ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Region calculation.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-03-06 22:36:02 +00:00
parent 18e2f8160f
commit 01534906bd
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -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;
}
};
}

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java
View File

@@ -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);
}
}