From 0270420da83e032547be9e779d1769c34b7c2ff3 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 1 Sep 2017 03:22:11 +0000 Subject: [PATCH] - Some minor refactoring in AiBlockController related to the previous commit. --- .../main/java/forge/ai/AiBlockController.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiBlockController.java b/forge-ai/src/main/java/forge/ai/AiBlockController.java index 9aadbdccc16..c11d8a059b8 100644 --- a/forge-ai/src/main/java/forge/ai/AiBlockController.java +++ b/forge-ai/src/main/java/forge/ai/AiBlockController.java @@ -540,21 +540,21 @@ public class AiBlockController { List currentAttackers = new ArrayList<>(attackersLeft); List killingBlockers; + // Parameters related to randomly trading when blocking (need to be enabled in the AI profile) + boolean enableRandomTrades = false; + boolean randomTradeIfBehindOnBoard = false; + int minRandomTradeChance = 0; + int maxRandomTradeChance = 0; + if (ai.getController().isAI()) { + AiController aic = ((PlayerControllerAi) ai.getController()).getAi(); + enableRandomTrades = aic.getBooleanProperty(AiProps.ENABLE_RANDOM_FAVORABLE_TRADES_ON_BLOCK); + randomTradeIfBehindOnBoard = aic.getBooleanProperty(AiProps.RANDOMLY_TRADE_EVEN_IF_HAS_LESS_CREATS); + minRandomTradeChance = aic.getIntProperty(AiProps.MIN_CHANCE_TO_RANDOMLY_TRADE_ON_BLOCK); + maxRandomTradeChance = aic.getIntProperty(AiProps.MAX_CHANCE_TO_RANDOMLY_TRADE_ON_BLOCK); + } + for (final Card attacker : attackersLeft) { - boolean enableRandomTrades = false; - boolean randomTradeIfBehindOnBoard = false; - int minRandomTradeChance = 0; - int maxRandomTradeChance = 0; - - if (ai.getController().isAI()) { - AiController aic = ((PlayerControllerAi) ai.getController()).getAi(); - enableRandomTrades = aic.getBooleanProperty(AiProps.ENABLE_RANDOM_FAVORABLE_TRADES_ON_BLOCK); - randomTradeIfBehindOnBoard = aic.getBooleanProperty(AiProps.RANDOMLY_TRADE_EVEN_IF_HAS_LESS_CREATS); - minRandomTradeChance = aic.getIntProperty(AiProps.MIN_CHANCE_TO_RANDOMLY_TRADE_ON_BLOCK); - maxRandomTradeChance = aic.getIntProperty(AiProps.MAX_CHANCE_TO_RANDOMLY_TRADE_ON_BLOCK); - } - if (attacker.hasStartOfKeyword("CantBeBlockedByAmount LT") || attacker.hasKeyword("Menace") || attacker.hasKeyword("CARDNAME can't be blocked unless all creatures defending player controls block it.")) {