diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java index a5f685ebee6..39d46f64629 100644 --- a/src/main/java/forge/game/GameNew.java +++ b/src/main/java/forge/game/GameNew.java @@ -115,7 +115,7 @@ public class GameNew { forge.card.trigger.Trigger.resetIDs(); AllZone.getTriggerHandler().clearTriggerSettings(); AllZone.getTriggerHandler().clearDelayedTrigger(); - CMessage.SINGLETON_INSTANCE.updateGameCount(); + CMessage.SINGLETON_INSTANCE.updateGameInfo(); // friendliness Card.resetUniqueNumber(); diff --git a/src/main/java/forge/game/GameSummary.java b/src/main/java/forge/game/GameSummary.java index 430d1bb52e8..01a9df4c92a 100644 --- a/src/main/java/forge/game/GameSummary.java +++ b/src/main/java/forge/game/GameSummary.java @@ -134,7 +134,7 @@ public final class GameSummary { * * @return the turn game ended */ - public int getTurnGameEnded() { + public int getLastTurnNumber() { return this.lastTurnNumber; } diff --git a/src/main/java/forge/game/phase/PhaseUtil.java b/src/main/java/forge/game/phase/PhaseUtil.java index c8a80ab5eef..17514535967 100644 --- a/src/main/java/forge/game/phase/PhaseUtil.java +++ b/src/main/java/forge/game/phase/PhaseUtil.java @@ -29,6 +29,7 @@ import forge.card.trigger.TriggerType; import forge.game.player.Player; import forge.game.zone.ZoneType; import forge.gui.match.CMatchUI; +import forge.gui.match.controllers.CMessage; import forge.gui.match.nonsingleton.VField.PhaseLabel; /** @@ -82,6 +83,7 @@ public class PhaseUtil { Singletons.getModel().getGameState().getPhaseHandler().turnReset(); Singletons.getModel().getGameSummary().notifyNextTurn(); + CMessage.SINGLETON_INSTANCE.updateGameInfo(); AllZone.getCombat().reset(); AllZone.getCombat().setAttackingPlayer(turn); diff --git a/src/main/java/forge/gui/match/QuestWinLoseHandler.java b/src/main/java/forge/gui/match/QuestWinLoseHandler.java index d1266afdbfe..cc7da38463b 100644 --- a/src/main/java/forge/gui/match/QuestWinLoseHandler.java +++ b/src/main/java/forge/gui/match/QuestWinLoseHandler.java @@ -398,7 +398,7 @@ public class QuestWinLoseHandler extends ControlWinLose { } // Early turn bonus - final int winTurn = game.getTurnGameEnded(); + final int winTurn = game.getLastTurnNumber(); final int turnCredits = this.getCreditsRewardForWinByTurn(winTurn); if (winTurn == 0) { diff --git a/src/main/java/forge/gui/match/controllers/CMessage.java b/src/main/java/forge/gui/match/controllers/CMessage.java index 5cc2917b4e3..ce7ec05534a 100644 --- a/src/main/java/forge/gui/match/controllers/CMessage.java +++ b/src/main/java/forge/gui/match/controllers/CMessage.java @@ -83,12 +83,13 @@ public enum CMessage implements ICDoc { VMessage.SINGLETON_INSTANCE.getTarMessage().setText(s0); } - /** Updates count label in input area. */ - public void updateGameCount() { - VMessage.SINGLETON_INSTANCE.getLblGames().setText("Game #" + /** Updates counter label in message area. */ + public void updateGameInfo() { + VMessage.SINGLETON_INSTANCE.getLblGames().setText( + Constant.Runtime.getGameType().toString() + ": Game #" + (Singletons.getModel().getMatchState().getGamesPlayedCount() + 1) + " of " + Singletons.getModel().getMatchState().getGamesPerMatch() - + "
" + Constant.Runtime.getGameType().toString() + " mode"); + + ", turn " + Singletons.getModel().getGameSummary().getLastTurnNumber()); } /** Flashes animation on input panel if play is currently waiting on input. */