From 76c043fa067a29f2ecbcd58bdc6eb30d18e49662 Mon Sep 17 00:00:00 2001 From: elcnesh Date: Fri, 11 Jul 2014 23:16:04 +0000 Subject: [PATCH] Fix some more block-triggers. --- .../java/forge/game/phase/PhaseHandler.java | 4 +- .../forge/game/trigger/TriggerBlocks.java | 41 +++++++++---------- forge-gui/res/cardsfolder/a/abomination.txt | 4 +- .../res/cardsfolder/c/catacomb_dragon.txt | 2 +- forge-gui/res/cardsfolder/c/cockatrice.txt | 4 +- .../res/cardsfolder/d/dead_iron_sledge.txt | 1 - forge-gui/res/cardsfolder/d/deathgazer.txt | 4 +- forge-gui/res/cardsfolder/d/dread_specter.txt | 4 +- forge-gui/res/cardsfolder/g/ghost_hounds.txt | 4 +- .../res/cardsfolder/g/gorgon_recluse.txt | 4 +- .../res/cardsfolder/i/infernal_medusa.txt | 4 +- forge-gui/res/cardsfolder/r/rock_basilisk.txt | 4 +- .../res/cardsfolder/t/thicket_basilisk.txt | 4 +- forge-gui/res/cardsfolder/v/venom.txt | 4 +- forge-gui/res/cardsfolder/w/wooden_stake.txt | 4 +- 15 files changed, 44 insertions(+), 48 deletions(-) diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java index 5e7665bbf91..fa0e27404dc 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java @@ -624,8 +624,6 @@ public class PhaseHandler implements java.io.Serializable { // Run triggers final HashMap runParams = new HashMap(); runParams.put("Blocker", c1); - // TODO : Fix No Quarter and convert scripts - runParams.put("Attacker", combat.getAttackersBlockedBy(c1).get(0)); runParams.put("Attackers", combat.getAttackersBlockedBy(c1)); game.getTriggerHandler().runTrigger(TriggerType.Blocks, runParams, false); } @@ -639,7 +637,7 @@ public class PhaseHandler implements java.io.Serializable { a.getDamageHistory().clearNotBeenBlockedSinceLastUpkeepOf(); } - List blockers = combat.getBlockers(a); + final List blockers = combat.getBlockers(a); if (blockers.isEmpty()) { continue; } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java index cd147568abc..68eaa10d985 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java @@ -51,34 +51,34 @@ public class TriggerBlocks extends Trigger { /** {@inheritDoc} */ @Override public final boolean performTest(final Map runParams2) { - Card blocker = (Card) runParams2.get("Blocker"); - Card attacker = (Card) runParams2.get("Attacker"); if (this.mapParams.containsKey("ValidCard")) { String validBlocker = this.mapParams.get("ValidCard"); - if (validBlocker.contains(".withLesserPower")) { - // Have to check this here as triggering objects aren't set yet for AI combat trigger checks - // so ValidCard$Creature.powerLTX where X:TriggeredAttacker$CardPower crashes with NPE - validBlocker = validBlocker.replace(".withLesserPower", ""); - if (blocker.getCurrentPower() >= attacker.getCurrentPower()) { - return false; - } - } if (!matchesValid(runParams2.get("Blocker"), validBlocker.split(","), this.getHostCard())) { return false; } } + if (this.mapParams.containsKey("ValidBlocked")) { - String validBlocked = this.mapParams.get("ValidBlocked"); - if (validBlocked.contains(".withLesserPower")) { - // Have to check this here as triggering objects aren't set yet for AI combat trigger checks - // so ValidBlocked$Creature.powerLTX where X:TriggeredBlocker$CardPower crashes with NPE - validBlocked = validBlocked.replace(".withLesserPower", ""); - if (blocker.getCurrentPower() <= attacker.getCurrentPower()) { - return false; - } + final String[] validBlockedSplit = this.mapParams.get("ValidBlocked").split(","); + final Object a = runParams2.get("Attackers"); + if (!(a instanceof Iterable)) { + return false; } - if (!matchesValid(runParams2.get("Attacker"), validBlocked.split(","), this.getHostCard())) { - return false; + + final Iterable attackers = (Iterable) a; + boolean foundMatch = false; + for (final Object o : attackers) { + if (!(o instanceof Card)) { + continue; + } + if (matchesValid(o, validBlockedSplit, this.getHostCard())) { + foundMatch = true; + break; + } + } + + if (!foundMatch) { + return false; } } @@ -89,7 +89,6 @@ public class TriggerBlocks extends Trigger { @Override public final void setTriggeringObjects(final SpellAbility sa) { sa.setTriggeringObject("Blocker", this.getRunParams().get("Blocker")); - sa.setTriggeringObject("Attacker", this.getRunParams().get("Attacker")); sa.setTriggeringObject("Attackers", this.getRunParams().get("Attackers")); } } diff --git a/forge-gui/res/cardsfolder/a/abomination.txt b/forge-gui/res/cardsfolder/a/abomination.txt index 9c065f162e7..46e913878e8 100644 --- a/forge-gui/res/cardsfolder/a/abomination.txt +++ b/forge-gui/res/cardsfolder/a/abomination.txt @@ -2,8 +2,8 @@ Name:Abomination ManaCost:3 B B Types:Creature Horror PT:2/6 -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Green,Creature.White | 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. SVar:TrigDestroyBlocked:AB$ Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/c/catacomb_dragon.txt b/forge-gui/res/cardsfolder/c/catacomb_dragon.txt index fef2ad913f0..35e4e7ec991 100644 --- a/forge-gui/res/cardsfolder/c/catacomb_dragon.txt +++ b/forge-gui/res/cardsfolder/c/catacomb_dragon.txt @@ -3,7 +3,7 @@ ManaCost:4 B B Types:Creature Dragon PT:4/4 K:Flying -T:Mode$ Blocks | ValidCard$ Creature.nonArtifact+nonDragon | ValidBlocked$ Card.Self | Execute$ TrigPumpBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a nonartifact, non-Dragon creature, that creature gets -X/-0 until end of turn, where X is half the creature's power, rounded down. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonArtifact+nonDragon | Execute$ TrigPumpBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a nonartifact, non-Dragon creature, that creature gets -X/-0 until end of turn, where X is half the creature's power, rounded down. SVar:TrigPumpBlocker:AB$Pump | Cost$ 0 | Defined$ TriggeredBlocker | NumAtt$ -X | References$ X SVar:X:TriggeredBlocker$CardPower/HalfDown SVar:Picture:http://www.wizards.com/global/images/magic/general/catacomb_dragon.jpg diff --git a/forge-gui/res/cardsfolder/c/cockatrice.txt b/forge-gui/res/cardsfolder/c/cockatrice.txt index 87118c9b304..fc1b19657f3 100644 --- a/forge-gui/res/cardsfolder/c/cockatrice.txt +++ b/forge-gui/res/cardsfolder/c/cockatrice.txt @@ -3,8 +3,8 @@ ManaCost:3 G G Types:Creature Cockatrice PT:2/4 K:Flying -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | 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. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/d/dead_iron_sledge.txt b/forge-gui/res/cardsfolder/d/dead_iron_sledge.txt index 9ef50b5b4a7..41c3349a934 100644 --- a/forge-gui/res/cardsfolder/d/dead_iron_sledge.txt +++ b/forge-gui/res/cardsfolder/d/dead_iron_sledge.txt @@ -4,7 +4,6 @@ Types:Artifact Equipment K:Equip 2 T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Creature.AttachedBy | ValidBlocker$ Creature | 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 SVar:RemAIDeck:True diff --git a/forge-gui/res/cardsfolder/d/deathgazer.txt b/forge-gui/res/cardsfolder/d/deathgazer.txt index ea2a7403274..85b4e0ed48f 100644 --- a/forge-gui/res/cardsfolder/d/deathgazer.txt +++ b/forge-gui/res/cardsfolder/d/deathgazer.txt @@ -2,8 +2,8 @@ Name:Deathgazer ManaCost:3 B Types:Creature Lizard PT:2/2 -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | 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. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/d/dread_specter.txt b/forge-gui/res/cardsfolder/d/dread_specter.txt index af43a3e65f7..dba203aabbd 100644 --- a/forge-gui/res/cardsfolder/d/dread_specter.txt +++ b/forge-gui/res/cardsfolder/d/dread_specter.txt @@ -2,8 +2,8 @@ Name:Dread Specter ManaCost:3 B Types:Creature Specter PT:2/2 -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | 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. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/g/ghost_hounds.txt b/forge-gui/res/cardsfolder/g/ghost_hounds.txt index 48490fdd5d3..1fa64fb68a0 100644 --- a/forge-gui/res/cardsfolder/g/ghost_hounds.txt +++ b/forge-gui/res/cardsfolder/g/ghost_hounds.txt @@ -3,8 +3,8 @@ ManaCost:1 B Types:Creature Hound Spirit PT:1/1 K:Vigilance -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.White | 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:Picture:http://www.wizards.com/global/images/magic/general/ghost_hounds.jpg Oracle:Vigilance\nWhenever Ghost Hounds blocks or becomes blocked by a white creature, Ghost Hounds gains first strike until end of turn. diff --git a/forge-gui/res/cardsfolder/g/gorgon_recluse.txt b/forge-gui/res/cardsfolder/g/gorgon_recluse.txt index b2195a3e464..2ba968966ba 100644 --- a/forge-gui/res/cardsfolder/g/gorgon_recluse.txt +++ b/forge-gui/res/cardsfolder/g/gorgon_recluse.txt @@ -2,8 +2,8 @@ Name:Gorgon Recluse ManaCost:3 B B Types:Creature Gorgon PT:2/4 -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | 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. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/i/infernal_medusa.txt b/forge-gui/res/cardsfolder/i/infernal_medusa.txt index a21206938cf..62dd9537806 100644 --- a/forge-gui/res/cardsfolder/i/infernal_medusa.txt +++ b/forge-gui/res/cardsfolder/i/infernal_medusa.txt @@ -2,8 +2,8 @@ Name:Infernal Medusa ManaCost:3 B B Types:Creature Gorgon PT:2/4 -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. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks a creature, destroy that creature at end of combat. +T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | 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. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/r/rock_basilisk.txt b/forge-gui/res/cardsfolder/r/rock_basilisk.txt index e5c325a77d7..51f74dc39ba 100644 --- a/forge-gui/res/cardsfolder/r/rock_basilisk.txt +++ b/forge-gui/res/cardsfolder/r/rock_basilisk.txt @@ -2,8 +2,8 @@ Name:Rock Basilisk ManaCost:4 R G Types:Creature Basilisk PT:4/5 -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | 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. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/t/thicket_basilisk.txt b/forge-gui/res/cardsfolder/t/thicket_basilisk.txt index 2b1e5bc638c..811bc9dbdea 100644 --- a/forge-gui/res/cardsfolder/t/thicket_basilisk.txt +++ b/forge-gui/res/cardsfolder/t/thicket_basilisk.txt @@ -2,8 +2,8 @@ Name:Thicket Basilisk ManaCost:3 G G Types:Creature Basilisk PT:2/4 -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | 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. SVar:TrigDestroyAttacker:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/v/venom.txt b/forge-gui/res/cardsfolder/v/venom.txt index 851e4dafdbc..ca1e397077c 100644 --- a/forge-gui/res/cardsfolder/v/venom.txt +++ b/forge-gui/res/cardsfolder/v/venom.txt @@ -3,8 +3,8 @@ ManaCost:1 G G Types:Enchantment Aura K:Enchant creature A:SP$ Attach | Cost$ 1 G G | ValidTgts$ Creature | AILogic$ Pump -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.AttachedBy | ValidBlocker$ Creature.nonWall | 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. SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker diff --git a/forge-gui/res/cardsfolder/w/wooden_stake.txt b/forge-gui/res/cardsfolder/w/wooden_stake.txt index 98ad44496ad..d80c998bf71 100644 --- a/forge-gui/res/cardsfolder/w/wooden_stake.txt +++ b/forge-gui/res/cardsfolder/w/wooden_stake.txt @@ -3,8 +3,8 @@ ManaCost:2 Types:Artifact Equipment K:Equip 1 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0. -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. +T:Mode$ AttackerBlockedByCreature | 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$ AttackerBlockedByCreature | ValidCard$ Card.AttachedBy | ValidBlocker$ Creature.Vampire | 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:Picture:http://www.wizards.com/global/images/magic/general/wooden_stake.jpg