#17: Improved maps/hierarchy.adoc.

Author: Orchaldir

FantasyWorldSimulation/data/map/test.json …ntasyWorldSimulation/data/map/test1.jsonFantasyWorldSimulation/data/map/test.json renamed to FantasyWorldSimulation/data/map/test1.json FantasyWorldSimulation/data/map/test.json renamed to FantasyWorldSimulation/data/map/test1.json

@@ -0,0 +1,24 @@
+{
+  "version": 1,
+  "width": 20,
+  "height": 10,
+  "used_terrain_types": [
+    "Low Mountain",
+    "Hill",
+    "Plain",
+    "Medium Mountain",
+    "High Mountain"
+  ],
+  "terrain_type_map": [
+    "0,0,0,0,0,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2",
+    "0,0,3,3,0,0,0,1,1,0,0,0,0,1,1,1,1,2,2,2",
+    "1,0,3,3,3,3,3,0,0,0,0,0,0,0,0,0,1,2,2,2",
+    "1,0,0,3,4,3,3,4,4,3,3,3,3,3,2,0,1,1,2,2",
+    "1,1,0,3,4,4,4,4,3,3,0,0,0,3,3,0,0,1,2,2",
+    "2,1,0,3,3,3,3,3,0,0,0,1,0,0,3,0,0,1,2,2",
+    "2,1,0,0,0,0,0,0,0,1,1,1,1,0,3,0,1,1,2,2",
+    "2,1,1,1,1,1,1,1,1,1,2,2,1,0,3,0,1,2,2,2",
+    "2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,0,1,2,2,2",
+    "2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,2,2,2"
+  ]
+}

FantasyWorldSimulation/data/map/test2.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "width": 20,
+  "height": 10,
+  "used_terrain_types": [
+    "Hill",
+    "Low Mountain",
+    "Plain",
+    "Shallow Ocean",
+    "Ocean",
+    "Medium Mountain",
+    "High Mountain",
+    "Deep Ocean"
+  ],
+  "terrain_type_map": [
+    "0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,2,2,3,4",
+    "0,1,1,5,5,5,5,5,1,1,1,1,1,1,1,0,2,3,3,4",
+    "0,1,5,5,6,6,5,5,5,5,1,1,0,0,0,0,2,3,4,4",
+    "0,1,5,5,6,6,6,5,5,1,1,0,0,0,2,2,3,3,4,4",
+    "0,1,1,5,6,6,5,5,1,1,1,0,0,2,2,2,3,4,4,4",
+    "0,0,1,5,5,5,5,1,1,0,0,0,0,2,2,2,3,4,4,7",
+    "0,0,1,1,1,1,1,1,0,0,2,0,0,2,2,3,3,4,4,7",
+    "2,0,0,0,0,0,0,0,0,0,2,2,2,2,3,3,4,4,7,7",
+    "2,2,2,2,2,0,0,0,2,2,2,2,2,3,3,4,4,4,7,7",
+    "2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,4,4,7,7,7"
+  ]
+}

FantasyWorldSimulation/data/map/test3.json

@@ -7,7 +7,8 @@
       "blue": 0.5
     },
     "base_elevation": 10,
-    "elevation_variation": 5
+    "elevation_variation": 5,
+    "hill_noise": 10
   },
   {
     "name": "Hill",
@@ -65,7 +66,8 @@
       "blue": 1.0
     },
     "base_elevation": -50,
-    "elevation_variation": 5
+    "elevation_variation": 5,
+    "hill_noise": 10
   },
   {
     "name": "Ocean",
@@ -76,7 +78,8 @@
       "blue": 1.0
     },
     "base_elevation": -100,
-    "elevation_variation": 10
+    "elevation_variation": 10,
+    "hill_noise": 20
   },
   {
     "name": "Deep Ocean",
@@ -87,6 +90,7 @@
       "blue": 0.75
     },
     "base_elevation": -150,
-    "elevation_variation": 10
+    "elevation_variation": 10,
+    "hill_noise": 50
   }
 ]

FantasyWorldSimulation/data/terrain-types.json

@@ -18,12 +18,16 @@ An abstract representation of a region.
 Individual objects like a building or a tree are abstracted away as Forests or Settlements,
 unless they are important enough.
 
+.Sketch Map of test3.json
 image::sketch-map.png[Sketch Map]
 
 ==== Region Map
 A more detailed representation of a region that is generated from a <<Sketch Map>>.
 Individual objects like a building or a tree are represented by individual but abstract objects. 
 
+.Region Map of test3.json
+image::region-map.jpg[Region Map]
+
 .Comparison of the Sketch & Region map
 [%header,cols=3*]
 |===

FantasyWorldSimulation/docs/docu/images/region-map.jpg

@@ -15,8 +15,11 @@ public String getName() {
 	public Color select(T cell) {
 		double elevation = cell.getElevation();
 
-		if(elevation < MIN_ELEVATION || elevation > MAX_ELEVATION) {
-			return Color.PINK;
+		if(elevation < MIN_ELEVATION) {
+			return Color.DARKBLUE;
+		}
+		else if(elevation > MAX_ELEVATION) {
+			return Color.WHITE;
 		}
 		else if(elevation < DEFAULT_ELEVATION) {
 			return interpolate(elevation, MIN_ELEVATION, DEFAULT_ELEVATION - 1, Color.DARKBLUE, Color.CYAN);
@@ -32,4 +35,4 @@ private Color interpolate(double elevation, double min, double max, Color start,
 		double factor = (elevation - min) / (max - min);
 		return start.interpolate(end, factor);
 	}
-}
+}

FantasyWorldSimulation/docs/docu/images/sketch-map.png

@@ -32,12 +32,12 @@ public void testGetName() {
 
 	@Test
 	public void testTooLow() {
-		assertColor(ElevationCell.MIN_ELEVATION - 100, Color.PINK);
+		assertColor(ElevationCell.MIN_ELEVATION - 100, Color.DARKBLUE);
 	}
 
 	@Test
 	public void testTooHigh() {
-		assertColor(ElevationCell.MAX_ELEVATION + 100, Color.PINK);
+		assertColor(ElevationCell.MAX_ELEVATION + 100, Color.WHITE);
 	}
 
 	@Test