From 9e806e1c7f04c02904169b518e4e01d5872fd1aa Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 25 Oct 2011 00:25:20 +0000 Subject: [PATCH] - "Theoden" and "Gamling" play possessions from hand using their ability, rather than from discard. --- .../java/com/gempukku/lotro/cards/set4/rohan/Card4_365.java | 4 ++-- .../java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java | 2 +- .../java/com/gempukku/lotro/cards/set5/rohan/Card5_093.java | 2 +- .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_365.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_365.java index 5b82a2879..15e2b1c72 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_365.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_365.java @@ -44,7 +44,7 @@ public class Card4_365 extends AbstractCompanion { protected List getExtraInPlayPhaseActions(final String playerId, final LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { final Filter additionalAttachmentFilter = Filters.and(Culture.ROHAN, CardType.COMPANION); - if (Filters.filter(game.getGameState().getDiscard(playerId), game.getGameState(), game.getModifiersQuerying(), CardType.POSSESSION, + if (Filters.filter(game.getGameState().getHand(playerId), game.getGameState(), game.getModifiersQuerying(), CardType.POSSESSION, new Filter() { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { @@ -55,7 +55,7 @@ public class Card4_365 extends AbstractCompanion { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new CheckLimitEffect(action, self, 1, Phase.FELLOWSHIP, - new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getDiscard(playerId), + new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getHand(playerId), Filters.and( CardType.POSSESSION, new Filter() { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java index 5374825ac..6a6b47cae 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java @@ -50,7 +50,7 @@ public class Card5_082 extends AbstractCompanion { && PlayConditions.canPlayFromHand(playerId, game, Culture.ROHAN, CardType.POSSESSION, ExtraFilters.attachableTo(game, self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getDiscard(playerId), Filters.and(Culture.ROHAN, CardType.POSSESSION, ExtraFilters.attachableTo(game, self)), 1, 1) { + new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getHand(playerId), Filters.and(Culture.ROHAN, CardType.POSSESSION, ExtraFilters.attachableTo(game, self)), 1, 1) { @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/set5/rohan/Card5_093.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_093.java index 83abe296f..58b9d53f7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_093.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_093.java @@ -42,7 +42,7 @@ public class Card5_093 extends AbstractCompanion { && PlayConditions.canPlayFromHand(playerId, game, Culture.ROHAN, CardType.POSSESSION, ExtraFilters.attachableTo(game, self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getDiscard(playerId), Filters.and(Culture.ROHAN, CardType.POSSESSION, ExtraFilters.attachableTo(game, self)), 1, 1) { + new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getHand(playerId), Filters.and(Culture.ROHAN, CardType.POSSESSION, ExtraFilters.attachableTo(game, self)), 1, 1) { @Override protected void cardsSelected(LotroGame game, Collection selectedCards) { if (selectedCards.size() > 0) { 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 3b183756b..0dc2039d0 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 @@ -11,6 +11,7 @@ a site. - "We Are the Fighting Uruk-hai" correctly adds bonuses to the Uruk-hai. - Liberating a site should no longer freeze the game. - Added animations for activating a card and removing a card form play. +- "Theoden" and "Gamling" play possessions from hand using their ability, rather than from discard. 23 Oct. 2011 - "Hornburg Causeway" now adds +2 to archery for each unbound companion over 3, instead of +1.