From defb59531720b3c51afc13946205a23895678704 Mon Sep 17 00:00:00 2001
From: Agetian <Agetian@269b9781-a132-4a9b-9d4e-f004f1b56b58>
Date: Wed, 27 Sep 2017 07:39:18 +0000
Subject: [PATCH] - Bushido AI: attempt to avoid accounting for it twice when
 predicting P/T bonuses.

git-svn-id: http://svn.slightlymagic.net/forge/trunk@35791 269b9781-a132-4a9b-9d4e-f004f1b56b58
---
 forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index 49cd80e2..1d1b8068 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -896,7 +896,7 @@ public class ComputerUtilCombat {
             power -= attacker.getNetCombatDamage();
         }
 
-        power += blocker.getKeywordMagnitude("Bushido");
+        // power += blocker.getKeywordMagnitude("Bushido"); // This is apparently accounted for in the combat trigs below
 
         final Game game = attacker.getGame();
         // look out for continuous static abilities that only care for blocking
@@ -1046,7 +1046,7 @@ public class ComputerUtilCombat {
             toughness += attacker.getNetToughness() - blocker.getNetToughness();
         } 
 
-        toughness += blocker.getKeywordMagnitude("Bushido");
+        // toughness += blocker.getKeywordMagnitude("Bushido"); // Apparently, this is already accounted for in the combat triggers below
         final Game game = attacker.getGame();
         final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
         for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
@@ -1204,7 +1204,7 @@ public class ComputerUtilCombat {
     public static int predictPowerBonusOfAttacker(final Card attacker, final Card blocker, final Combat combat, boolean withoutAbilities, boolean withoutCombatStaticAbilities) {
         int power = 0;
 
-        power += attacker.getKeywordMagnitude("Bushido");
+        // power += attacker.getKeywordMagnitude("Bushido"); // This is apparently accounted for in the combat trigs below
         //check Exalted only for the first attacker
         if (combat != null && combat.getAttackers().isEmpty()) {
             for (Card card : attacker.getController().getCardsIn(ZoneType.Battlefield)) {
@@ -1429,7 +1429,7 @@ public class ComputerUtilCombat {
             theTriggers.addAll(card.getTriggers());
         }
         if (blocker != null) {
-            toughness += attacker.getKeywordMagnitude("Bushido");
+            // toughness += attacker.getKeywordMagnitude("Bushido"); // This is apparently accounted for in the combat trigs below
             theTriggers.addAll(blocker.getTriggers());
         }