From 01534906bda6f0e56f8e42a2cd7789bead459fe0 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 6 Mar 2012 22:36:02 +0000 Subject: [PATCH] Region calculation. --- .../java/com/gempukku/lotro/filters/Filters.java | 16 ++-------------- .../java/com/gempukku/lotro/logic/GameUtils.java | 6 +++++- 2 files changed, 7 insertions(+), 15 deletions(-) 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 bfd8e1716..30ed73820 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 @@ -595,14 +595,7 @@ public class Filters { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { int siteNumber = physicalCard.getSiteNumber(); - int region; - if (siteNumber <= 3) - region = 1; - else if (siteNumber > 3 && siteNumber <= 6) - region = 2; - else - region = 3; - return GameUtils.getRegion(gameState) == region; + return GameUtils.getRegion(gameState) == GameUtils.getRegion(siteNumber); } }); @@ -611,12 +604,7 @@ public class Filters { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { int siteNumber = physicalCard.getSiteNumber(); - if (region == 1) - return siteNumber <= 3; - else if (region == 2) - return siteNumber > 3 && siteNumber <= 6; - else - return siteNumber > 6; + return GameUtils.getRegion(siteNumber) == region; } }; } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java index ec8ec4c30..ed9c67283 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java @@ -93,6 +93,10 @@ public class GameUtils { } public static int getRegion(GameState gameState) { - return 1 + ((gameState.getCurrentSiteNumber() - 1) / 3); + return getRegion(gameState.getCurrentSiteNumber()); + } + + public static int getRegion(int siteNumber) { + return 1 + ((siteNumber - 1) / 3); } }