From acda07b20df2d9a7a28fe5d6401fe2805d3891fb Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 28 Mar 2012 01:52:03 +0000 Subject: [PATCH] - "Galadriel, Lady of the Golden Wood" should play the next site correctly now in non-numbered formats. --- .../com/gempukku/lotro/cards/set3/elven/Card3_017.java | 9 ++------- .../src/main/webapp/includes/changeLog.html | 5 ++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_017.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_017.java index 5f4f46d4e..7fc66b333 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_017.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_017.java @@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractAlly; import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.effects.SelfExertEffect; 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; @@ -14,7 +13,6 @@ import com.gempukku.lotro.logic.effects.PlaySiteEffect; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -53,11 +51,8 @@ public class Card3_017 extends AbstractAlly { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new SelfExertEffect(self)); - Collection nextSites = Filters.filter(game.getGameState().getAdventureDeck(playerId), game.getGameState(), game.getModifiersQuerying(), Filters.siteNumber(game.getGameState().getCurrentSiteNumber() + 1)); - if (nextSites.size() > 0 && game.getModifiersQuerying().hasKeyword(game.getGameState(), nextSites.iterator().next(), Keyword.FOREST)) { - action.appendEffect( - new PlaySiteEffect(action, playerId, null, game.getGameState().getCurrentSiteNumber() + 1)); - } + action.appendEffect( + new PlaySiteEffect(action, playerId, null, game.getGameState().getCurrentSiteNumber() + 1, Keyword.FOREST)); return Collections.singletonList(action); } return null; 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 73f820449..cec7be9fe 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,7 +1,10 @@
+28 Mar. 2012
+- "Galadriel, Lady of the Golden Wood" should play the next site correctly now in non-numbered formats.
+
 27 Mar. 2012
 - Roaming penalty is separate from twilight cost modifiers and applies after them.
-- "Uruviel" no longer affects assignments when copying "Caras Galadhon". 
+- "Uruviel" no longer affects assignments when copying "Caras Galadhon".
 
 26 Mar. 2012
 - "Pillage of Rohan" and other similar cards should be active at the right time now (only on your turn).