From ae5f85352e3a2c8a123d656fdb1bc8083177ac83 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Tue, 17 Apr 2018 15:44:32 +0200 Subject: [PATCH] cards: Replace Moved that does check on damaged by need to use ValidLKI Closes #406 --- forge-gui/res/cardsfolder/f/frostwielder.txt | 2 +- forge-gui/res/cardsfolder/k/kumano_master_yamabushi.txt | 2 +- forge-gui/res/cardsfolder/k/kumanos_blessing.txt | 2 +- forge-gui/res/cardsfolder/k/kumanos_pupils.txt | 2 +- forge-gui/res/cardsfolder/r/runesword.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-gui/res/cardsfolder/f/frostwielder.txt b/forge-gui/res/cardsfolder/f/frostwielder.txt index 2df08e4e4c1..53f35e268fe 100644 --- a/forge-gui/res/cardsfolder/f/frostwielder.txt +++ b/forge-gui/res/cardsfolder/f/frostwielder.txt @@ -3,7 +3,7 @@ ManaCost:2 R R Types:Creature Human Shaman PT:1/2 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player. -R:Event$ Moved | ValidCard$ Creature.DamagedBy | Destination$ Graveyard | ReplaceWith$ DBExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead. +R:Event$ Moved | ValidLKI$ Creature.DamagedBy | Destination$ Graveyard | ActiveZones$ Battlefield | ReplaceWith$ DBExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead. SVar:DBExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile SVar:NonCombatPriority:1 SVar:Picture:http://www.wizards.com/global/images/magic/general/frostwielder.jpg diff --git a/forge-gui/res/cardsfolder/k/kumano_master_yamabushi.txt b/forge-gui/res/cardsfolder/k/kumano_master_yamabushi.txt index 289bb95b3a8..cd0f0c3165b 100644 --- a/forge-gui/res/cardsfolder/k/kumano_master_yamabushi.txt +++ b/forge-gui/res/cardsfolder/k/kumano_master_yamabushi.txt @@ -3,7 +3,7 @@ ManaCost:3 R R Types:Legendary Creature Human Shaman PT:4/4 A:AB$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player. -R:Event$ Moved | ValidCard$ Creature.DamagedBy | Destination$ Graveyard | ReplaceWith$ DBExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead. +R:Event$ Moved | ValidLKI$ Creature.DamagedBy | Destination$ Graveyard | ReplaceWith$ DBExile | ActiveZones$ Battlefield | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead. SVar:DBExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile SVar:Picture:http://www.wizards.com/global/images/magic/general/kumano_master_yamabushi.jpg Oracle:{1}{R}: Kumano, Master Yamabushi deals 1 damage to target creature or player.\nIf a creature dealt damage by Kumano this turn would die, exile it instead. diff --git a/forge-gui/res/cardsfolder/k/kumanos_blessing.txt b/forge-gui/res/cardsfolder/k/kumanos_blessing.txt index 67ce2ff4790..582dff6c9ac 100644 --- a/forge-gui/res/cardsfolder/k/kumanos_blessing.txt +++ b/forge-gui/res/cardsfolder/k/kumanos_blessing.txt @@ -4,7 +4,7 @@ Types:Enchantment Aura K:Flash K:Enchant creature A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump -R:Event$ Moved | ValidCard$ Creature.DamagedByEnchanted | Destination$ Graveyard | ReplaceWith$ DBExile | Description$ If a creature dealt damage by enchanted creature this turn would die, exile it instead. +R:Event$ Moved | ValidLKI$ Creature.DamagedByEnchanted | Destination$ Graveyard | ActiveZones$ Battlefield | ReplaceWith$ DBExile | Description$ If a creature dealt damage by enchanted creature this turn would die, exile it instead. SVar:DBExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile SVar:RemRandomDeck:True SVar:NonStackingAttachEffect:True diff --git a/forge-gui/res/cardsfolder/k/kumanos_pupils.txt b/forge-gui/res/cardsfolder/k/kumanos_pupils.txt index 5b0da0dc39d..1f433088a92 100644 --- a/forge-gui/res/cardsfolder/k/kumanos_pupils.txt +++ b/forge-gui/res/cardsfolder/k/kumanos_pupils.txt @@ -2,7 +2,7 @@ Name:Kumano's Pupils ManaCost:4 R Types:Creature Human Shaman PT:3/3 -R:Event$ Moved | ValidCard$ Creature.DamagedBy | Destination$ Graveyard | ReplaceWith$ DBExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead. +R:Event$ Moved | ValidLKI$ Creature.DamagedBy | Destination$ Graveyard | ActiveZones$ Battlefield | ReplaceWith$ DBExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead. SVar:DBExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile SVar:Picture:http://www.wizards.com/global/images/magic/general/kumanos_pupils.jpg Oracle:If a creature dealt damage by Kumano's Pupils this turn would die, exile it instead. diff --git a/forge-gui/res/cardsfolder/r/runesword.txt b/forge-gui/res/cardsfolder/r/runesword.txt index 16c3706ee2f..ac405d438b1 100644 --- a/forge-gui/res/cardsfolder/r/runesword.txt +++ b/forge-gui/res/cardsfolder/r/runesword.txt @@ -8,7 +8,7 @@ SVar:RuneswordSac:DB$ SacrificeAll | Defined$ Imprinted | SubAbility$ ExileEffec SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile SVar:TrigNoregen:Mode$ DamageDone | ValidSource$ Card.IsRemembered | ValidTarget$ Creature | Execute$ PumpNogen | Static$ True | TriggerDescription$ If the creature deals damage to a creature this turn, the creature dealt damage can't be regenerated this turn. SVar:PumpNogen:DB$ Pump | KW$ HIDDEN CARDNAME can't be regenerated. | Defined$ TriggeredTarget -SVar:RuneswordRep:Event$ Moved | ValidCard$ Creature.DamagedByRemembered | Destination$ Graveyard | ReplaceWith$ RuneswordExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead. +SVar:RuneswordRep:Event$ Moved | ValidLKI$ Creature.DamagedByRemembered | Destination$ Graveyard | ReplaceWith$ RuneswordExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead. SVar:RuneswordExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile SVar:Picture:http://www.wizards.com/global/images/magic/general/runesword.jpg Oracle:{3}, {T}: Target attacking creature gets +2/+0 until end of turn. When that creature leaves the battlefield this turn, sacrifice Runesword. If the creature deals damage to a creature this turn, the creature dealt damage can't be regenerated this turn. If a creature dealt damage by the targeted creature would die this turn, exile that creature instead.