From 13d29814c4330bcdc8a6e3f12d648a8550c27b52 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 16 Jun 2017 12:40:59 +0000 Subject: [PATCH] - Reorganized PayEnergyConservatively as an if-else chain. --- .../src/main/java/forge/ai/ability/CountersPutAi.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java index 054b6dee5d1..6fbb6daee74 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java @@ -225,15 +225,13 @@ public class CountersPutAi extends SpellAbilityAi { if (playAggro) { // aggro profiles ignore conservative play for this AI logic return true; - } - if (ai.getGame().getCombat() != null && sa.getHostCard() != null) { + } else if (ai.getCounters(CounterType.ENERGY) > ComputerUtilCard.getMaxSAEnergyCostOnBattlefield(ai) + sa.getPayCosts().getCostEnergy().convertAmount()) { + return true; + } else if (ai.getGame().getCombat() != null && sa.getHostCard() != null) { if (ai.getGame().getCombat().isAttacking(sa.getHostCard())) { return true; } } - if (ai.getCounters(CounterType.ENERGY) > ComputerUtilCard.getMaxSAEnergyCostOnBattlefield(ai) + sa.getPayCosts().getCostEnergy().convertAmount()) { - return true; - } } if (sa.getConditions() != null && !sa.getConditions().areMet(sa) && sa.getSubAbility() == null) {