From 265b85cb9ec379c82a0b28ea6e4a12de867cfbaf Mon Sep 17 00:00:00 2001 From: magenoxx Date: Mon, 18 Aug 2014 17:29:19 +0400 Subject: [PATCH] [TestAPI] Added adding choices for effects --- .../java/org/mage/test/player/TestPlayer.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index bd6bc86f13e..62b12c8d52c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -42,7 +42,10 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterCreatureForCombat; import mage.filter.common.FilterCreatureForCombatBlock; import mage.filter.common.FilterPlaneswalkerPermanent; +import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; +import mage.filter.predicate.permanent.AttackingPredicate; +import mage.filter.predicate.permanent.BlockingPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; @@ -59,9 +62,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; -import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.BlockingPredicate; /** * @@ -246,6 +246,21 @@ public class TestPlayer extends ComputerPlayer { return super.choose(outcome, choice, game); } + @Override + public int chooseEffect(List rEffects, Game game) { + if (!choices.isEmpty()) { + for (String choice: choices) { + for (int index = 0; index < rEffects.size(); index++) { + if (choice.equals(rEffects.get(index))) { + choices.remove(choice); + return index; + } + } + } + } + return super.chooseEffect(rEffects, game); + } + @Override public boolean choose(Outcome outcome, Target target, UUID sourceId, Game game, Map options) { if (!choices.isEmpty()) {