Improving some mana payment aspects for AI payment

forge-ai/src/main/java/forge/ai/ComputerUtilMana.java

@@ -51,24 +51,59 @@
 public class ComputerUtilMana {
     private final static boolean DEBUG_MANA_PAYMENT = false;
 
+    private static volatile boolean experimentalManaPaymentEnabled = false;
+    public static void setExperimentalManaPaymentEnabled(boolean enabled) {
+        experimentalManaPaymentEnabled = enabled;
+    }
+    public static boolean isExperimentalManaPaymentEnabled() {
+        return experimentalManaPaymentEnabled;
+    }
+
     public static boolean canPayManaCost(ManaCostBeingPaid cost, final SpellAbility sa, final Player ai, final boolean effect) {
+        if (isExperimentalManaPaymentEnabled()) {
+            return ManaPaymentService.canPayMana(cost, sa, ai, effect);
+        }
+
         cost = new ManaCostBeingPaid(cost); //check copy of cost so it doesn't modify the exist cost being paid
         return payManaCost(cost, sa, ai, true, true, effect);
     }
     public static boolean canPayManaCost(final SpellAbility sa, final Player ai, final int extraMana, final boolean effect) {
+        if (isExperimentalManaPaymentEnabled()) {
+            return ManaPaymentService.canPayMana(sa.getPayCosts(), sa, ai, extraMana, effect);
+        }
+
         return canPayManaCost(sa.getPayCosts(), sa, ai, extraMana, effect);
     }
     public static boolean canPayManaCost(final Cost cost, final SpellAbility sa, final Player ai, final int extraMana, final boolean effect) {
+       if (isExperimentalManaPaymentEnabled()) {
+            return ManaPaymentService.canPayMana(cost, sa, ai, extraMana, effect);
+       }
+
         return payManaCost(cost, sa, ai, true, extraMana, true, effect);
     }
 
     public static boolean payManaCost(ManaCostBeingPaid cost, final SpellAbility sa, final Player ai, final boolean effect) {
+        if (isExperimentalManaPaymentEnabled()) {
+            ManaPaymentService service = new ManaPaymentService(cost, sa, ai, effect);
+            return service.payManaCost();
+        }
+
         return payManaCost(cost, sa, ai, false, true, effect);
     }
     public static boolean payManaCost(final Cost cost, final Player ai, final SpellAbility sa, final boolean effect) {
+        if (isExperimentalManaPaymentEnabled()) {
+            ManaPaymentService service = new ManaPaymentService(cost, ai, sa, effect);
+            return service.payManaCost();
+        }
+
         return payManaCost(cost, sa, ai, false, 0, true, effect);
     }
     private static boolean payManaCost(final Cost cost, final SpellAbility sa, final Player ai, final boolean test, final int extraMana, boolean checkPlayable, final boolean effect) {
+        if (isExperimentalManaPaymentEnabled()) {
+            ManaPaymentService service = new ManaPaymentService(cost, sa, ai, extraMana, effect);
+            return service.payManaCost();
+        }
+
         ManaCostBeingPaid manaCost = calculateManaCost(cost, sa, ai, test, extraMana, effect);
         return payManaCost(manaCost, sa, ai, test, checkPlayable, effect);
     }

forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java

@@ -121,6 +121,7 @@ public void initialize() {
         lstControls.add(Pair.of(view.getCbEnforceDeckLegality(), FPref.ENFORCE_DECK_LEGALITY));
         lstControls.add(Pair.of(view.getCbPerformanceMode(), FPref.PERFORMANCE_MODE));
         lstControls.add(Pair.of(view.getCbExperimentalRestore(), FPref.MATCH_EXPERIMENTAL_RESTORE));
+        lstControls.add(Pair.of(view.getCbExperimentalAiManaPayment(), FPref.MATCH_EXPERIMENTAL_AI_MANA_PAYMENT));
         lstControls.add(Pair.of(view.getCbOrderHand(), FPref.UI_ORDER_HAND));
         lstControls.add(Pair.of(view.getCbFilteredHands(), FPref.FILTERED_HANDS));
         lstControls.add(Pair.of(view.getCbCloneImgSource(), FPref.UI_CLONE_MODE_SOURCE));

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java

@@ -78,6 +78,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
     private final JCheckBox cbWorkshopSyntax = new OptionsCheckBox(localizer.getMessage("cbWorkshopSyntax"));
     private final JCheckBox cbEnforceDeckLegality = new OptionsCheckBox(localizer.getMessage("cbEnforceDeckLegality"));
     private final JCheckBox cbExperimentalRestore = new OptionsCheckBox(localizer.getMessage("cbExperimentalRestore"));
+    private final JCheckBox cbExperimentalAiManaPayment = new OptionsCheckBox("Experimental AI Mana Payment"); // TODO: localize
     private final JCheckBox cbPerformanceMode = new OptionsCheckBox(localizer.getMessage("cbPerformanceMode"));
     private final JCheckBox cbSROptimize = new OptionsCheckBox(localizer.getMessage("cbSROptimize"));
     private final JCheckBox cbFilteredHands = new OptionsCheckBox(localizer.getMessage("cbFilteredHands"));
@@ -243,6 +244,8 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
 
         pnlPrefs.add(cbExperimentalRestore, titleConstraints);
         pnlPrefs.add(new NoteLabel(localizer.getMessage("nlExperimentalRestore")), descriptionConstraints);
+        pnlPrefs.add(cbExperimentalAiManaPayment, titleConstraints);
+        pnlPrefs.add(new NoteLabel("Enable experimental AI mana payment logic."), descriptionConstraints); // TODO: localize
 
         pnlPrefs.add(cbpAiTimeout, titleConstraints);
         pnlPrefs.add(new NoteLabel(localizer.getMessage("nlAITimeout")), descriptionConstraints);
@@ -893,6 +896,9 @@ public JCheckBox getCbPerformanceMode() {
     public JCheckBox getCbExperimentalRestore() {
         return cbExperimentalRestore;
     }
+    public JCheckBox getCbExperimentalAiManaPayment() {
+        return cbExperimentalAiManaPayment;
+    }
 
     public JCheckBox getCbOrderHand() {
         return cbOrderHand;