diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml index e66b98593c1..31bc6c7a302 100644 --- a/Mage.Server/config/config.xml +++ b/Mage.Server/config/config.xml @@ -7,7 +7,7 @@ - + diff --git a/Mage.Server/plugins/mage-player-ai-ma.jar b/Mage.Server/plugins/mage-player-ai-ma.jar index 1b616701480..69ae3994e2f 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 1b616701480..69ae3994e2f 100644 Binary files a/Mage.Tests/plugins/mage-player-ai-ma.jar and b/Mage.Tests/plugins/mage-player-ai-ma.jar differ diff --git a/Mage.Tests/scenario5.txt b/Mage.Tests/scenario5.txt new file mode 100644 index 00000000000..e00fa182141 --- /dev/null +++ b/Mage.Tests/scenario5.txt @@ -0,0 +1,30 @@ +# Test playing Earthquake that kills opponent but not AI + +### ComputerA ### +# Battlefield +battlefield:ComputerA:Island:2 +battlefield:ComputerA:Mountain:1 +battlefield:ComputerA:Dragonskull Summit:1 +battlefield:ComputerA:Lavaclaw Reaches:1 +# Hand +hand:ComputerA:Mountain:0 +hand:ComputerA:Earthquake:1 +# Library +# from down to top +library:ComputerA:clear:0 +library:ComputerA:Mountain:15 +# Life +player:ComputerA:life:5 + +### ComputerB ### +# Battlefield +battlefield:ComputerB:Plains:1 +# Hand +hand:ComputerB:Plains:2 +# Library +# from down to top +library:ComputerB:clear:0 +library:ComputerB:Plains:10 +# Life +player:ComputerB:life:4 + diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java index 5bfdf576898..d9918778a9c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java @@ -56,7 +56,7 @@ public class PlayGameTest extends MageTestBase { game.addPlayer(computerB, deck2); game.loadCards(deck2.getCards(), computerB.getId()); - //parseScenario("scenario4.txt"); + parseScenario("scenario5.txt"); game.cheat(computerA.getId(), commandsA); game.cheat(computerA.getId(), libraryCardsA, handCardsA, battlefieldCardsA, graveyardCardsA); game.cheat(computerB.getId(), commandsB);