diff --git a/res/cardsfolder/dingus_egg.txt b/res/cardsfolder/dingus_egg.txt index 21bdd66f492..957fd842a40 100644 --- a/res/cardsfolder/dingus_egg.txt +++ b/res/cardsfolder/dingus_egg.txt @@ -2,7 +2,8 @@ Name:Dingus Egg ManaCost:4 Types:Artifact Text:no text -K:Whenever a land is put into a graveyard from the battlefield, Dingus Egg deals 2 damage to that land's controller. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Land | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a land is put into a graveyard from the battlefield, CARDNAME deals 2 damage to that land's controller. +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredController | NumDmg$ 2 SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/dingus_egg.jpg diff --git a/res/cardsfolder/dingus_staff.txt b/res/cardsfolder/dingus_staff.txt index bb11115f258..56b5a0d231d 100644 --- a/res/cardsfolder/dingus_staff.txt +++ b/res/cardsfolder/dingus_staff.txt @@ -2,7 +2,8 @@ Name:Dingus Staff ManaCost:4 Types:Artifact Text:no text -K:Whenever a creature is put into a graveyard from the battlefield, Dingus Staff deals 2 damage to that creature's controller. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature is put into a graveyard from the battlefield, CARDNAME deals 2 damage to that land's controller. +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredController | NumDmg$ 2 SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/dingus_staff.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index fd1c8dc0d14..6a3adbb7029 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -2417,7 +2417,6 @@ public class GameActionUtil { public static void executeDestroyCardEffects(Card c, Card destroyed) { if(destroyed.isCreature()) executeDestroyCreatureCardEffects(c, destroyed); - if(destroyed.isLand()) executeDestroyLandCardEffects(c, destroyed); if(destroyed.isEnchantment()) executeDestroyEnchantmentCardEffects(c, destroyed); } @@ -2470,8 +2469,7 @@ public class GameActionUtil { if(c.getName().equals("Goblin Sharpshooter")) destroyCreature_Goblin_Sharpshooter(c, destroyed); */ - if (c.getName().equals("Dingus Staff")) destroyCreature_Dingus_Staff(c, destroyed); - else if (c.getName().equals("Prowess of the Fair") + if (c.getName().equals("Prowess of the Fair") && destroyed.isType("Elf") && !destroyed.isToken() && !c.equals(destroyed) @@ -2496,36 +2494,6 @@ public class GameActionUtil { } */ - private static void destroyCreature_Dingus_Staff(Card c, Card destroyed) { - final Card crd = destroyed; - Ability ability = new Ability(c, "0") { - @Override - public void resolve() { - Player player = crd.getController(); - player.loseLife(2,crd); - } - }; - - StringBuilder sb = new StringBuilder(); - sb.append("Dingus Staff - Deals 2 damage to ").append(destroyed.getController()).append("."); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - } - - /* - private static void destroyCreature_Dauthi_Ghoul(Card c, Card destroyed) { - final Card crd = c; - Ability ability = new Ability(c, "0") { - @Override - public void resolve() { - if(AllZone.GameAction.isCardInPlay(crd)) crd.addCounter(Counters.P1P1, 1); - } - }; - if(AllZone.GameAction.isCardInPlay(c)) ability.setStackDescription("Dauthi Ghoul - gets a +1/+1 counter."); - AllZone.Stack.add(ability); - }*/ - private static void destroyCreature_Prowess_of_the_Fair(Card c, Card destroyed) { final Card crd = c; final Card crd2 = c; @@ -2625,33 +2593,6 @@ public class GameActionUtil { //***CREATURES END HERE*** - //***LANDS START HERE*** - - public static void executeDestroyLandCardEffects(Card c, Card destroyed) { - if(c.getName().equals("Dingus Egg")) destroyLand_Dingus_Egg(c, destroyed); - } - - //*** - - private static void destroyLand_Dingus_Egg(Card c, Card destroyed) { - final Card crd = destroyed; - Ability ability = new Ability(c, "0") { - @Override - public void resolve() { - Player player = crd.getController(); - player.addDamage(2, crd); - } - }; - - StringBuilder sb = new StringBuilder(); - sb.append("Dingus Egg - Deals 2 damage to ").append(destroyed.getController()).append("."); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - } - - //***LANDS END HERE*** - //***ENCHANTMENTS START HERE*** public static void executeDestroyEnchantmentCardEffects(Card c, Card destroyed) {