From 0b79620dc74a197e30f987894d6d8d150dd1f0b9 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 30 Aug 2011 10:30:26 +0000 Subject: [PATCH] Cleaning up Playing actions. --- .../gempukku/lotro/cards/AbstractAlly.java | 4 ++-- .../lotro/cards/AbstractAttachable.java | 4 ++-- .../lotro/cards/AbstractCompanion.java | 10 ++++---- .../gempukku/lotro/cards/AbstractMinion.java | 4 ++-- ...Action.java => AttachPermanentAction.java} | 9 ++++--- ...omHandAction.java => PlayEventAction.java} | 12 ++++++---- ...ndAction.java => PlayPermanentAction.java} | 12 ++++++---- .../actions/PlayPermanentFromDeckAction.java | 24 ------------------- .../effects/RemoveCardFromDeckEffect.java | 18 -------------- ...ect.java => RemoveCardFromZoneEffect.java} | 4 ++-- .../lotro/cards/set1/dwarven/Card1_003.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_004.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_005.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_006.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_016.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_019.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_020.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_021.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_022.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_024.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_025.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_026.java | 4 ++-- .../lotro/cards/set1/elven/Card1_029.java | 4 ++-- .../lotro/cards/set1/elven/Card1_032.java | 4 ++-- .../lotro/cards/set1/elven/Card1_035.java | 4 ++-- .../lotro/cards/set1/elven/Card1_037.java | 4 ++-- .../lotro/cards/set1/elven/Card1_038.java | 4 ++-- .../lotro/cards/set1/elven/Card1_039.java | 4 ++-- .../lotro/cards/set1/elven/Card1_043.java | 4 ++-- .../lotro/cards/set1/elven/Card1_044.java | 4 ++-- .../lotro/cards/set1/elven/Card1_045.java | 4 ++-- .../lotro/cards/set1/elven/Card1_046.java | 4 ++-- .../lotro/cards/set1/elven/Card1_054.java | 4 ++-- .../lotro/cards/set1/elven/Card1_055.java | 4 ++-- .../lotro/cards/set1/elven/Card1_058.java | 4 ++-- .../lotro/cards/set1/elven/Card1_059.java | 4 ++-- 36 files changed, 85 insertions(+), 120 deletions(-) rename gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/{AttachPermanentFromHandAction.java => AttachPermanentAction.java} (76%) rename gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/{PlayEventFromHandAction.java => PlayEventAction.java} (61%) rename gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/{PlayPermanentFromHandAction.java => PlayPermanentAction.java} (60%) delete mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromDeckAction.java delete mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromDeckEffect.java rename gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/{RemoveCardFromHandEffect.java => RemoveCardFromZoneEffect.java} (74%) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java index 6f270ed2f..4527a353f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java @@ -1,6 +1,6 @@ package com.gempukku.lotro.cards; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.HealCardEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; @@ -37,7 +37,7 @@ public class AbstractAlly extends AbstractLotroCardBlueprint { protected void appendPlayAllyActions(List actions, LotroGame lotroGame, PhysicalCard self) { ModifiersQuerying modifiersQuerying = lotroGame.getModifiersQuerying(); if (PlayConditions.canPlayCharacterDuringFellowship(lotroGame.getGameState(), modifiersQuerying, self)) { - actions.add(new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT)); + actions.add(new PlayPermanentAction(self, Zone.FREE_SUPPORT)); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java index fc73a61a3..7d10fe41d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java @@ -1,6 +1,6 @@ package com.gempukku.lotro.cards; -import com.gempukku.lotro.cards.actions.AttachPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.AttachPermanentAction; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; @@ -38,7 +38,7 @@ public class AbstractAttachable extends AbstractLotroCardBlueprint { && (!blueprint.isUnique() || !Filters.canSpot(gameState, game.getModifiersQuerying(), Filters.name(blueprint.getName()))) && Filters.canSpot(gameState, game.getModifiersQuerying(), validTargetFilter)) { - actions.add(new AttachPermanentFromHandAction(self, validTargetFilter, playCostModifiers)); + actions.add(new AttachPermanentAction(self, validTargetFilter, playCostModifiers)); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java index ba14ec4bd..36c539097 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java @@ -1,7 +1,6 @@ package com.gempukku.lotro.cards; -import com.gempukku.lotro.cards.actions.PlayPermanentFromDeckAction; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.HealCardEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -43,10 +42,9 @@ public abstract class AbstractCompanion extends AbstractLotroCardBlueprint { protected void appendPlayCompanionActions(List actions, LotroGame lotroGame, PhysicalCard self) { ModifiersQuerying modifiersQuerying = lotroGame.getModifiersQuerying(); - if (PlayConditions.canPlayCompanionDuringSetup(lotroGame.getGameState(), modifiersQuerying, self)) { - actions.add(new PlayPermanentFromDeckAction(self, Zone.FREE_CHARACTERS)); - } else if (PlayConditions.canPlayCharacterDuringFellowship(lotroGame.getGameState(), modifiersQuerying, self)) { - actions.add(new PlayPermanentFromHandAction(self, Zone.FREE_CHARACTERS)); + if (PlayConditions.canPlayCompanionDuringSetup(lotroGame.getGameState(), modifiersQuerying, self) + || PlayConditions.canPlayCharacterDuringFellowship(lotroGame.getGameState(), modifiersQuerying, self)) { + actions.add(new PlayPermanentAction(self, Zone.FREE_CHARACTERS)); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java index 453f3b03e..0783d4a69 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java @@ -1,6 +1,6 @@ package com.gempukku.lotro.cards; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Side; @@ -33,7 +33,7 @@ public class AbstractMinion extends AbstractLotroCardBlueprint { protected void appendPlayMinionAction(List actions, LotroGame lotroGame, PhysicalCard self) { ModifiersQuerying modifiersQuerying = lotroGame.getModifiersQuerying(); if (PlayConditions.canPlayMinionDuringShadow(lotroGame.getGameState(), modifiersQuerying, self)) { - actions.add(new PlayPermanentFromHandAction(self, Zone.SHADOW_CHARACTERS)); + actions.add(new PlayPermanentAction(self, Zone.SHADOW_CHARACTERS)); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentFromHandAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java similarity index 76% rename from gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentFromHandAction.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java index 27beb9339..ecbbd0c34 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentFromHandAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.actions; import com.gempukku.lotro.cards.effects.*; +import com.gempukku.lotro.common.Zone; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; @@ -11,14 +12,14 @@ import com.gempukku.lotro.logic.timing.results.PlayCardResult; import java.util.Map; -public class AttachPermanentFromHandAction extends CostToEffectAction { - public AttachPermanentFromHandAction(final PhysicalCard card, Filter filter, final Map attachCostModifiers) { +public class AttachPermanentAction extends CostToEffectAction { + public AttachPermanentAction(final PhysicalCard card, Filter filter, final Map attachCostModifiers) { super(card, "Attach " + card.getBlueprint().getName() + " from hand"); addCost(new ChooseActiveCardEffect(card.getOwner(), "Choose target to attach to", filter) { @Override protected void cardSelected(LotroGame game, PhysicalCard target) { - addCost(new RemoveCardFromHandEffect(card)); + addCost(new RemoveCardFromZoneEffect(card)); int modifier = 0; for (Map.Entry filterIntegerEntry : attachCostModifiers.entrySet()) @@ -28,6 +29,8 @@ public class AttachPermanentFromHandAction extends CostToEffectAction { addCost(new PayPlayOnTwilightCostEffect(card, target, modifier)); addEffect(new AttachCardFromHandEffect(card, target)); + if (card.getZone() == Zone.DECK) + addEffect(new ShuffleDeckEffect(card.getOwner())); addEffect(new CardAffectingGameEffect(card)); addEffect(new TriggeringEffect(new PlayCardResult(card))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventFromHandAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventAction.java similarity index 61% rename from gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventFromHandAction.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventAction.java index 27b1c86c7..b39ceaaf9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventFromHandAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventAction.java @@ -2,19 +2,23 @@ package com.gempukku.lotro.cards.actions; import com.gempukku.lotro.cards.effects.PayTwilightCostEffect; import com.gempukku.lotro.cards.effects.PutCardIntoDiscardEffect; -import com.gempukku.lotro.cards.effects.RemoveCardFromHandEffect; +import com.gempukku.lotro.cards.effects.RemoveCardFromZoneEffect; +import com.gempukku.lotro.cards.effects.ShuffleDeckEffect; +import com.gempukku.lotro.common.Zone; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.logic.actions.CostToEffectAction; import com.gempukku.lotro.logic.effects.TriggeringEffect; import com.gempukku.lotro.logic.timing.results.PlayCardResult; -public class PlayEventFromHandAction extends CostToEffectAction { - public PlayEventFromHandAction(PhysicalCard card) { +public class PlayEventAction extends CostToEffectAction { + public PlayEventAction(PhysicalCard card) { super(card, "Play " + card.getBlueprint().getName() + " from hand"); - addCost(new RemoveCardFromHandEffect(card)); + addCost(new RemoveCardFromZoneEffect(card)); addCost(new PayTwilightCostEffect(card)); + if (card.getZone() == Zone.DECK) + addEffect(new ShuffleDeckEffect(card.getOwner())); addEffect(new TriggeringEffect(new PlayCardResult(card))); addEffect(new PutCardIntoDiscardEffect(card)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromHandAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java similarity index 60% rename from gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromHandAction.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java index 5c084d236..967cd8525 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromHandAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java @@ -7,18 +7,20 @@ import com.gempukku.lotro.logic.actions.CostToEffectAction; import com.gempukku.lotro.logic.effects.TriggeringEffect; import com.gempukku.lotro.logic.timing.results.PlayCardResult; -public class PlayPermanentFromHandAction extends CostToEffectAction { - public PlayPermanentFromHandAction(PhysicalCard card, Zone zone) { +public class PlayPermanentAction extends CostToEffectAction { + public PlayPermanentAction(PhysicalCard card, Zone zone) { this(card, zone, 0); } - public PlayPermanentFromHandAction(PhysicalCard card, Zone zone, int twilightModifier) { - super(card, "Play " + card.getBlueprint().getName() + " from hand"); + public PlayPermanentAction(PhysicalCard card, Zone zone, int twilightModifier) { + super(card, "Play " + card.getBlueprint().getName()); - addCost(new RemoveCardFromHandEffect(card)); + addCost(new RemoveCardFromZoneEffect(card)); addCost(new PayTwilightCostEffect(card, twilightModifier)); addEffect(new PutCardIntoPlayEffect(card, zone)); + if (card.getZone() == Zone.DECK) + addEffect(new ShuffleDeckEffect(card.getOwner())); addEffect(new CardAffectingGameEffect(card)); addEffect(new TriggeringEffect(new PlayCardResult(card))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromDeckAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromDeckAction.java deleted file mode 100644 index 22261bd6a..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentFromDeckAction.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gempukku.lotro.cards.actions; - -import com.gempukku.lotro.cards.effects.*; -import com.gempukku.lotro.common.Zone; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.logic.actions.CostToEffectAction; -import com.gempukku.lotro.logic.effects.TriggeringEffect; -import com.gempukku.lotro.logic.timing.results.PlayCardResult; - -public class PlayPermanentFromDeckAction extends CostToEffectAction { - public PlayPermanentFromDeckAction(PhysicalCard card, Zone zone) { - super(card, "Play " + card.getBlueprint().getName() + " from deck"); - - addCost(new RemoveCardFromDeckEffect(card)); - addCost(new PayTwilightCostEffect(card)); - - addEffect(new PutCardIntoPlayEffect(card, zone)); - addEffect(new ShuffleDeckEffect(card.getOwner())); - addEffect(new CardAffectingGameEffect(card)); - addEffect(new TriggeringEffect(new PlayCardResult(card))); - - addFailedCostEffect(new PutCardIntoDiscardEffect(card)); - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromDeckEffect.java deleted file mode 100644 index 4e49ac706..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromDeckEffect.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gempukku.lotro.cards.effects; - -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.timing.UnrespondableEffect; - -public class RemoveCardFromDeckEffect extends UnrespondableEffect { - private PhysicalCard _physicalCard; - - public RemoveCardFromDeckEffect(PhysicalCard physicalCard) { - _physicalCard = physicalCard; - } - - @Override - public void playEffect(LotroGame game) { - game.getGameState().removeCardFromZone(_physicalCard); - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromZoneEffect.java similarity index 74% rename from gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromHandEffect.java rename to gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromZoneEffect.java index 8548ee54d..2f629914e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromHandEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveCardFromZoneEffect.java @@ -4,10 +4,10 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.timing.UnrespondableEffect; -public class RemoveCardFromHandEffect extends UnrespondableEffect { +public class RemoveCardFromZoneEffect extends UnrespondableEffect { private PhysicalCard _physicalCard; - public RemoveCardFromHandEffect(PhysicalCard physicalCard) { + public RemoveCardFromZoneEffect(PhysicalCard physicalCard) { _physicalCard = physicalCard; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_003.java index c0a95cf1a..1b5c8db1d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_003.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_003.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.modifiers.StrengthModifier; import com.gempukku.lotro.common.*; @@ -33,7 +33,7 @@ public class Card1_003 extends AbstractLotroCardBlueprint { if (game.getGameState().getCurrentPhase() == Phase.SKIRMISH) { List actions = new LinkedList(); - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); List dwarves = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.DWARF)); if (dwarves.size() > 0) { action.addEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java index 2d2fda3a7..60bb73353 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.common.*; @@ -37,7 +37,7 @@ public class Card1_004 extends AbstractLotroCardBlueprint { && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.DWARF), Filters.canExert())) { List actions = new LinkedList(); - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addCost( new ChooseActiveCardEffect(playerId, "Choose Dwarf to exert", Filters.keyword(Keyword.DWARF), Filters.canExert()) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java index c9e3ed7c7..61de47ceb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -40,7 +40,7 @@ public class Card1_005 extends AbstractLotroCardBlueprint { if (game.getGameState().getCurrentPhase() == Phase.SKIRMISH) { List actions = new LinkedList(); - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); List dwarves = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.DWARF)); if (dwarves.size() > 0) { action.addEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_006.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_006.java index ad666517c..b32cea621 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_006.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_006.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; @@ -41,7 +41,7 @@ public class Card1_006 extends AbstractLotroCardBlueprint { if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.DWARF), Filters.type(CardType.COMPANION), Filters.canExert())) { List actions = new LinkedList(); - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addCost( new ChooseActiveCardEffect(playerId, "Choose Dwarf companion", Filters.keyword(Keyword.DWARF), Filters.type(CardType.COMPANION), Filters.canExert()) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java index 8a861d9c6..403993ced 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.DiscardTopCardFromDeckEffect; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.common.*; @@ -42,7 +42,7 @@ public class Card1_016 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (!Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name(getName())) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.DWARF), Filters.canExert())) { - final PlayPermanentFromHandAction action = new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT); + final PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); action.addCost( new ChooseActiveCardEffect(playerId, "Choose Dwarf to exert", Filters.keyword(Keyword.DWARF), Filters.canExert()) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_019.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_019.java index 83d6d5638..ba77665b8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_019.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_019.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -38,7 +38,7 @@ public class Card1_019 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (game.getGameState().getCurrentPhase() == Phase.MANEUVER && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.DWARF), Filters.canExert())) { - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addCost( new ChooseActiveCardEffect(playerId, "Choose Dwarf to exert", Filters.canExert(), Filters.keyword(Keyword.DWARF)) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java index 6870a9696..b557ae6aa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -39,7 +39,7 @@ public class Card1_020 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (game.getGameState().getCurrentPhase() == Phase.FELLOWSHIP && self.getZone() == Zone.HAND) { - PlayPermanentFromHandAction action = new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT); + PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java index e273a0d87..24c41f535 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -35,7 +35,7 @@ public class Card1_021 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (game.getGameState().getCurrentPhase() == Phase.FELLOWSHIP && self.getZone() == Zone.HAND) { - PlayPermanentFromHandAction action = new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT); + PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_022.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_022.java index 9ae44f23d..d25234787 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_022.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_022.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -42,7 +42,7 @@ public class Card1_022 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (game.getGameState().getCurrentPhase() == Phase.MANEUVER && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.DWARF), Filters.canExert())) { - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addCost( new ChooseActiveCardEffect(playerId, "Choose Dwarf to exert", Filters.keyword(Keyword.DWARF), Filters.canExert()) { @Override 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 069ceb983..b3830aa18 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.modifiers.StrengthModifier; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filter; @@ -40,7 +40,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)) { - return Collections.singletonList(new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT)); + 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_025.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java index 36fa5be87..3369ccd87 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.HealCardEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -38,7 +38,7 @@ public class Card1_025 extends AbstractLotroCardBlueprint { public List getPlayableWhenActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (self.getZone() == Zone.HAND && PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.keyword(Keyword.DWARF))) { SkirmishResult skirmishResult = (SkirmishResult) effectResult; - PlayEventFromHandAction action = new PlayEventFromHandAction(self); + PlayEventAction action = new PlayEventAction(self); action.addEffect(new HealCardEffect(skirmishResult.getWinners().get(0))); return Collections.singletonList(action); } 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 3c81e0c28..ea7043034 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.modifiers.StrengthModifier; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -37,7 +37,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)) { - PlayEventFromHandAction action = new PlayEventFromHandAction(self); + PlayEventAction action = new PlayEventAction(self); action.addEffect( new ChooseActiveCardEffect(playerId, "Choose Dwarf", Filters.keyword(Keyword.DWARF)) { @Override 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 8ba8d948c..f43cabecd 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseActionProxyEffect; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.DiscardCardAtRandomFromHandEffect; @@ -43,7 +43,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)) { - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addCost( new ChooseActiveCardEffect(playerId, "Choose an Elf", Filters.keyword(Keyword.ELF)) { @Override 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 64a5acf78..7193e8f09 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.modifiers.StrengthModifier; import com.gempukku.lotro.common.*; @@ -38,7 +38,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)) { - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addEffect( 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_035.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_035.java index 2736a5a3e..06350d1da 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.SpotEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filter; @@ -42,7 +42,7 @@ public class Card1_035 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(final String playerId, final LotroGame game, PhysicalCard self) { if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF))) { - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addCost(new SpotEffect(Filters.keyword(Keyword.ELF))); action.addEffect( new PlayoutDecisionEffect(game.getUserFeedback(), playerId, 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 bb9e81840..e8d450860 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.modifiers.StrengthModifier; import com.gempukku.lotro.common.*; @@ -38,7 +38,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)) { - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addEffect( 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_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java index 3930290ba..4941bf102 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.SpotEffect; import com.gempukku.lotro.cards.modifiers.ArcheryTotalModifier; @@ -38,7 +38,7 @@ public class Card1_038 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.ARCHERY, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.keyword(Keyword.ARCHERY), Filters.type(CardType.COMPANION))) { - PlayEventFromHandAction action = new PlayEventFromHandAction(self); + PlayEventAction action = new PlayEventAction(self); action.addCost(new SpotEffect(Filters.and(Filters.keyword(Keyword.ELF), Filters.keyword(Keyword.ARCHERY), Filters.type(CardType.COMPANION)))); action.addEffect(new AddUntilEndOfPhaseModifierEffect( new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY)); 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 32a51519f..f4ec6366e 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.RemoveBurderEffect; import com.gempukku.lotro.cards.effects.SpotEffect; import com.gempukku.lotro.common.*; @@ -37,7 +37,7 @@ public class Card1_039 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF))) { - PlayEventFromHandAction action = new PlayEventFromHandAction(self); + PlayEventAction action = new PlayEventAction(self); action.addCost(new SpotEffect(Filters.keyword(Keyword.ELF))); action.addEffect(new RemoveBurderEffect(playerId)); 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 0ac8bbd28..432fafdc5 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -41,7 +41,7 @@ public class Card1_043 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name("Far-seeing Eyes"))) { - PlayPermanentFromHandAction action = new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT); + PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); return Collections.singletonList(action); } return null; 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 a59831805..f64f9d33e 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -38,7 +38,7 @@ public class Card1_044 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.canExert())) { - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addCost( new ChooseActiveCardEffect(playerId, "Choose an Elf", Filters.keyword(Keyword.ELF), Filters.canExert()) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java index 08d2012e5..64f4ebfc6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractAlly; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.cards.effects.HealCardEffect; import com.gempukku.lotro.common.*; @@ -56,7 +56,7 @@ public class Card1_045 extends AbstractAlly { LotroCardBlueprint blueprint = card.getBlueprint(); if (!blueprint.isUnique() || !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name(blueprint.getName()))) { Zone zone = (blueprint.getCardType() == CardType.COMPANION) ? Zone.FREE_CHARACTERS : Zone.FREE_SUPPORT; - game.getActionsEnvironment().addActionToStack(new PlayPermanentFromHandAction(card, zone, -1000)); + game.getActionsEnvironment().addActionToStack(new PlayPermanentAction(card, zone, -1000)); } } }); 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 5f413d7ab..625baad9f 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfTurnModifierEffect; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.cards.modifiers.MoveLimitModifier; @@ -42,7 +42,7 @@ public class Card1_046 extends AbstractLotroCardBlueprint { if (PlayConditions.canPlayFromHandDuringPhase(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 PlayPermanentFromHandAction action = new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT); + final PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); action.addCost( new ChooseActiveCardEffect(playerId, "Choose an Elf ally to exert", Filters.keyword(Keyword.ELF), Filters.type(CardType.ALLY), Filters.canExert()) { @Override 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 1dea10f86..33f8ce226 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.PutCardFromHandOnBottomOfDeckEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -38,7 +38,7 @@ public class Card1_054 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { - PlayPermanentFromHandAction action = new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT); + 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 36294edc8..0c67546ae 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.cards.modifiers.StrengthModifier; import com.gempukku.lotro.common.*; @@ -43,7 +43,7 @@ public class Card1_055 extends AbstractLotroCardBlueprint { if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name("The Mirror of Galadriel"))) - actions.add(new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT)); + actions.add(new PlayPermanentAction(self, Zone.FREE_SUPPORT)); if (game.getGameState().getCurrentPhase() == Phase.MANEUVER && self.getZone() == 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 716abc73d..a327d44b3 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventFromHandAction; +import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -38,7 +38,7 @@ public class Card1_058 extends AbstractLotroCardBlueprint { public List getPlayablePhaseActions(final String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canPlayFromHandDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self) && Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.canExert()) >= 2) { - final PlayEventFromHandAction action = new PlayEventFromHandAction(self); + final PlayEventAction action = new PlayEventAction(self); action.addCost( new ChooseActiveCardEffect(playerId, "Exert first Elf", Filters.keyword(Keyword.ELF)) { @Override 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 0a16b140b..c3901e51b 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 @@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractLotroCardBlueprint; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentFromHandAction; +import com.gempukku.lotro.cards.actions.PlayPermanentAction; import com.gempukku.lotro.cards.effects.AddTwilightEffect; import com.gempukku.lotro.cards.effects.ChoiceEffect; import com.gempukku.lotro.cards.effects.ExertCharacterEffect; @@ -42,7 +42,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)) { - PlayPermanentFromHandAction action = new PlayPermanentFromHandAction(self, Zone.FREE_SUPPORT); + PlayPermanentAction action = new PlayPermanentAction(self, Zone.FREE_SUPPORT); return Collections.singletonList(action); }