From 44b85082da7352d3fefdc79e6a4f1481c781f28c Mon Sep 17 00:00:00 2001 From: marcins78 Date: Thu, 14 Mar 2013 10:42:57 +0000 Subject: [PATCH] - "Into the Wild" now increases site number only based on sites in current region (per card text). --- .../gemp-lotr-async/src/main/web/includes/changeLog.html | 3 +++ .../com/gempukku/lotro/cards/set20/gondor/Card20_197.java | 5 +++-- .../src/main/java/com/gempukku/lotro/filters/Filters.java | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index 05a328dfd..6a5940bea 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -1,4 +1,7 @@
+14 Mar. 2013
+- "Into the Wild" now increases site number only based on sites in current region (per card text).
+
 13 Mar. 2013
 - "Waylayed" now wounds 1 companion 4 times, instead of 4 companions once.
 - "Goblin Scrapper" has now correct stats - 6/2/4.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_197.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_197.java
index baed36131..a071ab1a6 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_197.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_197.java
@@ -14,7 +14,8 @@ import com.gempukku.lotro.logic.modifiers.SpotCondition;
  * 1
  * Into the Wild
  * Gondor	Condition • Support Area
- * While you can spot a [Gondor] ranger, each minion's site number is +1 for each site from your adventure deck on the adventure path.
+ * While you can spot a [Gondor] ranger, each minion's site number is +1 for each site from your adventure deck on the adventure path
+ * in the current region.
  */
 public class Card20_197 extends AbstractPermanent {
     public Card20_197() {
@@ -25,6 +26,6 @@ public class Card20_197 extends AbstractPermanent {
     public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) {
         return new MinionSiteNumberModifier(
                 self, CardType.MINION, new SpotCondition(Culture.GONDOR, Keyword.RANGER),
-                new CountActiveEvaluator(CardType.SITE, Zone.ADVENTURE_PATH, Filters.owner(self.getOwner())));
+                new CountActiveEvaluator(CardType.SITE, Zone.ADVENTURE_PATH, Filters.owner(self.getOwner()), Filters.currentRegion));
     }
 }
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
index 8caccbb49..1940b383e 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
@@ -669,6 +669,13 @@ public class Filters {
         }
     };
 
+    public static final Filter currentRegion = new Filter() {
+        @Override
+        public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
+            return GameUtils.getRegion(gameState.getCurrentSiteNumber()) == GameUtils.getRegion(gameState);
+        }
+    };
+
     public static Filter siteNumber(final int siteNumber) {
         return new Filter() {
             @Override