From 5ed34dbde4d8f730b1560882faef2a2abeab9b08 Mon Sep 17 00:00:00 2001 From: ArsenalNut Date: Wed, 23 Jan 2013 06:36:06 +0000 Subject: [PATCH] Fixed issues with blocking triggers --- res/cardsfolder/a/abomination.txt | 2 +- res/cardsfolder/a/aether_membrane.txt | 4 ++-- res/cardsfolder/a/aisling_leprechaun.txt | 8 ++++---- res/cardsfolder/a/alaborn_zealot.txt | 2 +- res/cardsfolder/a/arrogant_bloodlord.txt | 4 ++-- res/cardsfolder/a/ashmouth_hound.txt | 8 ++++---- res/cardsfolder/c/cockatrice.txt | 2 +- res/cardsfolder/c/crimson_roc.txt | 2 +- res/cardsfolder/d/dead_iron_sledge.txt | 2 +- res/cardsfolder/d/deathgazer.txt | 2 +- res/cardsfolder/d/dread_specter.txt | 2 +- res/cardsfolder/d/dread_wight.txt | 2 +- res/cardsfolder/d/dream_fighter.txt | 4 ++-- res/cardsfolder/e/engulfing_slagwurm.txt | 2 +- res/cardsfolder/e/ezuris_archers.txt | 2 +- res/cardsfolder/f/flailing_drake.txt | 2 +- res/cardsfolder/f/frostweb_spider.txt | 2 +- res/cardsfolder/g/ghost_hounds.txt | 2 +- res/cardsfolder/g/giant_shark.txt | 7 +++---- res/cardsfolder/g/gorgon_recluse.txt | 2 +- res/cardsfolder/g/greater_werewolf.txt | 2 +- res/cardsfolder/i/infernal_medusa.txt | 2 +- res/cardsfolder/i/inferno_elemental.txt | 8 ++++---- res/cardsfolder/k/kaijin_of_the_vanishing_touch.txt | 2 +- res/cardsfolder/l/lim_duls_cohort.txt | 2 +- res/cardsfolder/l/lim_duls_paladin.txt | 2 +- res/cardsfolder/l/loyal_sentry.txt | 2 +- res/cardsfolder/m/mammoth_harness.txt | 8 ++++---- res/cardsfolder/m/meglonoth.txt | 2 +- res/cardsfolder/r/righteous_indignation.txt | 2 +- res/cardsfolder/r/rock_basilisk.txt | 2 +- res/cardsfolder/s/sawtooth_ogre.txt | 2 +- res/cardsfolder/s/shape_stealer.txt | 2 +- res/cardsfolder/t/talruum_champion.txt | 2 +- res/cardsfolder/t/tangle_asp.txt | 2 +- res/cardsfolder/t/thicket_basilisk.txt | 2 +- res/cardsfolder/v/venom.txt | 2 +- res/cardsfolder/v/venomous_dragonfly.txt | 2 +- res/cardsfolder/v/vertigo_spawn.txt | 2 +- res/cardsfolder/w/wall_of_nets.txt | 2 +- res/cardsfolder/w/wall_of_tears.txt | 2 +- res/cardsfolder/w/witherscale_wurm.txt | 8 ++++---- res/cardsfolder/w/wooden_stake.txt | 6 +++--- res/cardsfolder/w/woolly_spider.txt | 2 +- src/main/java/forge/game/phase/CombatUtil.java | 8 +++++++- 45 files changed, 73 insertions(+), 68 deletions(-) diff --git a/res/cardsfolder/a/abomination.txt b/res/cardsfolder/a/abomination.txt index 729720ee81c..bd3fadba073 100644 --- a/res/cardsfolder/a/abomination.txt +++ b/res/cardsfolder/a/abomination.txt @@ -3,7 +3,7 @@ ManaCost:3 B B Types:Creature Horror Text:no text PT:2/6 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.Green,Creature.White | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.Green,Creature.White | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.Green,Creature.White | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/a/aether_membrane.txt b/res/cardsfolder/a/aether_membrane.txt index dabe369bccf..8999bc4b214 100644 --- a/res/cardsfolder/a/aether_membrane.txt +++ b/res/cardsfolder/a/aether_membrane.txt @@ -5,9 +5,9 @@ Text:no text PT:0/5 K:Defender K:Reach -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat. SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return blocked creature to its owner's hand at end of combat. -SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker +SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_membrane.jpg SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/93.jpg diff --git a/res/cardsfolder/a/aisling_leprechaun.txt b/res/cardsfolder/a/aisling_leprechaun.txt index dd577283b70..88073c7d5d8 100644 --- a/res/cardsfolder/a/aisling_leprechaun.txt +++ b/res/cardsfolder/a/aisling_leprechaun.txt @@ -3,10 +3,10 @@ ManaCost:G Types:Creature Faerie Text:no text PT:1/1 -T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigAnimate1 | 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$ TrigAnimate2 | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.) -SVar:TrigAnimate1:AB$Animate | Cost$ 0 | Defined$ TriggeredAttacker | Colors$ Green | Permanent$ True -SVar:TrigAnimate2:AB$Animate | Cost$ 0 | Defined$ TriggeredBlocker | Colors$ Green | Permanent$ True +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 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/aisling_leprechaun.jpg SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/87.jpg diff --git a/res/cardsfolder/a/alaborn_zealot.txt b/res/cardsfolder/a/alaborn_zealot.txt index 3277a6b9c56..a416f67c635 100644 --- a/res/cardsfolder/a/alaborn_zealot.txt +++ b/res/cardsfolder/a/alaborn_zealot.txt @@ -3,7 +3,7 @@ ManaCost:W Types:Creature Human Soldier Text:no text PT:1/1 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidAttacker$ Creature | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME blocks a creature, destroy that creature and CARDNAME. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME blocks a creature, destroy that creature and CARDNAME. SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DestroySelf SVar:DestroySelf:DB$Destroy | Cost$ 0 | Defined$ Self SVar:Rarity:Uncommon diff --git a/res/cardsfolder/a/arrogant_bloodlord.txt b/res/cardsfolder/a/arrogant_bloodlord.txt index 0b7f0eb43ed..f107d2ec126 100644 --- a/res/cardsfolder/a/arrogant_bloodlord.txt +++ b/res/cardsfolder/a/arrogant_bloodlord.txt @@ -3,10 +3,10 @@ ManaCost:1 B B Types:Creature Vampire Knight Text:no text PT:4/4 -T:Mode$ Blocks | ValidCard$ Creature.powerLE1 | ValidBlocked$ 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$ 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. -SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ Self +SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ Self SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/arrogant_bloodlord.jpg SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/94.jpg diff --git a/res/cardsfolder/a/ashmouth_hound.txt b/res/cardsfolder/a/ashmouth_hound.txt index bc650bd9e43..027484b9cd3 100644 --- a/res/cardsfolder/a/ashmouth_hound.txt +++ b/res/cardsfolder/a/ashmouth_hound.txt @@ -3,10 +3,10 @@ ManaCost:1 R Types:Creature Elemental Hound Text:no text PT:2/1 -T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigDamage1 | 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$ TrigDamage2 | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature. -SVar:TrigDamage1:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 1 -SVar:TrigDamage2:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredBlocker | NumDmg$ 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. +SVar:TrigDamageAttacker:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 1 +SVar:TrigDamageBlocker:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredBlocker | NumDmg$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/ashmouth_hound.jpg SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/128.jpg diff --git a/res/cardsfolder/c/cockatrice.txt b/res/cardsfolder/c/cockatrice.txt index f03ef043600..36a8c3c339e 100644 --- a/res/cardsfolder/c/cockatrice.txt +++ b/res/cardsfolder/c/cockatrice.txt @@ -4,7 +4,7 @@ Types:Creature Cockatrice Text:no text PT:2/4 K:Flying -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonWall | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.nonWall | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/c/crimson_roc.txt b/res/cardsfolder/c/crimson_roc.txt index 2b6470607c2..15c57b7b689 100644 --- a/res/cardsfolder/c/crimson_roc.txt +++ b/res/cardsfolder/c/crimson_roc.txt @@ -4,7 +4,7 @@ Types:Creature Bird Text:no text PT:2/2 K:Flying -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.withoutFlying | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature without flying, CARDNAME gets +1/+0 and gains first strike until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature.withoutFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature without flying, CARDNAME gets +1/+0 and gains first strike until end of turn. SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | KW$ First Strike SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/crimson_roc.jpg diff --git a/res/cardsfolder/d/dead_iron_sledge.txt b/res/cardsfolder/d/dead_iron_sledge.txt index cf23991bb0e..10995264360 100644 --- a/res/cardsfolder/d/dead_iron_sledge.txt +++ b/res/cardsfolder/d/dead_iron_sledge.txt @@ -3,7 +3,7 @@ ManaCost:1 Types:Artifact Equipment Text:no text K:Equip 2 -T:Mode$ Blocks | ValidCard$ Creature.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever equipped creature blocks or becomes blocked by a creature, destroy both creatures. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Creature.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever equipped creature blocks or becomes blocked by a creature, destroy both creatures. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Creature.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDestroy | Secondary$ True | TriggerDescription$ Whenever equipped creature blocks or becomes blocked by a creature, destroy both creatures. SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DBDestroy SVar:DBDestroy:DB$Destroy | Defined$ TriggeredBlocker diff --git a/res/cardsfolder/d/deathgazer.txt b/res/cardsfolder/d/deathgazer.txt index d3bf5eceeda..37129272834 100644 --- a/res/cardsfolder/d/deathgazer.txt +++ b/res/cardsfolder/d/deathgazer.txt @@ -3,7 +3,7 @@ ManaCost:3 B Types:Creature Lizard Text:no text PT:2/2 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.nonBlack | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/d/dread_specter.txt b/res/cardsfolder/d/dread_specter.txt index 2c2bd76aae7..59d460785dc 100644 --- a/res/cardsfolder/d/dread_specter.txt +++ b/res/cardsfolder/d/dread_specter.txt @@ -3,7 +3,7 @@ ManaCost:3 B Types:Creature Specter Text:no text PT:2/2 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.nonBlack | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/d/dread_wight.txt b/res/cardsfolder/d/dread_wight.txt index b830a863d47..0c3b9980bd1 100644 --- a/res/cardsfolder/d/dread_wight.txt +++ b/res/cardsfolder/d/dread_wight.txt @@ -3,7 +3,7 @@ ManaCost:3 B B Types:Creature Zombie Text:no text PT:3/4 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$At end of combat, put a paralyzation counter on each creature blocking or blocked by CARDNAME and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "4: Remove a paralyzation counter from this creature." +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$At end of combat, put a paralyzation counter on each creature blocking or blocked by CARDNAME and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "4: Remove a paralyzation counter from this creature." T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ At end of combat, put a paralyzation counter on each creature blocking or blocked by CARDNAME and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "4: Remove a paralyzation counter from this creature." SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigCounterBlocked | TriggerDescription$ At the end of combat, put a paralyzation counter on creature SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ You | Execute$ TrigCounterBlocker | TriggerDescription$ At the end of combat, put a paralyzation counter on creature diff --git a/res/cardsfolder/d/dream_fighter.txt b/res/cardsfolder/d/dream_fighter.txt index 47a1c80b4bb..fb99e7b4478 100644 --- a/res/cardsfolder/d/dream_fighter.txt +++ b/res/cardsfolder/d/dream_fighter.txt @@ -3,8 +3,8 @@ ManaCost:2 U Types:Creature Human Soldier Text:no text PT:1/1 -T:Mode$ Blocks | ValidCard$ Card.Self | TriggerZones$ Battlefield | ValidBlocked$ Creature | Execute$ TrigPhaseAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Dream Fighter and that creature phase out. -T:Mode$ Blocks | ValidCard$ Creature | TriggerZones$ Battlefield | ValidBlocked$ Card.Self | Execute$ TrigPhaseBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Dream Fighter and that creature phase out. +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. 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/res/cardsfolder/e/engulfing_slagwurm.txt b/res/cardsfolder/e/engulfing_slagwurm.txt index f78bfddbc8d..8abbe6ed223 100644 --- a/res/cardsfolder/e/engulfing_slagwurm.txt +++ b/res/cardsfolder/e/engulfing_slagwurm.txt @@ -3,7 +3,7 @@ ManaCost:5 G G Types:Creature Wurm Text:no text PT:7/7 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | 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$ 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. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DBGainLifeBlocked SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker | SubAbility$ DBGainLifeBlocker diff --git a/res/cardsfolder/e/ezuris_archers.txt b/res/cardsfolder/e/ezuris_archers.txt index a9529eb7a71..f5ad468e0ba 100644 --- a/res/cardsfolder/e/ezuris_archers.txt +++ b/res/cardsfolder/e/ezuris_archers.txt @@ -4,7 +4,7 @@ Types:Creature Elf Archer Text:no text PT:1/2 K:Reach -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.withFlying | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +3/+0 until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +3/+0 until end of turn. SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 3 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/ezuris_archers.jpg diff --git a/res/cardsfolder/f/flailing_drake.txt b/res/cardsfolder/f/flailing_drake.txt index abaa4fd9dd4..9cef0b8a6d0 100644 --- a/res/cardsfolder/f/flailing_drake.txt +++ b/res/cardsfolder/f/flailing_drake.txt @@ -4,7 +4,7 @@ Types:Creature Drake Text:no text PT:2/3 K:Flying -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigBlocks | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature gets +1/+1 until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigBlocks | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature gets +1/+1 until end of turn. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigBlocked | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature gets +1/+1 until end of turn. SVar:TrigBlocks:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ +1 | NumDef$ +1 SVar:TrigBlocked:AB$ Pump | Cost$ 0 | Defined$ TriggeredBlocker | NumAtt$ +1 | NumDef$ +1 diff --git a/res/cardsfolder/f/frostweb_spider.txt b/res/cardsfolder/f/frostweb_spider.txt index 83e41248d3f..9e2067541c1 100644 --- a/res/cardsfolder/f/frostweb_spider.txt +++ b/res/cardsfolder/f/frostweb_spider.txt @@ -4,7 +4,7 @@ Types:Snow Creature Spider Text:no text PT:1/3 K:Reach -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.withFlying | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, put a +1/+1 counter on CARDNAME at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, put a +1/+1 counter on CARDNAME at end of combat. SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigPutCounter | TriggerDescription$ Put a +1/+1 counter on CARDNAME. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 SVar:Rarity:Common diff --git a/res/cardsfolder/g/ghost_hounds.txt b/res/cardsfolder/g/ghost_hounds.txt index 7bbb2249be6..1a9c25fcd47 100644 --- a/res/cardsfolder/g/ghost_hounds.txt +++ b/res/cardsfolder/g/ghost_hounds.txt @@ -4,7 +4,7 @@ Types:Creature Hound Spirit Text:no text PT:1/1 K:Vigilance -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.White | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a white creature, CARDNAME gains first strike until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature.White | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a white creature, CARDNAME gains first strike until end of turn. T:Mode$ Blocks | ValidCard$ Creature.White | ValidBlocked$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a white creature, CARDNAME gains first strike until end of turn. SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ First Strike SVar:Rarity:Uncommon diff --git a/res/cardsfolder/g/giant_shark.txt b/res/cardsfolder/g/giant_shark.txt index 9a8739de7f0..f5ff68b8624 100644 --- a/res/cardsfolder/g/giant_shark.txt +++ b/res/cardsfolder/g/giant_shark.txt @@ -3,10 +3,9 @@ ManaCost:5 U Types:Creature Fish Text:no text PT:4/4 -T:Mode$ Blocks | ValidCard$ Creature.wasDealtDamageThisTurn | ValidAttacker$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBlockedPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature that has been dealt damage this turn, CARDNAME gets +2/+0 and gains trample until end of turn. -SVar:TrigBlockedPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 0 | KW$ Trample -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.wasDealtDamageThisTurn | TriggerZones$ Battlefield | Execute$ TrigBlockingPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature that has been dealt damage this turn, CARDNAME gets +2/+0 and gains trample until end of turn. -SVar:TrigBlockingPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 0 | KW$ Trample +T:Mode$ AttackerBlocked | ValidCard$ Creature.wasDealtDamageThisTurn | ValidBlocker$ Card.Self | Execute$ TrigPumpShark | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature that has been dealt damage this turn, CARDNAME gets +2/+0 and gains trample until end of turn. +T:Mode$ Blocks | ValidCard$ Creature.wasDealtDamageThisTurn | ValidBlocked$ Card.Self | Execute$ TrigPumpShark | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature that has been dealt damage this turn, CARDNAME gets +2/+0 and gains trample until end of turn. +SVar:TrigPumpShark:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 0 | KW$ Trample K:CARDNAME can't attack unless defending player controls an Island. T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Island.YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When you control no Islands, sacrifice CARDNAME. SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self diff --git a/res/cardsfolder/g/gorgon_recluse.txt b/res/cardsfolder/g/gorgon_recluse.txt index c5d48df13c5..d9085008cc6 100644 --- a/res/cardsfolder/g/gorgon_recluse.txt +++ b/res/cardsfolder/g/gorgon_recluse.txt @@ -3,7 +3,7 @@ ManaCost:3 B B Types:Creature Gorgon Text:no text PT:2/4 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.nonBlack | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/g/greater_werewolf.txt b/res/cardsfolder/g/greater_werewolf.txt index 9130e9970ff..b667a0ed79a 100644 --- a/res/cardsfolder/g/greater_werewolf.txt +++ b/res/cardsfolder/g/greater_werewolf.txt @@ -3,7 +3,7 @@ ManaCost:4 B Types:Creature Werewolf Text:no text PT:2/4 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ At end of combat, put a -0/-2 counter on each creature blocking or blocked by CARDNAME. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ At end of combat, put a -0/-2 counter on each creature blocking or blocked by CARDNAME. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ At end of combat, put a -0/-2 counter on each creature blocking or blocked by CARDNAME. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigCounterBlocked | TriggerDescription$ At the end of combat, put a -0/-2 counter on creature(s) SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ You | Execute$ TrigCounterBlocker | TriggerDescription$ At the end of combat, put a -0/-2 counter on creature(s) diff --git a/res/cardsfolder/i/infernal_medusa.txt b/res/cardsfolder/i/infernal_medusa.txt index 98b27dd5248..2fe7517c8df 100644 --- a/res/cardsfolder/i/infernal_medusa.txt +++ b/res/cardsfolder/i/infernal_medusa.txt @@ -3,7 +3,7 @@ ManaCost:3 B B Types:Creature Gorgon Text:no text PT:2/4 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks a creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks a creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.nonWall | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a non-Wall creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/i/inferno_elemental.txt b/res/cardsfolder/i/inferno_elemental.txt index 2958a2cac3c..a785f4ae649 100644 --- a/res/cardsfolder/i/inferno_elemental.txt +++ b/res/cardsfolder/i/inferno_elemental.txt @@ -3,10 +3,10 @@ ManaCost:4 R R Types:Creature Elemental Text:no text PT:4/4 -T:Mode$ Blocks | ValidBlocked$ Card.Self | Execute$ TrigDealDamageAttack | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 3 damage to that creature. -T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigDealDamageBlock | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 3 damage to that creature. -SVar:TrigDealDamageBlock:AB$DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 3 -SVar:TrigDealDamageAttack:AB$DealDamage | Cost$ 0 | Defined$ TriggeredBlocker | NumDmg$ 3 +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDealDamageAttack | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 3 damage to that creature. +T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigDealDamageBlock | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 3 damage to that creature. +SVar:TrigDealDamageAttack:AB$DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 3 +SVar:TrigDealDamageBlock:AB$DealDamage | Cost$ 0 | Defined$ TriggeredBlocker | NumDmg$ 3 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/inferno_elemental.jpg SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/142.jpg diff --git a/res/cardsfolder/k/kaijin_of_the_vanishing_touch.txt b/res/cardsfolder/k/kaijin_of_the_vanishing_touch.txt index 6f4e985cb79..c678068fa7f 100644 --- a/res/cardsfolder/k/kaijin_of_the_vanishing_touch.txt +++ b/res/cardsfolder/k/kaijin_of_the_vanishing_touch.txt @@ -4,7 +4,7 @@ Types:Creature Spirit Text:no text PT:0/3 K:Defender -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat. SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return blocked creature to its owner's hand at end of combat. SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker SVar:Rarity:Uncommon diff --git a/res/cardsfolder/l/lim_duls_cohort.txt b/res/cardsfolder/l/lim_duls_cohort.txt index b817a817923..78d8611a442 100644 --- a/res/cardsfolder/l/lim_duls_cohort.txt +++ b/res/cardsfolder/l/lim_duls_cohort.txt @@ -3,7 +3,7 @@ ManaCost:1 B B Types:Creature Zombie Text:no text PT:2/3 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigBlocks | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature can't be regenerated this turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigBlocks | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature can't be regenerated this turn. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigBlocked | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature can't be regenerated this turn. SVar:TrigBlocks:AB$Pump | Cost$ 0 | Defined$ TriggeredAttacker | KW$ HIDDEN CARDNAME can't be regenerated. SVar:TrigBlocked:AB$Pump | Cost$ 0 | Defined$ TriggeredBlocker | KW$ HIDDEN CARDNAME can't be regenerated. diff --git a/res/cardsfolder/l/lim_duls_paladin.txt b/res/cardsfolder/l/lim_duls_paladin.txt index bf330005041..208b7a550c4 100644 --- a/res/cardsfolder/l/lim_duls_paladin.txt +++ b/res/cardsfolder/l/lim_duls_paladin.txt @@ -9,7 +9,7 @@ SVar:TrigDiscard:AB$ Discard | Cost$ 0 | NumCards$ 1 | Mode$ TgtChoose | Optiona SVar:DBSacrifice:DB$ Sacrifice | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBDraw | References$ X SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBCleanup | References$ X SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBlockedPump | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, CARDNAME get +6/+3 until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature | TriggerZones$ Battlefield | Execute$ TrigBlockedPump | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, CARDNAME get +6/+3 until end of turn. SVar:TrigBlockedPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 6 | NumDef$ 3 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigUnBlockedPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, it assigns no combat damage to defending player this turn and that player loses 4 life. SVar:TrigUnBlockedPump:AB$ Pump | Cost$ 0 | KW$ HIDDEN CARDNAME assigns no combat damage | SubAbility$ DBLoseLife diff --git a/res/cardsfolder/l/loyal_sentry.txt b/res/cardsfolder/l/loyal_sentry.txt index b03e142d3f8..34b8ca61a58 100644 --- a/res/cardsfolder/l/loyal_sentry.txt +++ b/res/cardsfolder/l/loyal_sentry.txt @@ -3,7 +3,7 @@ ManaCost:W Types:Creature Human Soldier Text:no text PT:1/1 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME blocks a creature, destroy that creature and CARDNAME. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME blocks a creature, destroy that creature and CARDNAME. SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DestroySelf SVar:DestroySelf:DB$Destroy | Cost$ 0 | Defined$ Self SVar:Rarity:Rare diff --git a/res/cardsfolder/m/mammoth_harness.txt b/res/cardsfolder/m/mammoth_harness.txt index edd8aaab5c5..0e9274db015 100644 --- a/res/cardsfolder/m/mammoth_harness.txt +++ b/res/cardsfolder/m/mammoth_harness.txt @@ -5,10 +5,10 @@ Text:no text K:Enchant creature A:SP$ Attach | Cost$ 3 G | ValidTgts$ Creature | AITgts$ Creature.withFlying | AILogic$ Curse S:Mode$ Continuous | Affected$ Card.EnchantedBy | RemoveKeyword$ Flying | Description$ Enchanted creature loses flying. -T:Mode$ Blocks | ValidCard$ Card.EnchantedBy | ValidBlocked$ Creature | Execute$ TrigPump | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a creature, the other creature gains first strike until end of turn. -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.EnchantedBy | Execute$ TrigPump2 | Secondary$ True | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a creature, the other creature gains first strike until end of turn. -SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | KW$ First Strike -SVar:TrigPump2:AB$ Pump | Cost$ 0 | Defined$ TriggeredBlocker | KW$ First Strike +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.EnchantedBy | Execute$ TrigPumpAttacker | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a creature, the other creature gains first strike until end of turn. +T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.EnchantedBy | Execute$ TrigPumpBlocker | Secondary$ True | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a creature, the other creature gains first strike until end of turn. +SVar:TrigPumpAttacker:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | KW$ First Strike +SVar:TrigPumpBlocker:AB$ Pump | Cost$ 0 | Defined$ TriggeredBlocker | KW$ First Strike SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/mammoth_harness.jpg SetInfo:HML|Rare|http://magiccards.info/scans/en/hl/64.jpg diff --git a/res/cardsfolder/m/meglonoth.txt b/res/cardsfolder/m/meglonoth.txt index ccac33253ab..aedbbf0dffb 100644 --- a/res/cardsfolder/m/meglonoth.txt +++ b/res/cardsfolder/m/meglonoth.txt @@ -5,7 +5,7 @@ Text:no text PT:6/6 K:Vigilance K:Trample -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME blocks a creature, CARDNAME deals damage to that creature's controller equal to CARDNAME's power. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME blocks a creature, CARDNAME deals damage to that creature's controller equal to CARDNAME's power. SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredAttackerController | NumDmg$ X | References$ X SVar:X:Count$CardPower SVar:Rarity:Rare diff --git a/res/cardsfolder/r/righteous_indignation.txt b/res/cardsfolder/r/righteous_indignation.txt index ab9ae070d56..377e2271a67 100644 --- a/res/cardsfolder/r/righteous_indignation.txt +++ b/res/cardsfolder/r/righteous_indignation.txt @@ -2,7 +2,7 @@ Name:Righteous Indignation ManaCost:2 W Types:Enchantment Text:no text -T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Creature.Black,Creature.Red | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature blocks a black or red creature, the blocking creature gets +1/+1 until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature.Black,Creature.Red | ValidBlocker$ Creature | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature blocks a black or red creature, the blocking creature gets +1/+1 until end of turn. SVar:TrigPump:AB$ Pump | Cost$ 0 | NumAtt$ +1 | NumDef$ +1 | Defined$ TriggeredBlocker | SpellDescription$ The blocking creature gets +1/+1 until end of turn. SVar:RemRandomDeck:True SVar:Rarity:Uncommon diff --git a/res/cardsfolder/r/rock_basilisk.txt b/res/cardsfolder/r/rock_basilisk.txt index 51221780afc..b26e5807cda 100644 --- a/res/cardsfolder/r/rock_basilisk.txt +++ b/res/cardsfolder/r/rock_basilisk.txt @@ -3,7 +3,7 @@ ManaCost:4 R G Types:Creature Basilisk Text:no text PT:4/5 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonWall | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.nonWall | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/s/sawtooth_ogre.txt b/res/cardsfolder/s/sawtooth_ogre.txt index 528f0baf770..6087de4bd01 100644 --- a/res/cardsfolder/s/sawtooth_ogre.txt +++ b/res/cardsfolder/s/sawtooth_ogre.txt @@ -3,7 +3,7 @@ ManaCost:2 R R Types:Creature Ogre Text:no text PT:3/3 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Sawtooth Ogre deals 1 damage to that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Sawtooth Ogre deals 1 damage to that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Sawtooth Ogre deals 1 damage to that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDamageBlocked | TriggerDescription$ CARDNAME deals 1 damage to blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDamageBlocker | TriggerDescription$ CARDNAME deals 1 damage to blocking creature at end of combat. diff --git a/res/cardsfolder/s/shape_stealer.txt b/res/cardsfolder/s/shape_stealer.txt index 49977ec1fc1..04b2ac8678b 100644 --- a/res/cardsfolder/s/shape_stealer.txt +++ b/res/cardsfolder/s/shape_stealer.txt @@ -3,7 +3,7 @@ ManaCost:U U Types:Creature Shapeshifter Spirit Text:no text PT:1/1 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigAnimateBlocker | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, change CARDNAME's power and toughness to that creature's power and toughness until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigAnimateBlocker | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, change CARDNAME's power and toughness to that creature's power and toughness until end of turn. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigAnimateAttacker | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, change CARDNAME's power and toughness to that creature's power and toughness until end of turn. SVar:TrigAnimateBlocker:AB$ Animate | Cost$ 0 | Power$ W | Toughness$ X | References$ W,X SVar:TrigAnimateAttacker:AB$ Animate | Cost$ 0 | Power$ Y | Toughness$ Z | References$ Y,Z diff --git a/res/cardsfolder/t/talruum_champion.txt b/res/cardsfolder/t/talruum_champion.txt index 64ad45fc0bf..217b47afa3f 100644 --- a/res/cardsfolder/t/talruum_champion.txt +++ b/res/cardsfolder/t/talruum_champion.txt @@ -4,7 +4,7 @@ Types:Creature Minotaur Text:no text PT:3/3 K:First Strike -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigBlocks | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature loses first strike until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigBlocks | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature loses first strike until end of turn. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigBlocked | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature loses first strike until end of turn. SVar:TrigBlocks:AB$ Debuff | Cost$ 0 | Defined$ TriggeredAttacker | Keywords$ First Strike SVar:TrigBlocked:AB$ Debuff | Cost$ 0 | Defined$ TriggeredBlocker | Keywords$ First Strike diff --git a/res/cardsfolder/t/tangle_asp.txt b/res/cardsfolder/t/tangle_asp.txt index c95e40f4dd2..44a89b87ff2 100644 --- a/res/cardsfolder/t/tangle_asp.txt +++ b/res/cardsfolder/t/tangle_asp.txt @@ -3,7 +3,7 @@ ManaCost:1 G Types:Creature Snake Text:no text PT:1/2 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/t/thicket_basilisk.txt b/res/cardsfolder/t/thicket_basilisk.txt index 5daf1b96633..484a5dab331 100644 --- a/res/cardsfolder/t/thicket_basilisk.txt +++ b/res/cardsfolder/t/thicket_basilisk.txt @@ -3,7 +3,7 @@ ManaCost:3 G G Types:Creature Basilisk Text:no text PT:2/4 -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonWall | TriggerZones$ Battlefield | DelayedTrigger$ DelayBlockTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | DelayedTrigger$ DelayBlockTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.nonWall | ValidBlocked$ Card.Self | DelayedTrigger$ DelayAttackTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat. SVar:DelayBlockTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyAttacker | TriggerDescription$ Destroy attacking creature at end of combat. SVar:DelayAttackTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/v/venom.txt b/res/cardsfolder/v/venom.txt index c23d6de8e8a..e87c352827d 100644 --- a/res/cardsfolder/v/venom.txt +++ b/res/cardsfolder/v/venom.txt @@ -4,7 +4,7 @@ Types:Enchantment Aura Text:no text K:Enchant creature A:SP$ Attach | Cost$ 1 G G | ValidTgts$ Creature | AILogic$ Pump -T:Mode$ Blocks | ValidCard$ Card.AttachedBy | ValidBlocked$ Creature.nonWall | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature.nonWall | ValidBlocker$ Card.AttachedBy | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature.nonWall | ValidBlocked$ Card.AttachedBy | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/v/venomous_dragonfly.txt b/res/cardsfolder/v/venomous_dragonfly.txt index b690cd9ebbf..8b422afd3be 100644 --- a/res/cardsfolder/v/venomous_dragonfly.txt +++ b/res/cardsfolder/v/venomous_dragonfly.txt @@ -4,7 +4,7 @@ Types:Creature Insect Text:no text PT:1/1 K:Flying -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat. T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. diff --git a/res/cardsfolder/v/vertigo_spawn.txt b/res/cardsfolder/v/vertigo_spawn.txt index 5e34e2743bc..98b5ff7f2fb 100644 --- a/res/cardsfolder/v/vertigo_spawn.txt +++ b/res/cardsfolder/v/vertigo_spawn.txt @@ -4,7 +4,7 @@ Types:Creature Illusion Text:no text PT:0/3 K:Defender -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step. SVar:TrigTap:AB$ Tap | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DBPump SVar:DBPump:DB$ Pump | Defined$ TriggeredAttacker | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True SVar:Rarity:Uncommon diff --git a/res/cardsfolder/w/wall_of_nets.txt b/res/cardsfolder/w/wall_of_nets.txt index 065ffd5ee0e..866bce034f8 100644 --- a/res/cardsfolder/w/wall_of_nets.txt +++ b/res/cardsfolder/w/wall_of_nets.txt @@ -4,7 +4,7 @@ Types:Creature Wall Text:no text PT:0/7 K:Defender -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | Static$ True | TriggerDescription$ At end of combat, exile all creatures blocked by CARDNAME. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | Static$ True | TriggerDescription$ At end of combat, exile all creatures blocked by CARDNAME. T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return all cards exiled with CARDNAME to the battlefield under their owners' control. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigExile | TriggerDescription$ Exile blocked creature at end of combat. SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredAttacker | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True diff --git a/res/cardsfolder/w/wall_of_tears.txt b/res/cardsfolder/w/wall_of_tears.txt index 097244bdeb5..f0ad889ca95 100644 --- a/res/cardsfolder/w/wall_of_tears.txt +++ b/res/cardsfolder/w/wall_of_tears.txt @@ -4,7 +4,7 @@ Types:Creature Wall Text:no text PT:0/4 K:Defender -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat. +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat. SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return blocked creature to its owner's hand at end of combat. SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker SVar:Rarity:Uncommon diff --git a/res/cardsfolder/w/witherscale_wurm.txt b/res/cardsfolder/w/witherscale_wurm.txt index 5218abdd843..e036c0a0091 100644 --- a/res/cardsfolder/w/witherscale_wurm.txt +++ b/res/cardsfolder/w/witherscale_wurm.txt @@ -3,11 +3,11 @@ ManaCost:4 G G Types:Creature Wurm Text:no text PT:9/9 -T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigWitherBlocked | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.) -T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigWitherBlocker | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.) +T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigPumpAttacker | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.) +T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigPumpBlocker | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, remove all -1/-1 counters from it. -SVar:TrigWitherBlocked:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | KW$ Wither -SVar:TrigWitherBlocker:AB$ Pump | Cost$ 0 | Defined$ TriggeredBlocker | KW$ Wither +SVar:TrigPumpAttacker:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | KW$ Wither +SVar:TrigPumpBlocker:AB$ Pump | Cost$ 0 | Defined$ TriggeredBlocker | KW$ Wither SVar:TrigRemoveCounter:AB$ RemoveCounter | Cost$ 0 | CounterType$ M1M1 | CounterNum$ All | References$ All SVar:All:Count$CardCounters.M1M1 SVar:Rarity:Rare diff --git a/res/cardsfolder/w/wooden_stake.txt b/res/cardsfolder/w/wooden_stake.txt index 33f8cbb8bf2..19f9493ba7f 100644 --- a/res/cardsfolder/w/wooden_stake.txt +++ b/res/cardsfolder/w/wooden_stake.txt @@ -4,10 +4,10 @@ Types:Artifact Equipment Text:no text K:Equip 1 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0. -T:Mode$ Blocks | ValidCard$ Card.AttachedBy | ValidBlocked$ Creature.Vampire | Execute$ TrigDestroyBlocked | TriggerDescription$ Whenever equipped creature blocks or becomes blocked by a Vampire, destroy that creature. It can't be regenerated. +T:Mode$ AttackerBlocked | ValidCard$ Creature.Vampire | ValidBlocker$ Card.AttachedBy | Execute$ TrigDestroyBlocked | TriggerDescription$ Whenever equipped creature blocks or becomes blocked by a Vampire, destroy that creature. It can't be regenerated. T:Mode$ Blocks | ValidCard$ Creature.Vampire | ValidBlocked$ Card.AttachedBy | Execute$ TrigDestroyBlocker | Secondary$ True | TriggerDescription$ Whenever equipped creature blocks or becomes blocked by a Vampire, destroy that creature. It can't be regenerated. -SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker | NoRegen$ True -SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker | NoRegen$ True +SVar:TrigDestroyBlocked:AB$ Destroy | Cost$ 0 | Defined$ TriggeredAttacker | NoRegen$ True +SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker | NoRegen$ True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/wooden_stake.jpg SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/237.jpg diff --git a/res/cardsfolder/w/woolly_spider.txt b/res/cardsfolder/w/woolly_spider.txt index 047ef0fd215..30e21a5af6e 100644 --- a/res/cardsfolder/w/woolly_spider.txt +++ b/res/cardsfolder/w/woolly_spider.txt @@ -4,7 +4,7 @@ Types:Creature Spider Text:no text PT:2/3 K:Reach -T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.withFlying | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +0/+2 until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +0/+2 until end of turn. SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumDef$ 2 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/woolly_spider.jpg diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java index e7086ca600e..e9d90e3d0f1 100644 --- a/src/main/java/forge/game/phase/CombatUtil.java +++ b/src/main/java/forge/game/phase/CombatUtil.java @@ -2942,6 +2942,12 @@ public class CombatUtil { for (final Ability ab : CardFactoryUtil.getBushidoEffects(c)) { Singletons.getModel().getGame().getStack().add(ab); } + // Run triggers + final HashMap runParams = new HashMap(); + runParams.put("Blocker", c); + final Card attacker = Singletons.getModel().getGame().getCombat().getAttackersBlockedBy(c).get(0); + runParams.put("Attacker", attacker); + Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.Blocks, runParams, false); } c.getDamageHistory().setCreatureBlockedThisCombat(true); @@ -2966,7 +2972,7 @@ public class CombatUtil { final HashMap runParams = new HashMap(); runParams.put("Attacker", a); runParams.put("Blocker", b); - Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.Blocks, runParams, false); + //Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.Blocks, runParams, false); if (!a.getDamageHistory().getCreatureGotBlockedThisCombat()) { final int blockers = Singletons.getModel().getGame().getCombat().getBlockers(a).size();