From 7bfec3df487b445f5de7a10da330c7359a89ccc0 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 30 Aug 2011 10:45:32 +0000 Subject: [PATCH] "The Splendor of Their Banners" --- .../gempukku/lotro/cards/PlayConditions.java | 4 +- .../lotro/cards/set1/dwarven/Card1_024.java | 2 +- .../lotro/cards/set1/dwarven/Card1_026.java | 2 +- .../lotro/cards/set1/dwarven/Card1_028.java | 2 +- .../lotro/cards/set1/elven/Card1_029.java | 2 +- .../lotro/cards/set1/elven/Card1_032.java | 2 +- .../lotro/cards/set1/elven/Card1_035.java | 2 +- .../lotro/cards/set1/elven/Card1_036.java | 2 +- .../lotro/cards/set1/elven/Card1_037.java | 2 +- .../lotro/cards/set1/elven/Card1_038.java | 2 +- .../lotro/cards/set1/elven/Card1_039.java | 2 +- .../lotro/cards/set1/elven/Card1_043.java | 2 +- .../lotro/cards/set1/elven/Card1_044.java | 2 +- .../lotro/cards/set1/elven/Card1_046.java | 2 +- .../lotro/cards/set1/elven/Card1_052.java | 2 +- .../lotro/cards/set1/elven/Card1_054.java | 2 +- .../lotro/cards/set1/elven/Card1_055.java | 2 +- .../lotro/cards/set1/elven/Card1_058.java | 2 +- .../lotro/cards/set1/elven/Card1_059.java | 2 +- .../lotro/cards/set1/elven/Card1_060.java | 2 +- .../lotro/cards/set1/elven/Card1_061.java | 3 +- .../lotro/cards/set1/elven/Card1_062.java | 60 +++++++++++++++++++ 22 files changed, 82 insertions(+), 23 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java index 300d4a884..b9bf23c7c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java @@ -17,8 +17,8 @@ import com.gempukku.lotro.logic.timing.results.WoundResult; import java.util.List; public class PlayConditions { - public static boolean canPlayFromHandDuringPhase(GameState gameState, Phase phase, PhysicalCard self) { - return gameState.getCurrentPhase() == phase && self.getZone() == Zone.HAND; + public static boolean canPlayDuringPhase(GameState gameState, Phase phase, PhysicalCard self) { + return gameState.getCurrentPhase() == phase && (self.getZone() == Zone.HAND || self.getZone() == Zone.DECK); } public static boolean canPlayCompanionDuringSetup(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard self) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java index b3830aa18..d6e469678 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java @@ -39,7 +39,7 @@ public class Card1_024 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { return Collections.singletonList(new PlayPermanentAction(self, Zone.FREE_SUPPORT)); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java index ea7043034..6f5c5dbb8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java @@ -36,7 +36,7 @@ public class Card1_026 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, final LotroGame game, final PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.SKIRMISH, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.SKIRMISH, self)) { PlayEventAction action = new PlayEventAction(self); action.addEffect( new ChooseActiveCardEffect(playerId, "Choose Dwarf", Filters.keyword(Keyword.DWARF)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_028.java index 8df3b57f3..90c550ca8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_028.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_028.java @@ -31,7 +31,7 @@ public class Card1_028 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { // TODO } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java index f43cabecd..9cea7179d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java @@ -42,7 +42,7 @@ public class Card1_029 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, final PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.SKIRMISH, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.SKIRMISH, self)) { final PlayEventAction action = new PlayEventAction(self); action.addCost( new ChooseActiveCardEffect(playerId, "Choose an Elf", Filters.keyword(Keyword.ELF)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java index 7193e8f09..f8a4245b8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java @@ -37,7 +37,7 @@ public class Card1_032 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, final PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.SKIRMISH, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.SKIRMISH, self)) { final PlayEventAction action = new PlayEventAction(self); action.addEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java index 06350d1da..f276db1f0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java @@ -40,7 +40,7 @@ public class Card1_035 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(final String playerId, final LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF))) { final PlayEventAction action = new PlayEventAction(self); action.addCost(new SpotEffect(Filters.keyword(Keyword.ELF))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_036.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_036.java index e32b8ec69..48a72dd02 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_036.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_036.java @@ -39,7 +39,7 @@ public class Card1_036 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(final String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.canExert())) { final CostToEffectAction action = new CostToEffectAction(self, "Exert an Elf to reveal an opponent's hand. That player discards a card from hand for each Orc revealed."); action.addCost(new ChooseActiveCardEffect(playerId, "Choose an Elf", Filters.keyword(Keyword.ELF), Filters.canExert()) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_037.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_037.java index e8d450860..65797d144 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_037.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_037.java @@ -37,7 +37,7 @@ public class Card1_037 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, final PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.SKIRMISH, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.SKIRMISH, self)) { final PlayEventAction action = new PlayEventAction(self); action.addEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java index 4941bf102..d2263f1de 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java @@ -36,7 +36,7 @@ public class Card1_038 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.ARCHERY, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.ARCHERY, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.keyword(Keyword.ARCHERY), Filters.type(CardType.COMPANION))) { PlayEventAction action = new PlayEventAction(self); action.addCost(new SpotEffect(Filters.and(Filters.keyword(Keyword.ELF), Filters.keyword(Keyword.ARCHERY), Filters.type(CardType.COMPANION)))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java index f4ec6366e..b3051e7fa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java @@ -35,7 +35,7 @@ public class Card1_039 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF))) { PlayEventAction action = new PlayEventAction(self); action.addCost(new SpotEffect(Filters.keyword(Keyword.ELF))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java index 432fafdc5..8187e3cde 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java @@ -39,7 +39,7 @@ public class Card1_043 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name("Far-seeing Eyes"))) { PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_044.java index f64f9d33e..0374269fb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_044.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_044.java @@ -36,7 +36,7 @@ public class Card1_044 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.canExert())) { final PlayEventAction action = new PlayEventAction(self); action.addCost( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java index 625baad9f..858f69dd2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java @@ -39,7 +39,7 @@ public class Card1_046 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.type(CardType.ALLY), Filters.canExert()) && !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name("Gift of Boats"))) { final PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java index 7cf9bfceb..91219bd8f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java @@ -36,7 +36,7 @@ public class Card1_052 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.ARCHERY, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.ARCHERY, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.type(CardType.COMPANION))) { CostToEffectAction action = new CostToEffectAction(self, "Make the minion archery total -1"); action.addCost(new SpotEffect(Filters.and(Filters.keyword(Keyword.ELF), Filters.type(CardType.COMPANION)))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java index 33f8ce226..d98d8e125 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java @@ -37,7 +37,7 @@ public class Card1_054 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java index 0c67546ae..aa6f46c6e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java @@ -41,7 +41,7 @@ public class Card1_055 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { List actions = new LinkedList(); - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name("The Mirror of Galadriel"))) actions.add(new PlayPermanentAction(self, Zone.FREE_SUPPORT)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_058.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_058.java index a327d44b3..73f05182e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_058.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_058.java @@ -36,7 +36,7 @@ public class Card1_058 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(final String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.canExert()) >= 2) { final PlayEventAction action = new PlayEventAction(self); action.addCost( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java index c3901e51b..19f7c512e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java @@ -41,7 +41,7 @@ public class Card1_059 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(final String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java index a4407f95a..1ca3dcd96 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java @@ -89,7 +89,7 @@ public class Card1_060 extends AbstractAlly { if (copied != null) return copied.getPlayablePhaseActions(playerId, game, self); return null; - } else if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { + } else if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { List actions = new LinkedList(); appendPlayAllyActions(actions, game, self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java index 21ea9f895..f7117856c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java @@ -6,7 +6,6 @@ import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.RemoveBurderEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; -import com.gempukku.lotro.game.LotroCardBlueprint; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.CostToEffectAction; @@ -36,7 +35,7 @@ public class Card1_061 extends AbstractLotroCardBlueprint { @Override public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java new file mode 100644 index 000000000..c7a7d9938 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java @@ -0,0 +1,60 @@ +package com.gempukku.lotro.cards.set1.elven; + +import com.gempukku.lotro.cards.AbstractAttachable; +import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; +import com.gempukku.lotro.cards.effects.ExertCharacterEffect; +import com.gempukku.lotro.cards.modifiers.ArcheryTotalModifier; +import com.gempukku.lotro.common.*; +import com.gempukku.lotro.filters.Filter; +import com.gempukku.lotro.filters.Filters; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.actions.CostToEffectAction; +import com.gempukku.lotro.logic.timing.Action; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +/** + * Set: The Fellowship of the Ring + * Side: Free + * Culture: Elven + * Twilight Cost: 1 + * Type: Condition + * Game Text: Tale. Bearer must be an Elf companion. Archery: If bearer is an archer, exert bearer to make the + * fellowship archery total +1. + */ +public class Card1_062 extends AbstractAttachable { + public Card1_062() { + super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, "The Splendor of Their Banners", "1_62", true); + addKeyword(Keyword.TALE); + } + + @Override + public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { + if (PlayConditions.canPlayDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { + + Filter validTargetFilter = Filters.and(Filters.keyword(Keyword.ELF), Filters.type(CardType.COMPANION)); + + List actions = new LinkedList(); + appendAttachCardFromHandAction(actions, game, self, validTargetFilter); + return actions; + } + + if (game.getGameState().getCurrentPhase() == Phase.ARCHERY + && self.getZone() == Zone.ATTACHED + && game.getModifiersQuerying().hasKeyword(game.getGameState(), self.getAttachedTo(), Keyword.ARCHER) + && PlayConditions.canExert(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { + CostToEffectAction action = new CostToEffectAction(self, "Exert bearer to make the fellowship archery total +1"); + action.addCost(new ExertCharacterEffect(self.getAttachedTo())); + action.addEffect( + new AddUntilEndOfPhaseModifierEffect( + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY)); + + return Collections.singletonList(action); + } + return null; + } +}