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

Merge branch 'DumpTurn' into PriceOfProgress

Browse Source
This commit is contained in:
Seravy
2018-02-14 16:14:22 +01:00
parent c9b634a274 22846db1a3
commit b0677ca006
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,8 @@ public abstract class GameState {
private String precastHuman = null;
private String precastAI = null;
private int turn;
// Targeting for precast spells in a game state (mostly used by Puzzle Mode game states)
private final int TARGET_NONE = -1; // untargeted spell (e.g. Joraga Invocation)
private final int TARGET_HUMAN = -2;
@@ -110,6 +112,7 @@ public abstract class GameState {
sb.append(TextUtil.concatNoSpace("humanlife=", String.valueOf(humanLife), "\n"));
sb.append(TextUtil.concatNoSpace("ailife=", String.valueOf(computerLife), "\n"));
sb.append(TextUtil.concatNoSpace("turn=", String.valueOf(turn), "\n"));
if (!humanCounters.isEmpty()) {
sb.append(TextUtil.concatNoSpace("humancounters=", humanCounters, "\n"));
@@ -149,6 +152,7 @@ public abstract class GameState {
tChangePlayer = game.getPhaseHandler().getPlayerTurn() == ai ? "ai" : "human";
tChangePhase = game.getPhaseHandler().getPhase().toString();
turn = game.getPhaseHandler().getTurn();
aiCardTexts.clear();
humanCardTexts.clear();
@@ -392,6 +396,9 @@ public abstract class GameState {
boolean isHuman = categoryName.startsWith("human");
if (categoryName.endsWith("turn")) {
turn = Integer.parseInt(categoryValue);
}
if (categoryName.endsWith("life")) {
if (isHuman)
humanLife = Integer.parseInt(categoryValue);
@@ -499,7 +506,7 @@ public abstract class GameState {
applyCountersToGameEntity(ai, computerCounters);
}
game.getPhaseHandler().devModeSet(newPhase, newPlayerTurn);
game.getPhaseHandler().devModeSet(newPhase, newPlayerTurn, turn);
game.getTriggerHandler().setSuppressAllTriggers(true);
@@ -530,7 +537,7 @@ public abstract class GameState {
private void handleCombat(final Game game, final Player attackingPlayer, final Player defendingPlayer, final boolean toDeclareBlockers) {
// First we need to ensure that all attackers are declared in the Declare Attackers step,
// even if proceeding straight to Declare Blockers
game.getPhaseHandler().devModeSet(PhaseType.COMBAT_DECLARE_ATTACKERS, attackingPlayer);
game.getPhaseHandler().devModeSet(PhaseType.COMBAT_DECLARE_ATTACKERS, attackingPlayer, turn);
if (game.getPhaseHandler().getCombat() == null) {
game.getPhaseHandler().setCombat(new Combat(attackingPlayer));

2
forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
View File

@@ -98,7 +98,7 @@ public class GameCopier {
PhaseHandler origPhaseHandler = origGame.getPhaseHandler();
Player newPlayerTurn = playerMap.get(origPhaseHandler.getPlayerTurn());
newGame.getPhaseHandler().devModeSet(origPhaseHandler.getPhase(), newPlayerTurn);
newGame.getPhaseHandler().devModeSet(origPhaseHandler.getPhase(), newPlayerTurn, origPhaseHandler.getTurn());
newGame.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
for (Player p : newGame.getPlayers()) {
((PlayerZoneBattlefield) p.getZone(ZoneType.Battlefield)).setTriggers(false);