diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_179.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_179.java index 1f3f7b182..e5e0e54d4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_179.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_179.java @@ -42,7 +42,7 @@ public class Card1_179 extends AbstractMinion { new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getDiscard(playerId), Filters.and( Filters.weapon, - ExtraFilters.attachableTo(game, additionalAttachmentFilter)), 1, 1) { + ExtraFilters.attachableTo(game, additionalAttachmentFilter)), 1, 1, true) { @Override protected void cardsSelected(LotroGame game, Collection selectedCards) { if (selectedCards.size() > 0) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/moria/Card20_269.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/moria/Card20_269.java index 4c34dc1f7..3539493d7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/moria/Card20_269.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/moria/Card20_269.java @@ -38,7 +38,7 @@ public class Card20_269 extends AbstractMinion { new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getDiscard(playerId), Filters.and( Filters.weapon, - ExtraFilters.attachableTo(game, additionalAttachmentFilter)), 1, 1) { + ExtraFilters.attachableTo(game, additionalAttachmentFilter)), 1, 1, true) { @Override protected void cardsSelected(LotroGame game, Collection selectedCards) { if (selectedCards.size() > 0) { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseArbitraryCardsEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseArbitraryCardsEffect.java index fa2d34bc7..1a9590560 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseArbitraryCardsEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseArbitraryCardsEffect.java @@ -16,6 +16,7 @@ import java.util.HashSet; public abstract class ChooseArbitraryCardsEffect extends AbstractEffect { private String _playerId; private String _choiceText; + private boolean _showMatchingOnly; private Collection _cards; private Filterable _filter; private int _minimum; @@ -26,8 +27,13 @@ public abstract class ChooseArbitraryCardsEffect extends AbstractEffect { } public ChooseArbitraryCardsEffect(String playerId, String choiceText, Collection cards, Filterable filter, int minimum, int maximum) { + this(playerId, choiceText, cards, filter, minimum, maximum, false); + } + + public ChooseArbitraryCardsEffect(String playerId, String choiceText, Collection cards, Filterable filter, int minimum, int maximum, boolean showMatchingOnly) { _playerId = playerId; _choiceText = choiceText; + _showMatchingOnly = showMatchingOnly; _cards = new HashSet(cards); _filter = filter; _minimum = minimum; @@ -65,8 +71,12 @@ public abstract class ChooseArbitraryCardsEffect extends AbstractEffect { } else if (possibleCards.size() == minimum) { cardsSelected(game, possibleCards); } else { + Collection toShow = _cards; + if (_showMatchingOnly) + toShow = possibleCards; + game.getUserFeedback().sendAwaitingDecision(_playerId, - new ArbitraryCardsSelectionDecision(1, _choiceText, _cards, possibleCards, _minimum, _maximum) { + new ArbitraryCardsSelectionDecision(1, _choiceText, toShow, possibleCards, _minimum, _maximum) { @Override public void decisionMade(String result) throws DecisionResultInvalidException { cardsSelected(game, getSelectedCardsByResponse(result));