JSONize results of clearing rubble via bash results (#2452)

* JSONize results of clearing rubble via bash results * Also mods
cataclysmbnteam · Mar 31, 2023 · 662c8b4 · 662c8b4
1 parent 2bff3a5
commit 662c8b4
Show file tree

Hide file tree

Showing 24 changed files with 106 additions and 152 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-rural.json b/data/json/furniture_and_terrain/furniture-rural.json
@@ -42,6 +42,13 @@
       "TINY",
       "RUBBLE"
     ],
-    "examine_action": "rubble"
+    "examine_action": "rubble",
+    "bash": {
+      "str_min": 32,
+      "str_max": 80,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [ { "item": "splinter", "count": [ 25, 50 ] } ]
+    }
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -515,7 +515,18 @@
       "TINY",
       "RUBBLE"
     ],
-    "examine_action": "rubble"
+    "examine_action": "rubble",
+    "bash": {
+      "str_min": 32,
+      "str_max": 80,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [
+        { "item": "nail", "charges": [ 5, 10 ] },
+        { "item": "splinter", "count": [ 5, 10 ] },
+        { "group": "building_rubble", "count": [ 1, 3 ] }
+      ]
+    }
   },
   {
     "type": "furniture",
@@ -539,7 +550,14 @@
       "SHORT",
       "RUBBLE"
     ],
-    "examine_action": "rubble"
+    "examine_action": "rubble",
+    "bash": {
+      "str_min": 32,
+      "str_max": 80,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [ { "item": "rock", "count": [ 5, 10 ] }, { "item": "sharp_rock", "count": [ 1, 5 ] } ]
+    }
   },
   {
     "type": "furniture",
@@ -563,7 +581,14 @@
       "SHORT",
       "RUBBLE"
     ],
-    "examine_action": "rubble"
+    "examine_action": "rubble",
+    "bash": {
+      "str_min": 32,
+      "str_max": 80,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [ { "group": "trash", "count": [ 3, 6 ] } ]
+    }
   },
   {
     "type": "furniture",
@@ -588,7 +613,18 @@
       "SHORT",
       "RUBBLE"
     ],
-    "examine_action": "rubble"
+    "examine_action": "rubble",
+    "bash": {
+      "str_min": 32,
+      "str_max": 80,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [
+        { "item": "steel_chunk", "count": [ 1, 5 ] },
+        { "item": "scrap", "count": [ 5, 10 ] },
+        { "group": "wreckage", "count": [ 0, 2 ] }
+      ]
+    }
   },
   {
     "type": "furniture",
@@ -600,7 +636,14 @@
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "NOCOLLIDE", "CONTAINER", "SEALED", "PLACE_ITEM", "RUBBLE" ],
-    "examine_action": "rubble"
+    "examine_action": "rubble",
+    "bash": {
+      "str_min": 32,
+      "str_max": 80,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [ { "item": "ash", "charges": [ 1, 100 ] } ]
+    }
   },
   {
     "type": "furniture",

diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json
@@ -183,5 +183,20 @@
       [ "wheel_mount_medium", 10 ],
       [ "alternator_car", 10 ]
     ]
+  },
+  {
+    "id": "building_rubble",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "rock", "prob": 25 },
+      { "item": "scrap", "prob": 10 },
+      { "item": "splinter", "prob": 10 },
+      { "item": "rebar", "prob": 25 },
+      { "item": "nail", "prob": 5, "charges": [ 1, 10 ] },
+      { "item": "glass_shard", "prob": 15, "count": [ 0, 1 ] },
+      { "item": "wire", "prob": 5 },
+      { "item": "splinter", "prob": 20 }
+    ]
   }
 ]
