From 03886905bd5044be628688ba54dde473053fdd85 Mon Sep 17 00:00:00 2001 From: Seravy Date: Tue, 13 Feb 2018 13:03:44 +0100 Subject: [PATCH] Will not untap Coffin Queen if already reanimating a creature --- forge-ai/src/main/java/forge/ai/PlayerControllerAi.java | 9 +++++++++ forge-gui/res/cardsfolder/c/coffin_queen.txt | 1 + 2 files changed, 10 insertions(+) diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java index 2a73867ee70..9b42196a6b9 100644 --- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java +++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java @@ -562,6 +562,15 @@ public class PlayerControllerAi extends PlayerController { return true; case "Never": return false; + case "NothingRemembered": + if (source.getRememberedCount() == 0) { + return true; + } else { + Card rem = (Card) source.getFirstRemembered(); + if (!rem.getZone().is(ZoneType.Battlefield)) { + return true; + } + } case "BetterTgtThanRemembered": if (source.getRememberedCount() > 0) { Card rem = (Card) source.getFirstRemembered(); diff --git a/forge-gui/res/cardsfolder/c/coffin_queen.txt b/forge-gui/res/cardsfolder/c/coffin_queen.txt index 01403ac000a..67a2f901247 100644 --- a/forge-gui/res/cardsfolder/c/coffin_queen.txt +++ b/forge-gui/res/cardsfolder/c/coffin_queen.txt @@ -9,6 +9,7 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.S T:Mode$ ChangesController | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigExile | CheckSVar$ X | SVarCompare$ GE1 | Secondary$ True | TriggerDescription$ When you lose control of CARDNAME, exile creature controlled by CARDNAME. SVar:TrigExile:DB$ChangeZoneAll | ChangeType$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBCleanup SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True +SVar:AIUntapPreference:NothingRemembered # Clear tracking effect if the creature put onto the battlefield leaves the battlefield, as per Oracle ruling T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.IsRemembered | Execute$ DBCleanup | Secondary$ True | Static$ True | TriggerDescription$ Clear tracking effect if the creature put onto the battlefield leaves the battlefield, as per Oracle ruling. SVar:X:Remembered$Amount