Add spellsPlayedLastTurn count to MagicGame

src/magic/model/MagicGame.java

@@ -79,6 +79,7 @@ public class MagicGame {
     private int landPlayed;
     private int maxLand;
     private int spellsPlayed;
+    private int spellsPlayedLastTurn;
     private int priorityPassedCount;
     private boolean creatureDiedThisTurn;
     private boolean priorityPassed;
@@ -176,6 +177,7 @@ public class MagicGame {
         landPlayed = game.landPlayed;
         maxLand = game.maxLand;
         spellsPlayed = game.spellsPlayed;
+        spellsPlayedLastTurn = game.spellsPlayedLastTurn;
         creatureDiedThisTurn = game.creatureDiedThisTurn;
         priorityPassed = game.priorityPassed;
         priorityPassedCount = game.priorityPassedCount;
@@ -263,6 +265,7 @@ public class MagicGame {
             landPlayed,
             maxLand,
             spellsPlayed,
+            spellsPlayedLastTurn,
             priorityPassedCount,
             (creatureDiedThisTurn ? 1L : -1L),
             (priorityPassed ? 1L : -1L),
@@ -887,6 +890,14 @@ public class MagicGame {
     public void incSpellsPlayed() {
         spellsPlayed++;
     }
+    
+    public int getSpellsPlayedLastTurn() {
+        return spellsPlayedLastTurn;
+    }
+    
+    public void setSpellsPlayedLastTurn(final int spells) {
+        spellsPlayedLastTurn = spells;
+    }
 
     public boolean getCreatureDiedThisTurn() {
         return creatureDiedThisTurn;

src/magic/model/action/MagicMarkerAction.java

@@ -17,6 +17,7 @@ public class MagicMarkerAction extends MagicAction {
     private int oldScore;
     private int oldLandPlayed;
     private int oldSpellsPlayed;
+    private int oldSpellsPlayedLastTurn;
     private boolean oldCreatureDiedThisTurn;
     private boolean oldPriorityPassed;
     private int oldPriorityPassedCount;
@@ -41,6 +42,7 @@ public class MagicMarkerAction extends MagicAction {
         oldScore=game.getScore();
         oldLandPlayed=game.getLandPlayed();
         oldSpellsPlayed = game.getSpellsPlayed();
+        oldSpellsPlayedLastTurn = game.getSpellsPlayedLastTurn();
         oldCreatureDiedThisTurn = game.getCreatureDiedThisTurn();
         oldPriorityPassed=game.getPriorityPassed();
         oldPriorityPassedCount=game.getPriorityPassedCount();
@@ -68,6 +70,7 @@ public class MagicMarkerAction extends MagicAction {
         game.setScore(oldScore);
         game.setLandPlayed(oldLandPlayed);
         game.setSpellsPlayed(oldSpellsPlayed);
+        game.setSpellsPlayedLastTurn(oldSpellsPlayedLastTurn);
         game.setCreatureDiedThisTurn(oldCreatureDiedThisTurn);
         game.setPriorityPassed(oldPriorityPassed);
         game.setPriorityPassedCount(oldPriorityPassedCount);

src/magic/model/phase/MagicCleanupPhase.java

@@ -54,6 +54,7 @@ public class MagicCleanupPhase extends MagicPhase {
         game.resetLandPlayed();
         game.resetMaxLand();
         game.setCreatureDiedThisTurn(false);
+        game.setSpellsPlayedLastTurn(game.getSpellsPlayed());
         game.setSpellsPlayed(0);
     }