();
Coord offsetWorldmapTo = new Coord(999999, 999999);
for (WorldMapSegmentMap map : segment.maps.values()) {
- File f = WorldMapController.getFileForMap(map.mapName);
- if (!f.exists()) continue;
+ if (!shouldDisplayMapOnWorldmap(map.mapName)) continue;
+ displayedMapNames.add(map.mapName);
offsetWorldmapTo.x = Math.min(offsetWorldmapTo.x, map.worldPosition.x);
offsetWorldmapTo.y = Math.min(offsetWorldmapTo.y, map.worldPosition.y);
}
+ StringBuffer mapsAsHtml = new StringBuffer();
for (WorldMapSegmentMap segmentMap : segment.maps.values()) {
File f = WorldMapController.getFileForMap(segmentMap.mapName);
if (!f.exists()) continue;
- PredefinedMap map = world.maps.findPredefinedMap(segmentMap.mapName);
-
- sb
+ Size size = getMapSize(segmentMap, world);
+ mapsAsHtml
.append("![](\""))
");
+ if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) mapsAsHtml.append("\n");
+ }
+
+ StringBuffer namedAreasAsHtml = new StringBuffer();
+ for (NamedWorldMapArea area : segment.namedAreas.values()) {
+ CoordRect r = determineNamedAreaBoundary(area, segment, world, displayedMapNames);
+ if (r == null) continue;
+ namedAreasAsHtml
+ .append("")
+ .append(area.name)
+ .append("
");
+ if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) namedAreasAsHtml.append("\n");
}
return res.getString(R.string.worldmap_template)
- .replace("{{maps}}", sb.toString())
+ .replace("{{maps}}", mapsAsHtml.toString())
+ .replace("{{areas}}", namedAreasAsHtml.toString())
.replace("{{offsetx}}", Integer.toString(offsetWorldmapTo.x * WorldMapController.WORLDMAP_DISPLAY_TILESIZE))
.replace("{{offsety}}", Integer.toString(offsetWorldmapTo.y * WorldMapController.WORLDMAP_DISPLAY_TILESIZE));
}
+ private static Size getMapSize(WorldMapSegmentMap map, WorldContext world) {
+ return world.maps.findPredefinedMap(map.mapName).size;
+ }
+
+ private static CoordRect determineNamedAreaBoundary(NamedWorldMapArea area, WorldMapSegment segment, WorldContext world, HashSet displayedMapNames) {
+ Coord topLeft = null;
+ Coord bottomRight = null;
+
+ for (String mapName : area.mapNames) {
+ if (!displayedMapNames.contains(mapName)) continue;
+ WorldMapSegmentMap map = segment.maps.get(mapName);
+ Size size = getMapSize(map, world);
+ if (topLeft == null) {
+ topLeft = new Coord(map.worldPosition);
+ } else {
+ topLeft.x = Math.min(topLeft.x, map.worldPosition.x);
+ topLeft.y = Math.min(topLeft.y, map.worldPosition.y);
+ }
+ if (bottomRight == null) {
+ bottomRight = new Coord(map.worldPosition.x + size.width, map.worldPosition.y + size.height);
+ } else {
+ bottomRight.x = Math.max(bottomRight.x, map.worldPosition.x + size.width);
+ bottomRight.y = Math.max(bottomRight.y, map.worldPosition.y + size.height);
+ }
+ }
+ if (topLeft == null) return null;
+ return new CoordRect(topLeft, new Size(bottomRight.x - topLeft.x, bottomRight.y - topLeft.y));
+ }
+
private static void updateWorldMapSegment(Resources res, WorldContext world, String segmentName) throws IOException {
String mapAsHtml = getWorldMapSegmentAsHtml(res, world, segmentName);
File outputFile = getCombinedWorldMapFile(segmentName);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
index 1c529af47..8b1a084d6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
@@ -1,12 +1,14 @@
package com.gpl.rpg.AndorsTrail.model.map;
import java.util.HashMap;
+import java.util.HashSet;
import com.gpl.rpg.AndorsTrail.util.Coord;
public final class WorldMapSegment {
public final String name;
public final HashMap maps = new HashMap();
+ public final HashMap namedAreas = new HashMap();
public WorldMapSegment(String name) {
this.name = name;
@@ -22,4 +24,17 @@ public final class WorldMapSegment {
this.worldPosition = worldPosition;
}
}
+
+ // Towns, cities, villages, taverns, named dungeons
+ public static final class NamedWorldMapArea {
+ public final String id;
+ public final String name;
+ public final String type; // "settlement" or "other"
+ public final HashSet mapNames = new HashSet();
+ public NamedWorldMapArea(String id, String name, String type) {
+ this.id = id;
+ this.name = name;
+ this.type = type;
+ }
+ }
}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
index 20c8c801c..16513d291 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
@@ -1,6 +1,7 @@
package com.gpl.rpg.AndorsTrail.resource.parsers;
import java.io.IOException;
+import java.util.ArrayList;
import org.xmlpull.v1.XmlPullParserException;
@@ -9,9 +10,11 @@ import android.content.res.XmlResourceParser;
import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Pair;
import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils;
public final class WorldMapParser {
@@ -41,6 +44,7 @@ public final class WorldMapParser {
String segmentName = xrp.getAttributeValue(null, "id");
final WorldMapSegment segment = new WorldMapSegment(segmentName);
+ final ArrayList> mapsInNamedAreas = new ArrayList>();
XmlResourceParserUtils.readCurrentTagUntilEnd(xrp, new XmlResourceParserUtils.TagHandler() {
@Override
public void handleTag(XmlResourceParser xrp, String tagName) throws XmlPullParserException, IOException {
@@ -52,10 +56,22 @@ public final class WorldMapParser {
);
WorldMapSegmentMap map = new WorldMapSegmentMap(mapName, mapPosition);
segment.maps.put(mapName, map);
+
+ String namedArea = xrp.getAttributeValue(null, "area");
+ if (namedArea != null) mapsInNamedAreas.add(new Pair(mapName, namedArea));
+ } else if (tagName.equals("namedarea")) {
+ String id = xrp.getAttributeValue(null, "id");
+ String name = xrp.getAttributeValue(null, "name");
+ String type = xrp.getAttributeValue(null, "type");
+ segment.namedAreas.put(id, new NamedWorldMapArea(id, name, type));
}
}
});
+ for (Pair m : mapsInNamedAreas) {
+ segment.namedAreas.get(m.second).mapNames.add(m.first);
+ }
+
return segment;
}