From 52af9930a3c37aa777e525833038f08c3d7967c3 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Fri, 2 Dec 2011 13:07:27 +0000 Subject: [PATCH] Changing texts for playing phase actions. --- .../main/java/com/gempukku/lotro/common/Phase.java | 12 +++++++++++- ...layerPlaysPhaseActionsUntilPassesGameProcess.java | 2 +- .../PlayersPlayPhaseActionsInOrderGameProcess.java | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java index 85da00156..15d7838e4 100644 --- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java +++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java @@ -1,5 +1,15 @@ package com.gempukku.lotro.common; public enum Phase { - PUT_RING_BEARER, PLAY_STARTING_FELLOWSHIP, FELLOWSHIP, SHADOW, MANEUVER, ARCHERY, ASSIGNMENT, SKIRMISH, REGROUP, BETWEEN_TURNS + PUT_RING_BEARER(null), PLAY_STARTING_FELLOWSHIP(null), FELLOWSHIP("Fellowship"), SHADOW("Shadow"), MANEUVER("Maneuver"), ARCHERY("Archery"), ASSIGNMENT("Assignment"), SKIRMISH("Skirmish"), REGROUP("Regroup"), BETWEEN_TURNS(null); + + private String _humanReadable; + + private Phase(String humanReadable) { + _humanReadable = humanReadable; + } + + public String getHumanReadable() { + return _humanReadable; + } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayerPlaysPhaseActionsUntilPassesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayerPlaysPhaseActionsUntilPassesGameProcess.java index 2f390024e..27ab8c302 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayerPlaysPhaseActionsUntilPassesGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayerPlaysPhaseActionsUntilPassesGameProcess.java @@ -24,7 +24,7 @@ public class PlayerPlaysPhaseActionsUntilPassesGameProcess implements GameProces final List playableActions = game.getActionsEnvironment().getPhaseActions(_playerId); game.getUserFeedback().sendAwaitingDecision(_playerId, - new CardActionSelectionDecision(game, 1, "Choose action to play or Pass", playableActions) { + new CardActionSelectionDecision(game, 1, "Play " + game.getGameState().getCurrentPhase().getHumanReadable() + " action or Pass", playableActions) { @Override public void decisionMade(String result) throws DecisionResultInvalidException { Action action = getSelectedAction(result); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java index 235bc4deb..30a1058d7 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java @@ -44,7 +44,7 @@ public class PlayersPlayPhaseActionsInOrderGameProcess implements GameProcess { final List playableActions = game.getActionsEnvironment().getPhaseActions(playerId); game.getUserFeedback().sendAwaitingDecision(playerId, - new CardActionSelectionDecision(game, 1, "Choose action to play or Pass", playableActions) { + new CardActionSelectionDecision(game, 1, "Play " + game.getGameState().getCurrentPhase().getHumanReadable() + " action or Pass", playableActions) { @Override public void decisionMade(String result) throws DecisionResultInvalidException { Action action = getSelectedAction(result);