From c80a291d06ff7e3ba2ad77848e468a3ba7882cbc Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 19 Aug 2012 19:37:34 +0000 Subject: [PATCH] - The AI will no longer cheat with Incremental Growth. --- .../abilityfactory/AbilityFactoryCounters.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java index 1521f0f2528..ac1e3743a8a 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java @@ -434,11 +434,7 @@ public class AbilityFactoryCounters { chance &= subAb.chkAIDrawback(); } - if (AbilityFactory.playReusable(sa)) { - return chance; - } - - return ((r.nextFloat() < .6667) && chance); + return chance; } // putCanPlayAI /** @@ -466,12 +462,6 @@ public class AbilityFactoryCounters { final Player player = af.isCurse() ? AllZone.getHumanPlayer() : AllZone.getComputerPlayer(); list = player.getCardsIn(ZoneType.Battlefield); - list = list.filter(new CardListFilter() { - @Override - public boolean addCard(final Card c) { - return c.canBeTargetedBy(sa); - } - }); if (abTgt != null) { list = list.getValidCards(abTgt.getValidTgts(), source.getController(), source); @@ -483,6 +473,12 @@ public class AbilityFactoryCounters { abTgt.resetTargets(); // target loop while (abTgt.getNumTargeted() < abTgt.getMaxTargets(sa.getSourceCard(), sa)) { + list = list.filter(new CardListFilter() { + @Override + public boolean addCard(final Card c) { + return sa.canTarget(c); + } + }); if (list.size() == 0) { if ((abTgt.getNumTargeted() < abTgt.getMinTargets(sa.getSourceCard(), sa)) || (abTgt.getNumTargeted() == 0)) {