diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java index b905bb5b442..e683cee980a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java @@ -17,6 +17,7 @@ */ package forge.game.trigger; +import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; @@ -104,6 +105,16 @@ public class TriggerChangesZone extends Trigger { } } + if (this.mapParams.containsKey("ValidCardLKI")) { + final Game game = this.getHostCard().getGame(); + final Card movedLKI = game.getChangeZoneLKIInfo((Card) runParams2.get("Card")); + + if (!movedLKI.isValid(this.mapParams.get("ValidCardLKI").split(","), this.getHostCard().getController(), + this.getHostCard(), null)) { + return false; + } + } + // Check number of lands ETB this turn on triggered card's controller if (mapParams.containsKey("CheckOnTriggeredCard")) { final String[] condition = mapParams.get("CheckOnTriggeredCard").split(" ", 2); diff --git a/forge-gui/res/cardsfolder/d/dross_scorpion.txt b/forge-gui/res/cardsfolder/d/dross_scorpion.txt index 62ba64d47b8..9a694eb9870 100644 --- a/forge-gui/res/cardsfolder/d/dross_scorpion.txt +++ b/forge-gui/res/cardsfolder/d/dross_scorpion.txt @@ -2,7 +2,7 @@ Name:Dross Scorpion ManaCost:4 Types:Artifact Creature Scorpion PT:3/1 -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.Creature+Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME or another artifact creature dies, +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCardLKI$ Artifact.Creature+Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME or another artifact creature dies, T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ you may untap target artifact. SVar:TrigUntap:AB$Untap | Cost$ 0 | ValidTgts$ Artifact | TgtPrompt$ Choose target artifact. SVar:Picture:http://www.wizards.com/global/images/magic/general/dross_scorpion.jpg