From 60dc0051784750e854f75aff87ea5a7752dbf262 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Mon, 13 Feb 2012 02:38:20 +0000
Subject: [PATCH] - "Frodo" cannot be part of starting fellowship now (unless a
 Ring-bearer, or the special non-ring-bearer Frodo).

---
 ...yerPlaysStartingFellowshipGameProcess.java |  3 ++-
 .../lotro/at/IndividualCardAtTest.java        | 19 +++++++++++++++++--
 .../src/main/webapp/includes/changeLog.html   |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java
index 81d65432f..26a2da24b 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java
@@ -45,7 +45,8 @@ public class PlayerPlaysStartingFellowshipGameProcess implements GameProcess {
                     public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
                         int twilightCost = modifiersQuerying.getTwilightCost(gameState, physicalCard, false);
                         return gameState.getTwilightPool() + twilightCost <= 4
-                                && physicalCard.getBlueprint().checkPlayRequirements(playerId, game, physicalCard, 0, 0, false, false);
+                                && physicalCard.getBlueprint().checkPlayRequirements(playerId, game, physicalCard, 0, 0, false, false)
+                                && modifiersQuerying.canPlayAction(gameState, playerId, physicalCard.getBlueprint().getPlayCardAction(playerId, game, physicalCard, 0, false));
                     }
                 });
     }
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java
index aad175541..7435db27b 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java
@@ -8,6 +8,7 @@ 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.vo.LotroDeck;
+import static junit.framework.Assert.assertEquals;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -15,8 +16,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import static junit.framework.Assert.assertEquals;
-
 public class IndividualCardAtTest extends AbstractAtTest {
     @Test
     public void dwarvenAxeDoesNotFreeze() throws DecisionResultInvalidException {
@@ -429,4 +428,20 @@ public class IndividualCardAtTest extends AbstractAtTest {
         // Should not cancel skirmish (since it's a ring-bearer)
         assertEquals(Phase.SKIRMISH, _game.getGameState().getCurrentPhase());
     }
+
+    @Test
+    public void frodoCantBePlayedInStartingFellowship() throws DecisionResultInvalidException {
+        Map<String, LotroDeck> decks = new HashMap<String, LotroDeck>();
+        final LotroDeck p1Deck = createSimplestDeck();
+        p1Deck.setRingBearer("13_156");
+        p1Deck.addCard("4_301");
+        decks.put(P1, p1Deck);
+
+        decks.put(P2, createSimplestDeck());
+
+        initializeGameWithDecks(decks);
+
+        AwaitingDecision decision = _userFeedback.getAwaitingDecision(P1);
+        assertEquals(AwaitingDecisionType.MULTIPLE_CHOICE, decision.getDecisionType());
+    }
 }
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 b542f09b7..71aff0bf5 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
@@ -2,6 +2,7 @@
 <b>12 Feb. 2012</b>
 - "Tower Troll" now exerts itself twice to use the activated ability.
 - "Aragorn, Wingfoot" now allows you to choose how many unbound hobbits you wish to spot.
+- "Frodo" cannot be part of starting fellowship now (unless a Ring-bearer, or the special non-ring-bearer Frodo).
 
 <b>11 Feb. 2012</b>
 - "Hurried Barrows" now gives the bonus to companions only if they are mounted.