diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PreventSubAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PreventSubAction.java index 6779973b0..87859f01c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PreventSubAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PreventSubAction.java @@ -35,7 +35,7 @@ public class PreventSubAction extends SubAction { _playerPreventionCost = _preventionCost.createPreventionCostForPlayer(PreventSubAction.this, nextPlayer); if (_playerPreventionCost.isPlayableInFull(game)) { appendEffect( - new PlayoutDecisionEffect(game.getUserFeedback(), _choicePlayers.next(), + new PlayoutDecisionEffect(game.getUserFeedback(), nextPlayer, new MultipleChoiceAwaitingDecision(1, "Would you like to - " + _playerPreventionCost.getText(game) + " to prevent - " + _effectToExecute.getText(game), new String[]{"Yes", "No"}) { @Override protected void validDecisionMade(int index, String result) { 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 e64ec53de..8f6389c26 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 @@ -673,7 +673,8 @@ public class GameState { } // Current site is affecting - startAffecting(game, getCurrentSite()); + if (_currentPhase != Phase.GAME_SETUP) + startAffecting(game, getCurrentSite()); // Stacked cards on active cards are stack-affecting for (List stackedCards : _stacked.values()) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java index 02fbeacd7..f582e3883 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java @@ -25,6 +25,7 @@ public class PlayStartingFellowshipGameProcess implements GameProcess { if (nextPlayer != null) { _game.getGameState().startPlayerTurn(nextPlayer); + _game.getGameState().startAffectingCardsForCurrentPlayer(_game); _nextProcess = new PlayerPlaysStartingFellowshipGameProcess(_game, nextPlayer, new PlayStartingFellowshipGameProcess(_game, _playOrder, _firstPlayer)); } else { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java index 9830e7a1e..2ddc7639f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.logic.timing.processes.turn; +import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.PlayOrder; import com.gempukku.lotro.logic.effects.TriggeringResultEffect; @@ -20,6 +21,7 @@ public class StartOfTurnGameProcess implements GameProcess { playOrder.getNextPlayer(); String nextPlayer = playOrder.getNextPlayer(); + _game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS); _game.getGameState().startPlayerTurn(nextPlayer); _game.getGameState().startAffectingCardsForCurrentPlayer(_game); 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 a64c8605e..91a9ed9e5 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 @@ -774,6 +774,7 @@ var GempLotrGameUI = Class.extend({ var tokenOverlay = $(".tokenOverlay", cardDiv); var cardStrengthDiv = $("
"); + cardStrengthDiv.css({display: "none"}); tokenOverlay.append(cardStrengthDiv); cardDiv.data("card", card); @@ -788,10 +789,7 @@ var GempLotrGameUI = Class.extend({ var fontPerc = (size * 7) + "%"; var borderRadius = Math.ceil(size / 5) + "px"; - if (cardElem.data("card").strength != null) - $(".cardStrength", cardElem).css({position: "absolute", "border-radius": borderRadius, "font-size": fontPerc, left: borderWidth * 1.4 + "px", top: maxDimension * 0.64 + "px", width: size, height: size, display: ""}); - else - $(".cardStrength", cardElem).css({position: "absolute", "border-radius": borderRadius, "font-size": fontPerc, left: borderWidth * 1.4 + "px", top: maxDimension * 0.64 + "px", width: size, height: size, display: "none"}); + $(".cardStrength", cardElem).css({position: "absolute", "border-radius": borderRadius, "font-size": fontPerc, left: borderWidth * 1.4 + "px", top: maxDimension * 0.64 + "px", width: size, height: size}); } };