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

Fixed - reveal and choose card(s) effects now populate the list of cards into game log

Browse Source
This commit is contained in:
marcin.sciesinski
2017-11-11 14:31:36 -08:00
parent 4479fa782d
commit fde3cae561
2 changed files with 10 additions and 0 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/effects/RevealAndChooseCardsFromOpponentHandEffect.java
View File

@@ -4,6 +4,7 @@ import com.gempukku.lotro.common.Filterable;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.GameUtils;
import com.gempukku.lotro.logic.PlayOrder;
import com.gempukku.lotro.logic.decisions.ArbitraryCardsSelectionDecision;
import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
@@ -47,6 +48,7 @@ public abstract class RevealAndChooseCardsFromOpponentHandEffect extends Abstrac
public void playEffect(LotroGame game) {
if (game.getModifiersQuerying().canLookOrRevealCardsInHand(game.getGameState(), _opponentId, _playerId)) {
List<PhysicalCard> opponentHand = new LinkedList<PhysicalCard>(game.getGameState().getHand(_opponentId));
game.getGameState().sendMessage(GameUtils.getCardLink(_source) + " revealed " + _opponentId + " cards in hand - " + getAppendedNames(opponentHand));
final PlayOrder playOrder = game.getGameState().getPlayerOrder().getCounterClockwisePlayOrder(_opponentId, false);
// Skip hand owner (opponent)

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

@@ -1,8 +1,12 @@
package com.gempukku.lotro.logic.timing;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.GameUtils;
import com.gempukku.lotro.logic.actions.SubAction;
import java.util.Collection;
public abstract class AbstractSubActionEffect implements Effect {
private SubAction _subAction;
@@ -11,6 +15,10 @@ public abstract class AbstractSubActionEffect implements Effect {
game.getActionsEnvironment().addActionToStack(_subAction);
}
protected final String getAppendedNames(Collection<? extends PhysicalCard> cards) {
return GameUtils.getAppendedNames(cards);
}
@Override
public boolean wasCarriedOut() {
return _subAction != null && _subAction.wasCarriedOut();