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

Reconcile text added.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-22 17:54:10 +00:00
parent bd5b5042bc
commit 8281af021a
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReconcileHandEffect.java
View File

@@ -29,7 +29,6 @@ public class ReconcileHandEffect extends AbstractEffect {
@Override
protected FullEffectResult playEffectReturningResult(LotroGame game) {
PlayerReconcilesAction action = new PlayerReconcilesAction(game, _playerId);
game.getGameState().sendMessage(_playerId + " reconciles");
game.getActionsEnvironment().addActionToStack(action);
return new FullEffectResult(null, true, true);
}

7
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/PlayerReconcilesAction.java
View File

@@ -6,10 +6,7 @@ import com.gempukku.lotro.game.state.GameState;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.decisions.CardsSelectionDecision;
import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
import com.gempukku.lotro.logic.effects.DiscardCardsFromHandEffect;
import com.gempukku.lotro.logic.effects.DrawCardsEffect;
import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
import com.gempukku.lotro.logic.effects.TriggeringResultEffect;
import com.gempukku.lotro.logic.effects.*;
import com.gempukku.lotro.logic.timing.Action;
import com.gempukku.lotro.logic.timing.Effect;
import com.gempukku.lotro.logic.timing.results.ReconcileResult;
@@ -76,6 +73,8 @@ public class PlayerReconcilesAction implements Action {
public Effect nextEffect(LotroGame game) {
if (_effectQueue == null) {
_effectQueue = new LinkedList<Effect>();
_effectQueue.add(
new SendMessageEffect(_playerId + " reconciles"));
GameState gameState = _game.getGameState();
final Set<? extends PhysicalCard> cardsInHand = new HashSet<PhysicalCard>(gameState.getHand(_playerId));