diff --git a/forge-ai/src/main/java/forge/ai/simulation/Plan.java b/forge-ai/src/main/java/forge/ai/simulation/Plan.java index 0c8b00df547..9bb5efbf0ac 100644 --- a/forge-ai/src/main/java/forge/ai/simulation/Plan.java +++ b/forge-ai/src/main/java/forge/ai/simulation/Plan.java @@ -49,7 +49,7 @@ public class Plan { this.saCount = saList.size(); SpellAbility sa = saList.get(saIndex); this.saStr = sa.toString(); - this.saHumanStr = SpellAbilityPicker.abilityToString(sa); + this.saHumanStr = SpellAbilityPicker.abilityToString(sa, false); } public SpellAbility findReferencedAbility(List availableSAs) { diff --git a/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java b/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java index 4058badf735..34eb6bef2aa 100644 --- a/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java +++ b/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java @@ -176,6 +176,10 @@ public class SpellAbilityPicker { return plan != null && plan.hasNextDecision(); } + public Plan getPlan() { + return plan; + } + private void printPlannedActionFailure(Plan.Decision decision, String cause) { print("Failed to continue planned action (" + decision.saRef + "). Cause:"); print(" " + cause + "!"); @@ -214,6 +218,9 @@ public class SpellAbilityPicker { } public static String abilityToString(SpellAbility sa) { + return abilityToString(sa, true); + } + public static String abilityToString(SpellAbility sa, boolean withTargets) { String saString = "N/A"; if (sa != null) { saString = sa.toString(); @@ -224,13 +231,15 @@ public class SpellAbilityPicker { if (saString.length() > 40) { saString = saString.substring(0, 40) + "..."; } - SpellAbility saOrSubSa = sa; - do { - if (saOrSubSa.usesTargeting()) { - saString += " (targets: " + saOrSubSa.getTargets().getTargetedString() + ")"; - } - saOrSubSa = saOrSubSa.getSubAbility(); - } while (saOrSubSa != null); + if (withTargets) { + SpellAbility saOrSubSa = sa; + do { + if (saOrSubSa.usesTargeting()) { + saString += " (targets: " + saOrSubSa.getTargets().getTargetedString() + ")"; + } + saOrSubSa = saOrSubSa.getSubAbility(); + } while (saOrSubSa != null); + } saString = sa.getHostCard() + " -> " + saString; } return saString;