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

Fixing action processing bugs and fixing Gift of Boats to work properly.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-02 20:57:14 +00:00
parent 60da592274
commit 6c1f5ee4ea
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java
View File

@@ -56,7 +56,8 @@ public class Card1_046 extends AbstractLotroCardBlueprint {
@Override
public List<? extends Action> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (effectResult.getType() == EffectResult.Type.WHEN_MOVE_FROM) {
if (effectResult.getType() == EffectResult.Type.WHEN_MOVE_FROM
&& game.getGameState().getCurrentPhase() == Phase.FELLOWSHIP) {
CostToEffectAction action = new CostToEffectAction(self, null, "Move limit for this turn is +1");
action.addEffect(new AddUntilEndOfTurnModifierEffect(new MoveLimitModifier(self, 1)));
return Collections.singletonList(action);

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

@@ -161,7 +161,7 @@ public class TurnProcedure {
if (!_effect.isCancelled()) {
final String activePlayer = _playOrder.getNextPlayer();
List<Action> possibleActions = _actionMap.get(activePlayer);
possibleActions.addAll(_game.getActionsEnvironment().getOptionalAfterActions(activePlayer, _effectResult));
possibleActions.addAll(_game.getActionsEnvironment().getOptionalBeforeActions(activePlayer, _effect, _effectResult));
if (possibleActions.size() > 0) {
_game.getUserFeedback().sendAwaitingDecision(activePlayer,
@@ -172,17 +172,17 @@ public class TurnProcedure {
if (action != null) {
_game.getActionsEnvironment().addActionToStack(action);
_actionMap.get(activePlayer).remove(action);
_action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, 0, _effectResult));
_action.addEffect(new PlayoutOptionalBeforeResponsesEffect(_action, _actionMap, _playOrder, 0, _effect, _effectResult));
} else {
if ((_passCount + 1) < _playOrder.getPlayerCount()) {
_action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, _passCount + 1, _effectResult));
_action.addEffect(new PlayoutOptionalBeforeResponsesEffect(_action, _actionMap, _playOrder, _passCount + 1, _effect, _effectResult));
}
}
}
});
} else {
if ((_passCount + 1) < _playOrder.getPlayerCount()) {
_action.addEffect(new PlayoutOptionalAfterResponsesEffect(_action, _actionMap, _playOrder, _passCount + 1, _effectResult));
_action.addEffect(new PlayoutOptionalBeforeResponsesEffect(_action, _actionMap, _playOrder, _passCount + 1, _effect, _effectResult));
}
}
}