diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_317.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_317.java deleted file mode 100644 index dff01861c..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_317.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.logic.cardtype.AbstractCompanion; -import com.gempukku.lotro.logic.timing.TriggerConditions; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Keyword; -import com.gempukku.lotro.common.Race; -import com.gempukku.lotro.common.Signet; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.OptionalTriggerAction; -import com.gempukku.lotro.logic.effects.AddTwilightEffect; -import com.gempukku.lotro.logic.effects.RemoveThreatsEffect; -import com.gempukku.lotro.logic.timing.EffectResult; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 0 - * Type: Companion • Hobbit - * Strength: 3 - * Vitality: 4 - * Resistance: 10 - * Signet: Aragorn - * Game Text: Ring-bearer (resistance 10). Ring-bound. Each time the fellowship moves, you may add (3) to remove - * a threat. - */ -public class Card7_317 extends AbstractCompanion { - public Card7_317() { - super(0, 3, 4, 10, Culture.SHIRE, Race.HOBBIT, Signet.ARAGORN, "Frodo", "Hope of Free Peoples", true); - addKeyword(Keyword.CAN_START_WITH_RING); - addKeyword(Keyword.RING_BOUND); - } - - @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.moves(game, effectResult)) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendCost( - new AddTwilightEffect(self, 3)); - action.appendEffect( - new RemoveThreatsEffect(self, 1)); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_318.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_318.java deleted file mode 100644 index f29cf37c6..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_318.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.*; -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.ActivateCardAction; -import com.gempukku.lotro.logic.cardtype.AbstractCompanion; -import com.gempukku.lotro.logic.effects.AddBurdenEffect; -import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; -import com.gempukku.lotro.logic.timing.PlayConditions; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 0 - * Type: Companion • Hobbit - * Strength: 3 - * Vitality: 4 - * Resistance: 10 - * Signet: Gandalf - * Game Text: Ring-bearer (resistance 10). Ring-bound. Skirmish: At sites 6K to 8K, add 4 burdens to wound a minion - * skirmishing Frodo. - */ -public class Card7_318 extends AbstractCompanion { - public Card7_318() { - super(0, 3, 4, 10, Culture.SHIRE, Race.HOBBIT, Signet.GANDALF, "Frodo", "Wicked Masster!", true); - addKeyword(Keyword.CAN_START_WITH_RING); - addKeyword(Keyword.RING_BOUND); - } - - @Override - public List getPhaseActionsInPlay(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) - && Filters.and(Filters.siteBlock(SitesBlock.KING), Filters.or(Filters.siteNumber(6), Filters.siteNumber(7), Filters.siteNumber(8))) - .accepts(game, game.getGameState().getCurrentSite())) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new AddBurdenEffect(self.getOwner(), self, 4)); - action.appendEffect( - new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.inSkirmishAgainst(self))); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_320.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_320.java deleted file mode 100644 index 11d5204ba..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_320.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Phase; -import com.gempukku.lotro.common.Race; -import com.gempukku.lotro.common.Signet; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.ActivateCardAction; -import com.gempukku.lotro.logic.cardtype.AbstractCompanion; -import com.gempukku.lotro.logic.effects.AddThreatsEffect; -import com.gempukku.lotro.logic.effects.AddUntilEndOfPhaseModifierEffect; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; -import com.gempukku.lotro.logic.timing.PlayConditions; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 1 - * Type: Companion • Hobbit - * Strength: 3 - * Vitality: 4 - * Resistance: 6 - * Signet: Gandalf - * Game Text: Skirmish: If you cannot spot 3 threats, add a threat to make Merry strength +2. - */ -public class Card7_320 extends AbstractCompanion { - public Card7_320() { - super(1, 3, 4, 6, Culture.SHIRE, Race.HOBBIT, Signet.GANDALF, "Merry", "Rohirrim Squire", true); - } - - @Override - public List getPhaseActionsInPlay(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) - && PlayConditions.canAddThreat(game, self, 1) - && !PlayConditions.canSpotThreat(game, 3)) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new AddThreatsEffect(playerId, self, 1)); - action.appendEffect( - new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 2))); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_321.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_321.java deleted file mode 100644 index d5a028d45..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_321.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.*; -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.ActivateCardAction; -import com.gempukku.lotro.logic.cardtype.AbstractCompanion; -import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; -import com.gempukku.lotro.logic.decisions.IntegerAwaitingDecision; -import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect; -import com.gempukku.lotro.logic.effects.ReturnCardsToHandEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromDiscardEffect; -import com.gempukku.lotro.logic.timing.PlayConditions; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 1 - * Type: Companion • Hobbit - * Strength: 3 - * Vitality: 4 - * Resistance: 6 - * Signet: Theoden - * Game Text: Skirmish: If Merry is not assigned to a skirmish, return him to your hand to play up to - * 2 [ROHAN] possessions from your discard pile. - */ -public class Card7_321 extends AbstractCompanion { - public Card7_321() { - super(1, 3, 4, 6, Culture.SHIRE, Race.HOBBIT, Signet.THEODEN, "Merry", "Swordthain", true); - } - - @Override - public List getPhaseActionsInPlay(final String playerId, final LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) - && Filters.notAssignedToSkirmish.accepts(game, self)) { - final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new ReturnCardsToHandEffect(self, self)); - action.appendEffect( - new PlayoutDecisionEffect(playerId, - new IntegerAwaitingDecision(1, "How many ROHAN possessions do you wish to play from your discard pile?", 0, 2) { - @Override - public void decisionMade(String result) throws DecisionResultInvalidException { - int count = getValidatedResult(result); - for (int i = 0; i < count; i++) - action.appendEffect( - new ChooseAndPlayCardFromDiscardEffect(playerId, game, Culture.ROHAN, CardType.POSSESSION)); - - } - }) - ); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_323.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_323.java deleted file mode 100644 index 778371366..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_323.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Race; -import com.gempukku.lotro.common.Signet; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.cardtype.AbstractCompanion; -import com.gempukku.lotro.logic.modifiers.MaxThreatCondition; -import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; -import com.gempukku.lotro.logic.modifiers.evaluator.ForEachThreatEvaluator; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 1 - * Type: Companion • Hobbit - * Strength: 3 - * Vitality: 4 - * Resistance: 6 - * Signet: Gandalf - * Game Text: While you cannot spot 4 threats, Pippin is strength +1 for each threat you can spot. - */ -public class Card7_323 extends AbstractCompanion { - public Card7_323() { - super(1, 3, 4, 6, Culture.SHIRE, Race.HOBBIT, Signet.GANDALF, "Pippin", "Sworn to Service", true); - } - - @Override - public List getInPlayModifiers(LotroGame game, PhysicalCard self) { - return Collections.singletonList( - new StrengthModifier(self, self, new MaxThreatCondition(3), new ForEachThreatEvaluator())); - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_324.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_324.java deleted file mode 100644 index bd73e3735..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_324.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.*; -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.ActivateCardAction; -import com.gempukku.lotro.logic.cardtype.AbstractCompanion; -import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; -import com.gempukku.lotro.logic.effects.ReturnCardsToHandEffect; -import com.gempukku.lotro.logic.timing.PlayConditions; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 1 - * Type: Companion • Hobbit - * Strength: 3 - * Vitality: 4 - * Resistance: 6 - * Signet: Aragorn - * Game Text: Skirmish: If Pippin is not assigned to a skirmish, return him to your hand to wound a roaming minion - * twice. - */ -public class Card7_324 extends AbstractCompanion { - public Card7_324() { - super(1, 3, 4, 6, Culture.SHIRE, Race.HOBBIT, Signet.ARAGORN, "Pippin", "Wearer of Black and Silver", true); - } - - @Override - public List getPhaseActionsInPlay(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) - && Filters.notAssignedToSkirmish.accepts(game, self)) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new ReturnCardsToHandEffect(self, self)); - action.appendEffect( - new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, 2, CardType.MINION, Keyword.ROAMING)); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_325.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_325.java deleted file mode 100644 index 305b7a259..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_325.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.*; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.ActivateCardAction; -import com.gempukku.lotro.logic.actions.RequiredTriggerAction; -import com.gempukku.lotro.logic.cardtype.AbstractPermanent; -import com.gempukku.lotro.logic.effects.AddThreatsEffect; -import com.gempukku.lotro.logic.effects.ChoiceEffect; -import com.gempukku.lotro.logic.effects.PlaySiteEffect; -import com.gempukku.lotro.logic.effects.SelfDiscardEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndExertCharactersEffect; -import com.gempukku.lotro.logic.timing.Effect; -import com.gempukku.lotro.logic.timing.EffectResult; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.timing.TriggerConditions; - -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 0 - * Type: Condition • Support Area - * Game Text: To play, spot 2 Hobbits. Each time the fellowship moves, add a threat or discard this condition. - * Regroup: Discard this condition and exert a Hobbit companion to play the fellowship's next site (replacing opponent's - * site if necessary). - */ -public class Card7_325 extends AbstractPermanent { - public Card7_325() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, "Pressing On"); - } - - @Override - public boolean checkPlayRequirements(LotroGame game, PhysicalCard self) { - return PlayConditions.canSpot(game, 2, Race.HOBBIT); - } - - @Override - public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.moves(game, effectResult)) { - RequiredTriggerAction action = new RequiredTriggerAction(self); - List possibleEffects = new LinkedList<>(); - possibleEffects.add( - new AddThreatsEffect(self.getOwner(), self, 1)); - possibleEffects.add( - new SelfDiscardEffect(self) { - @Override - public String getText(LotroGame game) { - return "Discard this condition"; - } - }); - action.appendEffect( - new ChoiceEffect(action, self.getOwner(), possibleEffects)); - return Collections.singletonList(action); - } - return null; - } - - @Override - public List getPhaseActionsInPlay(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self) - && PlayConditions.canSelfDiscard(self, game) - && PlayConditions.canExert(self, game, CardType.COMPANION, Race.HOBBIT)) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new SelfDiscardEffect(self)); - action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION, Race.HOBBIT)); - action.appendEffect( - new PlaySiteEffect(action, playerId, null, game.getGameState().getCurrentSiteNumber() + 1)); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java deleted file mode 100644 index d48fbb84e..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.*; -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.ActivateCardAction; -import com.gempukku.lotro.logic.actions.OptionalTriggerAction; -import com.gempukku.lotro.logic.cardtype.AbstractCompanion; -import com.gempukku.lotro.logic.effects.MakeRingBearerEffect; -import com.gempukku.lotro.logic.effects.RemoveBurdenEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromHandEffect; -import com.gempukku.lotro.logic.timing.EffectResult; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.timing.TriggerConditions; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 2 - * Type: Companion • Hobbit - * Strength: 3 - * Vitality: 4 - * Resistance: 6 - * Signet: Aragorn - * Game Text: Ring-bound. Fellowship: Play a Hobbit companion to remove a burden. Response: If Frodo is killed, make - * Sam the Ring-bearer (resistance 5). - */ -public class Card7_326 extends AbstractCompanion { - public Card7_326() { - super(2, 3, 4, 5, Culture.SHIRE, Race.HOBBIT, Signet.ARAGORN, "Sam", "Needer of Vittles", true); - addKeyword(Keyword.RING_BOUND); - } - - @Override - public List getPhaseActionsInPlay(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self) - && PlayConditions.canPlayFromHand(playerId, game, CardType.COMPANION, Race.HOBBIT)) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new ChooseAndPlayCardFromHandEffect(playerId, game, CardType.COMPANION, Race.HOBBIT)); - action.appendEffect( - new RemoveBurdenEffect(playerId, self)); - return Collections.singletonList(action); - } - return null; - } - - @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendEffect(new MakeRingBearerEffect(self)); - return Collections.singletonList(action); - } - - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_327.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_327.java deleted file mode 100644 index 4af2498ee..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_327.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.*; -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.ActivateCardAction; -import com.gempukku.lotro.logic.actions.OptionalTriggerAction; -import com.gempukku.lotro.logic.cardtype.AbstractCompanion; -import com.gempukku.lotro.logic.effects.ChooseAndDiscardCardsFromHandEffect; -import com.gempukku.lotro.logic.effects.HealCharactersEffect; -import com.gempukku.lotro.logic.effects.MakeRingBearerEffect; -import com.gempukku.lotro.logic.timing.EffectResult; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.timing.TriggerConditions; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 2 - * Type: Companion • Hobbit - * Strength: 3 - * Vitality: 4 - * Resistance: 6 - * Signet: Frodo - * Game Text: Ring-bound. Fellowship: If you have initiative, discard a card from hand to heal Sam. Response: If Frodo - * is killed, make Sam the Ring-bearer (resistance 5). - */ -public class Card7_327 extends AbstractCompanion { - public Card7_327() { - super(2, 3, 4, 5, Culture.SHIRE, Race.HOBBIT, Signet.FRODO, "Sam", "Resolute Halfling", true); - addKeyword(Keyword.RING_BOUND); - } - - @Override - public List getPhaseActionsInPlay(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self) - && PlayConditions.hasInitiative(game, Side.FREE_PEOPLE) - && PlayConditions.canDiscardFromHand(game, playerId, 1, Filters.any)) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 1)); - action.appendEffect( - new HealCharactersEffect(self, self.getOwner(), self)); - return Collections.singletonList(action); - } - return null; - } - - @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendEffect(new MakeRingBearerEffect(self)); - return Collections.singletonList(action); - } - - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java deleted file mode 100644 index 4478c3196..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.gempukku.lotro.cards.set7.shire; - -import com.gempukku.lotro.common.*; -import com.gempukku.lotro.filters.Filters; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.GameUtils; -import com.gempukku.lotro.logic.actions.ActivateCardAction; -import com.gempukku.lotro.logic.cardtype.AbstractAttachable; -import com.gempukku.lotro.logic.effects.AssignmentEffect; -import com.gempukku.lotro.logic.effects.RemoveBurdenEffect; -import com.gempukku.lotro.logic.effects.SelfDiscardEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndDiscardCardsFromPlayEffect; -import com.gempukku.lotro.logic.modifiers.AddActionToCardModifier; -import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.timing.PlayConditions; - -import java.util.Collections; -import java.util.List; - -/** - * Set: The Return of the King - * Side: Free - * Culture: Shire - * Twilight Cost: 2 - * Type: Condition - * Game Text: Bearer must be Merry or Pippin. Each minion gains this ability: 'Assignment: Assign this minion to bearer - * of Slow-kindled Courage.' Regroup: Discard this condition to discard a minion and remove 2 burdens. - */ -public class Card7_328 extends AbstractAttachable { - public Card7_328() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 2, Culture.SHIRE, null, "Slow-kindled Courage", null, true); - } - - @Override - public Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { - return Filters.or(Filters.name("Merry"), Filters.name("Pippin")); - } - - @Override - public List getInPlayModifiers(final LotroGame game, final PhysicalCard self) { - return Collections.singletonList( - new AddActionToCardModifier(self, null, CardType.MINION) { - @Override - protected ActivateCardAction createExtraPhaseAction(LotroGame game, PhysicalCard matchingCard) { - if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard, 0)) { - ActivateCardAction action = new ActivateCardAction(matchingCard); - action.setText("Assign to " + GameUtils.getFullName(self.getAttachedTo())); - action.appendEffect( - new AssignmentEffect(matchingCard.getOwner(), self.getAttachedTo(), matchingCard)); - return action; - } - return null; - } - }); - } - - @Override - public List getPhaseActionsInPlay(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self) - && PlayConditions.canSelfDiscard(self, game)) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new SelfDiscardEffect(self)); - action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.MINION)); - action.appendEffect( - new RemoveBurdenEffect(playerId, self, 2)); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set07-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Shire.hjson similarity index 63% rename from gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set07-Shire.hjson rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Shire.hjson index d79aced7d..2a571d7a7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set07-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Shire.hjson @@ -26,19 +26,24 @@ strength: 3 vitality: 4 signet: Aragorn - resistance: 6 + resistance: 10 keywords: Ring-bound - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: trigger + optional: true + trigger: { + type: moves + } + cost: { + type: addTwilight + amount: 3 + } + effect: { + type: removeThreats + } + } + ] gametext: Ring-bearer (resistance 10). Ring-bound.
Each time the fellowship moves, you may add (3) to remove a threat. lore: Aiya Eärendil Elenion Ancalima!' promotext: "" @@ -76,19 +81,26 @@ strength: 3 vitality: 4 signet: Gandalf - resistance: 6 + resistance: 10 keywords: Ring-bound - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: activated + phase: skirmish + requires: { + type: location + filter: siteBlock(king),siteNumber(6-8) + } + cost: { + type: addBurdens + amount: 4 + } + effect: { + type: wound + filter: choose(minion,inSkirmishAgainst(self)) + } + } + ] gametext: Ring-bearer (resistance 10). Ring-bound.
Skirmish: At sites 6[K] to 8[K], add 4 burdens to wound a minion skirmishing Frodo. lore: Wicked masster cheats us; cheats Sméagol, gollum.' promotext: "" @@ -123,18 +135,7 @@ type: Possession strength: 2 itemclass: Hand weapon - #target: a Hobbit - /*requires: { - - } - effects: [ - { - - } - { - - } - ]*/ + target: hobbit gametext: Bearer must be a Hobbit. lore: "" promotext: "" @@ -173,17 +174,24 @@ vitality: 4 signet: Gandalf resistance: 6 - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: activated + phase: skirmish + requires: { + type: cantSpotThreats + amount: 3 + } + cost: { + type: addThreats + } + effect: { + type: modifyStrength + filter: self + amount: 2 + } + } + ] gametext: Skirmish: If you cannot spot 3 threats, add a threat to make Merry strength +2. lore: I will be ready... even if you bid me ride with you on the Paths of the Dead.' promotext: "" @@ -222,17 +230,32 @@ vitality: 4 signet: Theoden resistance: 6 - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: activated + phase: skirmish + requires: { + type: cantSpot + filter: self,assignedToSkirmish(any) + } + cost: { + type: returnToHand + filter: self + } + effect: [ + { + type: playCardFromDiscard + filter: choose(culture(rohan),possession) + optional: true + } + { + type: playCardFromDiscard + filter: choose(culture(rohan),possession) + optional: true + } + ] + } + ] gametext: Skirmish: If Merry is not assigned to a skirmish, return him to your hand to play up to 2 [rohan] possessions from your discard pile. lore: And I would not have it said of me in song only that I was always left behind!' promotext: "" @@ -266,20 +289,20 @@ twilight: 0 type: Event keywords: Skirmish - /*requires: { - - } effects: { type: event cost: { - + type: exert + filter: choose(companion,not(hobbit)) }, effect: [ { - + type: modifyStrength + filter: choose(hobbit) + amount: 3 } ] - }*/ + } gametext: Exert a companion (except a Hobbit) to make a Hobbit strength +3. lore: "" promotext: "" @@ -318,17 +341,22 @@ vitality: 4 signet: Gandalf resistance: 6 - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: modifier + modifier: { + type: modifyStrength + requires: { + type: cantSpotThreats + amount: 4 + } + filter: self + amount: { + type: forEachThreat + } + } + } + ] gametext: While you cannot spot 4 threats, Pippin is strength +1 for each threat you can spot. lore: I do not know what put it into your head, or your heart, to do that. But it was well done.' promotext: "" @@ -367,17 +395,25 @@ vitality: 4 signet: Aragorn resistance: 6 - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: activated + phase: skirmish + requires: { + type: cantSpot + filter: self,assignedToSkirmish(any) + } + cost: { + type: returnToHand + filter: self + } + effect: { + type: wound + filter: choose(roaming,minion) + times: 2 + } + } + ] gametext: Skirmish: If Pippin is not assigned to a skirmish, return him to your hand to wound a roaming minion twice. lore: And as for orders, I think you have a madman to deal with, not a lord.' promotext: "" @@ -411,17 +447,49 @@ twilight: 0 type: Condition keywords: Support Area - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: toPlay + requires: { + type: canSpot + filter: hobbit + count: 2 + } + } + { + type: trigger + trigger: { + type: moves + } + effect: { + type: choice + texts: [ + Add a threat + Discard this condition + ] + effects: [ + { + type: addThreats + } + { + type: discard + filter: self + } + ] + } + } + { + type: activated + phase: regroup + cost: { + type: discard + filter: self + } + effect: { + type: playNextSite + } + } + ] gametext: To play, spot 2 Hobbits.
Each time the fellowship moves, add a threat or discard this condition.
Regroup: Discard this condition and exert a Hobbit companion to play the fellowship's next site (replacing opponent's site if necessary). lore: "" promotext: "" @@ -459,19 +527,32 @@ strength: 3 vitality: 4 signet: Aragorn - resistance: 6 + resistance: 5 keywords: Ring-bound - /*requires: { - - } effects: [ + { + type: activated + phase: fellowship + cost: { + type: play + filter: choose(hobbit,companion) + } + effect: { + type: removeBurdens + } + } { - + type: trigger + optional: true + trigger: { + type: killed + filter: name(Frodo),ring bearer + } + effect: { + type: makeSelfRingBearer + } } - { - - } - ]*/ + ] gametext: Ring-bound.
Fellowship: Play a Hobbit companion to remove a burden.
Response: If Frodo is killed, make Sam the Ring-bearer (resistance 5). lore: ...but where there's life there's hope, as my Gaffer used to say....' promotext: "" @@ -509,19 +590,37 @@ strength: 3 vitality: 4 signet: Frodo - resistance: 6 + resistance: 5 keywords: Ring-bound - /*requires: { - - } effects: [ + { + type: activated + phase: fellowship + requires: { + type: haveInitiative + side: free people + } + cost: { + type: discardFromHand + forced: false + } + effect: { + type: heal + filter: self + } + } { - + type: trigger + optional: true + trigger: { + type: killed + filter: name(Frodo),ring bearer + } + effect: { + type: makeSelfRingBearer + } } - { - - } - ]*/ + ] gametext: Ring-bound.
Fellowship: If you have initiative, discard a card from hand to heal Sam.
Response: If Frodo is killed, make Sam the Ring-bearer (resistance 5). lore: The news that his master was still alive roused him.... promotext: "" @@ -554,17 +653,41 @@ culture: Shire twilight: 2 type: Condition - /*requires: { - - } + target: or(title(Merry),title(Pippin)) effects: [ - { - - } - { - - } - ]*/ + { + type: modifier + modifier: { + type: addActivated + filter: minion + phase: assignment + text: Assign this minion to bearer of Reckless Pride. + effect: { + type: assignFpCharacterToSkirmish + fpCharacter: choose(hasAttached(name(Slow-kindled Courage))) + against: self + } + } + } + { + type: activated + phase: regroup + cost: { + type: discard + filter: self + } + effect: [ + { + type: discard + filter: choose(minion) + } + { + type: removeBurdens + amount: 2 + } + ] + } + ] gametext: Bearer must be Merry or Pippin.
Each minion gains this ability: "Assignment: Assign this minion to bearer of Slow-kindled Courage."
Regroup: Discard this condition to discard a minion and remove 2 burdens. lore: "" promotext: ""