by adding a bit ugly method to player controller, I've removed last isHuman check and the last reference from api executor to AI

This commit is contained in:
Maxmtg
2014-02-09 20:22:15 +00:00
parent 2f2d24eb3e
commit 14a0e6e3ac
6 changed files with 33 additions and 8 deletions

View File

@@ -5,6 +5,7 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import forge.Singletons;
import forge.card.ColorSet;
import forge.card.MagicColor;
@@ -53,12 +54,14 @@ import forge.item.PaperCard;
import forge.properties.ForgePreferences.FPref;
import forge.util.Lang;
import forge.util.TextUtil;
import org.apache.commons.lang3.Range;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import javax.swing.*;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.*;
@@ -1087,4 +1090,9 @@ public class PlayerControllerHuman extends PlayerController {
return cp.getName();
}
}
@Override
public Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, String selectPrompt, boolean b, Player decider) {
return chooseSingleEntityForEffect(fetchList, sa, selectPrompt, b, decider);
}
}

View File

@@ -3,6 +3,7 @@ package forge.gamesimulationtests.util;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilMana;
import forge.ai.ability.ChangeZoneAi;
@@ -45,6 +46,7 @@ import forge.gamesimulationtests.util.playeractions.*;
import forge.gui.player.HumanPlay;
import forge.item.PaperCard;
import forge.util.MyRandom;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
@@ -586,4 +588,12 @@ public class PlayerControllerForTests extends PlayerController {
// TODO Auto-generated method stub
return null;
}
@Override
public Card chooseSingleCardForZoneChange(ZoneType destination,
List<ZoneType> origin, SpellAbility sa, List<Card> fetchList,
String selectPrompt, boolean b, Player decider) {
// TODO Auto-generated method stub
return ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player, decider);
}
}