From cdcb9c84be4a66fbeda1b4952dc4a14e767caee6 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 19 Sep 2014 04:39:44 +0000 Subject: [PATCH] - Added a way to disable predictive analysis for spells in Main 2 via an AI property PREDICT_SPELLS_FOR_MAIN2 (currently prediction is enabled by default for all profiles). --- forge-ai/src/main/java/forge/ai/AiController.java | 4 ++++ forge-ai/src/main/java/forge/ai/AiProps.java | 1 + forge-gui/res/ai/Default.ai | 1 + forge-gui/res/ai/Reckless.ai | 1 + 4 files changed, 7 insertions(+) diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index 3d46186e3e7..83c07de0dc7 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -641,6 +641,10 @@ public class AiController { } public SpellAbility predictSpellToCastInMain2(ApiType exceptSA, boolean handOnly) { + if (!getBooleanProperty(AiProps.PREDICT_SPELLS_FOR_MAIN2)) { + return null; + } + final List cards = handOnly ? player.getCardsIn(ZoneType.Hand) : getAvailableCards(); ArrayList all = getSpellAbilities(cards); diff --git a/forge-ai/src/main/java/forge/ai/AiProps.java b/forge-ai/src/main/java/forge/ai/AiProps.java index 7d231e0aa3e..c4b171c7be3 100644 --- a/forge-ai/src/main/java/forge/ai/AiProps.java +++ b/forge-ai/src/main/java/forge/ai/AiProps.java @@ -31,6 +31,7 @@ public enum AiProps { /** */ PLANAR_DIE_ROLL_HESITATION_CHANCE ("10"), CHEAT_WITH_MANA_ON_SHUFFLE ("false"), MOVE_EQUIPMENT_TO_BETTER_CREATURES ("from_useless_only"), + PREDICT_SPELLS_FOR_MAIN2 ("true"), /** */ RESERVE_MANA_FOR_MAIN2_CHANCE ("0"); /** */ private final String strDefaultVal; diff --git a/forge-gui/res/ai/Default.ai b/forge-gui/res/ai/Default.ai index 9c32870dcea..c5385a81867 100644 --- a/forge-gui/res/ai/Default.ai +++ b/forge-gui/res/ai/Default.ai @@ -5,5 +5,6 @@ DEFAULT_PLANAR_DIE_ROLL_CHANCE=50 MULLIGAN_THRESHOLD=5 PLANAR_DIE_ROLL_HESITATION_CHANCE=10 MOVE_EQUIPMENT_TO_BETTER_CREATURES=from_useless_only +PREDICT_SPELLS_FOR_MAIN2=true RESERVE_MANA_FOR_MAIN2_CHANCE=0 diff --git a/forge-gui/res/ai/Reckless.ai b/forge-gui/res/ai/Reckless.ai index c3055c7b5fa..71921c70d00 100644 --- a/forge-gui/res/ai/Reckless.ai +++ b/forge-gui/res/ai/Reckless.ai @@ -5,4 +5,5 @@ DEFAULT_PLANAR_DIE_ROLL_CHANCE=100 MULLIGAN_THRESHOLD=3 PLANAR_DIE_ROLL_HESITATION_CHANCE=0 MOVE_EQUIPMENT_TO_BETTER_CREATURES=always +PREDICT_SPELLS_FOR_MAIN2=true RESERVE_MANA_FOR_MAIN2_CHANCE=0