From 95e62035aa9642a74301a129be0f31dc6a303e89 Mon Sep 17 00:00:00 2001 From: TRT <> Date: Tue, 30 Nov 2021 10:35:44 +0100 Subject: [PATCH] Improve activateForCost --- forge-ai/src/main/java/forge/ai/ComputerUtil.java | 2 +- forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index 6e610e748ff..0970d893dc8 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -1323,7 +1323,7 @@ public class ComputerUtil { } else if (sa.isPwAbility() && ai.getGame().getPhaseHandler().is(PhaseType.MAIN2)) { for (final CostPart part : abCost.getCostParts()) { if (part instanceof CostPutCounter) { - return true; + return part.convertAmount() == null || part.convertAmount() > 0 || ai.isCardInPlay("Carth the Lion"); } } } diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java index 1b75bbdda28..9530308fe7f 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java @@ -379,7 +379,7 @@ public class ChangeZoneAi extends SpellAbilityAi { list = CardLists.getValidCards(list, type, source.getController(), source, sa); } - if (!activateForCost || list.isEmpty()) { + if (!activateForCost && list.isEmpty()) { return false; } if ("Atarka's Command".equals(sourceName)