fix: campground mapgen (#3702)

* fix_campground * fix_waterless_toilets * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Nov 17, 2023 · 0f8ea67 · 0f8ea67
1 parent f73f0d1
commit 0f8ea67
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 68 deletions.
diff --git a/data/json/mapgen/campground.json b/data/json/mapgen/campground.json
@@ -1,68 +1,10 @@
 [
   {
+    "type": "mapgen",
     "method": "json",
+    "om_terrain": [ [ "campground_1a", "campground_1b" ], [ "campground_2a", "campground_2b" ] ],
+    "weight": 100,
     "object": {
-      "items": {
-        ";": [
-          { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
-          { "item": "creepy", "chance": 2 },
-          { "item": "camping", "chance": 5 },
-          { "item": "archery", "chance": 2 }
-        ],
-        ",": [
-          { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
-          { "item": "creepy", "chance": 2 },
-          { "item": "camping", "chance": 5 },
-          { "item": "archery", "chance": 2 }
-        ],
-        "t": [
-          { "item": "barbecue", "chance": 5, "repeat": [ 1, 2 ] },
-          { "item": "misc_smoking", "chance": 2 },
-          { "item": "cannedfood", "chance": 2, "repeat": [ 1, 2 ] }
-        ]
-      },
-      "place_monsters": [
-        { "chance": 50, "density": 1, "monster": "CAMPERS", "x": [ 8, 18 ], "y": [ 7, 22 ] },
-        { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 17 ], "y": [ 2, 15 ], "repeat": [ 0, 2 ] },
-        { "chance": 50, "density": 1, "monster": "CAMPERS", "x": [ 3, 17 ], "y": [ 32, 46 ] },
-        { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 17 ], "y": [ 31, 46 ], "repeat": [ 0, 2 ] },
-        { "monster": "GROUP_PARK_ANIMAL", "x": [ 30, 46 ], "y": [ 31, 46 ], "repeat": [ 0, 2 ] }
-      ],
-      "place_vehicles": [
-        { "chance": 25, "fuel": 15, "rotation": 270, "status": -1, "vehicle": "campground_vehicles", "x": 16, "y": 2 },
-        { "chance": 25, "fuel": -1, "rotation": 180, "status": -1, "vehicle": "campground_vehicles", "x": 5, "y": 19 },
-        { "chance": 50, "fuel": 20, "rotation": 0, "status": -1, "vehicle": "lux_rv", "x": 43, "y": 18 },
-        {
-          "chance": 25,
-          "fuel": 15,
-          "rotation": 180,
-          "status": -1,
-          "vehicle": "campground_vehicles",
-          "x": 26,
-          "y": 14
-        },
-        {
-          "chance": 25,
-          "fuel": 15,
-          "rotation": 360,
-          "status": -1,
-          "vehicle": "campground_vehicles",
-          "x": 18,
-          "y": 32
-        },
-        { "chance": 25, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "campground_vehicles", "x": 7, "y": 34 },
-        {
-          "chance": 25,
-          "fuel": -1,
-          "rotation": 270,
-          "status": -1,
-          "vehicle": "campground_vehicles",
-          "x": 17,
-          "y": 40
-        },
-        { "chance": 10, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "rv", "x": 42, "y": 27 },
-        { "chance": 25, "fuel": 15, "rotation": 90, "status": -1, "vehicle": "campground_vehicles", "x": 35, "y": 43 }
-      ],
       "rows": [
         "_____________________ssssss_ss_......sssssssss__",
         "_______sssssssssssssssbbbbs__ss......|ww||||||||",
@@ -113,11 +55,61 @@
         "______________sssssss#####sssssssss____ssssss___",
         "____________________ssssss______________________"
       ],
-      "palettes": [ "campground_palette" ]
-    },
-    "om_terrain": [ [ "campground_1a", "campground_1b" ], [ "campground_2a", "campground_2b" ] ],
-    "type": "mapgen",
-    "weight": 100
+      "palettes": [ "campground_palette" ],
+      "items": {
+        ";": [
+          { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
+          { "item": "creepy", "chance": 2 },
+          { "item": "camping", "chance": 5 },
+          { "item": "archery", "chance": 2 }
+        ],
+        ",": [
+          { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
+          { "item": "creepy", "chance": 2 },
+          { "item": "camping", "chance": 5 },
+          { "item": "archery", "chance": 2 }
+        ],
+        "t": [
+          { "item": "barbecue", "chance": 5, "repeat": [ 1, 2 ] },
+          { "item": "misc_smoking", "chance": 2 },
+          { "item": "cannedfood", "chance": 2, "repeat": [ 1, 2 ] }
+        ]
+      },
+      "place_monsters": [
+        { "chance": 50, "density": 1, "monster": "CAMPERS", "x": [ 8, 18 ], "y": [ 7, 22 ] },
+        { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 17 ], "y": [ 2, 15 ], "repeat": [ 0, 2 ] },
+        { "chance": 50, "density": 1, "monster": "CAMPERS", "x": [ 3, 17 ], "y": [ 32, 46 ] },
+        { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 17 ], "y": [ 31, 46 ], "repeat": [ 0, 2 ] },
+        { "monster": "GROUP_PARK_ANIMAL", "x": [ 30, 46 ], "y": [ 31, 46 ], "repeat": [ 0, 2 ] }
+      ],
+      "place_vehicles": [
+        { "chance": 25, "fuel": 15, "rotation": 270, "status": -1, "vehicle": "campground_vehicles", "x": 16, "y": 5 },
+        { "chance": 25, "fuel": -1, "rotation": 180, "status": -1, "vehicle": "campground_vehicles", "x": 5, "y": 19 },
+        { "chance": 50, "fuel": 20, "rotation": 0, "status": -1, "vehicle": "lux_rv", "x": 42, "y": 18 },
+        {
+          "chance": 25,
+          "fuel": 15,
+          "rotation": 180,
+          "status": -1,
+          "vehicle": "campground_vehicles",
+          "x": 26,
+          "y": 14
+        },
+        { "chance": 25, "fuel": 15, "rotation": 90, "status": -1, "vehicle": "campground_vehicles", "x": 22, "y": 31 },
+        { "chance": 25, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "campground_vehicles", "x": 7, "y": 34 },
+        {
+          "chance": 25,
+          "fuel": -1,
+          "rotation": 270,
+          "status": -1,
+          "vehicle": "campground_vehicles",
+          "x": 17,
+          "y": 41
+        },
+        { "chance": 10, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "rv", "x": 42, "y": 27 },
+        { "chance": 25, "fuel": 15, "rotation": 90, "status": -1, "vehicle": "campground_vehicles", "x": 34, "y": 41 }
+      ]
+    }
   },
   {
     "method": "json",

diff --git a/data/json/mapgen_palettes/campground.json b/data/json/mapgen_palettes/campground.json
@@ -32,7 +32,6 @@
       "h": "f_chair",
       "H": "f_camp_chair",
       "#": "f_large_canvas_wall",
-      "&": "f_toilet",
       ";": "f_large_groundsheet",
       ",": "f_center_groundsheet",
       "B": "f_brazier",
@@ -42,6 +41,7 @@
       "t": "f_table",
       "n": "f_tourist_table",
       "o": "f_firering"
-    }
+    },
+    "toilets": { "&": {  } }
   }
 ]