fix: Stop letting unlicensed zombie contractors break stairs (#5807)

* Fix bash strength * Ranged bash info updoot --------- Co-authored-by: Chaosvolt <[email protected]>
cataclysmbnteam · Dec 13, 2024 · d3e0a66 · d3e0a66
1 parent 118ac20
commit d3e0a66
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 40 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json
@@ -213,7 +213,7 @@
       ]
     },
     "bash": {
-      "str_min": 8,
+      "str_min": 10,
       "str_max": 80,
       "str_min_blocked": 15,
       "str_max_blocked": 100,
@@ -226,7 +226,7 @@
         { "item": "splinter", "count": [ 1, 2 ] },
         { "item": "nail", "charges": [ 0, 2 ] }
       ],
-      "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 }
+      "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -252,7 +252,7 @@
       ]
     },
     "bash": {
-      "str_min": 8,
+      "str_min": 10,
       "str_max": 80,
       "str_min_blocked": 15,
       "str_max_blocked": 100,
@@ -265,7 +265,7 @@
         { "item": "splinter", "count": [ 1, 2 ] },
         { "item": "nail", "charges": [ 0, 2 ] }
       ],
-      "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 }
+      "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -291,7 +291,7 @@
       ]
     },
     "bash": {
-      "str_min": 8,
+      "str_min": 10,
       "str_max": 80,
       "str_min_blocked": 15,
       "str_max_blocked": 100,
@@ -304,7 +304,7 @@
         { "item": "splinter", "count": [ 1, 2 ] },
         { "item": "nail", "charges": [ 0, 2 ] }
       ],
-      "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 }
+      "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -330,7 +330,7 @@
       ]
     },
     "bash": {
-      "str_min": 8,
+      "str_min": 10,
       "str_max": 80,
       "str_min_blocked": 15,
       "str_max_blocked": 100,
@@ -343,7 +343,7 @@
         { "item": "splinter", "count": [ 1, 2 ] },
         { "item": "nail", "charges": [ 0, 2 ] }
       ],
-      "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 }
+      "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -369,7 +369,7 @@
       ]
     },
     "bash": {
-      "str_min": 8,
+      "str_min": 10,
       "str_max": 80,
       "str_min_blocked": 15,
       "str_max_blocked": 100,
@@ -382,7 +382,7 @@
         { "item": "splinter", "count": [ 1, 2 ] },
         { "item": "nail", "charges": [ 0, 2 ] }
       ],
-      "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 }
+      "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -408,7 +408,7 @@
       ]
     },
     "bash": {
-      "str_min": 8,
+      "str_min": 10,
       "str_max": 80,
       "str_min_blocked": 15,
       "str_max_blocked": 100,
@@ -421,7 +421,7 @@
         { "item": "splinter", "count": [ 1, 2 ] },
         { "item": "nail", "charges": [ 0, 2 ] }
       ],
