Split military outposts and bunkers (#48697)

CleverRaven · Jul 3, 2021 · e7eecb7 · e7eecb7
1 parent b631ae6
commit e7eecb7
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 5 deletions.
diff --git a/data/json/mapgen/bunker.json b/data/json/mapgen/bunker.json
@@ -112,7 +112,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "bunker_basement" ],
+    "om_terrain": [ "bunker_basement_1" ],
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
@@ -211,7 +211,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "bunker_basement" ],
+    "om_terrain": [ "bunker_basement_1" ],
     "weight": 500,
     "object": {
       "fill_ter": "t_floor",

diff --git a/data/json/mapgen/outpost.json b/data/json/mapgen/outpost.json
@@ -149,7 +149,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "outpost" ],
+    "om_terrain": [ "outpost_cross" ],
     "weight": 100,
     "object": {
       "rows": [

diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -821,7 +821,21 @@
     "connections": [ { "point": [ 0, -1, 0 ], "from": [ 0, 0, 0 ] } ],
     "locations": [ "forest" ],
     "city_distance": [ 20, -1 ],
-    "occurrences": [ 50, 100 ],
+    "occurrences": [ 25, 100 ],
+    "flags": [ "MILITARY", "UNIQUE" ]
+  },
+  {
+    "type": "overmap_special",
+    "id": "Military Bunker",
+    "overmaps": [
+      { "point": [ 0, -1, 0 ], "overmap": "road_end_north" },
+      { "point": [ 0, 0, 0 ], "overmap": "bunker_south" },
+      { "point": [ 0, 0, -1 ], "overmap": "bunker_basement_1" }
+    ],
+    "connections": [ { "point": [ 0, -1, 0 ], "from": [ 0, 0, 0 ] } ],
+    "locations": [ "forest" ],
+    "city_distance": [ 20, -1 ],
+    "occurrences": [ 25, 100 ],
     "flags": [ "MILITARY", "UNIQUE" ]
   },
   {
@@ -830,7 +844,16 @@
     "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "outpost_north" } ],
     "locations": [ "wilderness" ],
     "city_distance": [ 15, -1 ],
-    "occurrences": [ 50, 100 ],
+    "occurrences": [ 25, 100 ],
+    "flags": [ "MILITARY", "UNIQUE" ]
+  },
+  {
+    "type": "overmap_special",
+    "id": "Military Outpost",
+    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "outpost_cross_north" } ],
+    "locations": [ "wilderness" ],
+    "city_distance": [ 15, -1 ],
+    "occurrences": [ 25, 100 ],
     "flags": [ "MILITARY", "UNIQUE" ]
   },
   {

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_military.json b/data/json/overmap/overmap_terrain/overmap_terrain_military.json
@@ -153,6 +153,15 @@
     "see_cost": 2,
     "flags": [ "KNOWN_UP", "NO_ROTATE", "RISK_HIGH", "SOURCE_WEAPON", "SOURCE_AMMO" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "bunker_basement_1",
+    "name": "military bunker",
+    "sym": "B",
+    "color": "red",
+    "see_cost": 2,
+    "flags": [ "KNOWN_UP", "NO_ROTATE", "RISK_HIGH", "SOURCE_WEAPON", "SOURCE_AMMO" ]
+  },
   {
     "type": "overmap_terrain",
     "id": "outpost",
@@ -163,6 +172,16 @@
     "extras": "build",
     "flags": [ "RISK_HIGH", "SOURCE_WEAPON", "SOURCE_AMMO" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "outpost_cross",
+    "name": "military outpost",
+    "sym": "M",
+    "color": "red",
+    "see_cost": 2,
+    "extras": "build",
+    "flags": [ "RISK_HIGH", "SOURCE_WEAPON", "SOURCE_AMMO" ]
+  },
   {
     "type": "overmap_terrain",
     "id": [ "silo", "silo_1", "silo_2", "silo_3", "silo_4", "silo_finale" ],