Merge branch 'changeszoneLKI' into 'master'

support a tag for use of LKI with any ChangesZone triggers with any Origin/Destination

See merge request core-developers/forge!5198
This commit is contained in:
Michael Kamensky
2021-08-08 02:08:43 +00:00

View File

@@ -103,8 +103,8 @@ public class TriggerChangesZone extends Trigger {
if (hasParam("ValidCard")) { if (hasParam("ValidCard")) {
Card moved = (Card) runParams.get(AbilityKey.Card); Card moved = (Card) runParams.get(AbilityKey.Card);
boolean leavesLKIZone = "Battlefield".equals(getParam("Origin")); boolean leavesLKIZone = "Battlefield".equals(getParam("Origin"));
//TODO make this smarter if there ever is a card that lets you play anything from exile leavesLKIZone |= "Exile".equals(getParam("Origin")) && (moved.getZone().is(ZoneType.Graveyard) ||
leavesLKIZone |= "Exile".equals(getParam("Origin")) && (moved.getZone().is(ZoneType.Graveyard) || moved.getZone().is(ZoneType.Command)); moved.getZone().is(ZoneType.Command) || hasParam("UseLKI"));
if (leavesLKIZone) { if (leavesLKIZone) {
moved = (Card) runParams.get(AbilityKey.CardLKI); moved = (Card) runParams.get(AbilityKey.CardLKI);