From 55eb29242d255a166d8888653b4805b7cafca63b Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Fri, 17 Feb 2012 09:58:57 +0000
Subject: [PATCH] - "Grimir" now can prevent the wound only in Skirmish phase.

---
 .../com/gempukku/lotro/cards/set11/dwarven/Card11_010.java     | 2 ++
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html      | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/dwarven/Card11_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/dwarven/Card11_010.java
index 0063270f0..741d51871 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/dwarven/Card11_010.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/dwarven/Card11_010.java
@@ -7,6 +7,7 @@ import com.gempukku.lotro.cards.effects.PreventCardEffect;
 import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
 import com.gempukku.lotro.common.CardType;
 import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Phase;
 import com.gempukku.lotro.common.Race;
 import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
@@ -39,6 +40,7 @@ public class Card11_010 extends AbstractCompanion {
     @Override
     public List<? extends ActivateCardAction> getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) {
         if (TriggerConditions.isGettingWounded(effect, game, Race.DWARF, CardType.COMPANION)
+                && PlayConditions.isPhase(game, Phase.SKIRMISH)
                 && PlayConditions.canDiscardFromPlay(self, game, 2, Culture.DWARVEN, Filters.not(Filters.character))) {
             final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect;
 
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 a2cc13b09..f0ff5ae4d 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
@@ -1,4 +1,7 @@
 <pre style="font-size:80%">
+<b>17 Feb. 2012</b>
+- "Grimir" now can prevent the wound only in Skirmish phase.
+
 <b>15 Feb. 2012</b>
 - Followers are added to deck builder list of card types.
 - "Salt from the Shire" is no longer misspelled.