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

Added turn counter to message info.

Browse Source
This commit is contained in:
Doublestrike
2012-05-26 00:52:25 +00:00
parent d312eb5ab5
commit 975d7c2bb7
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/game/GameNew.java
View File

@@ -115,7 +115,7 @@ public class GameNew {
forge.card.trigger.Trigger.resetIDs(); forge.card.trigger.Trigger.resetIDs();
AllZone.getTriggerHandler().clearTriggerSettings(); AllZone.getTriggerHandler().clearTriggerSettings();
AllZone.getTriggerHandler().clearDelayedTrigger(); AllZone.getTriggerHandler().clearDelayedTrigger();
CMessage.SINGLETON_INSTANCE.updateGameCount(); CMessage.SINGLETON_INSTANCE.updateGameInfo();
// friendliness // friendliness
Card.resetUniqueNumber(); Card.resetUniqueNumber();

2
src/main/java/forge/game/GameSummary.java
View File

@@ -134,7 +134,7 @@ public final class GameSummary {
* *
* @return the turn game ended * @return the turn game ended
*/ */
public int getTurnGameEnded() { public int getLastTurnNumber() {
return this.lastTurnNumber; return this.lastTurnNumber;
} }

2
src/main/java/forge/game/phase/PhaseUtil.java
View File

@@ -29,6 +29,7 @@ import forge.card.trigger.TriggerType;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.match.CMatchUI; import forge.gui.match.CMatchUI;
import forge.gui.match.controllers.CMessage;
import forge.gui.match.nonsingleton.VField.PhaseLabel; import forge.gui.match.nonsingleton.VField.PhaseLabel;
/** /**
@@ -82,6 +83,7 @@ public class PhaseUtil {
Singletons.getModel().getGameState().getPhaseHandler().turnReset(); Singletons.getModel().getGameState().getPhaseHandler().turnReset();
Singletons.getModel().getGameSummary().notifyNextTurn(); Singletons.getModel().getGameSummary().notifyNextTurn();
CMessage.SINGLETON_INSTANCE.updateGameInfo();
AllZone.getCombat().reset(); AllZone.getCombat().reset();
AllZone.getCombat().setAttackingPlayer(turn); AllZone.getCombat().setAttackingPlayer(turn);

2
src/main/java/forge/gui/match/QuestWinLoseHandler.java
View File

@@ -398,7 +398,7 @@ public class QuestWinLoseHandler extends ControlWinLose {
} }
// Early turn bonus // Early turn bonus
final int winTurn = game.getTurnGameEnded(); final int winTurn = game.getLastTurnNumber();
final int turnCredits = this.getCreditsRewardForWinByTurn(winTurn); final int turnCredits = this.getCreditsRewardForWinByTurn(winTurn);
if (winTurn == 0) { if (winTurn == 0) {

9
src/main/java/forge/gui/match/controllers/CMessage.java
View File

@@ -83,12 +83,13 @@ public enum CMessage implements ICDoc {
VMessage.SINGLETON_INSTANCE.getTarMessage().setText(s0); VMessage.SINGLETON_INSTANCE.getTarMessage().setText(s0);
} }
/** Updates count label in input area. */ /** Updates counter label in message area. */
public void updateGameCount() { public void updateGameInfo() {
VMessage.SINGLETON_INSTANCE.getLblGames().setText("<html>Game #" VMessage.SINGLETON_INSTANCE.getLblGames().setText(
Constant.Runtime.getGameType().toString() + ": Game #"
+ (Singletons.getModel().getMatchState().getGamesPlayedCount() + 1) + (Singletons.getModel().getMatchState().getGamesPlayedCount() + 1)
+ " of " + Singletons.getModel().getMatchState().getGamesPerMatch() + " of " + Singletons.getModel().getMatchState().getGamesPerMatch()
+ "<br>" + Constant.Runtime.getGameType().toString() + " mode</html>"); + ", turn " + Singletons.getModel().getGameSummary().getLastTurnNumber());
} }
/** Flashes animation on input panel if play is currently waiting on input. */ /** Flashes animation on input panel if play is currently waiting on input. */