"Merry"

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/RaceSpotModifier.java

@@ -0,0 +1,26 @@
+package com.gempukku.lotro.cards.modifiers;
+
+import com.gempukku.lotro.common.Filterable;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.GameState;
+import com.gempukku.lotro.logic.modifiers.AbstractModifier;
+import com.gempukku.lotro.logic.modifiers.ModifierEffect;
+import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
+
+public class RaceSpotModifier extends AbstractModifier {
+    private Race _race;
+
+    public RaceSpotModifier(PhysicalCard source, Race race) {
+        super(source, "Spotting modifier", null, ModifierEffect.SPOT_MODIFIER);
+        _race = race;
+    }
+
+
+    @Override
+    public int getSpotCountModifier(GameState gameState, ModifiersQuerying modifiersQuerying, Filterable filter) {
+        if (filter == _race)
+            return 1;
+        return 0;
+    }
+}

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/shire/Card17_107.java

@@ -0,0 +1,55 @@
+package com.gempukku.lotro.cards.set17.shire;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.SelfExertEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndPutCardFromDiscardOnBottomOfDeckEffect;
+import com.gempukku.lotro.cards.modifiers.RaceSpotModifier;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Keyword;
+import com.gempukku.lotro.common.Phase;
+import com.gempukku.lotro.common.Race;
+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.modifiers.Modifier;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Rise of Saruman
+ * Side: Free
+ * Culture: Shire
+ * Twilight Cost: 1
+ * Type: Companion • Hobbit
+ * Strength: 3
+ * Vitality: 4
+ * Resistance: 8
+ * Game Text: Add 1 to the number of Ents you can spot. Regroup: Exert Merry to place a pipeweed from your discard pile
+ * beneath your draw deck.
+ */
+public class Card17_107 extends AbstractCompanion {
+    public Card17_107() {
+        super(1, 3, 4, 8, Culture.SHIRE, Race.HOBBIT, null, "Merry", true);
+    }
+
+    @Override
+    public Modifier getAlwaysOnModifier(PhysicalCard self) {
+        return new RaceSpotModifier(self, Race.ENT);
+    }
+
+    @Override
+    protected List<ActivateCardAction> getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)
+                && PlayConditions.canSelfExert(self, game)) {
+            ActivateCardAction action = new ActivateCardAction(self);
+            action.appendCost(
+                    new SelfExertEffect(self));
+            action.appendEffect(
+                    new ChooseAndPutCardFromDiscardOnBottomOfDeckEffect(action, playerId, 1, 1, Keyword.PIPEWEED));
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}