From 47d38e13450217d04694f57106e299c116275e4d Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 15 Mar 2012 01:19:54 +0000 Subject: [PATCH] Phases being visible and showing Fierce/Extra Assignments and Skirmishes. --- .../java/com/gempukku/lotro/common/Phase.java | 2 +- .../communication/GameStateListener.java | 3 +- .../lotro/game/state/EventSerializer.java | 2 +- .../gempukku/lotro/game/state/GameEvent.java | 7 +- .../gempukku/lotro/game/state/GameState.java | 12 +++- ...heringParticipantCommunicationChannel.java | 6 +- .../gemp-lotr-web/src/main/webapp/game.html | 10 +-- .../src/main/webapp/js/gameAnimations.js | 3 +- .../src/main/webapp/js/gameUi.js | 70 +++++++++---------- 9 files changed, 52 insertions(+), 63 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 15d7838e4..1dc5b866f 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,7 +1,7 @@ package com.gempukku.lotro.common; public enum Phase { - 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); + PUT_RING_BEARER("Put Ring-bearer"), PLAY_STARTING_FELLOWSHIP("Play starting fellowship"), FELLOWSHIP("Fellowship"), SHADOW("Shadow"), MANEUVER("Maneuver"), ARCHERY("Archery"), ASSIGNMENT("Assignment"), SKIRMISH("Skirmish"), REGROUP("Regroup"), BETWEEN_TURNS("Between turns"); private String _humanReadable; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java index 751ae4d23..8deb52e2e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java @@ -1,6 +1,5 @@ package com.gempukku.lotro.communication; -import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Token; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.logic.decisions.AwaitingDecision; @@ -25,7 +24,7 @@ public interface GameStateListener { public void setCurrentPlayerId(String playerId); - public void setCurrentPhase(Phase currentPhase); + public void setCurrentPhase(String currentPhase); public void addAssignment(PhysicalCard fp, Set minions); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/EventSerializer.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/EventSerializer.java index a6a95bd87..b0b9d11c3 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/EventSerializer.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/EventSerializer.java @@ -34,7 +34,7 @@ public class EventSerializer { eventElem.setAttribute("allParticipantIds", sb.toString()); } if (gameEvent.getPhase() != null) - eventElem.setAttribute("phase", gameEvent.getPhase().name()); + eventElem.setAttribute("phase", gameEvent.getPhase()); if (gameEvent.getTargetCardId() != null) eventElem.setAttribute("targetCardId", gameEvent.getTargetCardId().toString()); if (gameEvent.getZone() != null) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java index 71d1c0c00..961b412b3 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java @@ -1,7 +1,6 @@ package com.gempukku.lotro.game.state; import com.gempukku.lotro.common.CardType; -import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Token; import com.gempukku.lotro.common.Zone; import com.gempukku.lotro.game.PhysicalCard; @@ -33,7 +32,7 @@ public class GameEvent { private String _blueprintId; private Integer _cardId; private Integer _targetCardId; - private Phase _phase; + private String _phase; private Integer _count; private Token _token; private int[] _otherCardIds; @@ -198,11 +197,11 @@ public class GameEvent { return this; } - public Phase getPhase() { + public String getPhase() { return _phase; } - public GameEvent phase(Phase phase) { + public GameEvent phase(String phase) { _phase = phase; return this; } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java index 069f2cddf..1fe08e42e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java @@ -146,13 +146,21 @@ public class GameState { return Collections.unmodifiableSet(_gameStateListeners); } + private String getPhaseString() { + if (isFierceSkirmishes()) + return "Fierce " + _currentPhase.getHumanReadable(); + if (isExtraSkirmishes()) + return "Extra " + _currentPhase.getHumanReadable(); + return _currentPhase.getHumanReadable(); + } + private void sendStateToPlayer(String playerId, GameStateListener listener, GameStats gameStats) { if (_playerOrder != null) { listener.setPlayerOrder(_playerOrder.getAllPlayers()); if (_currentPlayerId != null) listener.setCurrentPlayerId(_currentPlayerId); if (_currentPhase != null) - listener.setCurrentPhase(_currentPhase); + listener.setCurrentPhase(getPhaseString()); listener.setTwilight(_twilightPool); for (Map.Entry stringIntegerEntry : _playerPosition.entrySet()) listener.setPlayerPosition(stringIntegerEntry.getKey(), stringIntegerEntry.getValue()); @@ -887,7 +895,7 @@ public class GameState { public void setCurrentPhase(Phase phase) { _currentPhase = phase; for (GameStateListener listener : getAllGameStateListeners()) - listener.setCurrentPhase(_currentPhase); + listener.setCurrentPhase(getPhaseString()); } public Phase getCurrentPhase() { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GatheringParticipantCommunicationChannel.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GatheringParticipantCommunicationChannel.java index 7c8370da3..0481be20b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GatheringParticipantCommunicationChannel.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GatheringParticipantCommunicationChannel.java @@ -1,16 +1,14 @@ package com.gempukku.lotro.game.state; -import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Token; import com.gempukku.lotro.communication.GameStateListener; import com.gempukku.lotro.game.PhysicalCard; +import static com.gempukku.lotro.game.state.GameEvent.Type.*; import com.gempukku.lotro.logic.decisions.AwaitingDecision; import com.gempukku.lotro.logic.timing.GameStats; import java.util.*; -import static com.gempukku.lotro.game.state.GameEvent.Type.*; - public class GatheringParticipantCommunicationChannel implements GameStateListener { private List _events = new LinkedList(); private String _self; @@ -72,7 +70,7 @@ public class GatheringParticipantCommunicationChannel implements GameStateListen } @Override - public void setCurrentPhase(Phase phase) { + public void setCurrentPhase(String phase) { _events.add(new GameEvent(GPC).phase(phase)); } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html index 6aaae48ed..4c6956f2a 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html @@ -186,16 +186,8 @@ body { } .phase { - display: inline-table; - padding: 2px; color: #ffffff; -} - -.phase.current { - display: inline-table; - padding: 2px; - background-color: #ffffff; - color: #000000; + font-size: 120%; } .twilightPool { diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js index 57e808a45..8362a5619 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js @@ -443,8 +443,7 @@ var GameAnimations = Class.extend({ function(next) { var phase = element.getAttribute("phase"); - $(".phase").removeClass("current"); - $(".phase#" + phase).addClass("current"); + $(".phase").text(phase); next(); }); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js index 716f8025e..b4cc1b954 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js @@ -267,13 +267,7 @@ var GempLotrGameUI = Class.extend({ } this.gameStateElem.append("
0
"); - this.gameStateElem.append("
Fel
"); - this.gameStateElem.append("
Sh
"); - this.gameStateElem.append("
Man
"); - this.gameStateElem.append("
Arc
"); - this.gameStateElem.append("
As
"); - this.gameStateElem.append("
Sk
"); - this.gameStateElem.append("
Re
"); + this.gameStateElem.append("
"); $("#main").append(this.gameStateElem); @@ -651,21 +645,21 @@ var GempLotrGameUI = Class.extend({ initializeDialogs: function() { this.smallDialog = $("
") .dialog({ - autoOpen: false, - closeOnEscape: false, - resizable: false, - width: 400, - height: 200 - }); + autoOpen: false, + closeOnEscape: false, + resizable: false, + width: 400, + height: 200 + }); this.cardActionDialog = $("
") .dialog({ - autoOpen: false, - closeOnEscape: false, - resizable: true, - width: 600, - height: 300 - }); + autoOpen: false, + closeOnEscape: false, + resizable: true, + width: 600, + height: 300 + }); var that = this; @@ -680,11 +674,11 @@ var GempLotrGameUI = Class.extend({ this.infoDialog = $("
") .dialog({ - autoOpen: false, - closeOnEscape: true, - resizable: false, - title: "Card information" - }); + autoOpen: false, + closeOnEscape: true, + resizable: false, + title: "Card information" + }); var swipeOptions = { threshold: 20, @@ -1165,12 +1159,12 @@ var GempLotrGameUI = Class.extend({ if (!this.replayMode) { this.smallDialog.dialog("option", "buttons", - { - "OK": function() { - $(this).dialog("close"); - that.decisionFunction(id, $("#integerDecision").val()); - } - }); + { + "OK": function() { + $(this).dialog("close"); + that.decisionFunction(id, $("#integerDecision").val()); + } + }); } $("#integerDecision").SpinnerControl({ type: 'range', @@ -1208,12 +1202,12 @@ var GempLotrGameUI = Class.extend({ if (!this.replayMode) { this.smallDialog.dialog("option", "buttons", - { - "OK": function() { - that.smallDialog.dialog("close"); - that.decisionFunction(id, $("#multipleChoiceDecision").val()); - } - }); + { + "OK": function() { + that.smallDialog.dialog("close"); + that.decisionFunction(id, $("#multipleChoiceDecision").val()); + } + }); } } else { this.smallDialog.append("
"); @@ -1601,8 +1595,8 @@ var GempLotrGameUI = Class.extend({ $(div).find('LI.hover').removeClass('hover'); $(this).parent().addClass('hover'); }).mouseout(function() { - $(div).find('LI.hover').removeClass('hover'); - }); + $(div).find('LI.hover').removeClass('hover'); + }); var getRidOfContextMenu = function() { $(div).remove();