Give API logic access to castSA

Card-Forge · Jan 1, 2025 · 4a7e319 · Hanmac · Jan 1, 2025 · 4a7e319
1 parent bc97d79
commit 4a7e319
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java
@@ -775,9 +775,15 @@ private AiPlayDecision canPlayAndPayFor(final SpellAbility sa) {
         if (currentState != null) {
             host.setState(sa.getCardStateName(), false);
         }
+        if (sa.isSpell()) {
+            host.setCastSA(sa);
+        }
 
         AiPlayDecision decision = canPlayAndPayForFace(sa);
 
+        if (sa.isSpell()) {
+            host.setCastSA(null);
+        }
         if (currentState != null) {
             host.setState(currentState, false);
         }

diff --git a/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java b/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java
@@ -418,7 +418,6 @@ public List<OptionalCostValue> chooseOptionalCosts(SpellAbility chosen, Player p
         List<OptionalCostValue> chosenOptCosts = Lists.newArrayList();
         Cost costSoFar = chosen.getPayCosts().copy();
 
-        outer:
         for (OptionalCostValue opt : optionalCostValues) {
             // Choose the optional cost if it can be paid (to be improved later, check for playability and other conditions perhaps)
             Cost fullCost = opt.getCost().copy().add(costSoFar);
@@ -436,33 +435,6 @@ public List<OptionalCostValue> chooseOptionalCosts(SpellAbility chosen, Player p
             }
 
             if (ComputerUtilCost.canPayCost(fullCostSa, player, false)) {
-                // check for additional Cost breaking targets AI had already chosen
-                boolean targeting = false;
-                SpellAbility sub = fullCostSa;
-                while (sub != null) {
-                    if (sub.usesTargeting()) {
-                        targeting = true;
-                        break;
-                    }
-                    sub = sub.getSubAbility();
-                }
-                if (targeting) {
-                    fullCostSa.addOptionalCost(opt.getType());
-                    Card copy = CardCopyService.getLKICopy(chosen.getHostCard());
-                    copy.setCastSA(fullCostSa);
-                    fullCostSa.setHostCard(copy);
-
-                    sub = fullCostSa;
-                    while (sub != null) {
-                        if (sub.usesTargeting() && !sub.isTargetNumberValid()) {
-                            // adding cost would break target
-                            continue outer;
-                        }
-                        sub = sub.getSubAbility();
-                    }
-
-                }
-
                 chosenOptCosts.add(opt);
                 costSoFar.add(opt.getCost());
             }