From 11908b8419d4d8de1e59c715bcc3b2e584f09e51 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 25 Apr 2022 12:42:33 -0400 Subject: [PATCH 1/3] ChangeZoneAi getParamOrDefault for ChangeNum to match Effect --- forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1c689660504..d6c4052cbfd 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java @@ -387,7 +387,7 @@ public class ChangeZoneAi extends SpellAbilityAi { return false; } - String num = sa.getParam("ChangeNum"); + String num = sa.getParamOrDefault("ChangeNum", "1"); if (num != null) { if (num.contains("X") && sa.getSVar("X").equals("Count$xPaid")) { // Set PayX here to maximum value. From 9cd7136086e7fb92a7e9770b12ff7e59c7223a3d Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 25 Apr 2022 12:42:54 -0400 Subject: [PATCH 2/3] SpecialCardAi getParamOrDefault for ChangeNum to match Effect --- forge-ai/src/main/java/forge/ai/SpecialCardAi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java index be7ad6dae96..476fbde124e 100644 --- a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java +++ b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java @@ -709,7 +709,8 @@ public class SpecialCardAi { } } - int changeNum = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("ChangeNum"), sa); + int changeNum = AbilityUtils.calculateAmount(sa.getHostCard(), + sa.getParamOrDefault("ChangeNum", "1"), sa); CardCollection lib = CardLists.filter(ai.getCardsIn(ZoneType.Library), Predicates.not(CardPredicates.nameEquals(sa.getHostCard().getName()))); Collections.sort(lib, CardLists.CmcComparatorInv); From 92a4407c9b4803961b91ef9d654c2370d5aca885 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 25 Apr 2022 12:48:00 -0400 Subject: [PATCH 3/3] num can't be in hiddenOriginCanPlayAI now --- .../main/java/forge/ai/ability/ChangeZoneAi.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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 d6c4052cbfd..fa364648ec1 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java @@ -388,14 +388,12 @@ public class ChangeZoneAi extends SpellAbilityAi { } String num = sa.getParamOrDefault("ChangeNum", "1"); - if (num != null) { - if (num.contains("X") && sa.getSVar("X").equals("Count$xPaid")) { - // Set PayX here to maximum value. - int xPay = ComputerUtilCost.getMaxXValue(sa, ai, sa.isTrigger()); - if (xPay == 0) return false; - xPay = Math.min(xPay, list.size()); - sa.setXManaCostPaid(xPay); - } + if (num.contains("X") && sa.getSVar("X").equals("Count$xPaid")) { + // Set PayX here to maximum value. + int xPay = ComputerUtilCost.getMaxXValue(sa, ai, sa.isTrigger()); + if (xPay == 0) return false; + xPay = Math.min(xPay, list.size()); + sa.setXManaCostPaid(xPay); } if (sourceName.equals("Temur Sabertooth")) {