From 58328d6ebc8f1cb39cf203d87feafd95b5fe1a43 Mon Sep 17 00:00:00 2001 From: Sol Date: Mon, 18 Jan 2016 00:22:51 +0000 Subject: [PATCH] - Allow ReplaceMoved to look at the LKI info of the about to be moving object to fix new Kalitas --- .../src/main/java/forge/game/replacement/ReplaceMoved.java | 6 ++++++ forge-gui/res/cardsfolder/k/kalitas_traitor_of_ghet.txt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java b/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java index 11abba707ca..a88dedc02c2 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java @@ -35,6 +35,12 @@ public class ReplaceMoved extends ReplacementEffect { return false; } } + + if (this.getMapParams().containsKey("ValidLKI")) { + if (!matchesValid(runParams.get("CardLKI"), this.getMapParams().get("ValidLKI").split(","), this.getHostCard())) { + return false; + } + } boolean matchedZone = false; if (this.getMapParams().containsKey("Origin")) { diff --git a/forge-gui/res/cardsfolder/k/kalitas_traitor_of_ghet.txt b/forge-gui/res/cardsfolder/k/kalitas_traitor_of_ghet.txt index af05514549b..2017e3f009f 100644 --- a/forge-gui/res/cardsfolder/k/kalitas_traitor_of_ghet.txt +++ b/forge-gui/res/cardsfolder/k/kalitas_traitor_of_ghet.txt @@ -3,8 +3,8 @@ ManaCost:2 B B Types:Legendary Creature Vampire Warrior PT:3/4 K:Lifelink -R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+OppCtrl | ReplaceWith$ Exile | Description$ If a nontoken creature an opponent controls would die, instead exile that card and put a 2/2 black Zombie creature token onto the battlefield. -SVar:Exile:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | Defined$ ReplacedCard +R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Creature.nonToken+OppCtrl | ReplaceWith$ Exile | Description$ If a nontoken creature an opponent controls would die, instead exile that card and put a 2/2 black Zombie creature token onto the battlefield. +SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | Defined$ ReplacedCard SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenImage$ b 2 2 zombie OGW A:AB$ PutCounter | Cost$ 2 B Sac<1/Vampire.Other;Zombie.Other/another Vampire or Zombie> | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on CARDNAME. SVar:Picture:http://www.wizards.com/global/images/magic/general/kalitas_traitor_of_ghet.jpg