-      "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 }
+      "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 80 }
     }
   },
   {

diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
@@ -38,14 +38,14 @@
     "roof": "t_flat_roof",
     "flags": [ "FLAMMABLE_HARD", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
     "bash": {
-      "str_min": 30,
+      "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
       "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 }
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210 }
     }
   },
   {
@@ -126,13 +126,13 @@
     ],
     "deconstruct": { "ter_set": "t_floor", "items": [ { "item": "2x4", "count": 10 }, { "item": "nail", "charges": 20 } ] },
     "bash": {
-      "str_min": 8,
-      "str_max": 20,
+      "str_min": 15,
+      "str_max": 30,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
-      "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" }
+      "ranged": { "reduction": [ 15, 15 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
     }
   },
   {
@@ -158,14 +158,14 @@
       "BLOCK_WIND"
     ],
     "bash": {
-      "str_min": 30,
+      "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
       "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 }
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210 }
     }
   },
   {
@@ -191,14 +191,14 @@
       "BLOCK_WIND"
     ],
     "bash": {
-      "str_min": 30,
+      "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
       "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 }
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210 }
     }
   },
   {
@@ -224,14 +224,14 @@
       "BLOCK_WIND"
     ],
     "bash": {
-      "str_min": 30,
+      "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
       "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 }
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210 }
     }
   },
   {
@@ -257,14 +257,14 @@
       "BLOCK_WIND"
     ],
     "bash": {
-      "str_min": 30,
+      "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
       "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 }
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210 }
     }
   },
   {
@@ -290,14 +290,14 @@
       "BLOCK_WIND"
     ],
     "bash": {
-      "str_min": 30,
+      "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
       "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 }
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210 }
     }
   },
   {
@@ -322,14 +322,14 @@
       "BLOCK_WIND"
     ],
     "bash": {
-      "str_min": 30,
+      "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
       "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 }
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210 }
     }
   },
   {
@@ -355,14 +355,14 @@
       "BLOCK_WIND"
     ],
     "bash": {
-      "str_min": 30,
+      "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
       "items": "wall_bash_results",
       "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 }
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210 }
     }
   },
   {

diff --git a/data/json/furniture_and_terrain/terrain-zlevel-transitions.json b/data/json/furniture_and_terrain/terrain-zlevel-transitions.json
@@ -9,7 +9,7 @@
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "GOES_DOWN", "INDOORS", "PLACE_ITEM" ],
     "bash": {
-      "str_min": 10,
+      "str_min": 40,
       "str_max": 70,
       "sound": "crunch!",
       "sound_fail": "whump!",
@@ -36,7 +36,7 @@
       "items": [ { "item": "nail", "charges": [ 12, 20 ] }, { "item": "2x4", "count": [ 2, 6 ] } ]
     },
     "bash": {
-      "str_min": 10,
+      "str_min": 20,
       "str_max": 70,
       "sound": "crunch!",
       "sound_fail": "whump!",
@@ -58,7 +58,7 @@
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM" ],
     "bash": {
-      "str_min": 8,
+      "str_min": 20,
       "str_max": 110,
       "sound": "crunch!",
       "sound_fail": "whump!",
@@ -90,7 +90,7 @@
       ]
     },
     "bash": {
-      "str_min": 12,
+      "str_min": 40,
       "str_max": 150,
       "sound": "crunch!",
       "sound_fail": "whump!",
@@ -174,7 +174,7 @@
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "GOES_UP", "GOES_DOWN", "PLACE_ITEM", "DIFFICULT_Z" ],
     "bash": {
-      "str_min": 25,
+      "str_min": 45,
       "str_max": 150,
       "sound": "metal screeching!",
       "sound_fail": "clang!",
@@ -192,7 +192,7 @@
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "GOES_UP", "PLACE_ITEM", "DIFFICULT_Z" ],
     "bash": {
-      "str_min": 25,
+      "str_min": 45,
       "str_max": 150,
       "sound": "metal screeching!",
       "sound_fail": "clang!",
@@ -210,7 +210,7 @@
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "GOES_DOWN", "PLACE_ITEM", "DIFFICULT_Z" ],
     "bash": {
-      "str_min": 25,
+      "str_min": 45,
       "str_max": 150,
       "sound": "metal screeching!",
       "sound_fail": "clang!",
@@ -338,7 +338,7 @@
     "move_cost": 4,
     "flags": [ "TRANSPARENT", "BASHABLE", "FLAMMABLE", "PLACE_ITEM", "RAMP", "SEEN_FROM_ABOVE" ],
     "bash": {
-      "str_min": 12,
+      "str_min": 32,
       "str_max": 50,
       "sound": "crunch!",
       "sound_fail": "whump!",
@@ -360,7 +360,7 @@
     "move_cost": 0,
     "flags": [ "BASHABLE", "FLAMMABLE", "PLACE_ITEM", "RAMP", "RAMP_END", "SEEN_FROM_ABOVE" ],
     "bash": {
-      "str_min": 20,
+      "str_min": 32,
       "str_max": 50,
       "sound": "crunch!",
       "sound_fail": "whump!",