external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support flagging planes as unreachable until they're ready

Browse Source
This commit is contained in:
drdev
2016-02-02 03:40:15 +00:00
parent bc842b41d5
commit 4d451a84d2
3 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java
View File

@@ -5,7 +5,9 @@ import java.util.List;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import forge.Graphics; import forge.Graphics;
import forge.assets.FImage; 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 MONITOR_LEFT_MULTIPLIER = 19f / 443f;
private static final float ARROW_THICKNESS = Utils.scale(3); private static final float ARROW_THICKNESS = Utils.scale(3);
private static final List<ConquestPlane> planes = ImmutableList.copyOf(FModel.getPlanes()); private static final List<ConquestPlane> planes = ImmutableList.copyOf(Iterables.filter(FModel.getPlanes(), new Predicate<ConquestPlane>() {
@Override
public boolean apply(ConquestPlane plane) {
return !plane.isUnreachable(); //filter out unreachable planes
}
}));
private final FTimer timer = new FTimer(2.5f) { private final FTimer timer = new FTimer(2.5f) {
@Override @Override

20
forge-gui/res/conquest/planes/planes.txt
View File

@@ -1,15 +1,15 @@
Name:Alara|RegionSize:9|Desc: Name:Alara|RegionSize:9|Desc:
Name:Dominaria|RegionSize:9|Desc: Name:Dominaria|RegionSize:9|Unreachable:True|Desc:
Name:Innistrad|RegionSize:6|Desc: Name:Innistrad|RegionSize:6|Desc:
Name:Kaladesh|RegionSize:6|Desc: Name:Kaladesh|RegionSize:6|Unreachable:True|Desc:
Name:Kamigawa|RegionSize:6|Desc: Name:Kamigawa|RegionSize:6|Unreachable:True|Desc:
Name:Lorwyn-Shadowmoor|RegionSize:6|Desc: Name:Lorwyn-Shadowmoor|RegionSize:6|Desc:
Name:Mercadia|RegionSize:6|Desc: Name:Mercadia|RegionSize:6|Unreachable:True|Desc:
Name:Mirrodin|RegionSize:9|Desc: Name:Mirrodin|RegionSize:9|Unreachable:True|Desc:
Name:Rath|RegionSize:6|Desc: Name:Rath|RegionSize:6|Unreachable:True|Desc:
Name:Regatha|RegionSize:6|Desc: Name:Regatha|RegionSize:6|Unreachable:True|Desc:
Name:Shandalar|RegionSize:9|Desc: Name:Shandalar|RegionSize:9|Unreachable:True|Desc:
Name:Tarkir|RegionSize:9|Desc: Name:Tarkir|RegionSize:9|Desc:
Name:Theros|RegionSize:6|Desc: Name:Theros|RegionSize:6|Desc:
Name:Ulgrotha|RegionSize:6|Desc: Name:Ulgrotha|RegionSize:6|Unreachable:True|Desc:
Name:Zendikar|RegionSize:9|Desc: Name:Zendikar|RegionSize:9|Unreachable:True|Desc:

14
forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java
View File

@@ -43,6 +43,7 @@ public class ConquestPlane {
private final String name; private final String name;
private final String directory; private final String directory;
private final String description; private final String description;
private final boolean unreachable;
private final int rowsPerRegion; private final int rowsPerRegion;
private final int cols; private final int cols;
@@ -53,10 +54,11 @@ public class ConquestPlane {
private ConquestAwardPool awardPool; private ConquestAwardPool awardPool;
private ConquestEvent[] events; private ConquestEvent[] events;
private ConquestPlane(String name0, String description0, int regionSize0) { private ConquestPlane(String name0, String description0, int regionSize0, boolean unreachable0) {
name = name0; name = name0;
directory = ForgeConstants.CONQUEST_PLANES_DIR + name + ForgeConstants.PATH_SEPARATOR; directory = ForgeConstants.CONQUEST_PLANES_DIR + name + ForgeConstants.PATH_SEPARATOR;
description = description0; description = description0;
unreachable = unreachable0;
switch (regionSize0) { switch (regionSize0) {
case 9: case 9:
@@ -87,6 +89,10 @@ public class ConquestPlane {
return description; return description;
} }
public boolean isUnreachable() {
return unreachable;
}
public FCollectionView<ConquestRegion> getRegions() { public FCollectionView<ConquestRegion> getRegions() {
ensureRegionsLoaded(); ensureRegionsLoaded();
return regions; return regions;
@@ -235,6 +241,7 @@ public class ConquestPlane {
String name = null; String name = null;
int regionSize = 0; int regionSize = 0;
String description = null; String description = null;
boolean unreachable = false;
String[] pieces = line.trim().split("\\|"); String[] pieces = line.trim().split("\\|");
for (String piece : pieces) { for (String piece : pieces) {
@@ -253,12 +260,15 @@ public class ConquestPlane {
System.out.println(value + " is not a valid region size"); System.out.println(value + " is not a valid region size");
} }
break; break;
case "unreachable":
unreachable = true;
break;
case "desc": case "desc":
description = value; description = value;
break; break;
} }
} }
return new ConquestPlane(name, description, regionSize); return new ConquestPlane(name, description, regionSize, unreachable);
} }
} }