From f37ffe54127f3b7444db16e63d92ffcecedd515d Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 20:44:35 +0000 Subject: [PATCH] Fecundity was converted to triggers. The hard-coded stuff was never removed or commented. Now, it is removed. --- src/forge/GameAction.java | 15 --------------- src/forge/GameActionUtil.java | 36 ----------------------------------- 2 files changed, 51 deletions(-) diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index e0b7889a421..1c581e96c0d 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -2064,22 +2064,7 @@ public class GameAction { // Destroy needs to be called with Last Known Information c.destroy(); - //destroy card effects: - CardList list = AllZoneUtil.getCardsInPlay(); - list = list.filter(new CardListFilter() { - public boolean addCard(Card c) { - ArrayList keywords = c.getKeyword(); - for(String kw:keywords) { - if(kw.startsWith("Whenever ") && kw.contains(" put into") - && kw.contains("graveyard from the battlefield,")) return true; - } - return false; - } - }); - checkWheneverKeyword(c, "PermanentIntoGraveyard",null); - for(int i = 0; i < list.size(); i++) - GameActionUtil.executeDestroyCardEffects(list.get(i), c); if(persist) { final Card persistCard = newCard; diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index f194bbeeef1..bd09c1e2b73 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -1942,10 +1942,6 @@ public class GameActionUtil { AllZone.GameInfo.setAssignedFirstStrikeDamageThisCombat(false); AllZone.GameInfo.setResolvedFirstStrikeDamageThisCombat(false); } - - public static void executeDestroyCardEffects(Card c, Card destroyed) { - if(destroyed.isCreature()) executeDestroyCreatureCardEffects(c, destroyed); - } public static boolean showYesNoDialog(Card c, String question) { AllZone.Display.setCard(c); @@ -1987,38 +1983,6 @@ public class GameActionUtil { } } - //***CREATURES START HERE*** - - public static void executeDestroyCreatureCardEffects(Card c, Card destroyed) { - if (c.getName().equals("Fecundity")) destroyCreature_Fecundity(c, destroyed); - } - - //*** - - private static void destroyCreature_Fecundity(Card c, Card destroyed) { - final Card crd = destroyed; - final Card crd2 = c; - - Ability ability = new Ability(c, "0") { - @Override - public void resolve() { - Player player = crd.getController(); - if (player.isHuman()) { - String question = "Draw a card?"; - if (showYesNoDialog(crd2, question)) player.drawCard(); - } else player.drawCard(); //computer - } - }; - - StringBuilder sb = new StringBuilder(); - sb.append("Fecundity - ").append(destroyed.getController()).append(" may draw a card."); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - } - - //***CREATURES END HERE*** - public static void executeLandfallEffects(Card c) { if(c.getName().equals("Lotus Cobra")) landfall_Lotus_Cobra(c); }