diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java index cd750650304..c15d9a28894 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java @@ -5,7 +5,9 @@ import java.util.List; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.math.Rectangle; +import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import forge.Graphics; import forge.assets.FImage; @@ -31,7 +33,12 @@ public class ConquestPlaneSelector extends FDisplayObject { private static final float MONITOR_LEFT_MULTIPLIER = 19f / 443f; private static final float ARROW_THICKNESS = Utils.scale(3); - private static final List planes = ImmutableList.copyOf(FModel.getPlanes()); + private static final List planes = ImmutableList.copyOf(Iterables.filter(FModel.getPlanes(), new Predicate() { + @Override + public boolean apply(ConquestPlane plane) { + return !plane.isUnreachable(); //filter out unreachable planes + } + })); private final FTimer timer = new FTimer(2.5f) { @Override diff --git a/forge-gui/res/conquest/planes/planes.txt b/forge-gui/res/conquest/planes/planes.txt index 6554628d070..12cc2da11ed 100644 --- a/forge-gui/res/conquest/planes/planes.txt +++ b/forge-gui/res/conquest/planes/planes.txt @@ -1,15 +1,15 @@ Name:Alara|RegionSize:9|Desc: -Name:Dominaria|RegionSize:9|Desc: +Name:Dominaria|RegionSize:9|Unreachable:True|Desc: Name:Innistrad|RegionSize:6|Desc: -Name:Kaladesh|RegionSize:6|Desc: -Name:Kamigawa|RegionSize:6|Desc: +Name:Kaladesh|RegionSize:6|Unreachable:True|Desc: +Name:Kamigawa|RegionSize:6|Unreachable:True|Desc: Name:Lorwyn-Shadowmoor|RegionSize:6|Desc: -Name:Mercadia|RegionSize:6|Desc: -Name:Mirrodin|RegionSize:9|Desc: -Name:Rath|RegionSize:6|Desc: -Name:Regatha|RegionSize:6|Desc: -Name:Shandalar|RegionSize:9|Desc: +Name:Mercadia|RegionSize:6|Unreachable:True|Desc: +Name:Mirrodin|RegionSize:9|Unreachable:True|Desc: +Name:Rath|RegionSize:6|Unreachable:True|Desc: +Name:Regatha|RegionSize:6|Unreachable:True|Desc: +Name:Shandalar|RegionSize:9|Unreachable:True|Desc: Name:Tarkir|RegionSize:9|Desc: Name:Theros|RegionSize:6|Desc: -Name:Ulgrotha|RegionSize:6|Desc: -Name:Zendikar|RegionSize:9|Desc: \ No newline at end of file +Name:Ulgrotha|RegionSize:6|Unreachable:True|Desc: +Name:Zendikar|RegionSize:9|Unreachable:True|Desc: \ No newline at end of file diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java b/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java index 66a40ece81f..b6c2f088c7c 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java @@ -43,6 +43,7 @@ public class ConquestPlane { private final String name; private final String directory; private final String description; + private final boolean unreachable; private final int rowsPerRegion; private final int cols; @@ -53,10 +54,11 @@ public class ConquestPlane { private ConquestAwardPool awardPool; private ConquestEvent[] events; - private ConquestPlane(String name0, String description0, int regionSize0) { + private ConquestPlane(String name0, String description0, int regionSize0, boolean unreachable0) { name = name0; directory = ForgeConstants.CONQUEST_PLANES_DIR + name + ForgeConstants.PATH_SEPARATOR; description = description0; + unreachable = unreachable0; switch (regionSize0) { case 9: @@ -87,6 +89,10 @@ public class ConquestPlane { return description; } + public boolean isUnreachable() { + return unreachable; + } + public FCollectionView getRegions() { ensureRegionsLoaded(); return regions; @@ -235,6 +241,7 @@ public class ConquestPlane { String name = null; int regionSize = 0; String description = null; + boolean unreachable = false; String[] pieces = line.trim().split("\\|"); for (String piece : pieces) { @@ -253,12 +260,15 @@ public class ConquestPlane { System.out.println(value + " is not a valid region size"); } break; + case "unreachable": + unreachable = true; + break; case "desc": description = value; break; } } - return new ConquestPlane(name, description, regionSize); + return new ConquestPlane(name, description, regionSize, unreachable); } }