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

A bit of working with how the actions are played and messages being displayed.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-14 11:21:12 +00:00
parent a304170b15
commit 98bbb068a7
10 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/TriggeringEffect.java
View File

@@ -6,9 +6,11 @@ import com.gempukku.lotro.logic.timing.EffectResult;
public class TriggeringEffect extends AbstractEffect { public class TriggeringEffect extends AbstractEffect {
private EffectResult _effectResult; private EffectResult _effectResult;
private String _text;
public TriggeringEffect(EffectResult effectResult) { public TriggeringEffect(EffectResult effectResult, String text) {
_effectResult = effectResult; _effectResult = effectResult;
_text = text;
} }
@Override @Override
@@ -18,7 +20,7 @@ public class TriggeringEffect extends AbstractEffect {
@Override @Override
public String getText() { public String getText() {
return null; return _text;
} }
@Override @Override

20
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java
View File

@@ -47,7 +47,7 @@ public class TurnProcedure {
} else { } else {
Effect effect = _actionStack.getNextEffect(); Effect effect = _actionStack.getNextEffect();
if (effect != null) { if (effect != null) {
if (effect instanceof UnrespondableEffect) { if (effect.getType() == null) {
if (effect.canPlayEffect(_game)) if (effect.canPlayEffect(_game))
effect.playEffect(_game); effect.playEffect(_game);
else else
@@ -134,7 +134,7 @@ public class TurnProcedure {
Map<String, List<Action>> optionalWhenResponses = _game.getActionsEnvironment().getOptionalAfterTriggers(_game.getGameState().getPlayerOrder().getAllPlayers(), _effectResult); Map<String, List<Action>> optionalWhenResponses = _game.getActionsEnvironment().getOptionalAfterTriggers(_game.getGameState().getPlayerOrder().getAllPlayers(), _effectResult);
DefaultCostToEffectAction action = new DefaultCostToEffectAction(null, null, null); DefaultCostToEffectAction action = new DefaultCostToEffectAction(null, null, null);
action.addEffect( action.addEffect(
new PlayoutOptionalAfterResponsesEffect(action, optionalWhenResponses, _game.getGameState().getPlayerOrder().getCounterClockwisePlayOrder(_game.getGameState().getCurrentPlayerId(), true), 0, _effectResult)); new PlayoutOptionalAfterResponsesEffect(action, optionalWhenResponses, _game.getGameState().getPlayerOrder().getCounterClockwisePlayOrder(_game.getGameState().getCurrentPlayerId(), true), 0, _effect, _effectResult));
return new StackActionEffect(action); return new StackActionEffect(action);
} }
} }
@@ -167,7 +167,7 @@ public class TurnProcedure {
if (possibleActions.size() > 0) { if (possibleActions.size() > 0) {
_game.getUserFeedback().sendAwaitingDecision(activePlayer, _game.getUserFeedback().sendAwaitingDecision(activePlayer,
new CardActionSelectionDecision(1, "Choose action to play or DONE", possibleActions, true) { new CardActionSelectionDecision(1, _effect.getText() + " - Optional \"is about to\" responses", possibleActions, true) {
@Override @Override
public void decisionMade(String result) throws DecisionResultInvalidException { public void decisionMade(String result) throws DecisionResultInvalidException {
Action action = getSelectedAction(result); Action action = getSelectedAction(result);
@@ -196,13 +196,15 @@ public class TurnProcedure {
private Map<String, List<Action>> _actionMap = new HashMap<String, List<Action>>(); private Map<String, List<Action>> _actionMap = new HashMap<String, List<Action>>();
private PlayOrder _playOrder; private PlayOrder _playOrder;
private int _passCount; private int _passCount;
private Effect _effect;
private EffectResult _effectResult; private EffectResult _effectResult;
private PlayoutOptionalAfterResponsesEffect(DefaultCostToEffectAction action, Map<String, List<Action>> actionMap, PlayOrder playOrder, int passCount, EffectResult effectResult) { private PlayoutOptionalAfterResponsesEffect(DefaultCostToEffectAction action, Map<String, List<Action>> actionMap, PlayOrder playOrder, int passCount, Effect effect, EffectResult effectResult) {
_action = action; _action = action;
_actionMap = actionMap; _actionMap = actionMap;
_playOrder = playOrder; _playOrder = playOrder;
_passCount = passCount; _passCount = passCount;
_effect = effect;
_effectResult = effectResult; _effectResult = effectResult;
} }
@@ -214,24 +216,24 @@ public class TurnProcedure {
if (possibleActions.size() > 0) { if (possibleActions.size() > 0) {
_game.getUserFeedback().sendAwaitingDecision(activePlayer, _game.getUserFeedback().sendAwaitingDecision(activePlayer,
new CardActionSelectionDecision(1, "Choose action to play or DONE", possibleActions, true) { new CardActionSelectionDecision(1, _effect.getText() + " - optional \"when\" responses", possibleActions, true) {
@Override @Override
public void decisionMade(String result) throws DecisionResultInvalidException { public void decisionMade(String result) throws DecisionResultInvalidException {
Action action = getSelectedAction(result); Action action = getSelectedAction(result);
if (action != null) { if (action != null) {
_game.getActionsEnvironment().addActionToStack(action); _game.getActionsEnvironment().addActionToStack(action);
_actionMap.get(activePlayer).remove(action); _actionMap.get(activePlayer).remove(action);
_action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, 0, _effectResult)); _action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, 0, _effect, _effectResult));
} else { } else {
if ((_passCount + 1) < _playOrder.getPlayerCount()) { if ((_passCount + 1) < _playOrder.getPlayerCount()) {
_action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, _passCount + 1, _effectResult)); _action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, _passCount + 1, _effect, _effectResult));
} }
} }
} }
}); });
} else { } else {
if ((_passCount + 1) < _playOrder.getPlayerCount()) { if ((_passCount + 1) < _playOrder.getPlayerCount()) {
_action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, _passCount + 1, _effectResult)); _action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, _passCount + 1, _effect, _effectResult));
} }
} }
} }
@@ -255,7 +257,7 @@ public class TurnProcedure {
_game.getActionsEnvironment().addActionToStack(_actions.get(0)); _game.getActionsEnvironment().addActionToStack(_actions.get(0));
} else { } else {
_game.getUserFeedback().sendAwaitingDecision(_game.getGameState().getCurrentPlayerId(), _game.getUserFeedback().sendAwaitingDecision(_game.getGameState().getCurrentPlayerId(),
new ActionSelectionDecision(1, "Choose action to play now", _actions) { new ActionSelectionDecision(1, _effect.getText() + " - required responses", _actions) {
@Override @Override
public void decisionMade(String result) throws DecisionResultInvalidException { public void decisionMade(String result) throws DecisionResultInvalidException {
Action action = getSelectedAction(result); Action action = getSelectedAction(result);

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

@@ -16,7 +16,7 @@ public class EndOfTurnGameProcess implements GameProcess {
@Override @Override
public void process() { public void process() {
_game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new EndOfTurnResult()), "End of turn")); _game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new EndOfTurnResult(), "End of turn"), "End of turn"));
_game.getGameState().stopAffectingCardsForCurrentPlayer(); _game.getGameState().stopAffectingCardsForCurrentPlayer();
_game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS); _game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS);
} }

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

@@ -23,7 +23,7 @@ public class StartOfTurnGameProcess implements GameProcess {
_game.getGameState().startPlayerTurn(nextPlayer); _game.getGameState().startPlayerTurn(nextPlayer);
_game.getGameState().startAffectingCardsForCurrentPlayer(_game.getModifiersEnvironment()); _game.getGameState().startAffectingCardsForCurrentPlayer(_game.getModifiersEnvironment());
_game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new StartOfTurnResult()), "Start of turn")); _game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new StartOfTurnResult(), "Start of turn"), "Start of turn"));
} }
@Override @Override

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

