From 643b43d8bb1b254ac1e6b0bad950bdf8ca7a11ca Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Fri, 4 Jan 2013 12:06:45 +0000
Subject: [PATCH] - If FP player uses Muster, shadow player is now also able to
 use it.

---
 .../lotro/logic/timing/rules/MusterRule.java  |  2 +-
 .../com/gempukku/lotro/at/TriggersAtTest.java | 51 ++++++++++++++++++-
 .../src/main/webapp/includes/changeLog.html   |  3 ++
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/MusterRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/MusterRule.java
index 4bb0d1053..bc0b98f77 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/MusterRule.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/MusterRule.java
@@ -38,7 +38,7 @@ public class MusterRule {
                             PhysicalCard firstMuster = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.owner(playerId), Keyword.MUSTER);
                             if (firstMuster != null) {
                                 final OptionalTriggerAction action = new OptionalTriggerAction(firstMuster);
-                                action.setTriggerIdentifier("muster");
+                                action.setTriggerIdentifier("muster-"+playerId);
                                 action.setVirtualCardAction(true);
                                 action.setText("Use Muster");
                                 ChooseAndDiscardCardsFromHandEffect effect = new ChooseAndDiscardCardsFromHandEffect(action, playerId, false,
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java
index 7d1d419c2..a0506949b 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java
@@ -9,8 +9,6 @@ import com.gempukku.lotro.logic.decisions.AwaitingDecision;
 import com.gempukku.lotro.logic.decisions.AwaitingDecisionType;
 import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
 import com.gempukku.lotro.logic.modifiers.KeywordModifier;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 import org.junit.Test;
 
 import java.util.Collection;
@@ -18,6 +16,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
 public class TriggersAtTest extends AbstractAtTest {
     @Test
     public void fpCharWinsSkirmish() throws DecisionResultInvalidException {
@@ -200,6 +201,52 @@ public class TriggersAtTest extends AbstractAtTest {
         assertEquals(Phase.REGROUP, _game.getGameState().getCurrentPhase());
     }
 
+    @Test
+    public void musterForShadowSideTriggersCorrectly() throws DecisionResultInvalidException {
+        initializeSimplestGame();
+
+        PhysicalCardImpl musterWitchKing = new PhysicalCardImpl(100, "11_226", P2, _library.getLotroCardBlueprint("11_226"));
+        PhysicalCardImpl musterWitchKing2 = new PhysicalCardImpl(101, "11_226", P2, _library.getLotroCardBlueprint("11_226"));
+
+        skipMulligans();
+
+        _game.getGameState().addCardToZone(_game, musterWitchKing, Zone.SHADOW_CHARACTERS);
+        _game.getGameState().addCardToZone(_game, musterWitchKing2, Zone.HAND);
+
+        // End fellowship phase
+        playerDecided(P1, "");
+
+        // End shadow phase
+        playerDecided(P2, "");
+
+        // End maneuver phase
+        playerDecided(P1, "");
+        playerDecided(P2, "");
+
+        // End archery phase
+        playerDecided(P1, "");
+        playerDecided(P2, "");
+
+        // End assignment phase
+        playerDecided(P1, "");
+        playerDecided(P2, "");
+
+        // Assign
+        playerDecided(P1, "");
+        playerDecided(P2, "");
+
+        // End fierce assignment phase
+        playerDecided(P1, "");
+        playerDecided(P2, "");
+
+        // Fierce assign
+        playerDecided(P1, "");
+        playerDecided(P2, "");
+
+        // Start regroup
+        assertEquals(Phase.REGROUP, _game.getGameState().getCurrentPhase());
+    }
+
     @Test
     public void replaceSiteNotPossibleWithMountDoom() throws DecisionResultInvalidException {
         initializeSimplestGame();
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 f079fc10d..39eacaa86 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
@@ -5,6 +5,9 @@ response.setHeader("Pragma","no-cache");
 response.setDateHeader ("Expires", -1);
 %>
 <pre style="font-size:80%">
+<b>04 Jan. 2013</b>
+- If FP player uses Muster, shadow player is now also able to use it.
+
 <b>03 Jan. 2013</b>
 - "Legolas, Elven Comrade" now should automatically allow to choose a minion skirmishing an unbound companion.