From ec9331ceb852a81595c4d4879fa2c0efa1283ced Mon Sep 17 00:00:00 2001
From: excessum <excessum@cardforge.org>
Date: Tue, 15 Apr 2014 13:44:10 +0000
Subject: [PATCH] - Minor update to FightAI

---
 .../main/java/forge/ai/ability/PumpAi.java    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
index cee0392e2d9..0e5727d78bd 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
@@ -242,29 +242,29 @@ public class PumpAi extends PumpAiBase {
                 int buffedAtk = attack, buffedDef = defense;
                 for (Card humanCreature : humCreatures) {
                 	for (Card aiCreature : aiCreatures) {
+                	    if (sa.isSpell()) {   //heroic triggers adding counters
+                            for (Trigger t : aiCreature.getTriggers()) {
+                                if (t.getMode() == TriggerType.SpellCast) {
+                                    final Map<String, String> params = t.getMapParams();
+                                    if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer"))) {
+                                        SpellAbility heroic = AbilityFactory.getAbility(aiCreature.getSVar(params.get("Execute")),aiCreature);
+                                        if ("Self".equals(heroic.getParam("Defined")) && "P1P1".equals(heroic.getParam("CounterType"))) {
+                                            int amount = AbilityUtils.calculateAmount(aiCreature, heroic.getParam("CounterNum"), heroic);
+                                            buffedAtk += amount;
+                                            buffedDef += amount;
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+                        }
                 		if (sa.getParam("AILogic").equals("PowerDmg")) {
-                			if (FightAi.canKill(aiCreature, humanCreature, attack)) {
+                			if (FightAi.canKill(aiCreature, humanCreature, buffedAtk)) {
 	                			sa.getTargets().add(aiCreature);
 	                			tgtFight.getTargets().add(humanCreature);
 	                			return true;
 	                		}
                 		} else {
-                		    if (sa.isSpell()) {   //heroic triggers adding counters
-                                for (Trigger t : aiCreature.getTriggers()) {
-                                    if (t.getMode() == TriggerType.SpellCast) {
-                                        final Map<String, String> params = t.getMapParams();
-                                        if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer"))) {
-                                            SpellAbility heroic = AbilityFactory.getAbility(aiCreature.getSVar(params.get("Execute")),aiCreature);
-                                            if ("Self".equals(heroic.getParam("Defined")) && "P1P1".equals(heroic.getParam("CounterType"))) {
-                                                int amount = AbilityUtils.calculateAmount(aiCreature, heroic.getParam("CounterNum"), heroic);
-                                                buffedAtk += amount;
-                                                buffedDef += amount;
-                                            }
-                                            break;
-                                        }
-                                    }
-                                }
-                		    }
 	                		if (FightAi.shouldFight(aiCreature, humanCreature, buffedAtk, buffedDef)) {
 	                			sa.getTargets().add(aiCreature);
 	                			tgtFight.getTargets().add(humanCreature);