diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index c1e66d44445..54bb2586a1e 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -1037,7 +1037,7 @@ public class AiController { // re-created if needed and used for any AI logic that needs it. predictedCombat = null; - if (useSimulation && (SpellAbilityPicker.SIMULATE_LAND_PLAYS || simPicker.hasActivePlan())) { + if (useSimulation) { return singleSpellAbilityList(simPicker.chooseSpellAbilityToPlay(null)); } @@ -1057,10 +1057,6 @@ public class AiController { } } - if (useSimulation && !SpellAbilityPicker.SIMULATE_LAND_PLAYS) { - return singleSpellAbilityList(simPicker.chooseSpellAbilityToPlay(null)); - } - return singleSpellAbilityList(getSpellAbilityToPlay()); } 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 f06af65f902..eda8966df70 100644 --- a/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java +++ b/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java @@ -27,8 +27,6 @@ import forge.game.spellability.SpellAbilityCondition; import forge.game.zone.ZoneType; public class SpellAbilityPicker { - public static boolean SIMULATE_LAND_PLAYS = true; - private Game game; private Player player; private Score bestScore; @@ -94,19 +92,17 @@ public class SpellAbilityPicker { CardCollection cards = ComputerUtilAbility.getAvailableCards(game, player); List all = ComputerUtilAbility.getSpellAbilities(cards, player); - if (SIMULATE_LAND_PLAYS) { - CardCollection landsToPlay = ComputerUtilAbility.getAvailableLandsToPlay(game, player); - if (landsToPlay != null) { - HashMap landsDeDupe = new HashMap(); - for (Card land : landsToPlay) { - Card previousLand = landsDeDupe.get(land.getName()); - // Skip identical lands. - if (previousLand != null && previousLand.getZone() == land.getZone() && previousLand.getOwner() == land.getOwner()) { - continue; - } - landsDeDupe.put(land.getName(), land); - all.add(new PlayLandAbility(land)); + CardCollection landsToPlay = ComputerUtilAbility.getAvailableLandsToPlay(game, player); + if (landsToPlay != null) { + HashMap landsDeDupe = new HashMap(); + for (Card land : landsToPlay) { + Card previousLand = landsDeDupe.get(land.getName()); + // Skip identical lands. + if (previousLand != null && previousLand.getZone() == land.getZone() && previousLand.getOwner() == land.getOwner()) { + continue; } + landsDeDupe.put(land.getName(), land); + all.add(new PlayLandAbility(land)); } }