External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 18:50:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor improvements

Browse source
This commit is contained in:
betasteward 2015-01-12 18:49:36 -05:00
parent 299658054a
commit 74255eb808
3 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java
View file

@ -449,7 +449,7 @@ public class MCTSNode {
break; break;
} }
} }
else { else if (mergeChild.combat != null && child.combat != null) {
if (mergeChild.combat.getValue().equals(child.combat.getValue())) { if (mergeChild.combat.getValue().equals(child.combat.getValue())) {
if (!mergeChild.stateValue.equals(child.stateValue)) { if (!mergeChild.stateValue.equals(child.stateValue)) {
logger.info("mismatched merge states"); logger.info("mismatched merge states");
@ -462,6 +462,9 @@ public class MCTSNode {
break; break;
} }
} }
else {
logger.info("wtf ???");
}
} }
} }
if (!mergeChildren.isEmpty()) { if (!mergeChildren.isEmpty()) {

9
Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java
View file

@ -128,15 +128,9 @@ public class MCTSPlayer extends ComputerPlayer {
} }
} }
protected List<Ability> getPlayableAbilities(Game game) {
List<Ability> playables = getPlayable(game, true);
playables.add(pass);
return playables;
}
public List<Ability> getPlayableOptions(Game game) { public List<Ability> getPlayableOptions(Game game) {
List<Ability> all = new ArrayList<>(); List<Ability> all = new ArrayList<>();
List<Ability> playables = getPlayableAbilities(game); List<Ability> playables = getPlayable(game, true); //getPlayableAbilities(game);
for (Ability ability: playables) { for (Ability ability: playables) {
List<Ability> options = game.getPlayer(playerId).getPlayableOptions(ability, game); List<Ability> options = game.getPlayer(playerId).getPlayableOptions(ability, game);
if (options.isEmpty()) { if (options.isEmpty()) {
@ -158,6 +152,7 @@ public class MCTSPlayer extends ComputerPlayer {
} }
} }
} }
all.add(pass);
return all; return all;
} }

36
Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java
View file

