From 1447585137340ff1cc9822b2173281cc43d75005 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 14 Sep 2011 11:30:00 +0000 Subject: [PATCH] Reveal on Sting and Glamdring. --- .../gempukku/lotro/cards/set1/gandalf/Card1_075.java | 10 +++++++++- .../com/gempukku/lotro/cards/set1/shire/Card1_313.java | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java index 3a82f8bd6..841c8af6e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.effects.ChooseOpponentEffect; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.cards.effects.RemoveTwilightEffect; +import com.gempukku.lotro.cards.effects.RevealAndChooseCardsFromOpponentHandEffect; import com.gempukku.lotro.cards.modifiers.StrengthModifier; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; @@ -53,7 +54,7 @@ public class Card1_075 extends AbstractAttachableFPPossession { } @Override - protected List getExtraInPlayPhaseActions(String playerId, final LotroGame game, PhysicalCard self) { + protected List getExtraInPlayPhaseActions(final String playerId, final LotroGame game, PhysicalCard self) { if ((PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) || PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.REGROUP, self)) && PlayConditions.canExert(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { @@ -70,6 +71,13 @@ public class Card1_075 extends AbstractAttachableFPPossession { new ChooseOpponentEffect(playerId) { @Override protected void opponentChosen(String opponentId) { + action.addEffect( + new RevealAndChooseCardsFromOpponentHandEffect(playerId, opponentId, "Opponent's hand", Filters.none(), 0, 0) { + @Override + protected void cardsSelected(List selectedCards) { + // This is just to reveal the hand + } + }); List orcs = Filters.filter(game.getGameState().getHand(opponentId), game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.ORC)); action.addEffect(new RemoveTwilightEffect(orcs.size())); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java index fffb0bc46..16a545805 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.effects.ChooseOpponentEffect; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.cards.effects.RemoveTwilightEffect; +import com.gempukku.lotro.cards.effects.RevealAndChooseCardsFromOpponentHandEffect; import com.gempukku.lotro.cards.modifiers.StrengthModifier; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; @@ -50,7 +51,7 @@ public class Card1_313 extends AbstractAttachableFPPossession { } @Override - protected List getExtraInPlayPhaseActions(String playerId, final LotroGame game, final PhysicalCard self) { + protected List getExtraInPlayPhaseActions(final String playerId, final LotroGame game, final PhysicalCard self) { if ((PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) || PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.REGROUP, self)) && PlayConditions.canExert(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { @@ -67,6 +68,13 @@ public class Card1_313 extends AbstractAttachableFPPossession { new ChooseOpponentEffect(playerId) { @Override protected void opponentChosen(String opponentId) { + action.addEffect( + new RevealAndChooseCardsFromOpponentHandEffect(playerId, opponentId, "Opponent's hand", Filters.none(), 0, 0) { + @Override + protected void cardsSelected(List selectedCards) { + // This is just to reveal the hand + } + }); List orcs = Filters.filter(game.getGameState().getHand(opponentId), game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.ORC)); Integer limit = (Integer) self.getData(); int usedUp = 0;