~ no inPlay check for now

Card-Forge · Dec 21, 2024 · a2bbd7f · a2bbd7f
1 parent a6bd61c
commit a2bbd7f
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java b/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
@@ -233,7 +233,7 @@ else if (c.hasKeyword(Keyword.WITHER)) {
 
         if (c.hasSVar("EndOfTurnLeavePlay")) {
             value -= subValue(50, "eot-leaves");
-        } else if (c.isInPlay()) {
+        } else {
             for (Trigger t : c.getTriggers()) {
                 if (!TriggerType.Phase.equals(t.getMode())) {
                     continue;
@@ -272,19 +272,6 @@ else if (c.hasKeyword(Keyword.WITHER)) {
                     value -= subValue(20, "sac-unless");
                 }
             }
-        } else {
-            if (c.hasKeyword(Keyword.CUMULATIVE_UPKEEP)) {
-                value -= subValue(30, "cupkeep");
-            } else if (c.hasKeyword(Keyword.ECHO) && c.cameUnderControlSinceLastUpkeep()) {
-                value -= subValue(10, "echo-unpaid");
-            }
-
-            if (c.hasKeyword(Keyword.FADING)) {
-                value -= subValue(20 / (Math.max(1, c.getCounters(CounterEnumType.FADE))), "fading");
-            }
-            if (c.hasKeyword(Keyword.VANISHING)) {
-                value -= subValue(20 / (Math.max(1, c.getCounters(CounterEnumType.TIME))), "vanishing");
-            }
         }
 
         // card-specific evaluation modifier