From 0473427d35d7afb650e26373b0bd1626a99bfc1d Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Mon, 17 Dec 2012 17:38:53 +0000
Subject: [PATCH] - The AI will now attack with Frozen Shade.

---
 .../java/forge/game/phase/CombatUtil.java     | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java
index 1cb768d3b29..f950b36e7e4 100644
--- a/src/main/java/forge/game/phase/CombatUtil.java
+++ b/src/main/java/forge/game/phase/CombatUtil.java
@@ -1039,7 +1039,7 @@ public class CombatUtil {
         if (!attacked.canLoseLife()) {
             return 0;
         }
-        damage += CombatUtil.predictPowerBonusOfAttacker(attacker, null, combat);
+        damage += CombatUtil.predictPowerBonusOfAttacker(attacker, null, combat, false);
         if (!attacker.hasKeyword("Infect")) {
             sum = attacked.predictDamage(damage, attacker, true);
             if (attacker.hasKeyword("Double Strike")) {
@@ -1066,7 +1066,7 @@ public class CombatUtil {
     public static int poisonIfUnblocked(final Card attacker, final Player attacked) {
         int damage = attacker.getNetCombatDamage();
         int poison = 0;
-        damage += CombatUtil.predictPowerBonusOfAttacker(attacker, null, null);
+        damage += CombatUtil.predictPowerBonusOfAttacker(attacker, null, null, false);
         if (attacker.hasKeyword("Infect")) {
             poison += attacked.predictDamage(damage, attacker, true);
             if (attacker.hasKeyword("Double Strike")) {
@@ -1840,7 +1840,8 @@ public class CombatUtil {
      *            a {@link forge.game.phase.Combat} object.
      * @return a int.
      */
-    public static int predictPowerBonusOfAttacker(final Card attacker, final Card defender, final Combat combat) {
+    public static int predictPowerBonusOfAttacker(final Card attacker, final Card defender, final Combat combat
+            , boolean withoutAbilities) {
         int power = 0;
 
         power += attacker.getKeywordMagnitude("Bushido");
@@ -1955,6 +1956,28 @@ public class CombatUtil {
 
             }
         }
+        if (withoutAbilities) {
+            return power;
+        }
+        for (SpellAbility ability : attacker.getAllSpellAbilities()) {
+            if (!(ability instanceof AbilityActivated) || ability.getPayCosts() == null) {
+                continue;
+            }
+            if (ability.getApi() != ApiType.Pump) {
+                continue;
+            }
+
+            if (!ability.hasParam("NumAtt")) {
+                continue;
+            }
+
+            if (!ability.getPayCosts().getTap() && ComputerUtil.canPayCost(ability, attacker.getController())) {
+                int pBonus = AbilityFactory.calculateAmount(ability.getSourceCard(), ability.getParam("NumAtt"), ability);
+                if (pBonus > 0) {
+                    power += pBonus;
+                }
+            }
+        }
         return power;
     }
 
@@ -2263,7 +2286,7 @@ public class CombatUtil {
         int defenderDamage = defender.getNetAttack()
                 + CombatUtil.predictPowerBonusOfBlocker(attacker, defender, withoutAbilities);
         int attackerDamage = attacker.getNetAttack()
-                + CombatUtil.predictPowerBonusOfAttacker(attacker, defender, combat);
+                + CombatUtil.predictPowerBonusOfAttacker(attacker, defender, combat, withoutAbilities);
         if (Singletons.getModel().getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.toughnessAssignsDamage)) {
             defenderDamage = defender.getNetDefense()
                     + CombatUtil.predictToughnessBonusOfBlocker(attacker, defender, withoutAbilities);
@@ -2411,7 +2434,7 @@ public class CombatUtil {
         int defenderDamage = defender.getNetAttack()
                 + CombatUtil.predictPowerBonusOfBlocker(attacker, defender, withoutAbilities);
         int attackerDamage = attacker.getNetAttack()
-                + CombatUtil.predictPowerBonusOfAttacker(attacker, defender, combat);
+                + CombatUtil.predictPowerBonusOfAttacker(attacker, defender, combat, withoutAbilities);
         if (Singletons.getModel().getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.toughnessAssignsDamage)) {
             defenderDamage = defender.getNetDefense()
                     + CombatUtil.predictToughnessBonusOfBlocker(attacker, defender, withoutAbilities);