github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged X value changes. Some UI fixes.

Browse source
This commit is contained in:
magenoxx 2011-02-25 20:54:54 +03:00
parent 66fad7b482
commit e9c2decd3c
7 changed files with 122 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java
View file

@ -34,6 +34,10 @@ import mage.Constants.RangeOfInfluence;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.ActivatedAbility; import mage.abilities.ActivatedAbility;
import mage.abilities.common.PassAbility; import mage.abilities.common.PassAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.costs.mana.VariableManaCost;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.SearchEffect; import mage.abilities.effects.SearchEffect;
import mage.cards.Card; import mage.cards.Card;
@ -59,8 +63,6 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* *
@ -68,7 +70,7 @@ import java.util.logging.Logger;
*/ */
public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements Player { public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements Player {
private static final transient Logger logger = Logging.getLogger(ComputerPlayer6.class.getName()); private static final transient org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(ComputerPlayer6.class);
private static final ExecutorService pool = Executors.newFixedThreadPool(1); private static final ExecutorService pool = Executors.newFixedThreadPool(1);
protected int maxDepth; protected int maxDepth;
@ -122,6 +124,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
case POSTCOMBAT_MAIN: case POSTCOMBAT_MAIN:
if (game.getActivePlayerId().equals(playerId)) { if (game.getActivePlayerId().equals(playerId)) {
printOutState(game, playerId); printOutState(game, playerId);
printOutState(game, game.getOpponents(playerId).iterator().next());
if (actions.size() == 0) { if (actions.size() == 0) {
calculateActions(game); calculateActions(game);
} }
@ -143,7 +146,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
calculateActions(game); calculateActions(game);
} }
act(game); act(game);
printOutState(game, playerId); //printOutState(game, playerId);
} else { } else {
pass(); pass();
} }
@ -205,13 +208,13 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
} }
protected void calculateActions(Game game) { protected void calculateActions(Game game) {
currentScore = GameStateEvaluator2.evaluate(playerId, game);
if (!getNextAction(game)) { if (!getNextAction(game)) {
Game sim = createSimulation(game); Game sim = createSimulation(game);
SimulationNode2.resetCount(); SimulationNode2.resetCount();
root = new SimulationNode2(null, sim, maxDepth, playerId); root = new SimulationNode2(null, sim, maxDepth, playerId);
logger.info("simulating actions"); logger.info("simulating actions");
//int bestScore = addActionsTimed(new FilterAbility()); //int bestScore = addActionsTimed(new FilterAbility());
currentScore = GameStateEvaluator2.evaluate(playerId, game);
addActionsTimed(new FilterAbility()); addActionsTimed(new FilterAbility());
if (root.children.size() > 0) { if (root.children.size() > 0) {
root = root.children.get(0); root = root.children.get(0);
@ -333,7 +336,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
SimulationNode2 newNode = new SimulationNode2(node, sim, depth, ability.getControllerId()); SimulationNode2 newNode = new SimulationNode2(node, sim, depth, ability.getControllerId());
node.children.add(newNode); node.children.add(newNode);
newNode.getTargets().add(targetId); newNode.getTargets().add(targetId);
logger.fine("simulating search -- node#: " + SimulationNode2.getCount() + "for player: " + sim.getPlayer(ability.getControllerId()).getName()); logger.debug("simulating search -- node#: " + SimulationNode2.getCount() + "for player: " + sim.getPlayer(ability.getControllerId()).getName());
} }
return; return;
} }
@ -355,7 +358,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
}); });
pool.execute(task); pool.execute(task);
try { try {
return task.get(Config2.maxThinkSeconds, TimeUnit.MINUTES); return task.get(Config2.maxThinkSeconds, TimeUnit.SECONDS);
} catch (TimeoutException e) { } catch (TimeoutException e) {
logger.info("simulating - timed out"); logger.info("simulating - timed out");
task.cancel(true); task.cancel(true);
@ -374,28 +377,29 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
} }
protected int addActions(SimulationNode2 node, FilterAbility filter, int depth, int alpha, int beta) { protected int addActions(SimulationNode2 node, FilterAbility filter, int depth, int alpha, int beta) {
logger.fine("addActions: " + depth + ", alpha=" + alpha + ", beta=" + beta); logger.debug("addActions: " + depth + ", alpha=" + alpha + ", beta=" + beta);
Game game = node.getGame(); Game game = node.getGame();
int val; int val;
if (Thread.interrupted()) { if (Thread.interrupted()) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
logger.info("interrupted");
val = GameStateEvaluator2.evaluate(playerId, game); val = GameStateEvaluator2.evaluate(playerId, game);
logger.info("interrupted - " + val);
return val; return val;
} }
if (depth <= 0 || SimulationNode2.nodeCount > maxNodes || game.isGameOver()) { if (depth <= 0 || SimulationNode2.nodeCount > maxNodes || game.isGameOver()) {
logger.fine("simulating -- reached end state, node count=" + SimulationNode2.nodeCount + ", depth=" + depth); logger.debug("simulating -- reached end state, node count=" + SimulationNode2.nodeCount + ", depth=" + depth);
val = GameStateEvaluator2.evaluate(playerId, game); val = GameStateEvaluator2.evaluate(playerId, game);
UUID currentPlayerId = node.getGame().getPlayerList().get();
//logger.info("reached - " + val + ", playerId=" + playerId + ", node.pid="+currentPlayerId);
return val; return val;
} }
else if (node.getChildren().size() > 0) { else if (node.getChildren().size() > 0) {
logger.fine("simulating -- somthing added children:" + node.getChildren().size()); logger.debug("simulating -- somthing added children:" + node.getChildren().size());
val = minimaxAB(node, filter, depth-1, alpha, beta); val = minimaxAB(node, filter, depth-1, alpha, beta);
return val; return val;
} }
else { else {
if (logger.isLoggable(Level.FINE)) logger.debug("simulating -- alpha: " + alpha + " beta: " + beta + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + (node.getPlayerId().equals(playerId) ? "yes" : "no"));
logger.fine("simulating -- alpha: " + alpha + " beta: " + beta + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + (node.getPlayerId().equals(playerId) ? "yes" : "no"));
if (allPassed(game)) { if (allPassed(game)) {
if (!game.getStack().isEmpty()) { if (!game.getStack().isEmpty()) {
resolve(node, depth, game); resolve(node, depth, game);
@ -408,10 +412,9 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
if (game.isGameOver()) { if (game.isGameOver()) {
val = GameStateEvaluator2.evaluate(playerId, game); val = GameStateEvaluator2.evaluate(playerId, game);
} } else if (node.getChildren().size() > 0) {
else if (node.getChildren().size() > 0) {
//declared attackers or blockers or triggered abilities //declared attackers or blockers or triggered abilities
logger.fine("simulating -- attack/block/trigger added children:" + node.getChildren().size()); logger.debug("simulating -- attack/block/trigger added children:" + node.getChildren().size());
val = minimaxAB(node, filter, depth-1, alpha, beta); val = minimaxAB(node, filter, depth-1, alpha, beta);
} }
else { else {
@ -419,8 +422,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
} }
} }
if (logger.isLoggable(Level.FINE)) logger.debug("returning -- score: " + val + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(node.getPlayerId()).getName());
logger.fine("returning -- score: " + val + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(node.getPlayerId()).getName());
return val; return val;
} }
@ -436,8 +438,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
//logger.info("simulating -- player " + currentPlayer.getName()); //logger.info("simulating -- player " + currentPlayer.getName());
SimulationNode2 bestNode = null; SimulationNode2 bestNode = null;
List<Ability> allActions = currentPlayer.simulatePriority(game, filter); List<Ability> allActions = currentPlayer.simulatePriority(game, filter);
if (logger.isLoggable(Level.FINE)) logger.debug("simulating -- adding " + allActions.size() + " children:" + allActions);
logger.fine("simulating -- adding " + allActions.size() + " children:" + allActions);
for (Ability action: allActions) { for (Ability action: allActions) {
Game sim = game.copy(); Game sim = game.copy();
if (sim.getPlayer(currentPlayer.getId()).activateAbility((ActivatedAbility) action.copy(), sim)) { if (sim.getPlayer(currentPlayer.getId()).activateAbility((ActivatedAbility) action.copy(), sim)) {
@ -450,10 +451,15 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
sim.getPlayerList().getNext(); sim.getPlayerList().getNext();
} }
SimulationNode2 newNode = new SimulationNode2(node, sim, action, depth, currentPlayer.getId()); SimulationNode2 newNode = new SimulationNode2(node, sim, action, depth, currentPlayer.getId());
if (logger.isLoggable(Level.FINE)) logger.debug("simulating -- node #:" + SimulationNode2.getCount() + " actions:" + action);
logger.fine("simulating -- node #:" + SimulationNode2.getCount() + " actions:" + action);
sim.checkStateAndTriggered(); sim.checkStateAndTriggered();
if (depth == 20) {
logger.info("*** Action *** " + action.toString());
}
int val = addActions(newNode, filter, depth-1, alpha, beta); int val = addActions(newNode, filter, depth-1, alpha, beta);
if (depth == 20) {
logger.info("*** Value *** " + val);
}
if (!currentPlayer.getId().equals(playerId)) { if (!currentPlayer.getId().equals(playerId)) {
if (val < beta) { if (val < beta) {
beta = val; beta = val;
@ -472,6 +478,18 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
targets = node.getTargets(); targets = node.getTargets();
if (node.getChoices().size() > 0) if (node.getChoices().size() > 0)
choices = node.getChoices(); choices = node.getChoices();
if (depth == 20) {
logger.info("saved");
node.children.clear();
node.children.add(bestNode);
node.setScore(bestNode.getScore());
}
}
// no need to check other actions
if (val == GameStateEvaluator2.WIN_GAME_SCORE) {
logger.info("win - break");
break;
} }
} }
if (alpha >= beta) { if (alpha >= beta) {
@ -479,7 +497,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
break; break;
} }
if (SimulationNode2.nodeCount > maxNodes) { if (SimulationNode2.nodeCount > maxNodes) {
logger.fine("simulating -- reached end-state"); logger.debug("simulating -- reached end-state");
break; break;
} }
} }
@ -558,6 +576,20 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
return true; return true;
} }
@Override
public boolean playXMana(VariableManaCost cost, ManaCosts<ManaCost> costs, Game game) {
//SimulatedPlayer.simulateVariableCosts method adds a generic mana cost for each option
for (ManaCost manaCost: costs) {
if (manaCost instanceof GenericManaCost) {
cost.setPayment(manaCost.getPayment());
logger.debug("using X = " + cost.getPayment().count());
break;
}
}
cost.setPaid();
return true;
}
public void playNext(Game game, UUID activePlayerId, SimulationNode2 node) { public void playNext(Game game, UUID activePlayerId, SimulationNode2 node) {
boolean skip = false; boolean skip = false;
while (true) { while (true) {
@ -628,7 +660,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
} }
sim.fireEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_ATTACKERS, playerId, playerId)); sim.fireEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_ATTACKERS, playerId, playerId));
SimulationNode2 newNode = new SimulationNode2(node, sim, node.getDepth()-1, activePlayerId); SimulationNode2 newNode = new SimulationNode2(node, sim, node.getDepth()-1, activePlayerId);
logger.info("simulating -- node #:" + SimulationNode2.getCount() + " declare attakers"); logger.debug("simulating -- node #:" + SimulationNode2.getCount() + " declare attakers");
newNode.setCombat(sim.getCombat()); newNode.setCombat(sim.getCombat());
node.children.add(newNode); node.children.add(newNode);
} }
@ -652,7 +684,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
} }
sim.fireEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_BLOCKERS, playerId, playerId)); sim.fireEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_BLOCKERS, playerId, playerId));
SimulationNode2 newNode = new SimulationNode2(node, sim, node.getDepth()-1, defenderId); SimulationNode2 newNode = new SimulationNode2(node, sim, node.getDepth()-1, defenderId);
logger.info("simulating -- node #:" + SimulationNode2.getCount() + " declare blockers"); logger.debug("simulating -- node #:" + SimulationNode2.getCount() + " declare blockers");
newNode.setCombat(sim.getCombat()); newNode.setCombat(sim.getCombat());
node.children.add(newNode); node.children.add(newNode);
} }
@ -675,11 +707,11 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
@Override @Override
public void selectAttackers(Game game) { public void selectAttackers(Game game) {
logger.info("selectAttackers"); logger.debug("selectAttackers");
if (combat != null) { if (combat != null) {
UUID opponentId = game.getCombat().getDefenders().iterator().next(); UUID opponentId = game.getCombat().getDefenders().iterator().next();
for (UUID attackerId: combat.getAttackers()) { for (UUID attackerId: combat.getAttackers()) {
logger.info("declare attacker: " + game.getCard(attackerId).getName()); logger.debug("declare attacker: " + game.getCard(attackerId).getName());
this.declareAttacker(attackerId, opponentId, game); this.declareAttacker(attackerId, opponentId, game);
} }
} }
@ -687,7 +719,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
@Override @Override
public void selectBlockers(Game game) { public void selectBlockers(Game game) {
logger.info("selectBlockers"); logger.debug("selectBlockers");
if (combat != null && combat.getGroups().size() > 0) { if (combat != null && combat.getGroups().size() > 0) {
List<CombatGroup> groups = game.getCombat().getGroups(); List<CombatGroup> groups = game.getCombat().getGroups();
for (int i = 0; i < groups.size(); i++) { for (int i = 0; i < groups.size(); i++) {

66
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java
View file

@ -35,11 +35,13 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.logging.Level;
import java.util.logging.Logger;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbility;
import mage.abilities.common.PassAbility; import mage.abilities.common.PassAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.costs.mana.VariableManaCost;
import mage.abilities.mana.ManaOptions; import mage.abilities.mana.ManaOptions;
import mage.choices.Choice; import mage.choices.Choice;
import mage.filter.FilterAbility; import mage.filter.FilterAbility;
@ -50,6 +52,7 @@ import mage.game.permanent.Permanent;
import mage.game.stack.StackAbility; import mage.game.stack.StackAbility;
import mage.target.Target; import mage.target.Target;
import mage.util.Logging; import mage.util.Logging;
import org.apache.log4j.Logger;
/** /**
* *
@ -57,7 +60,7 @@ import mage.util.Logging;
*/ */
public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> { public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> {
private final static transient Logger logger = Logging.getLogger(SimulatedPlayer2.class.getName()); private final static transient Logger logger = Logger.getLogger(SimulatedPlayer2.class);
private boolean isSimulatedPlayer; private boolean isSimulatedPlayer;
private FilterAbility filter; private FilterAbility filter;
private transient ConcurrentLinkedQueue<Ability> allActions; private transient ConcurrentLinkedQueue<Ability> allActions;
@ -101,13 +104,23 @@ public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> {
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.size() == 0) { if (options.size() == 0) {
allActions.add(ability); if (ability.getManaCosts().getVariableCosts().size() > 0) {
simulateVariableCosts(ability, game);
}
else {
allActions.add(ability);
}
// simulateAction(game, previousActions, ability); // simulateAction(game, previousActions, ability);
} }
else { else {
// ExecutorService simulationExecutor = Executors.newFixedThreadPool(4); // ExecutorService simulationExecutor = Executors.newFixedThreadPool(4);
for (Ability option: options) { for (Ability option: options) {
allActions.add(option); if (ability.getManaCosts().getVariableCosts().size() > 0) {
simulateVariableCosts(option, game);
}
else {
allActions.add(option);
}
// SimulationWorker worker = new SimulationWorker(game, this, previousActions, option); // SimulationWorker worker = new SimulationWorker(game, this, previousActions, option);
// simulationExecutor.submit(worker); // simulationExecutor.submit(worker);
} }
@ -128,6 +141,31 @@ public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> {
// } // }
// } // }
//add a generic mana cost for each amount possible
protected void simulateVariableCosts(Ability ability, Game game) {
int numAvailable = getAvailableManaProducers(game).size();
// Start with X = {1}
for (int i = 1; i < numAvailable; i++) {
Ability newAbility = ability.copy();
newAbility.addManaCost(new GenericManaCost(i));
allActions.add(newAbility);
}
}
@Override
public boolean playXMana(VariableManaCost cost, ManaCosts<ManaCost> costs, Game game) {
//simulateVariableCosts method adds a generic mana cost for each option
for (ManaCost manaCost: costs) {
if (manaCost instanceof GenericManaCost) {
cost.setPayment(manaCost.getPayment());
logger.debug("simulating -- X = " + cost.getPayment().count());
break;
}
}
cost.setPaid();
return true;
}
public List<Combat> addAttackers(Game game) { public List<Combat> addAttackers(Game game) {
Map<Integer, Combat> engagements = new HashMap<Integer, Combat>(); Map<Integer, Combat> engagements = new HashMap<Integer, Combat>();
//useful only for two player games - will only attack first opponent //useful only for two player games - will only attack first opponent
@ -148,10 +186,10 @@ public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> {
sim.getCombat().declareAttacker(attackersList.get(j).getId(), defenderId, sim); sim.getCombat().declareAttacker(attackersList.get(j).getId(), defenderId, sim);
} }
if (engagements.put(sim.getCombat().getValue(sim), sim.getCombat()) != null) { if (engagements.put(sim.getCombat().getValue(sim), sim.getCombat()) != null) {
logger.fine("simulating -- found redundant attack combination"); logger.debug("simulating -- found redundant attack combination");
} }
else if (logger.isLoggable(Level.FINE)) { else {
logger.fine("simulating -- attack:" + sim.getCombat().getGroups().size()); logger.debug("simulating -- attack:" + sim.getCombat().getGroups().size());
} }
} }
return new ArrayList<Combat>(engagements.values()); return new ArrayList<Combat>(engagements.values());
@ -179,15 +217,14 @@ public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> {
int numGroups = game.getCombat().getGroups().size(); int numGroups = game.getCombat().getGroups().size();
//try to block each attacker with each potential blocker //try to block each attacker with each potential blocker
Permanent blocker = blockers.get(0); Permanent blocker = blockers.get(0);
if (logger.isLoggable(Level.FINE)) logger.debug("simulating -- block:" + blocker);
logger.fine("simulating -- block:" + blocker);
List<Permanent> remaining = remove(blockers, blocker); List<Permanent> remaining = remove(blockers, blocker);
for (int i = 0; i < numGroups; i++) { for (int i = 0; i < numGroups; i++) {
if (game.getCombat().getGroups().get(i).canBlock(blocker, game)) { if (game.getCombat().getGroups().get(i).canBlock(blocker, game)) {
Game sim = game.copy(); Game sim = game.copy();
sim.getCombat().getGroups().get(i).addBlocker(blocker.getId(), playerId, sim); sim.getCombat().getGroups().get(i).addBlocker(blocker.getId(), playerId, sim);
if (engagements.put(sim.getCombat().getValue(sim), sim.getCombat()) != null) if (engagements.put(sim.getCombat().getValue(sim), sim.getCombat()) != null)
logger.fine("simulating -- found redundant block combination"); logger.debug("simulating -- found redundant block combination");
addBlocker(sim, remaining, engagements); // and recurse minus the used blocker addBlocker(sim, remaining, engagements); // and recurse minus the used blocker
} }
} }
@ -199,8 +236,7 @@ public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> {
Ability ability = source.copy(); Ability ability = source.copy();
List<Ability> options = getPlayableOptions(ability, game); List<Ability> options = getPlayableOptions(ability, game);
if (options.size() == 0) { if (options.size() == 0) {
if (logger.isLoggable(Level.FINE)) logger.debug("simulating -- triggered ability:" + ability);
logger.fine("simulating -- triggered ability:" + ability);
game.getStack().push(new StackAbility(ability, playerId)); game.getStack().push(new StackAbility(ability, playerId));
ability.activate(game, false); ability.activate(game, false);
game.applyEffects(); game.applyEffects();
@ -210,7 +246,7 @@ public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> {
SimulationNode2 parent = (SimulationNode2) game.getCustomData(); SimulationNode2 parent = (SimulationNode2) game.getCustomData();
int depth = parent.getDepth() - 1; int depth = parent.getDepth() - 1;
if (depth == 0) return true; if (depth == 0) return true;
logger.fine("simulating -- triggered ability - adding children:" + options.size()); logger.debug("simulating -- triggered ability - adding children:" + options.size());
for (Ability option: options) { for (Ability option: options) {
addAbilityNode(parent, option, depth, game); addAbilityNode(parent, option, depth, game);
} }
@ -224,7 +260,7 @@ public class SimulatedPlayer2 extends ComputerPlayer<SimulatedPlayer2> {
ability.activate(sim, false); ability.activate(sim, false);
sim.applyEffects(); sim.applyEffects();
SimulationNode2 newNode = new SimulationNode2(parent, sim, depth, playerId); SimulationNode2 newNode = new SimulationNode2(parent, sim, depth, playerId);
logger.fine("simulating -- node #:" + SimulationNode2.getCount() + " triggered ability option"); logger.debug("simulating -- node #:" + SimulationNode2.getCount() + " triggered ability option");
for (Target target: ability.getTargets()) { for (Target target: ability.getTargets()) {
for (UUID targetId: target.getTargets()) { for (UUID targetId: target.getTargets()) {
newNode.getTargets().add(targetId); newNode.getTargets().add(targetId);

BIN
Mage.Server/plugins/mage-player-ai-ma.jar
View file

Binary file not shown.

BIN
Mage.Tests/plugins/mage-player-ai-ma.jar
View file

Binary file not shown.

BIN
Mage.Tests/plugins/mage-player-aiminimax.jar
View file

Binary file not shown.

4
Mage.Tests/scenario5.txt
View file

@ -3,9 +3,9 @@
### ComputerA ### ### ComputerA ###
# Battlefield # Battlefield
battlefield:ComputerA:Island:2 battlefield:ComputerA:Island:2
battlefield:ComputerA:Mountain:1 battlefield:ComputerA:Mountain:3
battlefield:ComputerA:Dragonskull Summit:1 battlefield:ComputerA:Dragonskull Summit:1
battlefield:ComputerA:Lavaclaw Reaches:1 battlefield:ComputerA:Lavaclaw Reaches:0
# Hand # Hand
hand:ComputerA:Mountain:0 hand:ComputerA:Mountain:0
hand:ComputerA:Earthquake:1 hand:ComputerA:Earthquake:1

14
Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java
View file

@ -43,31 +43,35 @@ public class PlayGameTest extends MageTestBase {
Deck deck = Deck.load(Sets.loadDeck("RB Aggro.dck")); Deck deck = Deck.load(Sets.loadDeck("RB Aggro.dck"));
if (deck.getCards().size() < 40) { if (deck.getCards().size() < 40) {
throw new IllegalArgumentException("Couldn't load deck, deck side=" + deck.getCards().size()); throw new IllegalArgumentException("Couldn't load deck, deck size=" + deck.getCards().size());
} }
game.addPlayer(computerA, deck); game.addPlayer(computerA, deck);
game.loadCards(deck.getCards(), computerA.getId()); game.loadCards(deck.getCards(), computerA.getId());
Player computerB = createPlayer("ComputerB", "Computer - mad"); Player computerB = createPlayer("ComputerB", "Computer - minimax hybrid");
Deck deck2 = Deck.load(Sets.loadDeck("RB Aggro.dck")); Deck deck2 = Deck.load(Sets.loadDeck("RB Aggro.dck"));
if (deck2.getCards().size() < 40) { if (deck2.getCards().size() < 40) {
throw new IllegalArgumentException("Couldn't load deck, deck side=" + deck2.getCards().size()); throw new IllegalArgumentException("Couldn't load deck, deck size=" + deck2.getCards().size());
} }
game.addPlayer(computerB, deck2); game.addPlayer(computerB, deck2);
game.loadCards(deck2.getCards(), computerB.getId()); game.loadCards(deck2.getCards(), computerB.getId());
parseScenario("scenario5.txt"); /*parseScenario("scenario7.txt");
game.cheat(computerA.getId(), commandsA); game.cheat(computerA.getId(), commandsA);
game.cheat(computerA.getId(), libraryCardsA, handCardsA, battlefieldCardsA, graveyardCardsA); game.cheat(computerA.getId(), libraryCardsA, handCardsA, battlefieldCardsA, graveyardCardsA);
game.cheat(computerB.getId(), commandsB); game.cheat(computerB.getId(), commandsB);
game.cheat(computerB.getId(), libraryCardsB, handCardsB, battlefieldCardsB, graveyardCardsB); game.cheat(computerB.getId(), libraryCardsB, handCardsB, battlefieldCardsB, graveyardCardsB);
*/
long t1 = System.nanoTime(); long t1 = System.nanoTime();
game.start(computerA.getId(), true); game.start(computerA.getId(), false);
long t2 = System.nanoTime(); long t2 = System.nanoTime();
logger.info("Winner: " + game.getWinner()); logger.info("Winner: " + game.getWinner());
logger.info("Time: " + (t2 - t1) / 1000000 + " ms"); logger.info("Time: " + (t2 - t1) / 1000000 + " ms");
/*if (!game.getWinner().equals("Player ComputerA is the winner")) {
throw new RuntimeException("Lost :(");
}*/
} }
private void addCard(List<Card> cards, String name, int count) { private void addCard(List<Card> cards, String name, int count) {