From 248c95123a72bc1b0cc3e613f285e05f40a9888e Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 22:12:55 +0000 Subject: [PATCH] *Suppressed CounterAdded triggers when adding counters via Devour keyword. *Converted Caldera Hellion to script. (It was hardcoded inside the devour code o_O) --- res/cardsfolder/caldera_hellion.txt | 4 +++- src/forge/card/cardFactory/CardFactory.java | 12 +++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/res/cardsfolder/caldera_hellion.txt b/res/cardsfolder/caldera_hellion.txt index d931aeb9599..852de5152bc 100644 --- a/res/cardsfolder/caldera_hellion.txt +++ b/res/cardsfolder/caldera_hellion.txt @@ -1,9 +1,11 @@ Name:Caldera Hellion ManaCost:3 R R Types:Creature Hellion -Text:When CARDNAME enters the battlefield, it deals 3 damage to each creature. +Text:no text PT:3/3 K:Devour:1 +T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 3 damage to each creature. +SVar:TrigDamage:AB$DamageAll | Cost$ 0 | ValidCards$ Creature | ValidDescription$ each creature. | NumDmg$ 3 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/caldera_hellion.jpg SetInfo:ALA|Rare|http://magiccards.info/scans/en/ala/95.jpg diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java index 89df1c82a1b..5e0b41b1a3d 100644 --- a/src/forge/card/cardFactory/CardFactory.java +++ b/src/forge/card/cardFactory/CardFactory.java @@ -801,19 +801,17 @@ public class CardFactory implements NewConstants { @Override public void resolve() { int totalCounters = numCreatures[0] * multiplier; + + AllZone.TriggerHandler.suppressMode("CounterAdded"); + card.addCounter(Counters.P1P1, totalCounters); + + AllZone.TriggerHandler.clearSuppression("CounterAdded"); if(card.getName().equals("Skullmulcher")) { for(int i = 0; i < numCreatures[0]; i++) { card.getController().drawCard(); } - } else if(card.getName().equals("Caldera Hellion")) { - CardList creatures = AllZoneUtil.getCreaturesInPlay(); - - for(int i = 0; i < creatures.size(); i++) { - Card crd = creatures.get(i); - crd.addDamage(3, card); - } } }