From c05b31345078f10fd46080195292fc44d51641fe Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Thu, 3 Nov 2011 22:02:51 +0000
Subject: [PATCH] - It should not be possible to assign non-fierce minions to
 skirmish during fierce skirmishes by a card effect.

---
 .../src/main/java/com/gempukku/lotro/filters/Filters.java  | 7 +++++++
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html  | 1 +
 2 files changed, 8 insertions(+)

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 54693f691..aec03c772 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
@@ -115,6 +115,13 @@ public class Filters {
     public static Filter canBeAssignedToSkirmishByEffect(final Side sidePlayer) {
         return Filters.and(
                 notAssignedToSkirmish,
+                Filters.or(
+                        new Filter() {
+                            @Override
+                            public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
+                                return !gameState.isFierceSkirmishes();
+                            }
+                        }, Keyword.FIERCE),
                 new Filter() {
                     @Override
                     public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index d1f9b328c..a66e99d4a 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -7,6 +7,7 @@
 - "Legolas, Elven Comrade" now gives the strength penalty correctly to the minion.
 - "Company of Archers" now correctly tries to spot 2 ELVEN companions rather than conditions to be able to play it.
 - Ambush is now correctly an optional trigger, rather than required.
+- It should not be possible to assign non-fierce minions to skirmish during fierce skirmishes by a card effect.
 
 <b>2 Nov. 2011</b>
 - "O Elbereth! Gilthoniel!" should correctly give the option to cancel a skirmish with Nazgul when used in skirmish