From fde3cae561a13d0ac144bbb8c2832ecb033292ca Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Sat, 11 Nov 2017 14:31:36 -0800 Subject: [PATCH] Fixed - reveal and choose card(s) effects now populate the list of cards into game log --- .../RevealAndChooseCardsFromOpponentHandEffect.java | 2 ++ .../lotro/logic/timing/AbstractSubActionEffect.java | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RevealAndChooseCardsFromOpponentHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RevealAndChooseCardsFromOpponentHandEffect.java index a4836b6b0..207d6c7d5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RevealAndChooseCardsFromOpponentHandEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RevealAndChooseCardsFromOpponentHandEffect.java @@ -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 opponentHand = new LinkedList(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) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java index c41230a47..453d24b38 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java @@ -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 cards) { + return GameUtils.getAppendedNames(cards); + } + @Override public boolean wasCarriedOut() { return _subAction != null && _subAction.wasCarriedOut();