"Arwen"

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_007.java

@@ -1,4 +1,4 @@
-package com.gempukku.lotro.cards.set3.dwarven;
+package com.gempukku.lotro.cards.set3.elven;
 
 import com.gempukku.lotro.cards.AbstractCompanion;
 import com.gempukku.lotro.cards.effects.ChooseAndDiscardCardsFromHandEffect;

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_008.java

@@ -0,0 +1,45 @@
+package com.gempukku.lotro.cards.set3.elven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.modifiers.StrengthModifier;
+import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Signet;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.logic.modifiers.Modifier;
+import com.gempukku.lotro.logic.modifiers.SpotCondition;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Realms of Elf-lords
+ * Side: Free
+ * Culture: Elven
+ * Twilight Cost: 2
+ * Type: Companion • Elf
+ * Strength: 6
+ * Vitality: 3
+ * Resistance: 6
+ * Signet: Gandalf
+ * Game Text: While you can spot 3 [ELVEN] allies whose home is site 3, each minion skirmishing Arwen is strength -3.
+ */
+public class Card3_008 extends AbstractCompanion {
+    public Card3_008() {
+        super(2, 6, 3, Culture.ELVEN, Race.ELF, Signet.GANDALF, "Arwen", true);
+    }
+
+    @Override
+    public List<? extends Modifier> getAlwaysOnModifiers(PhysicalCard self) {
+        return Collections.singletonList(
+                new StrengthModifier(self, Filters.inSkirmishAgainst(Filters.sameCard(self)),
+                        new SpotCondition(
+                                Filters.and(
+                                        Filters.culture(Culture.ELVEN),
+                                        Filters.type(CardType.ALLY),
+                                        Filters.siteNumber(3)
+                                ), 3), -3));
+    }
+}

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/SpotCondition.java

@@ -6,14 +6,20 @@ import com.gempukku.lotro.game.state.GameState;
 
 public class SpotCondition implements Condition {
     private Filter _filter;
+    private int _count;
 
     public SpotCondition(Filter filter) {
+        this(filter, 1);
+    }
+
+    public SpotCondition(Filter filter, int count) {
         _filter = filter;
+        _count = count;
     }
 
     @Override
     public boolean isFullfilled(GameState gameState, ModifiersQuerying modifiersQuerying) {
-        return Filters.canSpot(gameState, modifiersQuerying, _filter);
+        return Filters.countSpottable(gameState, modifiersQuerying, _filter) >= _count;
     }
 }