diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java index 03774d22e..4f2684d89 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java @@ -6,7 +6,6 @@ import com.gempukku.lotro.cards.effects.TakeControlOfASiteEffect; import com.gempukku.lotro.common.Filterable; import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Side; -import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.GameState; @@ -73,7 +72,7 @@ public class TriggerConditions { return false; } - public static boolean losesSkirmish(LotroGame game, EffectResult effectResult, Filter filter) { + public static boolean losesSkirmish(LotroGame game, EffectResult effectResult, Filterable filter) { EffectResult.Type effectType = effectResult.getType(); if (effectType == EffectResult.Type.RESOLVE_SKIRMISH || effectType == EffectResult.Type.OVERWHELM_IN_SKIRMISH) { SkirmishResult skirmishResult = (SkirmishResult) effectResult; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_099.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_099.java new file mode 100644 index 000000000..eee7c4a01 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_099.java @@ -0,0 +1,45 @@ +package com.gempukku.lotro.cards.set10.sauron; + +import com.gempukku.lotro.cards.AbstractMinion; +import com.gempukku.lotro.cards.TriggerConditions; +import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; +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.actions.OptionalTriggerAction; +import com.gempukku.lotro.logic.timing.EffectResult; + +import java.util.Collections; +import java.util.List; + +/** + * Set: Mount Doom + * Side: Shadow + * Culture: Sauron + * Twilight Cost: 5 + * Type: Minion • Uruk-Hai + * Strength: 13 + * Vitality: 3 + * Site: 6 + * Game Text: Damage +1. Each time Shagrat loses a skirmish, you may exert a character. + */ +public class Card10_099 extends AbstractMinion { + public Card10_099() { + super(5, 13, 3, 6, Race.URUK_HAI, Culture.SAURON, "Shagrat", true); + addKeyword(Keyword.DAMAGE, 1); + } + + @Override + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.losesSkirmish(game, effectResult, self)) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendEffect( + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.character)); + return Collections.singletonList(action); + } + return null; + } +} diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java index b615f02a2..3236619df 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java @@ -239,6 +239,7 @@ public class Filters { public static final Filter galadriel = Filters.name("Galadriel"); public static final Filter weapon = Filters.or(PossessionClass.HAND_WEAPON, PossessionClass.RANGED_WEAPON); + public static final Filter character = Filters.or(CardType.ALLY, CardType.COMPANION, CardType.MINION); public static final Filter inSkirmish = new Filter() { @Override