- Adding ways to determine the number of lands played and spells cast by a particular player last turn (will be necessary for some upcoming AI additions).

This commit is contained in:
Agetian
2017-01-07 04:59:11 +00:00
parent c46683e92d
commit 7599e41a63
3 changed files with 17 additions and 0 deletions

View File

@@ -69,6 +69,7 @@ public class RestartGameEffect extends SpellAbilityEffect {
player.setStartingLife(psc.getStartingLife()); player.setStartingLife(psc.getStartingLife());
player.setPoisonCounters(0, sa.getHostCard()); player.setPoisonCounters(0, sa.getHostCard());
player.setLandsPlayedLastTurn(0);
player.resetLandsPlayedThisTurn(); player.resetLandsPlayedThisTurn();
player.resetInvestigatedThisTurn(); player.resetInvestigatedThisTurn();
player.initVariantsZones(psc); player.initVariantsZones(psc);

View File

@@ -736,6 +736,7 @@ public class PhaseHandler implements java.io.Serializable {
} }
for (Player p : game.getPlayers()) { for (Player p : game.getPlayers()) {
p.resetProwl(); p.resetProwl();
p.setSpellsCastLastTurn(p.getSpellsCastThisTurn());
p.resetSpellsCastThisTurn(); p.resetSpellsCastThisTurn();
p.setLifeLostLastTurn(p.getLifeLostThisTurn()); p.setLifeLostLastTurn(p.getLifeLostThisTurn());
p.setLifeLostThisTurn(0); p.setLifeLostThisTurn(0);

View File

@@ -88,7 +88,9 @@ public class Player extends GameEntity implements Comparable<Player> {
private final Map<Card, Integer> assignedDamage = Maps.newHashMap(); private final Map<Card, Integer> assignedDamage = Maps.newHashMap();
private final Map<Card, Integer> assignedCombatDamage = Maps.newHashMap(); private final Map<Card, Integer> assignedCombatDamage = Maps.newHashMap();
private int spellsCastThisTurn = 0; private int spellsCastThisTurn = 0;
private int spellsCastLastTurn = 0;
private int landsPlayedThisTurn = 0; private int landsPlayedThisTurn = 0;
private int landsPlayedLastTurn = 0;
private int investigatedThisTurn = 0; private int investigatedThisTurn = 0;
private int lifeLostThisTurn = 0; private int lifeLostThisTurn = 0;
private int lifeLostLastTurn = 0; private int lifeLostLastTurn = 0;
@@ -2333,6 +2335,9 @@ public class Player extends GameEntity implements Comparable<Player> {
public final int getLandsPlayedThisTurn() { public final int getLandsPlayedThisTurn() {
return landsPlayedThisTurn; return landsPlayedThisTurn;
} }
public final int getLandsPlayedLastTurn() {
return landsPlayedLastTurn;
}
public final void addLandPlayedThisTurn() { public final void addLandPlayedThisTurn() {
landsPlayedThisTurn++; landsPlayedThisTurn++;
achievementTracker.landsPlayed++; achievementTracker.landsPlayed++;
@@ -2340,6 +2345,9 @@ public class Player extends GameEntity implements Comparable<Player> {
public final void resetLandsPlayedThisTurn() { public final void resetLandsPlayedThisTurn() {
landsPlayedThisTurn = 0; landsPlayedThisTurn = 0;
} }
public final void setLandsPlayedLastTurn(int num) {
landsPlayedLastTurn = num;
}
public final int getInvestigateNumThisTurn() { public final int getInvestigateNumThisTurn() {
return investigatedThisTurn; return investigatedThisTurn;
@@ -2398,6 +2406,9 @@ public class Player extends GameEntity implements Comparable<Player> {
public final int getSpellsCastThisTurn() { public final int getSpellsCastThisTurn() {
return spellsCastThisTurn; return spellsCastThisTurn;
} }
public final int getSpellsCastLastTurn() {
return spellsCastLastTurn;
}
public final void addSpellCastThisTurn() { public final void addSpellCastThisTurn() {
spellsCastThisTurn++; spellsCastThisTurn++;
achievementTracker.spellsCast++; achievementTracker.spellsCast++;
@@ -2408,6 +2419,9 @@ public class Player extends GameEntity implements Comparable<Player> {
public final void resetSpellsCastThisTurn() { public final void resetSpellsCastThisTurn() {
spellsCastThisTurn = 0; spellsCastThisTurn = 0;
} }
public final void setSpellsCastLastTurn(int num) {
spellsCastLastTurn = num;
}
public final int getLifeGainedThisTurn() { public final int getLifeGainedThisTurn() {
return lifeGainedThisTurn; return lifeGainedThisTurn;
@@ -2589,6 +2603,7 @@ public class Player extends GameEntity implements Comparable<Player> {
setAttackedWithCreatureThisTurn(false); setAttackedWithCreatureThisTurn(false);
setActivateLoyaltyAbilityThisTurn(false); setActivateLoyaltyAbilityThisTurn(false);
setTappedLandForManaThisTurn(false); setTappedLandForManaThisTurn(false);
setLandsPlayedLastTurn(getLandsPlayedThisTurn());
resetLandsPlayedThisTurn(); resetLandsPlayedThisTurn();
resetInvestigatedThisTurn(); resetInvestigatedThisTurn();
resetSacrificedThisTurn(); resetSacrificedThisTurn();