external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Also reset the lands played last turn.

Browse Source
This commit is contained in:
Agetian
2018-07-17 16:13:35 +03:00
parent 442263710b
commit 3c2f5b2ecf
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-ai/src/main/java/forge/ai/GameState.java
View File

@@ -61,6 +61,8 @@ public abstract class GameState {
private String computerPersistentMana = ""; private String computerPersistentMana = "";
private int humanLandsPlayed = 0; private int humanLandsPlayed = 0;
private int computerLandsPlayed = 0; private int computerLandsPlayed = 0;
private int humanLandsPlayedLastTurn = 0;
private int computerLandsPlayedLastTurn = 0;
private boolean puzzleCreatorState = false; private boolean puzzleCreatorState = false;
@@ -126,6 +128,8 @@ public abstract class GameState {
sb.append(TextUtil.concatNoSpace("ailife=", String.valueOf(computerLife), "\n")); sb.append(TextUtil.concatNoSpace("ailife=", String.valueOf(computerLife), "\n"));
sb.append(TextUtil.concatNoSpace("humanlandsplayed=", String.valueOf(humanLandsPlayed), "\n")); sb.append(TextUtil.concatNoSpace("humanlandsplayed=", String.valueOf(humanLandsPlayed), "\n"));
sb.append(TextUtil.concatNoSpace("ailandsplayed=", String.valueOf(computerLandsPlayed), "\n")); sb.append(TextUtil.concatNoSpace("ailandsplayed=", String.valueOf(computerLandsPlayed), "\n"));
sb.append(TextUtil.concatNoSpace("humanlandsplayedlastturn=", String.valueOf(humanLandsPlayedLastTurn), "\n"));
sb.append(TextUtil.concatNoSpace("ailandsplayedlastturn=", String.valueOf(computerLandsPlayedLastTurn), "\n"));
sb.append(TextUtil.concatNoSpace("turn=", String.valueOf(turn), "\n")); sb.append(TextUtil.concatNoSpace("turn=", String.valueOf(turn), "\n"));
if (!humanCounters.isEmpty()) { if (!humanCounters.isEmpty()) {
@@ -170,6 +174,8 @@ public abstract class GameState {
computerLife = ai.getLife(); computerLife = ai.getLife();
humanLandsPlayed = human.getLandsPlayedThisTurn(); humanLandsPlayed = human.getLandsPlayedThisTurn();
computerLandsPlayed = ai.getLandsPlayedThisTurn(); computerLandsPlayed = ai.getLandsPlayedThisTurn();
humanLandsPlayedLastTurn = human.getLandsPlayedLastTurn();
computerLandsPlayedLastTurn = ai.getLandsPlayedLastTurn();
humanCounters = countersToString(human.getCounters()); humanCounters = countersToString(human.getCounters());
computerCounters = countersToString(ai.getCounters()); computerCounters = countersToString(ai.getCounters());
humanManaPool = processManaPool(human.getManaPool()); humanManaPool = processManaPool(human.getManaPool());
@@ -453,6 +459,13 @@ public abstract class GameState {
computerLandsPlayed = Integer.parseInt(categoryValue); computerLandsPlayed = Integer.parseInt(categoryValue);
} }
else if (categoryName.endsWith("landsplayedlastturn")) {
if (isHuman)
humanLandsPlayedLastTurn = Integer.parseInt(categoryValue);
else
computerLandsPlayedLastTurn = Integer.parseInt(categoryValue);
}
else if (categoryName.endsWith("play") || categoryName.endsWith("battlefield")) { else if (categoryName.endsWith("play") || categoryName.endsWith("battlefield")) {
if (isHuman) if (isHuman)
humanCardTexts.put(ZoneType.Battlefield, categoryValue); humanCardTexts.put(ZoneType.Battlefield, categoryValue);
@@ -572,8 +585,8 @@ public abstract class GameState {
game.getTriggerHandler().setSuppressAllTriggers(true); game.getTriggerHandler().setSuppressAllTriggers(true);
setupPlayerState(humanLife, humanCardTexts, human, humanLandsPlayed); setupPlayerState(humanLife, humanCardTexts, human, humanLandsPlayed, humanLandsPlayedLastTurn);
setupPlayerState(computerLife, aiCardTexts, ai, computerLandsPlayed); setupPlayerState(computerLife, aiCardTexts, ai, computerLandsPlayed, computerLandsPlayedLastTurn);
handleCardAttachments(); handleCardAttachments();
handleChosenEntities(); handleChosenEntities();
@@ -988,7 +1001,7 @@ public abstract class GameState {
} }
} }
private void setupPlayerState(int life, Map<ZoneType, String> cardTexts, final Player p, final int landsPlayed) { private void setupPlayerState(int life, Map<ZoneType, String> cardTexts, final Player p, final int landsPlayed, final int landsPlayedLastTurn) {
// Lock check static as we setup player state // Lock check static as we setup player state
Map<ZoneType, CardCollectionView> playerCards = new EnumMap<ZoneType, CardCollectionView>(ZoneType.class); Map<ZoneType, CardCollectionView> playerCards = new EnumMap<ZoneType, CardCollectionView>(ZoneType.class);
@@ -999,6 +1012,7 @@ public abstract class GameState {
if (life >= 0) p.setLife(life, null); if (life >= 0) p.setLife(life, null);
p.setLandsPlayedThisTurn(landsPlayed); p.setLandsPlayedThisTurn(landsPlayed);
p.setLandsPlayedLastTurn(landsPlayedLastTurn);
for (Entry<ZoneType, CardCollectionView> kv : playerCards.entrySet()) { for (Entry<ZoneType, CardCollectionView> kv : playerCards.entrySet()) {
PlayerZone zone = p.getZone(kv.getKey()); PlayerZone zone = p.getZone(kv.getKey());