From e3f56a0dea7327bbcedaafa13ade9cf28ef787b4 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 7 May 2012 16:33:25 +0000 Subject: [PATCH] - Improved changeZoneAllTriggerAINoCost. --- .../abilityfactory/AbilityFactoryChangeZone.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java index e3b18ff80ff..3c4f286039a 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java @@ -2459,14 +2459,14 @@ public final class AbilityFactoryChangeZone { // if the AI is using it defensively, then something else needs to occur // if only creatures are affected evaluate both lists and pass only // if human creatures are more valuable - if ((humanType.getNotType("Creature").size() == 0) && (computerType.getNotType("Creature").size() == 0)) { - if (CardFactoryUtil.evaluateCreatureList(computerType) > CardFactoryUtil + if ((humanType.getNotType("Creature").isEmpty()) && (computerType.getNotType("Creature").isEmpty())) { + if (CardFactoryUtil.evaluateCreatureList(computerType) >= CardFactoryUtil .evaluateCreatureList(humanType)) { return false; } } // otherwise evaluate both lists by CMC and pass only if human // permanents are more valuable - else if (CardFactoryUtil.evaluatePermanentList(computerType) > CardFactoryUtil + else if (CardFactoryUtil.evaluatePermanentList(computerType) >= CardFactoryUtil .evaluatePermanentList(humanType)) { return false; } @@ -2506,14 +2506,14 @@ public final class AbilityFactoryChangeZone { } } else { // don't activate if human gets more back than AI does - if ((humanType.getNotType("Creature").size() == 0) && (computerType.getNotType("Creature").size() == 0)) { - if (CardFactoryUtil.evaluateCreatureList(computerType) < CardFactoryUtil + if ((humanType.getNotType("Creature").isEmpty()) && (computerType.getNotType("Creature").isEmpty())) { + if (CardFactoryUtil.evaluateCreatureList(computerType) <= CardFactoryUtil .evaluateCreatureList(humanType)) { return false; } } // otherwise evaluate both lists by CMC and pass only if human // permanents are less valuable - else if (CardFactoryUtil.evaluatePermanentList(computerType) < CardFactoryUtil + else if (CardFactoryUtil.evaluatePermanentList(computerType) <= CardFactoryUtil .evaluatePermanentList(humanType)) { return false; }