From 97bf29e7822d58f6c104456c0b591f73f191528b Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Mon, 16 Jan 2012 13:41:37 +0000
Subject: [PATCH] - "Master Proudfoot" now gives an option of choosing which
 cards to put into hand, because of Rule of 4.

---
 .../lotro/cards/set1/shire/Card1_301.java     | 34 ++++++++++++-------
 .../src/main/webapp/includes/changeLog.html   |  1 +
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java
index 39374b2e9..60d5c8192 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java
@@ -3,18 +3,18 @@ package com.gempukku.lotro.cards.set1.shire;
 import com.gempukku.lotro.cards.AbstractAlly;
 import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.effects.DiscardCardFromDeckEffect;
-import com.gempukku.lotro.cards.effects.PutCardFromDeckIntoHandOrDiscardEffect;
 import com.gempukku.lotro.cards.effects.RevealTopCardsOfDrawDeckEffect;
-import com.gempukku.lotro.common.Block;
-import com.gempukku.lotro.common.Culture;
-import com.gempukku.lotro.common.Phase;
-import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndPutCardFromDeckIntoHandEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.actions.ActivateCardAction;
 import com.gempukku.lotro.logic.effects.AddTwilightEffect;
 import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.UnrespondableEffect;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -44,13 +44,23 @@ public class Card1_301 extends AbstractAlly {
             action.appendEffect(
                     new RevealTopCardsOfDrawDeckEffect(self, playerId, 3) {
                         @Override
-                        protected void cardsRevealed(List<PhysicalCard> cards) {
-                            for (PhysicalCard card : cards) {
-                                if (card.getBlueprint().getCulture() == Culture.SHIRE)
-                                    action.appendEffect(new PutCardFromDeckIntoHandOrDiscardEffect(card));
-                                else
-                                    action.appendEffect(new DiscardCardFromDeckEffect(card));
-                            }
+                        protected void cardsRevealed(final List<PhysicalCard> cards) {
+                            for (int i = 0; i < cards.size(); i++)
+                                action.appendEffect(
+                                        new ChooseAndPutCardFromDeckIntoHandEffect(action, playerId, 1, 1, Filters.in(cards), Culture.SHIRE, Zone.DECK));
+
+                            action.appendEffect(
+                                    new UnrespondableEffect() {
+                                        @Override
+                                        protected void doPlayEffect(LotroGame game) {
+                                            Collection<PhysicalCard> cardsToDiscard = Filters.filter(cards, game.getGameState(), game.getModifiersQuerying(), Zone.DECK);
+                                            for (PhysicalCard cardToDiscard : cardsToDiscard) {
+                                                action.appendEffect(
+                                                        new DiscardCardFromDeckEffect(cardToDiscard));
+
+                                            }
+                                        }
+                                    });
                         }
                     });
             return Collections.singletonList(action);
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 8e24ea062..478fa8fc6 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
@@ -3,6 +3,7 @@
 - "Fearless" should now be giving a proper bonus to the minion.
 - "Orthanc Warrior" has a propert name now.
 - Added "Bloodlines" (set 13) set.
+- "Master Proudfoot" now gives an option of choosing which cards to put into hand, because of Rule of 4. 
 
 <b>15 Jan. 2012</b>
 - "Hobbit Farmer" and other allies copying site text should now be able to activate the site phase actions.