diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-dwarven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-dwarven.json index 45dac4b71..79c59d19e 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-dwarven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-dwarven.json @@ -78,17 +78,6 @@ "type": "event", "keyword": "Regroup" }, - "4_46": { - "side": "free_people", - "cost": 3, - "culture": "Dwarven", - "title": "*Ever My Heart Rises", - "type": "condition", - "keyword": [ - "Support Area", - "Tale" - ] - }, "4_57": { "side": "free_people", "cost": 0, diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata-playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata-playtest.json index da1495d8d..d0d07419c 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata-playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata-playtest.json @@ -8,25 +8,48 @@ "tale", "support area" ], - "effects": { - "type": "activated", - "phase": "fellowship", - "cost": [ - { - "type": "exert", - "filter": "choose(dwarf)" - }, - { + "effects": [ + { + "type": "activated", + "text": "Discard 3 cards from the top of your draw deck to play a [dwarven] weapon from discard.", + "phase": "fellowship", + "cost": { "type": "discardTopCardsFromDeck", "forced": false, - "count": 2 + "count": 3 + }, + "effect": { + "type": "playCardFromDiscard", + "filter": "choose(culture(dwarven),weapon)" } - ], - "effect": { - "type": "playCardFromDiscard", - "filter": "choose(culture(dwarven),weapon)" + }, + { + "type": "activated", + "text": "Discard cards from the top of your deck to no effect.", + "phase": "fellowship", + "effect": [ + { + "type": "chooseANumber", + "from": 0, + "to": 99, + "text": "Choose how many times to discard 3 cards from draw deck", + "memorize": "chosenNumber" + }, + { + "type": "discardTopCardsFromDeck", + "forced": false, + "count": { + "type": "multiply", + "multiplier": 3, + "source": { + "type": "fromMemory", + "memory": "chosenNumber" + }, + } + } + ], } - } + ] }, "72_6": { "title": "*Fror", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set4/set4-dwarven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set4/set4-dwarven.json new file mode 100644 index 000000000..a95132dae --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set4/set4-dwarven.json @@ -0,0 +1,73 @@ +{ + "4_46": { + "title": "*Ever My Heart Rises", + "culture": "Dwarven", + "cost": 3, + "type": "condition", + "keyword": [ + "Support Area", + "Tale" + ], + "effects": [ + { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "self" + }, + "effect": { + "type": "stackTopCardsOfDrawDeck", + "count": 6, + "where": "self" + } + }, + { + "type": "activated", + "text": "Discard 1 card from the top of your draw deck to take a Free Peoples card stacked here into hand.", + "phase": "fellowship", + "condition": [ + { + "type": "canSpot", + "filter": "dwarf" + } + ], + "cost": { + "type": "discardTopCardsFromDeck", + "count": 1, + "forced": false + }, + "effect": { + "type": "putStackedCardsIntoHand", + "filter": "choose(side(free people))", + "on": "self" + } + }, + { + "type": "activated", + "text": "Discard cards from the top of your deck to no effect.", + "phase": "fellowship", + "effect": [ + { + "type": "chooseANumber", + "from": 0, + "to": 99, + "text": "Choose how many times to discard 5 cards from draw deck", + "memorize": "chosenNumber" + }, + { + "type": "discardTopCardsFromDeck", + "forced": false, + "count": { + "type": "multiply", + "multiplier": 5, + "source": { + "type": "fromMemory", + "memory": "chosenNumber" + }, + } + } + ], + } + ] + } +} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_046.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_046.java deleted file mode 100644 index f9c8c688b..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_046.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.gempukku.lotro.cards.set4.dwarven; - -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.RequiredTriggerAction; -import com.gempukku.lotro.logic.cardtype.AbstractPermanent; -import com.gempukku.lotro.logic.effects.DiscardTopCardFromDeckEffect; -import com.gempukku.lotro.logic.effects.PutCardFromStackedIntoHandEffect; -import com.gempukku.lotro.logic.effects.StackTopCardsFromDeckEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseStackedCardsEffect; -import com.gempukku.lotro.logic.timing.EffectResult; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.timing.TriggerConditions; - -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -/** - * Set: The Two Towers - * Side: Free - * Culture: Dwarven - * Twilight Cost: 3 - * Type: Condition - * Game Text: Tale. Plays to your support area. When you play this condition, reveal the top 6 cards of your draw deck - * and stack them here. - * Fellowship: Spot a Dwarf and discard the top card of your draw deck to take a Free Peoples card stacked here into - * hand. - */ -public class Card4_046 extends AbstractPermanent { - public Card4_046() { - super(Side.FREE_PEOPLE, 3, CardType.CONDITION, Culture.DWARVEN, "Ever My Heart Rises", null, true); - addKeyword(Keyword.TALE); - } - - @Override - public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.played(game, effectResult, self)) { - RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect( - new StackTopCardsFromDeckEffect(self, self.getOwner(), 6, self)); - return Collections.singletonList(action); - } - return null; - } - - @Override - public List getPhaseActionsInPlay(String playerId, LotroGame game, final PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self) - && Filters.canSpot(game, Race.DWARF) - && game.getGameState().getDeck(playerId).size() > 0) { - final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new DiscardTopCardFromDeckEffect(self, playerId, false)); - action.appendEffect( - new ChooseStackedCardsEffect(action, playerId, 1, 1, self, Side.FREE_PEOPLE) { - @Override - protected void cardsChosen(LotroGame game, Collection stackedCards) { - for (PhysicalCard stackedCard : stackedCards) { - action.appendEffect( - new PutCardFromStackedIntoHandEffect(stackedCard)); - - } - } - }); - return Collections.singletonList(action); - } - return null; - } -}