From 0f37de96272e80cf38884e334cd1e8caa996feb1 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 9 Feb 2014 20:25:47 +0000 Subject: [PATCH] removed another ai hook --- .../src/main/java/forge/ai/AiCostDecision.java | 14 +++++++++++++- .../java/forge/game/cost/CostRemoveAnyCounter.java | 8 +------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/forge-game/src/main/java/forge/ai/AiCostDecision.java b/forge-game/src/main/java/forge/ai/AiCostDecision.java index e8a090a6a2f..13fe48dae96 100644 --- a/forge-game/src/main/java/forge/ai/AiCostDecision.java +++ b/forge-game/src/main/java/forge/ai/AiCostDecision.java @@ -480,9 +480,21 @@ public class AiCostDecision extends CostDecisionMakerBase implements ICostVisito return false; } }); + + if(hperms.isEmpty()) + return null; + + PaymentDecision result = PaymentDecision.card(hperms); + Card valid = hperms.get(0); + for (CounterType c1 : valid.getCounters().keySet()) { + if (valid.getCounters(c1) >= c && ComputerUtil.isNegativeCounter(c1, valid)) { + result.ct = c1; + break; + } + } // Only find cards with enough negative counters // TODO: add ai for Chisei, Heart of Oceans - return hperms.isEmpty() ? null : PaymentDecision.card(hperms); + return result; } @Override diff --git a/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java index f4f7c48d00f..636ad988b71 100644 --- a/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java @@ -19,7 +19,6 @@ package forge.game.cost; import com.google.common.base.Predicate; -import forge.ai.ComputerUtil; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; @@ -138,12 +137,7 @@ public class CostRemoveAnyCounter extends CostPartWithList { c = AbilityUtils.calculateAmount(source, amount, ability); } Card valid = decision.cards.get(0); - for (CounterType c1 : valid.getCounters().keySet()) { - if (valid.getCounters(c1) >= c && ComputerUtil.isNegativeCounter(c1, valid)) { - counterType = c1; - break; - } - } + counterType = decision.ct; for (int i = 0; i < c; i++) { executePayment(ability, valid); }