ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Continued work on the client.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-26 21:32:52 +00:00
parent 97d2054ad0
commit 25947c4879
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PreventSubAction.java
View File

@@ -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) {

3
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
View File

@@ -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<PhysicalCardImpl> stackedCards : _stacked.values())

1
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayStartingFellowshipGameProcess.java
View File

@@ -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 {

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java
View File

@@ -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);

6
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js
View File

@@ -774,6 +774,7 @@ var GempLotrGameUI = Class.extend({
var tokenOverlay = $(".tokenOverlay", cardDiv);
var cardStrengthDiv = $("<div class='cardStrength'></div>");
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});
}
};