Fix some minor city building and special issues (#1135)

cataclysmbnteam · Nov 27, 2021 · c91865e · c91865e
1 parent 2c0cb36
commit c91865e
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 16 deletions.
diff --git a/data/json/mapgen/mine/mine_entrance.json b/data/json/mapgen/mine/mine_entrance.json
@@ -159,6 +159,56 @@
       "nested": { "`": { "chunks": [ [ "gasoline_diesel_motor_oil", 80 ], [ "null", 80 ] ] } }
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "mine_entrance_parking",
+    "weight": 500,
+    "object": {
+      "fill_ter": "t_region_groundcover_urban",
+      "rows": [
+        "  ;;;;;;;;;;;;;;;;;;;;  ",
+        " Y;;;;;;;;;;;;;;;;;;;;Y ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " °°°°°°°;;;;;;;;°°°°°°° ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " °°°°°°°;;;;;;;;°°°°°°° ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " °°°°°°°;;;;;;;;°°°°°°° ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        " ;;;;;;;;;;;;;;;;;;;;;; ",
+        "                        "
+      ],
+      "terrain": {
+        " ": [ [ "t_region_groundcover", 4 ], [ "t_region_shrub", 2 ], [ "t_region_tree", 1 ] ],
+        ";": "t_pavement",
+        "°": "t_pavement_y",
+        "Y": "t_pavement"
+      },
+      "furniture": { "Y": "f_street_light" },
+      "place_vehicles": [
+        { "vehicle": "parkinglotbasic", "x": 3, "y": 9, "chance": 25, "rotation": 180 },
+        { "vehicle": "parkinglotbasic", "x": 3, "y": 15, "chance": 25, "rotation": 180 },
+        { "vehicle": "parkinglotbasic", "x": 3, "y": 21, "chance": 25, "rotation": 180 },
+        { "vehicle": "parkinglotbasic", "x": 20, "y": 7, "chance": 25 },
+        { "vehicle": "parkinglotbasic", "x": 20, "y": 13, "chance": 25 },
+        { "vehicle": "parkinglotbasic", "x": 20, "y": 19, "chance": 25 }
+      ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",

diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -804,24 +804,24 @@
     "id": "church",
     "locations": [ "land" ],
     "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "church_north" },
-      { "point": [ 0, 0, 1 ], "overmap": "church_roof_north" },
-      { "point": [ 0, 0, 2 ], "overmap": "church_steeple_north" },
-      { "point": [ 0, 0, 3 ], "overmap": "church_steeple_north" },
-      { "point": [ 0, 0, 4 ], "overmap": "church_steeple_north" },
-      { "point": [ 0, 0, 5 ], "overmap": "church_steeple_end_north" },
-      { "point": [ 0, 0, 6 ], "overmap": "church_steeple_roof_north" }
+      { "point": [ 0, 0, 0 ], "overmap": "church_south" },
+      { "point": [ 0, 0, 1 ], "overmap": "church_roof_south" },
+      { "point": [ 0, 0, 2 ], "overmap": "church_steeple_south" },
+      { "point": [ 0, 0, 3 ], "overmap": "church_steeple_south" },
+      { "point": [ 0, 0, 4 ], "overmap": "church_steeple_south" },
+      { "point": [ 0, 0, 5 ], "overmap": "church_steeple_end_south" },
+      { "point": [ 0, 0, 6 ], "overmap": "church_steeple_roof_south" }
     ]
   },
   {
     "type": "city_building",
     "id": "church_1",
     "locations": [ "land" ],
     "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "church_1_north" },
-      { "point": [ 0, 0, 1 ], "overmap": "church_2ndfloor_1_north" },
-      { "point": [ 0, 0, 2 ], "overmap": "church_3rdfloor_1_north" },
-      { "point": [ 0, 0, 3 ], "overmap": "church_roof_1_north" }
+      { "point": [ 0, 0, 0 ], "overmap": "church_1_south" },
+      { "point": [ 0, 0, 1 ], "overmap": "church_2ndfloor_1_south" },
+      { "point": [ 0, 0, 2 ], "overmap": "church_3rdfloor_1_south" },
+      { "point": [ 0, 0, 3 ], "overmap": "church_roof_1_south" }
     ]
   },
   {

diff --git a/data/json/overmap/overmap_special/mine.json b/data/json/overmap/overmap_special/mine.json
@@ -3,7 +3,7 @@
     "type": "overmap_special",
     "id": "Mine Entrance",
     "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "s_lot" },
+      { "point": [ 0, 0, 0 ], "overmap": "mine_entrance_parking_north" },
       { "point": [ 0, 1, 0 ], "overmap": "mine_entrance_north" },
       { "point": [ 1, 1, 0 ], "overmap": "mine_entrance_loading_zone_north" },
       { "point": [ 1, 0, 0 ], "overmap": "road_end_north" },
@@ -28,7 +28,7 @@
     "type": "overmap_special",
     "id": "Spiral mine",
     "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "s_lot" },
+      { "point": [ 0, 0, 0 ], "overmap": "mine_entrance_parking_north" },
       { "point": [ 0, 1, 0 ], "overmap": "mine_entrance_north" },
       { "point": [ 1, 1, 0 ], "overmap": "mine_entrance_loading_zone_north" },
       { "point": [ 1, 0, 0 ], "overmap": "road_end_north" },
@@ -68,7 +68,7 @@
     "type": "overmap_special",
     "id": "Amigara mine",
     "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "s_lot" },
+      { "point": [ 0, 0, 0 ], "overmap": "mine_entrance_parking_north" },
       { "point": [ 0, 1, 0 ], "overmap": "mine_entrance_north" },
       { "point": [ 1, 1, 0 ], "overmap": "mine_entrance_loading_zone_north" },
       { "point": [ 1, 0, 0 ], "overmap": "road_end_north" },
@@ -102,7 +102,7 @@
     "type": "overmap_special",
     "id": "Wyrms mine",
     "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "s_lot" },
+      { "point": [ 0, 0, 0 ], "overmap": "mine_entrance_parking_north" },
       { "point": [ 0, 1, 0 ], "overmap": "mine_entrance_north" },
       { "point": [ 1, 1, 0 ], "overmap": "mine_entrance_loading_zone_north" },
       { "point": [ 1, 0, 0 ], "overmap": "road_end_north" },

diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -812,7 +812,7 @@
       { "point": [ 0, 0, 5 ], "overmap": "radio_tower_odd_north" },
       { "point": [ 0, 0, 6 ], "overmap": "radio_tower_top_north" }
     ],
-    "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, 0, 0 ] } ],
+    "connections": [ { "point": [ 0, 1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, 0, 0 ] } ],
     "locations": [ "land" ],
     "city_distance": [ 0, 20 ],
     "occurrences": [ 0, 5 ],

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json b/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json
@@ -1201,6 +1201,11 @@
     "color": "magenta",
     "see_cost": 5
   },
+  {
+    "type": "overmap_terrain",
+    "id": "mine_entrance_parking",
+    "copy-from": "parking_2x1_0"
+  },
   {
     "type": "overmap_terrain",
     "id": [ "mine_shaft_middle", "mine_shaft_middle_east" ],