added keeping track of amount of spells played per turn

master
beholder 2012-03-20 16:26:55 +01:00
parent 8b543e47cc
commit ea6f0056cb
3 changed files with 13 additions and 0 deletions

View File

@ -70,6 +70,7 @@ public class MagicGame {
private int startTurn=0;
private int mainPhaseCount=100000000;
private int landPlayed=0;
private int spellsPlayed = 0;
private boolean creatureDiedThisTurn = false;
private boolean priorityPassed=false;
private int priorityPassedCount=0;
@ -159,6 +160,7 @@ public class MagicGame {
this.turn = game.turn;
this.startTurn = game.startTurn;
this.landPlayed = game.landPlayed;
this.spellsPlayed = game.spellsPlayed;
this.creatureDiedThisTurn = game.creatureDiedThisTurn;
this.priorityPassed = game.priorityPassed;
this.priorityPassedCount = game.priorityPassedCount;
@ -739,7 +741,14 @@ public class MagicGame {
public void setLandPlayed(final int lp) {
this.landPlayed = lp;
}
public int getSpellsPlayed() {
return spellsPlayed;
}
public void setSpellsPlayed(int spells) {
spellsPlayed = spells;
}
public boolean getCreatureDiedThisTurn() {
return creatureDiedThisTurn;
}

View File

@ -16,6 +16,7 @@ public class MagicMarkerAction extends MagicAction {
private int oldMainPhaseCount;
private int oldScore;
private int oldLandPlayed;
private int oldSpellsPlayed;
private boolean oldCreatureDiedThisTurn;
private boolean oldPriorityPassed;
private int oldPriorityPassedCount;
@ -39,6 +40,7 @@ public class MagicMarkerAction extends MagicAction {
oldMainPhaseCount=game.getMainPhaseCount();
oldScore=game.getScore();
oldLandPlayed=game.getLandPlayed();
oldSpellsPlayed = game.getSpellsPlayed();
oldCreatureDiedThisTurn = game.getCreatureDiedThisTurn();
oldPriorityPassed=game.getPriorityPassed();
oldPriorityPassedCount=game.getPriorityPassedCount();
@ -67,6 +69,7 @@ public class MagicMarkerAction extends MagicAction {
game.setMainPhaseCount(oldMainPhaseCount);
game.setScore(oldScore);
game.setLandPlayed(oldLandPlayed);
game.setSpellsPlayed(oldSpellsPlayed);
game.setCreatureDiedThisTurn(oldCreatureDiedThisTurn);
game.setPriorityPassed(oldPriorityPassed);
game.setPriorityPassedCount(oldPriorityPassedCount);

View File

@ -52,6 +52,7 @@ public class MagicCleanupPhase extends MagicPhase {
game.setTurn(game.getTurn()+1);
game.resetLandPlayed();
game.setCreatureDiedThisTurn(false);
game.setSpellsPlayed(0);
}
@Override