From bdd34f548e73fe790015390215e0bcc16b425caa Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 17 Sep 2012 18:45:49 +0000 Subject: [PATCH] - Added Necravolver and Rakavolver by marc. --- .gitattributes | 2 ++ res/cardsfolder/n/necravolver.txt | 22 +++++++++++++++++++ res/cardsfolder/r/rakavolver.txt | 22 +++++++++++++++++++ .../forge/card/trigger/TriggerHandler.java | 5 ++++- 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 res/cardsfolder/n/necravolver.txt create mode 100644 res/cardsfolder/r/rakavolver.txt diff --git a/.gitattributes b/.gitattributes index 3453f8b0d1e..db69c375b08 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6355,6 +6355,7 @@ res/cardsfolder/n/neck_snap.txt svneol=native#text/plain res/cardsfolder/n/necra_disciple.txt svneol=native#text/plain res/cardsfolder/n/necra_sanctuary.txt -text res/cardsfolder/n/necratog.txt svneol=native#text/plain +res/cardsfolder/n/necravolver.txt -text res/cardsfolder/n/necrite.txt svneol=native#text/plain res/cardsfolder/n/necrobite.txt -text res/cardsfolder/n/necrogen_censer.txt svneol=native#text/plain @@ -7406,6 +7407,7 @@ res/cardsfolder/r/raise_the_alarm.txt svneol=native#text/plain res/cardsfolder/r/raka_disciple.txt svneol=native#text/plain res/cardsfolder/r/raka_sanctuary.txt -text res/cardsfolder/r/rakalite.txt -text +res/cardsfolder/r/rakavolver.txt -text res/cardsfolder/r/rakdos_augermage.txt svneol=native#text/plain res/cardsfolder/r/rakdos_carnarium.txt svneol=native#text/plain res/cardsfolder/r/rakdos_guildmage.txt svneol=native#text/plain diff --git a/res/cardsfolder/n/necravolver.txt b/res/cardsfolder/n/necravolver.txt new file mode 100644 index 00000000000..bc3700d6f02 --- /dev/null +++ b/res/cardsfolder/n/necravolver.txt @@ -0,0 +1,22 @@ +Name:Necravolver +ManaCost:2 B +Types:Creature Volver +Text:no text +PT:2/2 +K:Kicker 1 G +K:Kicker W +T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked 1 G | Origin$ Any | Destination$ Battlefield | Execute$ VolverPumped | Static$ True | TriggerDescription$ If CARDNAME was kicked with its 1 G kicker, it enters the battlefield with two +1/+1 counters on it and with trample. +SVar:VolverPumped:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ VolverStomp +SVar:VolverStomp:DB$ Pump | Defined$ Self | KW$ Trample | Permanent$ True +T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked W | Origin$ Any | Destination$ Battlefield | Execute$ VolverPumped2 | Static$ True | TriggerDescription$ If CARDNAME was kicked with its W kicker, it enters the battlefield with a +1/+1 counter on it and with "Whenever CARDNAME deals damage, you gain that much life." +SVar:VolverPumped2:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ VolverLife +SVar:VolverLife:DB$ Animate | Defined$ Self | Triggers$ PseudoLifelink | sVars$ VolverTrigGain,VolverX | Permanent$ True +SVar:PseudoLifelink:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life. +SVar:VolverTrigGain:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ VolverX | References$ VolverX +SVar:VolverX:TriggerCount$DamageAmount +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/necravolver.jpg +SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/46.jpg +Oracle:Kicker {1}{G} and/or {W} (You may pay an additional {1}{G} and/or {W} as you cast this spell.)\nIf Necravolver was kicked with its {1}{G} kicker, it enters the battlefield with two +1/+1 counters on it and with trample.\nIf Necravolver was kicked with its {W} kicker, it enters the battlefield with a +1/+1 counter on it and with "Whenever Necravolver deals damage, you gain that much life." +End \ No newline at end of file diff --git a/res/cardsfolder/r/rakavolver.txt b/res/cardsfolder/r/rakavolver.txt new file mode 100644 index 00000000000..e8094bd1cc3 --- /dev/null +++ b/res/cardsfolder/r/rakavolver.txt @@ -0,0 +1,22 @@ +Name:Rakavolver +ManaCost:2 R +Types:Creature Volver +Text:no text +PT:2/2 +K:Kicker 1 W +K:Kicker U +T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked 1 W | Origin$ Any | Destination$ Battlefield | Execute$ VolverStrength | Static$ True | TriggerDescription$ If CARDNAME was kicked with its 1 W kicker, it enters the battlefield with two +1/+1 counters on it and with "Whenever CARDNAME deals damage, you gain that much life." +SVar:VolverStrength:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ VolverLife +SVar:VolverLife:DB$ Animate | Defined$ Self | Triggers$ PseudoLifelink | sVars$ VolverTrigGain,VolverX | Permanent$ True +SVar:PseudoLifelink:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life. +SVar:VolverTrigGain:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ VolverX | References$ VolverX +SVar:VolverX:TriggerCount$DamageAmount +T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked U | Origin$ Any | Destination$ Battlefield | Execute$ VolverPumped | Static$ True | TriggerDescription$ If CARDNAME was kicked with its U kicker, it enters the battlefield with a +1/+1 counter on it and with flying. +SVar:VolverPumped:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ VolverLaunch +SVar:VolverLaunch:DB$ Pump | Defined$ Self | KW$ Flying | Permanent$ True +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/rakavolver.jpg +SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/68.jpg +Oracle:Kicker {1}{W} and/or {U} (You may pay an additional {1}{W} and/or {U} as you cast this spell.)\nIf Rakavolver was kicked with its {1}{W} kicker, it enters the battlefield with two +1/+1 counters on it and with "Whenever Rakavolver deals damage, you gain that much life."\nIf Rakavolver was kicked with its {U} kicker, it enters the battlefield with a +1/+1 counter on it and with flying. +End \ No newline at end of file diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index ae7bcae01f9..6dc96181722 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -20,6 +20,7 @@ package forge.card.trigger; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; +import java.util.List; import java.util.Map; import forge.AllZone; import forge.AllZoneUtil; @@ -293,7 +294,9 @@ public class TriggerHandler { // Static triggers for (final Card c : allCards) { - for (final Trigger t : c.getTriggers()) { + ArrayList triggers = new ArrayList(); + triggers.addAll(c.getTriggers()); + for (final Trigger t : triggers) { if (t.isStatic()) { checkStatics |= this.runSingleTrigger(t, mode, runParams); }