diff --git a/data/json/mapgen/abandoned_barn.json b/data/json/mapgen/abandoned_barn.json
@@ -119,14 +119,6 @@
       ],
       "palettes": [ "desolatebarn_palette" ],
       "place_items": [
-        { "chance": 33, "item": "building_rubble", "x": 13, "y": 19 },
-        { "chance": 33, "item": "building_rubble", "x": 14, "y": 19 },
-        { "chance": 33, "item": "building_rubble", "x": 19, "y": 17 },
-        { "chance": 33, "item": "building_rubble", "x": 19, "y": 18 },
-        { "chance": 33, "item": "building_rubble", "x": 6, "y": 14 },
-        { "chance": 33, "item": "building_rubble", "x": 7, "y": 14 },
-        { "chance": 33, "item": "building_rubble", "x": 8, "y": 14 },
-        { "chance": 33, "item": "building_rubble", "x": 13, "y": 11 },
         { "chance": 25, "item": "trash", "x": 19, "y": 19 },
         { "chance": 25, "item": "trash", "x": 15, "y": 15 },
         { "chance": 25, "item": "trash", "x": 20, "y": 12 },

diff --git a/data/json/mapgen/cabin.json b/data/json/mapgen/cabin.json
@@ -107,18 +107,18 @@
       ],
       "palettes": [ "cabin_palette" ],
       "place_rubble": [
-        { "x": 20, "y": 17, "items": true },
-        { "x": 19, "y": 18, "items": true },
-        { "x": 20, "y": 18, "items": true },
-        { "x": 18, "y": 19, "items": true },
-        { "x": 19, "y": 19, "items": true },
-        { "x": 20, "y": 19, "items": true },
-        { "x": 19, "y": 3, "items": true },
-        { "x": 20, "y": 3, "items": true },
-        { "x": 21, "y": 3, "items": true },
-        { "x": 20, "y": 4, "items": true },
-        { "x": 21, "y": 4, "items": true },
-        { "x": 21, "y": 5, "items": true }
+        { "x": 20, "y": 17 },
+        { "x": 19, "y": 18 },
+        { "x": 20, "y": 18 },
+        { "x": 18, "y": 19 },
+        { "x": 19, "y": 19 },
+        { "x": 20, "y": 19 },
+        { "x": 19, "y": 3 },
+        { "x": 20, "y": 3 },
+        { "x": 21, "y": 3 },
+        { "x": 20, "y": 4 },
+        { "x": 21, "y": 4 },
+        { "x": 21, "y": 5 }
       ],
       "place_loot": [ { "group": "homeguns", "x": 7, "y": 9, "chance": 30, "ammo": 90, "magazine": 100 } ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": 11, "y": 12 } ]

diff --git a/data/json/mapgen/lab/lab_floorplans_1side.json b/data/json/mapgen/lab/lab_floorplans_1side.json
@@ -291,7 +291,7 @@
     "nested_mapgen_id": "lab_hulk_smash",
     "object": {
       "mapgensize": [ 24, 24 ],
-      "place_rubble": [ { "x": 11, "y": 4, "items": true }, { "x": 13, "y": 11, "items": true }, { "x": 12, "y": 13, "items": true } ],
+      "place_rubble": [ { "x": 11, "y": 4 }, { "x": 13, "y": 11 }, { "x": 12, "y": 13 } ],
       "place_monster": [
         {
           "monster": [ "mon_zombie_hulk", "mon_skeleton_hulk", "mon_nakedmolerat_giant" ],

diff --git a/data/json/mapgen/landfill.json b/data/json/mapgen/landfill.json
@@ -5,7 +5,6 @@
       "furniture": { "#": "f_rubble_landfill", ".": "f_null", "4": "f_null", "_": "f_null" },
       "items": {
         "#": [
-          { "item": "trash", "chance": 25, "repeat": 2 },
           { "item": "road", "chance": 2 },
           { "item": "allclothes_damaged", "chance": 3 },
           { "item": "stoner", "chance": 1 },
@@ -65,7 +64,6 @@
       "furniture": { "#": "f_rubble_landfill", ".": "f_null", "P": "f_sign", "_": "f_null" },
       "items": {
         "#": [
-          { "item": "trash", "chance": 25, "repeat": 2 },
           { "item": "road", "chance": 2 },
           { "item": "allclothes_damaged", "chance": 3 },
           { "item": "stoner", "chance": 1 },
@@ -126,7 +124,6 @@
       "furniture": { "#": "f_rubble_landfill", ".": "f_null", "7": "f_null", "_": "f_null", "s": "f_null" },
       "items": {
         "#": [
-          { "item": "trash", "chance": 25, "repeat": 2 },
           { "item": "road", "chance": 2 },
           { "item": "allclothes_damaged", "chance": 3 },
           { "item": "stoner", "chance": 1 },
@@ -188,7 +185,6 @@
       "furniture": { "#": "f_rubble_landfill", ".": "f_null", "_": "f_null", "s": "f_null", "|": "f_null" },
       "items": {
         "#": [
-          { "item": "trash", "chance": 25, "repeat": 2 },
           { "item": "road", "chance": 2 },
           { "item": "allclothes_damaged", "chance": 3 },
           { "item": "stoner", "chance": 1 },
@@ -249,7 +245,6 @@
       "furniture": { "#": "f_rubble_landfill", ".": "f_null", "7": "f_null", "_": "f_null", "|": "f_null" },
       "items": {
         "#": [
-          { "item": "trash", "chance": 25, "repeat": 2 },
           { "item": "road", "chance": 2 },
           { "item": "allclothes_damaged", "chance": 3 },
           { "item": "stoner", "chance": 1 },

diff --git a/data/json/mapgen/necropolis/necropolis.json b/data/json/mapgen/necropolis/necropolis.json
@@ -10,21 +10,6 @@
       { "monster": "mon_irradiated_wanderer_3", "freq": 1, "cost_multiplier": 1 }
     ]
   },
-  {
-    "id": "building_rubble",
-    "type": "item_group",
-    "subtype": "distribution",
-    "entries": [
-      { "item": "rock", "prob": 25 },
-      { "item": "scrap", "prob": 10 },
-      { "item": "splinter", "prob": 10 },
-      { "item": "rebar", "prob": 25 },
-      { "item": "nail", "prob": 5 },
-      { "item": "glass_shard", "prob": 15, "count": [ 0, 1 ] },
-      { "item": "wire", "prob": 5 },
-      { "item": "splinter", "prob": 20 }
-    ]
-  },
   {
     "id": "vehicle_scrapped",
     "type": "item_group",

diff --git a/data/json/mapgen/ws_survivor_bunker.json b/data/json/mapgen/ws_survivor_bunker.json
@@ -97,11 +97,6 @@
     "id": "oa_ig_sb_wood",
     "items": [ [ "2x4", 20 ], [ "stick", 20 ], [ "pointy_stick", 10 ], [ "log", 20 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "oa_ig_sb_rubble",
-    "items": [ [ "rock", 20 ], [ "sharp_rock", 10 ] ]
-  },
   {
     "type": "item_group",
     "id": "oa_ig_sb_water",
@@ -223,7 +218,6 @@
         "C": { "item": "oa_ig_sb_rare", "chance": 40 },
         "B": { "item": "bed", "chance": 80 },
         "k": { "item": "oa_ig_sb_water", "chance": 60 },
-        "r": { "item": "oa_ig_sb_rubble", "chance": 80 },
         "W": { "item": "oa_ig_sb_wood", "chance": 70 }
       },
       "add": [

diff --git a/data/mods/National_Guard_Camp/national_guard_camp/national_guard_camp.json b/data/mods/National_Guard_Camp/national_guard_camp/national_guard_camp.json
@@ -127,7 +127,6 @@
       ],
       "palettes": [ "national_guard_camp" ],
       "items": {
-        "Y": { "item": "dirt_rubble", "chance": 60 },
         "8": { "item": "dirt_rubble", "chance": 50 },
         "z": { "item": "dirt_rubble", "chance": 25 },
         "%": { "item": "fence_caught", "chance": 1 }

diff --git a/data/mods/National_Guard_Camp/national_guard_camp/national_guard_camp_b1.json b/data/mods/National_Guard_Camp/national_guard_camp/national_guard_camp_b1.json
@@ -1287,8 +1287,7 @@
         "r": { "item": "chem_lab", "chance": 40 },
         "c": { "item": "chem_lab", "chance": 20 },
         "g": { "item": "mut_lab", "chance": 25 },
-        "L": { "item": "sewage_plant", "chance": 40 },
-        "Z": { "item": "building_rubble", "chance": 60 }
+        "L": { "item": "sewage_plant", "chance": 40 }
       },
       "terrain": { "=": [ "t_door_metal_c", "t_door_metal_locked", "t_door_metal_locked", "t_door_metal_locked" ] },
       "place_monsters": [

diff --git a/data/mods/No_Hope/Mapgen/abandoned_barn.json b/data/mods/No_Hope/Mapgen/abandoned_barn.json
@@ -119,14 +119,6 @@
       ],
       "palettes": [ "desolatebarn_palette" ],
       "place_items": [
-        { "chance": 33, "item": "building_rubble", "x": 13, "y": 19 },
-        { "chance": 33, "item": "building_rubble", "x": 14, "y": 19 },
-        { "chance": 33, "item": "building_rubble", "x": 19, "y": 17 },
-        { "chance": 33, "item": "building_rubble", "x": 19, "y": 18 },
-        { "chance": 33, "item": "building_rubble", "x": 6, "y": 14 },
-        { "chance": 33, "item": "building_rubble", "x": 7, "y": 14 },
-        { "chance": 33, "item": "building_rubble", "x": 8, "y": 14 },
-        { "chance": 33, "item": "building_rubble", "x": 13, "y": 11 },
         { "chance": 25, "item": "trash", "x": 19, "y": 19 },
         { "chance": 25, "item": "trash", "x": 15, "y": 15 },
         { "chance": 25, "item": "trash", "x": 20, "y": 12 },

diff --git a/data/mods/No_Hope/Mapgen/lab_floorplans_1side.json b/data/mods/No_Hope/Mapgen/lab_floorplans_1side.json
@@ -291,7 +291,7 @@
     "nested_mapgen_id": "lab_hulk_smash",
     "object": {
       "mapgensize": [ 24, 24 ],
-      "place_rubble": [ { "x": 11, "y": 4, "items": true }, { "x": 13, "y": 11, "items": true }, { "x": 12, "y": 13, "items": true } ],
+      "place_rubble": [ { "x": 11, "y": 4 }, { "x": 13, "y": 11 }, { "x": 12, "y": 13 } ],
       "place_monster": [
         {
           "monster": [ "mon_zombie_hulk", "mon_skeleton_hulk", "mon_nakedmolerat_giant" ],

diff --git a/data/mods/No_Hope/Mapgen/necropolis.json b/data/mods/No_Hope/Mapgen/necropolis.json
@@ -10,21 +10,6 @@
       { "monster": "mon_irradiated_wanderer_3", "freq": 1, "cost_multiplier": 1 }
     ]
   },
-  {
-    "id": "building_rubble",
-    "type": "item_group",
-    "subtype": "distribution",
-    "entries": [
-      { "item": "rock", "prob": 25 },
-      { "item": "scrap", "prob": 10 },
-      { "item": "splinter", "prob": 10 },
-      { "item": "rebar", "prob": 25 },
-      { "item": "nail", "prob": 5 },
-      { "item": "glass_shard", "prob": 15, "count": [ 1, 8 ] },
-      { "item": "wire", "prob": 5 },
-      { "item": "splinter", "prob": 20 }
-    ]
-  },
   {
     "id": "vehicle_scrapped",
     "type": "item_group",