Merge pull request #74777 from PatrikLundell/derelict

Synchronized bashing to roof and ground level
CleverRaven · Jun 25, 2024 · d56fc07 · d56fc07
2 parents 001506d + 41466a1
commit d56fc07
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/data/json/mapgen/derelict_property.json b/data/json/mapgen/derelict_property.json
@@ -99,10 +99,10 @@
       "W": { "param": "trash_type", "fallback": "f_null" }
     },
     "nested": {
-      "|": { "chunks": [ [ "1x1_bash", 7 ], [ "general_graffiti", 20 ], [ "null", 90 ] ] },
-      "w": { "chunks": [ [ "1x1_bash", 1 ], [ "null", 6 ] ] },
-      ".": { "chunks": [ [ "1x1_bash", 1 ], [ "null", 10 ] ] },
-      "4": { "chunks": [ [ "1x1_bash", 1 ], [ "null", 4 ] ] }
+      "|": { "chunks": [ [ "1x1_2z_bash", 7 ], [ "general_graffiti", 20 ], [ "null", 90 ] ] },
+      "w": { "chunks": [ [ "1x1_2z_bash", 1 ], [ "null", 6 ] ] },
+      ".": { "chunks": [ [ "1x1_2z_bash", 1 ], [ "null", 10 ] ] },
+      "4": { "chunks": [ [ "1x1_2z_bash", 1 ], [ "null", 4 ] ] }
     },
     "items": {
       "{": { "item": "homebooks", "chance": 20, "repeat": [ 1, 2 ] },
@@ -146,9 +146,9 @@
     "id": "derelict_roof_palette",
     "palettes": [ "roof_palette" ],
     "nested": {
-      ".": { "chunks": [ [ "1x1_bash", 1 ], [ "null", 9 ] ] },
-      "-": { "chunks": [ [ "1x1_bash", 1 ], [ "null", 4 ] ] },
-      "5": { "chunks": [ [ "1x1_bash", 1 ], [ "null", 4 ] ] }
+      ".": { "chunks": [ [ "1x1_2z_bash", 1 ], [ "null", 9 ] ] },
+      "-": { "chunks": [ [ "1x1_2z_bash", 1 ], [ "null", 4 ] ] },
+      "5": { "chunks": [ [ "1x1_2z_bash", 1 ], [ "null", 4 ] ] }
     }
   },
   {

diff --git a/data/json/mapgen/nested/aux_nested.json b/data/json/mapgen/nested/aux_nested.json
@@ -376,6 +376,16 @@
     "nested_mapgen_id": "1x1_bash",
     "object": { "mapgensize": [ 1, 1 ], "set": [ { "point": "bash", "x": 0, "y": 0 } ] }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "A nested map bash damage.",
+    "nested_mapgen_id": "1x1_2z_bash",
+    "object": {
+      "mapgensize": [ 1, 1 ],
+      "set": [ { "point": "bash", "x": 0, "y": 0, "z": 0 }, { "point": "bash", "x": 0, "y": 0, "z": 1 } ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",