@ -55,10 +55,11 @@ import java.util.*;
*/ */
public class SimulatedPlayerMCTS extends MCTSPlayer { public class SimulatedPlayerMCTS extends MCTSPlayer {
private static final boolean USE_AI_METHODS = false;
private boolean isSimulatedPlayer; private boolean isSimulatedPlayer;
private static Random rnd = new Random(); private static Random rnd = new Random();
private int actionCount = 0; private int actionCount = 0;
private static final transient Logger logger = Logger.getLogger(SimulatedPlayerMCTS.class); private static final transient Logger logger = Logger.getLogger(SimulatedPlayerMCTS.class);
public SimulatedPlayerMCTS(UUID id, boolean isSimulatedPlayer) { public SimulatedPlayerMCTS(UUID id, boolean isSimulatedPlayer) {
super(id); super(id);
@ -89,9 +90,10 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
// logger.info("priority"); // logger.info("priority");
boolean didSomething = false; boolean didSomething = false;
Ability ability = getAction(game); Ability ability = getAction(game);
// logger.info("simulate " + ability.toString()); if (!(ability instanceof PassAbility)) {
if (!(ability instanceof PassAbility))
didSomething = true; didSomething = true;
//logger.info("simulate action: " + ability.toString() + " state: " + game.getState());
}
activateAbility((ActivatedAbility) ability, game); activateAbility((ActivatedAbility) ability, game);
@ -100,7 +102,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
} }
private Ability getAction(Game game) { private Ability getAction(Game game) {
List<Ability> playables = getPlayableAbilities(game); List<Ability> playables = getPlayableOptions(game);
Ability ability; Ability ability;
while (true) { while (true) {
if (playables.size() == 1) if (playables.size() == 1)
@ -264,14 +266,14 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public boolean choose(Outcome outcome, Target target, UUID sourceId, Game game) { public boolean choose(Outcome outcome, Target target, UUID sourceId, Game game) {
if (this.isHuman()) if (USE_AI_METHODS || this.isHuman())
return chooseRandom(target, game); return chooseRandom(target, game);
return super.choose(outcome, target, sourceId, game); return super.choose(outcome, target, sourceId, game);
} }
@Override @Override
public boolean choose(Outcome outcome, Target target, UUID sourceId, Game game, Map<String, Serializable> options) { public boolean choose(Outcome outcome, Target target, UUID sourceId, Game game, Map<String, Serializable> options) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
return chooseRandom(target, game); return chooseRandom(target, game);
} }
return super.choose(outcome, target, sourceId, game, options); return super.choose(outcome, target, sourceId, game, options);
@ -279,7 +281,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public boolean choose(Outcome outcome, Cards cards, TargetCard target, Game game) { public boolean choose(Outcome outcome, Cards cards, TargetCard target, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
if (cards.isEmpty()) { if (cards.isEmpty()) {
return false; return false;
} }
@ -346,7 +348,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public boolean chooseUse(Outcome outcome, String message, Game game) { public boolean chooseUse(Outcome outcome, String message, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
return rnd.nextBoolean(); return rnd.nextBoolean();
} }
return super.chooseUse(outcome, message, game); return super.chooseUse(outcome, message, game);
@ -354,7 +356,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public boolean choosePile(Outcome outcome, String message, List<? extends Card> pile1, List<? extends Card> pile2, Game game) { public boolean choosePile(Outcome outcome, String message, List<? extends Card> pile1, List<? extends Card> pile2, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
return rnd.nextBoolean(); return rnd.nextBoolean();
} }
return super.choosePile(outcome, message, pile1, pile2, game); return super.choosePile(outcome, message, pile1, pile2, game);
@ -362,7 +364,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public boolean choose(Outcome outcome, Choice choice, Game game) { public boolean choose(Outcome outcome, Choice choice, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
Iterator<String> it = choice.getChoices().iterator(); Iterator<String> it = choice.getChoices().iterator();
String sChoice = it.next(); String sChoice = it.next();
int choiceNum = rnd.nextInt(choice.getChoices().size()); int choiceNum = rnd.nextInt(choice.getChoices().size());
@ -377,7 +379,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public int chooseReplacementEffect(Map<String, String> rEffects, Game game) { public int chooseReplacementEffect(Map<String, String> rEffects, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
return rnd.nextInt(rEffects.size()); return rnd.nextInt(rEffects.size());
} }
return super.chooseReplacementEffect(rEffects, game); return super.chooseReplacementEffect(rEffects, game);
@ -385,7 +387,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public TriggeredAbility chooseTriggeredAbility(List<TriggeredAbility> abilities, Game game) { public TriggeredAbility chooseTriggeredAbility(List<TriggeredAbility> abilities, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
return abilities.get(rnd.nextInt(abilities.size())); return abilities.get(rnd.nextInt(abilities.size()));
} }
return super.chooseTriggeredAbility(abilities, game); return super.chooseTriggeredAbility(abilities, game);
@ -393,7 +395,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public Mode chooseMode(Modes modes, Ability source, Game game) { public Mode chooseMode(Modes modes, Ability source, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
Iterator<Mode> it = modes.values().iterator(); Iterator<Mode> it = modes.values().iterator();
Mode mode = it.next(); Mode mode = it.next();
if (modes.size() == 1) { if (modes.size() == 1) {
@ -410,7 +412,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public UUID chooseAttackerOrder(List<Permanent> attackers, Game game) { public UUID chooseAttackerOrder(List<Permanent> attackers, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
return attackers.get(rnd.nextInt(attackers.size())).getId(); return attackers.get(rnd.nextInt(attackers.size())).getId();
} }
return super.chooseAttackerOrder(attackers, game); return super.chooseAttackerOrder(attackers, game);
@ -418,7 +420,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public UUID chooseBlockerOrder(List<Permanent> blockers, CombatGroup combatGroup, List<UUID> blockerOrder, Game game) { public UUID chooseBlockerOrder(List<Permanent> blockers, CombatGroup combatGroup, List<UUID> blockerOrder, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
return blockers.get(rnd.nextInt(blockers.size())).getId(); return blockers.get(rnd.nextInt(blockers.size())).getId();
} }
return super.chooseBlockerOrder(blockers, combatGroup, blockerOrder, game); return super.chooseBlockerOrder(blockers, combatGroup, blockerOrder, game);
@ -426,7 +428,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public void assignDamage(int damage, List<UUID> targets, String singleTargetName, UUID sourceId, Game game) { public void assignDamage(int damage, List<UUID> targets, String singleTargetName, UUID sourceId, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
int remainingDamage = damage; int remainingDamage = damage;
UUID targetId; UUID targetId;
int amount; int amount;
@ -461,7 +463,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override @Override
public int getAmount(int min, int max, String message, Game game) { public int getAmount(int min, int max, String message, Game game) {
if (this.isHuman()) { if (USE_AI_METHODS || this.isHuman()) {
return rnd.nextInt(max - min) + min; return rnd.nextInt(max - min) + min;
} }
return super.getAmount(min, max, message, game); return super.getAmount(min, max, message, game);