From 6286e57068b0cdb773732afffc95dce6a6fc2461 Mon Sep 17 00:00:00 2001 From: elcnesh Date: Fri, 11 Jul 2014 11:03:56 +0000 Subject: [PATCH] Fix '[blocks or] becomes blocked by a creature' triggers to trigger once for each blocker ('a'-'e'). --- forge-gui/res/cardsfolder/a/aisling_leprechaun.txt | 8 ++++---- forge-gui/res/cardsfolder/a/arrogant_bloodlord.txt | 6 +++--- forge-gui/res/cardsfolder/a/ashmouth_hound.txt | 4 ++-- forge-gui/res/cardsfolder/b/basalt_golem.txt | 6 +++--- forge-gui/res/cardsfolder/b/battering_ram.txt | 2 +- forge-gui/res/cardsfolder/c/cave_tiger.txt | 2 +- forge-gui/res/cardsfolder/d/dream_fighter.txt | 4 ++-- forge-gui/res/cardsfolder/e/elven_warhounds.txt | 2 +- forge-gui/res/cardsfolder/e/engulfing_slagwurm.txt | 4 ++-- forge-gui/res/cardsfolder/e/evil_eye_of_urborg.txt | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/forge-gui/res/cardsfolder/a/aisling_leprechaun.txt b/forge-gui/res/cardsfolder/a/aisling_leprechaun.txt index 490676049a4..65b4f75f226 100644 --- a/forge-gui/res/cardsfolder/a/aisling_leprechaun.txt +++ b/forge-gui/res/cardsfolder/a/aisling_leprechaun.txt @@ -2,9 +2,9 @@ Name:Aisling Leprechaun ManaCost:G Types:Creature Faerie PT:1/1 -T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigAnimateAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.) -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigAnimateBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.) -SVar:TrigAnimateAttacker:AB$Animate | Cost$ 0 | Defined$ TriggeredAttacker | Colors$ Green | Permanent$ True -SVar:TrigAnimateBlocker:AB$Animate | Cost$ 0 | Defined$ TriggeredBlocker | Colors$ Green | Permanent$ True +T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigAnimateAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.) +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigAnimateBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.) +SVar:TrigAnimateAttacker:AB$Animate | Cost$ 0 | Defined$ TriggeredAttacker | Colors$ Green | OverwriteColors$ True | Permanent$ True +SVar:TrigAnimateBlocker:AB$Animate | Cost$ 0 | Defined$ TriggeredBlocker | Colors$ Green | OverwriteColors$ True | Permanent$ True SVar:Picture:http://www.wizards.com/global/images/magic/general/aisling_leprechaun.jpg Oracle:Whenever Aisling Leprechaun blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.) diff --git a/forge-gui/res/cardsfolder/a/arrogant_bloodlord.txt b/forge-gui/res/cardsfolder/a/arrogant_bloodlord.txt index 1cfa1b0800e..49ca71e31e3 100644 --- a/forge-gui/res/cardsfolder/a/arrogant_bloodlord.txt +++ b/forge-gui/res/cardsfolder/a/arrogant_bloodlord.txt @@ -2,9 +2,9 @@ Name:Arrogant Bloodlord ManaCost:1 B B Types:Creature Vampire Knight PT:4/4 -T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature.powerLE1 | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat. -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.powerLE1 | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat. -SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy CARDNAME at end of combat. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.powerLE1 | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.powerLE1 | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat. +SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy the creature blocking or blocked by CARDNAME at end of combat. SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ Self SVar:Picture:http://www.wizards.com/global/images/magic/general/arrogant_bloodlord.jpg Oracle:Whenever Arrogant Bloodlord blocks or becomes blocked by a creature with power 1 or less, destroy Arrogant Bloodlord at end of combat. diff --git a/forge-gui/res/cardsfolder/a/ashmouth_hound.txt b/forge-gui/res/cardsfolder/a/ashmouth_hound.txt index 2241540040e..ef639635467 100644 --- a/forge-gui/res/cardsfolder/a/ashmouth_hound.txt +++ b/forge-gui/res/cardsfolder/a/ashmouth_hound.txt @@ -2,8 +2,8 @@ Name:Ashmouth Hound ManaCost:1 R Types:Creature Elemental Hound PT:2/1 -T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDamageAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature. -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigDamageBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDamageAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigDamageBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature. SVar:TrigDamageAttacker:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 1 SVar:TrigDamageBlocker:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredBlocker | NumDmg$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashmouth_hound.jpg diff --git a/forge-gui/res/cardsfolder/b/basalt_golem.txt b/forge-gui/res/cardsfolder/b/basalt_golem.txt index 787ec218b16..ebae30fd46f 100644 --- a/forge-gui/res/cardsfolder/b/basalt_golem.txt +++ b/forge-gui/res/cardsfolder/b/basalt_golem.txt @@ -3,10 +3,10 @@ ManaCost:5 Types:Artifact Creature Golem PT:2/4 K:CantBeBlockedBy Artifact.Creature -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | DelayedTrigger$ TrigEndCombat | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, that creature's controller sacrifices it at end of combat. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield. -SVar:TrigEndCombat:Mode$ Phase | Phase$ EndCombat | Execute$ TrigSacBlocker | TriggerDescription$ At end of combat sacrifice creature that blocked Basalt Golem. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | DelayedTrigger$ TrigEndCombat | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, that creature's controller sacrifices it at end of combat. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield. +SVar:TrigEndCombat:Mode$ Phase | Phase$ EndCombat | Execute$ TrigSacBlocker | TriggerDescription$ At end of combat, the controller of the creature that blocked CARDNAME sacrifices that creature. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield. SVar:TrigSacBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker | Sacrifice$ True | SubAbility$ DBToken | RememberDestroyed$ True -SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Wall | TokenTypes$ Artifact,Creature,Wall | TokenOwner$ TriggeredBlockerController | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 2 | TokenKeywords$ Defender | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup +SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Wall | TokenTypes$ Artifact,Creature,Wall | TokenOwner$ TriggeredBlockerController | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 2 | TokenKeywords$ Defender | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Amount SVar:Picture:http://www.wizards.com/global/images/magic/general/basalt_golem.jpg diff --git a/forge-gui/res/cardsfolder/b/battering_ram.txt b/forge-gui/res/cardsfolder/b/battering_ram.txt index a00909fe0cd..5519a95e54a 100644 --- a/forge-gui/res/cardsfolder/b/battering_ram.txt +++ b/forge-gui/res/cardsfolder/b/battering_ram.txt @@ -4,7 +4,7 @@ Types:Artifact Creature Construct PT:1/1 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigBanding | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, CARDNAME gains banding until end of combat. SVar:TrigBanding:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ Banding | UntilEndOfCombat$ True -T:Mode$ Blocks | ValidCard$ Creature.Wall | ValidBlocked$ Card.Self | DelayedTrigger$ DelayAttackTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a Wall, destroy that Wall at end of combat. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Wall | DelayedTrigger$ DelayAttackTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a Wall, destroy that Wall at end of combat. SVar:DelayAttackTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocked creature at end of combat. SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker SVar:RemAIDeck:True diff --git a/forge-gui/res/cardsfolder/c/cave_tiger.txt b/forge-gui/res/cardsfolder/c/cave_tiger.txt index d16446ec6a1..ffe3d1fe73b 100644 --- a/forge-gui/res/cardsfolder/c/cave_tiger.txt +++ b/forge-gui/res/cardsfolder/c/cave_tiger.txt @@ -2,7 +2,7 @@ Name:Cave Tiger ManaCost:2 G Types:Creature Cat PT:2/2 -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBlockedPump | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, CARDNAME gets +1/+1 until end of turn. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocked$ Creature | TriggerZones$ Battlefield | Execute$ TrigBlockedPump | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, CARDNAME gets +1/+1 until end of turn. SVar:TrigBlockedPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ +1 | NumDef$ +1 SVar:Picture:http://www.wizards.com/global/images/magic/general/cave_tiger.jpg Oracle:Whenever Cave Tiger becomes blocked by a creature, Cave Tiger gets +1/+1 until end of turn. diff --git a/forge-gui/res/cardsfolder/d/dream_fighter.txt b/forge-gui/res/cardsfolder/d/dream_fighter.txt index ce26a5bdf55..23a30c8920d 100644 --- a/forge-gui/res/cardsfolder/d/dream_fighter.txt +++ b/forge-gui/res/cardsfolder/d/dream_fighter.txt @@ -2,8 +2,8 @@ Name:Dream Fighter ManaCost:2 U Types:Creature Human Soldier PT:1/1 -T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPhaseAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Dream Fighter and that creature phase out. -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPhaseBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Dream Fighter and that creature phase out. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPhaseAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Dream Fighter and that creature phase out. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | TriggerZones$ Battlefield | Execute$ TrigPhaseBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Dream Fighter and that creature phase out. SVar:TrigPhaseAttacker:DB$ Phases | Defined$ TriggeredAttacker | SubAbility$ DBPhaseSelf SVar:TrigPhaseBlocker:DB$ Phases | Defined$ TriggeredBlocker | SubAbility$ DBPhaseSelf SVar:DBPhaseSelf:DB$ Phases | Defined$ Self diff --git a/forge-gui/res/cardsfolder/e/elven_warhounds.txt b/forge-gui/res/cardsfolder/e/elven_warhounds.txt index d8cbfde02d1..340f6df3b09 100644 --- a/forge-gui/res/cardsfolder/e/elven_warhounds.txt +++ b/forge-gui/res/cardsfolder/e/elven_warhounds.txt @@ -2,7 +2,7 @@ Name:Elven Warhounds ManaCost:3 G Types:Creature Hound PT:2/2 -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, put that creature on top of its owner's library. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, put that creature on top of its owner's library. SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Defined$ TriggeredBlocker | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 SVar:Picture:http://www.wizards.com/global/images/magic/general/elven_warhounds.jpg Oracle:Whenever Elven Warhounds becomes blocked by a creature, put that creature on top of its owner's library. diff --git a/forge-gui/res/cardsfolder/e/engulfing_slagwurm.txt b/forge-gui/res/cardsfolder/e/engulfing_slagwurm.txt index e92e8892ae3..fed960c3fed 100644 --- a/forge-gui/res/cardsfolder/e/engulfing_slagwurm.txt +++ b/forge-gui/res/cardsfolder/e/engulfing_slagwurm.txt @@ -2,8 +2,8 @@ Name:Engulfing Slagwurm ManaCost:5 G G Types:Creature Wurm PT:7/7 -T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDestroyBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature. You gain life equal to that creature's toughness. -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigDestroyBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature. You gain life equal to that creature's toughness. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDestroyBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature. You gain life equal to that creature's toughness. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigDestroyBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature. You gain life equal to that creature's toughness. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DBGainLifeBlocked SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker | SubAbility$ DBGainLifeBlocker SVar:DBGainLifeBlocked:DB$GainLife | Defined$ You | LifeAmount$ X | References$ X diff --git a/forge-gui/res/cardsfolder/e/evil_eye_of_urborg.txt b/forge-gui/res/cardsfolder/e/evil_eye_of_urborg.txt index 5b5d2a59b42..e38403696e2 100644 --- a/forge-gui/res/cardsfolder/e/evil_eye_of_urborg.txt +++ b/forge-gui/res/cardsfolder/e/evil_eye_of_urborg.txt @@ -3,7 +3,7 @@ ManaCost:4 B Types:Creature Eye PT:6/3 S:Mode$ Continuous | Affected$ Creature.nonEye+YouCtrl | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Non-Eye creatures you control can't attack. -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigDestroyBlocker | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, destroy that creature. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigDestroyBlocker | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, destroy that creature. SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker SVar:Picture:http://www.wizards.com/global/images/magic/general/evil_eye_of_urborg.jpg Oracle:Non-Eye creatures you control can't attack.\nWhenever Evil Eye of Urborg becomes blocked by a creature, destroy that creature.