diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/sauron/Card13_140.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/sauron/Card13_140.java deleted file mode 100644 index b13ce7980..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/sauron/Card13_140.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.gempukku.lotro.cards.set13.sauron; - -import com.gempukku.lotro.common.CardType; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Keyword; -import com.gempukku.lotro.common.Race; -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.CostToEffectAction; -import com.gempukku.lotro.logic.cardtype.AbstractMinion; -import com.gempukku.lotro.logic.effects.discount.ExertCharactersDiscountEffect; - -/** - * Set: Bloodlines - * Side: Shadow - * Culture: Sauron - * Twilight Cost: 16 - * Type: Minion • Maia - * Strength: 24 - * Vitality: 5 - * Site: 6 - * Game Text: Damage +1. Fierce. When you play Sauron, you may exert any number of minions. For each minion you exert, - * Sauron is twilight cost -X, where X is the current region number. - */ -public class Card13_140 extends AbstractMinion { - public Card13_140() { - super(16, 24, 5, 6, Race.MAIA, Culture.SAURON, "Sauron", "Dark Lord of Mordor", true); - addKeyword(Keyword.DAMAGE, 1); - addKeyword(Keyword.FIERCE); - } - - @Override - public int getPotentialDiscount(LotroGame game, String playerId, PhysicalCard self) { - return Filters.countActive(game, CardType.MINION, Filters.canExert(self)) * GameUtils.getRegion(game); - } - - @Override - public void appendPotentialDiscountEffects(LotroGame game, CostToEffectAction action, String playerId, PhysicalCard self) { - action.appendPotentialDiscount(new ExertCharactersDiscountEffect(action, self, playerId, GameUtils.getRegion(game), CardType.MINION)); - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/sauron/Card13_141.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/sauron/Card13_141.java deleted file mode 100644 index ef3ea7af6..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/sauron/Card13_141.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.gempukku.lotro.cards.set13.sauron; - -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.OptionalTriggerAction; -import com.gempukku.lotro.logic.cardtype.AbstractAttachable; -import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; -import com.gempukku.lotro.logic.modifiers.KeywordModifier; -import com.gempukku.lotro.logic.modifiers.Modifier; -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: Bloodlines - * Side: Shadow - * Culture: Sauron - * Twilight Cost: 0 - * Type: Artifact • Hand Weapon - * Strength: +2 - * Vitality: +1 - * Game Text: Bearer must be Sauron. He is damage +1. Each time Sauron wins a skirmish and the companion he - * is skirmishing is not killed, you may assign X wounds to other companions, where X is the current region number. - */ -public class Card13_141 extends AbstractAttachable { - public Card13_141() { - super(Side.SHADOW, CardType.ARTIFACT, 0, Culture.SAURON, PossessionClass.HAND_WEAPON, "Sceptre of the Dark Lord", null, true); - } - - @Override - public Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { - return Filters.name("Sauron"); - } - - @Override - public int getStrength() { - return 2; - } - - @Override - public int getVitality() { - return 1; - } - - @Override - public List getInPlayModifiers(LotroGame game, PhysicalCard self) { - List modifiers = new LinkedList<>(); - modifiers.add( - new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE, 1)); - - return modifiers; - } - - @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.winsSkirmish(game, effectResult, Filters.hasAttached(self)) - && PlayConditions.canSpot(game, CardType.COMPANION, Filters.inSkirmish)) { - int region = GameUtils.getRegion(game); - OptionalTriggerAction action = new OptionalTriggerAction(self); - for (int i = 0; i < region; i++) - action.appendEffect( - new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.COMPANION, Filters.not(Filters.inSkirmish))); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set13-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Sauron.hjson similarity index 63% rename from gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set13-Sauron.hjson rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Sauron.hjson index c5225b6f5..87e984e72 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set13-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Sauron.hjson @@ -31,6 +31,16 @@ Fierce ] effects: [ + { + type: discount + discount: { + type: perExert + filter: minion + multiplier: { + type: regionNumber + } + } + } ] gametext: Damage +1. Fierce.
When you play Sauron, you may exert any number of minions. For each minion you exert, Sauron is twilight cost -X, where X is the current region number. lore: ...the Shadow grows once more....' @@ -67,8 +77,39 @@ strength: 2 vitality: 1 itemclass: Hand weapon - #target: title(Sauron) + target: title(Sauron) effects: [ + { + type: modifier + modifier: { + type: addKeyword + filter: bearer + keyword: damage + amount: 1 + } + } + { + type: trigger + optional: true + trigger: { + type: winsSkirmish + filter: name(Sauron) + } + requires: { + type: canSpot + filter: companion,inSkirmish + } + effect: { + type: repeat + times: { + type: regionNumber + } + effect: { + type: wound + filter: choose(companion,not(inSkirmish)) + } + } + } ] gametext: Bearer must be Sauron.
He is damage +1.
Each time Sauron wins a skirmish and the companion he is skirmishing is not killed, you may assign X wounds to other companions, where X is the current region number. lore: ""