github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[mad-ai] Fixed not using combat and post combat main phases.

Browse source
This commit is contained in:
magenoxx 2011-02-18 00:17:55 +03:00
parent 27420f784c
commit 97a83998eb
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,6 +116,11 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
pass(); pass();
break; break;
case PRECOMBAT_MAIN: case PRECOMBAT_MAIN:
case BEGIN_COMBAT:
case DECLARE_ATTACKERS:
case DECLARE_BLOCKERS:
case COMBAT_DAMAGE:
case END_COMBAT:
case POSTCOMBAT_MAIN: case POSTCOMBAT_MAIN:
if (game.getActivePlayerId().equals(playerId)) { if (game.getActivePlayerId().equals(playerId)) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
@ -141,11 +146,6 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
} }
act(game); act(game);
break; break;
case BEGIN_COMBAT:
case DECLARE_ATTACKERS:
case DECLARE_BLOCKERS:
case COMBAT_DAMAGE:
case END_COMBAT:
case END_TURN: case END_TURN:
pass(); pass();
break; break;

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

Binary file not shown.

1
Mage.Tests/scenario1.txt
View file

@ -1,6 +1,7 @@
### ComputerA ### ### ComputerA ###
# Battlefield # Battlefield
battlefield:ComputerA:Island:1 battlefield:ComputerA:Island:1
battlefield:ComputerA:Goblin Guide:1
# Hand # Hand
hand:ComputerA:Mountain:2 hand:ComputerA:Mountain:2
hand:ComputerA:Lightning Bolt:5 hand:ComputerA:Lightning Bolt:5

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

@ -56,7 +56,7 @@ public class PlayGameTest extends MageTestBase {
game.addPlayer(computerB, deck2); game.addPlayer(computerB, deck2);
game.loadCards(deck2.getCards(), computerB.getId()); game.loadCards(deck2.getCards(), computerB.getId());
parseScenario("scenario1.txt"); //parseScenario("scenario1.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);