diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java index d94fc144451..5248d95f1ed 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java @@ -234,11 +234,15 @@ public class ComputerPlayer6 extends ComputerPlayer implements root = root.children.get(0); //GameStateEvaluator2.evaluate(playerId, root.getGame()); int bestScore = root.getScore(); - if (bestScore > currentScore) { + //if (bestScore > currentScore) { actions = new LinkedList(root.abilities); combat = root.combat; - } - } + //} else { + //System.out.println("[" + game.getPlayer(playerId).getName() + "] Action: not better score"); + //} + } else { + System.out.println("[" + game.getPlayer(playerId).getName() + "] Action: skip"); + } } } diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java index 24a88b97c4c..494b3306667 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java @@ -157,11 +157,15 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player { if (root.children.size() > 0) { root = root.children.get(0); int bestScore = root.getScore(); - if (bestScore > currentScore || allowBadMoves) { + //if (bestScore > currentScore || allowBadMoves) { actions = new LinkedList(root.abilities); combat = root.combat; - } - } + //} else { + //System.out.println("[" + game.getPlayer(playerId).getName() + "][pre] Action: not better score"); + //} + } else { + System.out.println("[" + game.getPlayer(playerId).getName() + "][pre] Action: skip"); + } } } @@ -177,11 +181,15 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player { if (root.children.size() > 0) { root = root.children.get(0); int bestScore = root.getScore(); - if (bestScore > currentScore || allowBadMoves) { + //if (bestScore > currentScore || allowBadMoves) { actions = new LinkedList(root.abilities); combat = root.combat; - } - } + //} else { + //System.out.println("[" + game.getPlayer(playerId).getName() + "][post] Action: not better score"); + //} + } else { + System.out.println("[" + game.getPlayer(playerId).getName() + "][post] Action: skip"); + } } } diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java index 1471a3f3cb8..f29e057ea68 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java @@ -199,6 +199,12 @@ public class SimulatedPlayer2 extends ComputerPlayer { filtered.add(option); return filtered; } else { + Card target = game.getCard(option.getFirstTarget()); + if (target != null && target.getName().equals(name)) { + System.out.println("matched(option): " + s); + filtered.add(option); + return filtered; + } System.out.println("not equal UUID for target, player=" + player); } } diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java index cf6981542bc..f0db2eed657 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java @@ -65,6 +65,7 @@ public class ArtificialScoringSystem { public static int getVariablePermanentScore(final Game game, final Permanent permanent) { int score = permanent.getCounters().getCount(CounterType.CHARGE) * 30; + score -= permanent.getDamage() * 2; if (!canTap(permanent)) { score += getTappedScore(permanent); } diff --git a/Mage.Server/plugins/mage-player-ai-ma.jar b/Mage.Server/plugins/mage-player-ai-ma.jar index 3f26d5d1b8f..44f42068bca 100644 Binary files a/Mage.Server/plugins/mage-player-ai-ma.jar and b/Mage.Server/plugins/mage-player-ai-ma.jar differ diff --git a/Mage.Tests/plugins/mage-player-ai-ma.jar b/Mage.Tests/plugins/mage-player-ai-ma.jar index a9a57761163..44f42068bca 100644 Binary files a/Mage.Tests/plugins/mage-player-ai-ma.jar and b/Mage.Tests/plugins/mage-player-ai-ma.jar differ