diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChooseCardsFromHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChooseCardsFromHandEffect.java index 92e40ff80..88ad1caf2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChooseCardsFromHandEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChooseCardsFromHandEffect.java @@ -52,7 +52,7 @@ public abstract class ChooseCardsFromHandEffect extends AbstractEffect { cardsSelected(game, selectableCards); else { game.getUserFeedback().sendAwaitingDecision(_playerId, - new CardsSelectionDecision(1, "Choose card from hand", selectableCards, minimum, _maximum) { + new CardsSelectionDecision(1, "Choose card(s) from hand", selectableCards, minimum, _maximum) { @Override public void decisionMade(String result) throws DecisionResultInvalidException { Set selectedCards = getSelectedCardsByResponse(result); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java index 59608f505..42ec23c84 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.gandalf; import com.gempukku.lotro.cards.AbstractAlly; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.effects.ChooseArbitraryCardsEffect; +import com.gempukku.lotro.cards.effects.ChooseCardsFromHandEffect; import com.gempukku.lotro.cards.effects.ExertCharactersEffect; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; @@ -50,7 +50,7 @@ public class Card1_080 extends AbstractAlly { final ActivateCardAction action = new ActivateCardAction(self, Keyword.FELLOWSHIP); action.appendCost(new ExertCharactersEffect(self, self)); action.appendEffect( - new ChooseArbitraryCardsEffect(playerId, "Choose card(s) to discard", game.getGameState().getHand(playerId), 0, 3) { + new ChooseCardsFromHandEffect(playerId, 0, 3, Filters.any()) { @Override protected void cardsSelected(LotroGame game, Collection selectedCards) { action.appendEffect(new DiscardCardsFromHandEffect(self, selectedCards)); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 1255beb5a..dd943b2e1 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -10,6 +10,8 @@ even though after page reload (F5) they were showing up. - Added game manual. - The "Card information" window will be bigger by default. In cases of most screen sizes it should be enough to see the whole card without scrolling window. +- Arbitrary multiple card choice now works correctly. +- Saruman no longer can be assigned to skirmish. 26 Sept. 2011 - Changed the cost-to-effect actions to follow the "do as much as possible" route, rathern than can/can't do.