@@ -20,7 +20,7 @@ public class EndOfPhaseGameProcess implements GameProcess {
@Override @Override
public void process() { public void process() {
_game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new EndOfPhaseResult(_phase)), "End of " + _phase + " phase")); _game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new EndOfPhaseResult(_phase), "End of " + _phase + " phase"), "End of " + _phase + " phase"));
} }
@Override @Override

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

@@ -21,7 +21,7 @@ public class SimpleTriggeringGameProcess implements GameProcess {
@Override @Override
public void process() { public void process() {
_game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(_effectResult), _text)); _game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(_effectResult, _text), _text));
} }
@Override @Override

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

@@ -21,7 +21,7 @@ public class StartOfPhaseGameProcess implements GameProcess {
@Override @Override
public void process() { public void process() {
_game.getGameState().setCurrentPhase(_phase); _game.getGameState().setCurrentPhase(_phase);
_game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new StartOfPhaseResult(_phase)), "Start of " + _phase + " phase")); _game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new StartOfPhaseResult(_phase), "Start of " + _phase + " phase"), "Start of " + _phase + " phase"));
} }
@Override @Override

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroGameMediator.java
View File

@@ -144,7 +144,7 @@ public class LotroGameMediator {
visitor.visitWarning(warning); visitor.visitWarning(warning);
AwaitingDecision awaitingDecision = _userFeedback.getAwaitingDecision(participantId); AwaitingDecision awaitingDecision = _userFeedback.getAwaitingDecision(participantId);
if (awaitingDecision != null) if (awaitingDecision != null)
visitor.visitAwaitingDecision(_lotroGame.getActionStack().getTopmostAction(), awaitingDecision); visitor.visitAwaitingDecision(awaitingDecision);
Map<String, Integer> secondsLeft = new HashMap<String, Integer>(); Map<String, Integer> secondsLeft = new HashMap<String, Integer>();
for (Map.Entry<String, Integer> playerClock : _playerClocks.entrySet()) { for (Map.Entry<String, Integer> playerClock : _playerClocks.entrySet()) {
@@ -171,7 +171,7 @@ public class LotroGameMediator {
visitor.visitWarning(warning); visitor.visitWarning(warning);
AwaitingDecision awaitingDecision = _userFeedback.getAwaitingDecision(participantId); AwaitingDecision awaitingDecision = _userFeedback.getAwaitingDecision(participantId);
if (awaitingDecision != null) if (awaitingDecision != null)
visitor.visitAwaitingDecision(_lotroGame.getActionStack().getTopmostAction(), awaitingDecision); visitor.visitAwaitingDecision(awaitingDecision);
Map<String, Integer> secondsLeft = new HashMap<String, Integer>(); Map<String, Integer> secondsLeft = new HashMap<String, Integer>();
for (Map.Entry<String, Integer> playerClock : _playerClocks.entrySet()) { for (Map.Entry<String, Integer> playerClock : _playerClocks.entrySet()) {

3
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/ParticipantCommunicationVisitor.java
View File

@@ -2,7 +2,6 @@ package com.gempukku.lotro.game;
import com.gempukku.lotro.GameEvent; import com.gempukku.lotro.GameEvent;
import com.gempukku.lotro.logic.decisions.AwaitingDecision; import com.gempukku.lotro.logic.decisions.AwaitingDecision;
import com.gempukku.lotro.logic.timing.Action;
import java.util.Map; import java.util.Map;
@@ -11,7 +10,7 @@ public interface ParticipantCommunicationVisitor {
public void visitWarning(String warning); public void visitWarning(String warning);
public void visitAwaitingDecision(Action currentAction, AwaitingDecision awaitingDecision); public void visitAwaitingDecision(AwaitingDecision awaitingDecision);
public void visitGameEvent(GameEvent gameEvent); public void visitGameEvent(GameEvent gameEvent);
} }

16
gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java
View File

@@ -15,7 +15,6 @@ import com.gempukku.lotro.game.CardCollection;
import com.gempukku.lotro.game.DefaultLotroFormat; import com.gempukku.lotro.game.DefaultLotroFormat;
import com.gempukku.lotro.game.ParticipantCommunicationVisitor; import com.gempukku.lotro.game.ParticipantCommunicationVisitor;
import com.gempukku.lotro.logic.decisions.AwaitingDecision; import com.gempukku.lotro.logic.decisions.AwaitingDecision;
import com.gempukku.lotro.logic.timing.Action;
import com.sun.jersey.spi.resource.Singleton; import com.sun.jersey.spi.resource.Singleton;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@@ -417,8 +416,8 @@ public class ServerResource {
} }
@Override @Override
public void visitAwaitingDecision(Action currentAction, AwaitingDecision awaitingDecision) { public void visitAwaitingDecision(AwaitingDecision awaitingDecision) {
_element.appendChild(serializeDecision(_doc, currentAction, awaitingDecision)); _element.appendChild(serializeDecision(_doc, awaitingDecision));
} }
@Override @Override
@@ -439,17 +438,12 @@ public class ServerResource {
return clocks; return clocks;
} }
private Node serializeDecision(Document doc, Action currentAction, AwaitingDecision decision) { private Node serializeDecision(Document doc, AwaitingDecision decision) {
Element decisionElem = doc.createElement("decision"); Element decisionElem = doc.createElement("decision");
decisionElem.setAttribute("id", String.valueOf(decision.getAwaitingDecisionId())); decisionElem.setAttribute("id", String.valueOf(decision.getAwaitingDecisionId()));
decisionElem.setAttribute("type", decision.getDecisionType().name()); decisionElem.setAttribute("type", decision.getDecisionType().name());
if (decision.getText() != null) { if (decision.getText() != null)
String text = ""; decisionElem.setAttribute("text", decision.getText());
if (currentAction != null)
text += currentAction.getText() + ": ";
text += decision.getText();
decisionElem.setAttribute("text", text);
}
for (Map.Entry<String, Object> paramEntry : decision.getDecisionParameters().entrySet()) { for (Map.Entry<String, Object> paramEntry : decision.getDecisionParameters().entrySet()) {
if (paramEntry.getValue() instanceof String) { if (paramEntry.getValue() instanceof String) {
Element decisionParam = doc.createElement("parameter"); Element decisionParam = doc.createElement("parameter");