diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_072.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_072.java deleted file mode 100644 index 7b831ec92..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_072.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gempukku.lotro.cards.set10.rohan; - -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.SelfExertEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseOpponentEffect; -import com.gempukku.lotro.logic.timing.PlayConditions; - -import java.util.Collections; -import java.util.List; - -/** - * Set: Mount Doom - * Side: Free - * Culture: Rohan - * Twilight Cost: 2 - * Type: Companion • Man - * Strength: 6 - * Vitality: 3 - * Resistance: 6 - * Signet: Gandalf - * Game Text: Skirmish: Exert Eowyn to choose an opponent. That opponent must wound a minion for each wound on each - * minion skirmishing Eowyn. - */ -public class Card10_072 extends AbstractCompanion { - public Card10_072() { - super(2, 6, 3, 6, Culture.ROHAN, Race.MAN, Signet.GANDALF, Names.eowyn, "Lady of Ithilien", true); - } - - @Override - public List getPhaseActionsInPlay(final String playerId, final LotroGame game, final PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) - && PlayConditions.canSelfExert(self, game)) { - final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new SelfExertEffect(action, self)); - action.appendEffect( - new ChooseOpponentEffect(playerId) { - @Override - protected void opponentChosen(String opponentId) { - int wounds = 0; - for (PhysicalCard minion : Filters.filterActive(game, CardType.MINION, Filters.inSkirmishAgainst(self))) - wounds += game.getGameState().getWounds(minion); - for (int i = 0; i < wounds; i++) - action.appendEffect( - new ChooseAndWoundCharactersEffect(action, opponentId, 1, 1, CardType.MINION)); - } - }); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_073.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_073.java deleted file mode 100644 index aa70ae941..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_073.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gempukku.lotro.cards.set10.rohan; - -import com.gempukku.lotro.common.CardType; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Race; -import com.gempukku.lotro.common.Side; -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.cardtype.AbstractPermanent; -import com.gempukku.lotro.logic.effects.LiberateASiteEffect; -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: Mount Doom - * Side: Free - * Culture: Rohan - * Twilight Cost: 1 - * Type: Condition • Support Area - * Game Text: To play, spot a [ROHAN] Man. Each time you lose initiative, you may liberate a site. - */ -public class Card10_073 extends AbstractPermanent { - public Card10_073() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ROHAN, "Fell Deeds Awake", null, true); - } - - @Override - public boolean checkPlayRequirements(LotroGame game, PhysicalCard self) { - return PlayConditions.canSpot(game, Culture.ROHAN, Race.MAN); - } - - @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.losesInitiative(effectResult, Side.FREE_PEOPLE)) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendEffect( - new LiberateASiteEffect(self, playerId, null)); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_074.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_074.java deleted file mode 100644 index 9e9f30fa4..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/rohan/Card10_074.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gempukku.lotro.cards.set10.rohan; - -import com.gempukku.lotro.common.CardType; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Race; -import com.gempukku.lotro.common.Side; -import com.gempukku.lotro.filters.Filters; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.PlayUtils; -import com.gempukku.lotro.logic.actions.PlayEventAction; -import com.gempukku.lotro.logic.cardtype.AbstractResponseEvent; -import com.gempukku.lotro.logic.effects.ChoiceEffect; -import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; -import com.gempukku.lotro.logic.effects.LiberateASiteEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndDiscardCardsFromPlayEffect; -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: Mount Doom - * Side: Free - * Culture: Rohan - * Twilight Cost: 1 - * Type: Event • Response - * Game Text: If your [ROHAN] Man wins a skirmish, discard a [ROHAN] possession to wound a minion or to liberate a site. - */ -public class Card10_074 extends AbstractResponseEvent { - public Card10_074() { - super(Side.FREE_PEOPLE, 1, Culture.ROHAN, "Unyielding"); - } - - @Override - public List getPlayResponseEventAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.winsSkirmish(game, effectResult, Culture.ROHAN, Race.MAN, Filters.owner(playerId)) - && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, 0, false, false) - && PlayConditions.canDiscardFromPlay(self, game, Culture.ROHAN, CardType.POSSESSION)) { - PlayEventAction action = new PlayEventAction(self); - action.appendCost( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Culture.ROHAN, CardType.POSSESSION)); - List possibleEffects = new LinkedList<>(); - possibleEffects.add( - new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION) { - @Override - public String getText(LotroGame game) { - return "Wound a minion"; - } - }); - possibleEffects.add( - new LiberateASiteEffect(self, playerId, null)); - action.appendEffect( - new ChoiceEffect(action, playerId, possibleEffects)); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set10-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Rohan.hjson similarity index 65% rename from gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set10-Rohan.hjson rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Rohan.hjson index c0490288b..1264115d9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set10-Rohan.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Rohan.hjson @@ -27,17 +27,28 @@ vitality: 3 signet: Gandalf resistance: 6 - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: activated + phase: skirmish + cost: { + type: exert + filter: self + } + effect: { + type: repeat + times: { + type: forEachWound + filter: minion,inSkirmishAgainst(self) + } + effect: { + type: wound + player: shadow + filter: choose(minion) + } + } + } + ] gametext: Skirmish: Exert Éowyn to choose an opponent. That opponent must wound a minion for each wound on each minion skirmishing Éowyn. lore: Yet now that I have leave to depart, I would remain. For this House has become to me of all dwellings the most blessed.' promotext: "" @@ -71,17 +82,26 @@ twilight: 1 type: Condition keywords: Support Area - /*requires: { - - } effects: [ - { - - } - { - - } - ]*/ + { + type: toPlay + requires: { + type: canSpot + filter: culture(rohan),man + } + } + { + type: trigger + optional: true + trigger: { + type: losesInitiative + side: free people + } + effect: { + type: liberateSite + } + } + ] gametext: To play, spot a [rohan] Man.
Each time you lose initiative, you may liberate a site. lore: ...he seized a great horn from Guthláf his banner-bearer, and he blew such a blast upon it that it burst asunder. promotext: "" @@ -115,26 +135,35 @@ twilight: 1 type: Event keywords: Response - /*requires: { - - } - */ effects: { type: responseEvent trigger: { - + type: winsSkirmish + filter: culture(rohan),man } cost: { - type: SendMessage - text: Placeholder effect for development. + type: discard + filter: choose(culture(rohan),possession) } effect: [ { - type: SendMessage - text: Placeholder effect for development. + type: choice + texts: [ + Wound a minion + Liberate a site + ] + effects: [ + { + type: wound + filter: choose(minion) + } + { + type: liberateSite + } + ] } ] - ] + } gametext: If your [rohan] Man wins a skirmish, discard a [rohan] possession to wound a minion or to liberate a site. lore: ...they gathered and rallied and fought until the day wore away. promotext: ""