From 95db45a4cf1d2f19cde826893e6a4cd637422c1f Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Tue, 3 Apr 2012 15:16:21 +0000
Subject: [PATCH] Clearing the "assigned to skirmish [quality]" filter.

---
 .../java/com/gempukku/lotro/cards/set4/gondor/Card4_122.java  | 2 +-
 .../java/com/gempukku/lotro/cards/set5/dwarven/Card5_007.java | 2 +-
 .../java/com/gempukku/lotro/cards/set7/raider/Card7_135.java  | 2 --
 .../src/main/java/com/gempukku/lotro/filters/Filters.java     | 4 ++++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_122.java
index 4a0aa1937..f615d2a9c 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_122.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_122.java
@@ -34,6 +34,6 @@ public class Card4_122 extends AbstractCompanion {
     @Override
     public List<? extends Modifier> getAlwaysOnModifiers(LotroGame game, PhysicalCard self) {
         return Collections.singletonList(
-                new MinionSiteNumberModifier(self, Filters.inSkirmishAgainst(Filters.and(Race.MAN, Keyword.RING_BOUND)), null, 2));
+                new MinionSiteNumberModifier(self, Filters.assignedToSkirmishAgainst(Filters.and(Race.MAN, Keyword.RING_BOUND)), null, 2));
     }
 }
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dwarven/Card5_007.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dwarven/Card5_007.java
index a22a1918c..fabe43142 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dwarven/Card5_007.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dwarven/Card5_007.java
@@ -37,7 +37,7 @@ public class Card5_007 extends AbstractCompanion {
         if (TriggerConditions.winsSkirmish(game, effectResult, self)) {
             OptionalTriggerAction action = new OptionalTriggerAction(self);
             action.appendEffect(
-                    new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.assignedAgainst(Filters.unboundCompanion)));
+                    new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.assignedToSkirmishAgainst(Filters.unboundCompanion)));
             return Collections.singletonList(action);
         }
         return null;
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_135.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_135.java
index b47b7db41..92d2f53a6 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_135.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_135.java
@@ -13,7 +13,6 @@ import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
 import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
 import com.gempukku.lotro.logic.timing.EffectResult;
-import com.gempukku.lotro.logic.timing.results.AssignmentResult;
 
 import java.util.Collections;
 import java.util.List;
@@ -42,7 +41,6 @@ public class Card7_135 extends AbstractMinion {
         if (TriggerConditions.assignedAgainst(game, effectResult, Side.FREE_PEOPLE, Filters.any, self)
                 && PlayConditions.hasInitiative(game, Side.SHADOW)) {
             OptionalTriggerAction action = new OptionalTriggerAction(self);
-            AssignmentResult assignment = (AssignmentResult) effectResult;
             action.appendEffect(
                     new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Filters.assignedAgainst(self)));
             return Collections.singletonList(action);
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 95207cb64..d253d15c4 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
@@ -458,6 +458,10 @@ public class Filters {
 
     public static final Filter assignedToSkirmish = Filters.not(Filters.notAssignedToSkirmish);
 
+    public static final Filter assignedToSkirmishAgainst(final Filterable... againstFilters) {
+        return Filters.or(Filters.assignedAgainst(againstFilters), Filters.inSkirmishAgainst(againstFilters));
+    }
+
     public static final Filter assignedAgainst(final Filterable... againstFilters) {
         return new Filter() {
             @Override