feat(balance): rebalance constructing standard walls relative to wood…

…en wall (#4725) * feat(balance): rebalance constructing standard walls relative to wooden wall * Fix an oops
cataclysmbnteam · Jun 8, 2024 · 7d363dd · 7d363dd
1 parent 66bb6ec
commit 7d363dd
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 31 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2487,12 +2487,26 @@
     "type": "construction",
     "id": "constr_wall",
     "group": "constr_wall_standard",
+    "//": "Step 1: frame wall in an empty space",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "30 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-    "components": [ [ [ "wood_sheet", 1 ], [ "wood_panel", 2 ] ], [ [ "2x4", 6 ] ], [ [ "nail", 40 ] ] ],
+    "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 15 ] ] ],
     "pre_special": "check_empty",
+    "post_terrain": "t_wall_half_domestic"
+  },
+  {
+    "type": "construction",
+    "id": "constr_wall",
+    "group": "constr_wall_standard",
+    "//": "Step 2: complete the half made wall with paneling and surface with mortar in place of drywall",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 3 ] ],
+    "time": "60 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ], [ { "id": "SMOOTH", "level": 1 } ] ],
+    "components": [ [ [ "wood_panel", 1 ] ], [ [ "nail", 15 ] ], [ [ "mortar_build", 2 ], [ "mortar_adobe", 2 ] ] ],
+    "pre_terrain": "t_wall_half_domestic",
     "post_terrain": "t_wall"
   },
   {

diff --git a/data/json/deconstruction.json b/data/json/deconstruction.json
@@ -5,9 +5,9 @@
     "subtype": "collection",
     "entries": [
       { "item": "rock", "count": [ 0, 4 ] },
-      { "item": "wood_panel", "count": [ 0, 2 ] },
-      { "item": "nail", "charges": [ 8, 32 ] },
-      { "item": "splinter", "count": [ 0, 4 ] }
+      { "item": "wood_panel", "count": 1 },
+      { "item": "nail", "charges": 30 },
+      { "item": "2x4", "count": 6 }
     ]
   },
   {

diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
@@ -30,13 +30,13 @@
     "id": "t_wall",
     "alias": [ "t_wall_h", "t_wall_v" ],
     "name": "wall",
-    "description": "The stereotypical wall with wooden support structure filled with insulation and drywalled.  Paint job is the all too common and neutral off-white or cream color, it could use more vibrant paint.  Appears as though the material is still flammable.",
+    "description": "The stereotypical wall with wooden support structure filled with insulation and drywalled.  Paint job is the all too common and neutral off-white or cream color, it could use more vibrant paint.  The underlying material is still somewhat flammable.",
     "symbol": "LINE_OXOX",
     "color": "light_gray",
     "move_cost": 0,
     "coverage": 100,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [ "FLAMMABLE_HARD", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
     "bash": {
       "str_min": 30,
       "str_max": 210,
@@ -50,7 +50,7 @@
   {
     "type": "terrain",
     "id": "t_wall_half",
-    "name": "half-built wall",
+    "name": "half-built wooden wall",
     "description": "An incomplete wall of refined wood, dotted with carefully placed nails to provide proper support.  It requires some more two by fours and nails before it'd be considered a suitable wall.",
     "symbol": "#",
     "color": "light_red",
@@ -73,6 +73,31 @@
       "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" }
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_wall_half_domestic",
+    "copy-from": "t_wall_half",
+    "name": "half-built domestic wall",
+    "description": "Wooden slats nailed across the bare skeleton of what will eventually be a modern interior wall.  The finishing touches would typically be drywall or plaster, or whatever one can improvise out of local materials.",
+    "symbol": "#",
+    "color": "light_red",
+    "move_cost": 0,
+    "coverage": 35,
+    "delete": { "flags": [ "MOUNTABLE" ] },
+    "bash": {
+      "str_min": 8,
+      "str_max": 50,
+      "sound": "crash!",
+      "sound_fail": "whump!",
+      "ter_set": "t_null",
+      "items": [
+        { "item": "2x4", "count": [ 0, 3 ] },
+        { "item": "nail", "charges": [ 0, 5 ] },
+        { "item": "splinter", "count": [ 3, 6 ] }
+      ],
+      "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" }
+    }
+  },
   {
     "type": "terrain",
     "id": "t_ponywall",
@@ -119,7 +144,17 @@
     "move_cost": 0,
     "coverage": 100,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "CHIP", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_HARD",
+      "NOITEM",
+      "SUPPORTS_ROOF",
+      "WALL",
+      "NO_SCENT",
+      "CHIP",
+      "AUTO_WALL_SYMBOL",
+      "MINEABLE",
+      "BLOCK_WIND"
+    ],
     "bash": {
       "str_min": 30,
       "str_max": 210,
@@ -141,7 +176,17 @@
     "move_cost": 0,
     "coverage": 100,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "CHIP", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_HARD",
+      "NOITEM",
+      "SUPPORTS_ROOF",
+      "WALL",
+      "NO_SCENT",
+      "CHIP",
+      "AUTO_WALL_SYMBOL",
+      "MINEABLE",
+      "BLOCK_WIND"
+    ],
     "bash": {
       "str_min": 30,
       "str_max": 210,
@@ -163,7 +208,17 @@
     "move_cost": 0,
     "coverage": 100,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "CHIP", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_HARD",
+      "NOITEM",
+      "SUPPORTS_ROOF",
+      "WALL",
+      "NO_SCENT",
+      "CHIP",
+      "AUTO_WALL_SYMBOL",
+      "MINEABLE",
+      "BLOCK_WIND"
+    ],
     "bash": {
       "str_min": 30,
       "str_max": 210,
@@ -185,7 +240,17 @@
     "move_cost": 0,
     "coverage": 100,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "CHIP", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_HARD",
+      "NOITEM",
+      "SUPPORTS_ROOF",
+      "WALL",
+      "NO_SCENT",
+      "CHIP",
+      "AUTO_WALL_SYMBOL",
+      "MINEABLE",
+      "BLOCK_WIND"
+    ],
     "bash": {
       "str_min": 30,
       "str_max": 210,
@@ -207,7 +272,17 @@
     "move_cost": 0,
     "coverage": 100,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "CHIP", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_HARD",
+      "NOITEM",
+      "SUPPORTS_ROOF",
+      "WALL",
+      "NO_SCENT",
+      "CHIP",
+      "AUTO_WALL_SYMBOL",
+      "MINEABLE",
+      "BLOCK_WIND"
+    ],
     "bash": {
       "str_min": 30,
       "str_max": 210,
@@ -228,7 +303,17 @@
     "color": "pink",
     "move_cost": 0,
     "coverage": 100,
-    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "CHIP", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_HARD",
+      "NOITEM",
+      "SUPPORTS_ROOF",
+      "WALL",
+      "NO_SCENT",
+      "CHIP",
+      "AUTO_WALL_SYMBOL",
+      "MINEABLE",
+      "BLOCK_WIND"
+    ],
     "bash": {
       "str_min": 30,
       "str_max": 210,
@@ -250,7 +335,17 @@
     "move_cost": 0,
     "coverage": 100,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "CHIP", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_HARD",
+      "NOITEM",
+      "SUPPORTS_ROOF",
+      "WALL",
+      "NO_SCENT",
+      "CHIP",
+      "AUTO_WALL_SYMBOL",
+      "MINEABLE",
+      "BLOCK_WIND"
+    ],
     "bash": {
       "str_min": 30,
       "str_max": 210,

diff --git a/data/json/mapgen/construction_site.json b/data/json/mapgen/construction_site.json
@@ -12,7 +12,7 @@
         "_|||0||||0||#....##|||__",
         "_|...................|d_",
         "_|...................|__",
-        "_#.....w........W....#d_",
+        "_#.....w........w....#d_",
         "_#.....-........-....#d_",
         "__.....-.......T-....#d_",
         "__.....-.......T-....#d_",
@@ -38,13 +38,12 @@
         "0": "t_window_frame",
         "B": "t_grass",
         "T": "t_concrete",
-        "W": "t_wall_log_half",
         "_": "t_grass",
         "b": "t_dirt",
         "c": "t_concrete",
         "d": "t_dirt",
         "t": "t_thconc_floor",
-        "w": "t_wall_half",
+        "w": "t_wall_half_domestic",
         "{": "t_dirt",
         "|": "t_brick_wall"
       },
@@ -98,7 +97,7 @@
         "________________________"
       ],
       "terrain": {
-        "#": "t_wall_half",
+        "#": "t_wall_half_domestic",
         "&": "t_dirt",
         "-": "t_wall",
         ".": "t_concrete",
@@ -308,7 +307,7 @@
         "...._....._____........."
       ],
       "terrain": {
-        "#": "t_wall_half",
+        "#": "t_wall_half_domestic",
         "&": "t_grass",
         "+": "t_door_glass_c",
         "-": "t_wall_glass",

diff --git a/data/json/mapgen/derelict_property.json b/data/json/mapgen/derelict_property.json
@@ -50,7 +50,7 @@
         "r": "t_floor",
         "s": "t_shrub",
         "u": "t_underbrush",
-        "w": "t_wall_half",
+        "w": "t_wall_half_domestic",
         "|": "t_wall"
       },
       "furniture": { "H": "f_armchair", "^": "f_rubble", "c": "f_chair", "d": "f_desk", "m": "f_makeshift_bed", "r": "f_rubble" },
@@ -121,7 +121,7 @@
         "s": "t_sidewalk",
         "t": "t_tree_dead",
         "u": "t_underbrush",
-        "w": "t_wall_log_half",
+        "w": "t_wall_half_domestic",
         "{": "t_floor",
         "|": "t_wall"
       },
@@ -191,7 +191,7 @@
         "C": "t_floor",
         "D": "t_floor",
         "U": "t_underbrush_harvested_spring",
-        "W": "t_wall_half",
+        "W": "t_wall_half_domestic",
         "^": "t_dirt",
         "_": "t_floor",
         "a": "t_door_o",
@@ -201,7 +201,7 @@
         "g": "t_grass_white",
         "r": "t_floor",
         "u": "t_underbrush",
-        "w": "t_wall_log_half",
+        "w": "t_wall_half_domestic",
         "|": "t_wall"
       },
       "furniture": { "C": "f_cupboard", "D": "f_desk", "^": "f_rubble", "c": "f_chair", "f": "f_dandelion", "r": "f_rubble" },
@@ -370,7 +370,7 @@
         "r": "t_grass",
         "s": "t_shrub_blueberry",
         "t": "t_concrete",
-        "w": "t_wall_half",
+        "w": "t_wall_half_domestic",
         "|": "t_wall"
       }
     },
@@ -461,7 +461,7 @@
         "r": "t_grass",
         "s": "t_shrub_blueberry",
         "t": "t_concrete",
-        "w": "t_wall_half",
+        "w": "t_wall_half_domestic",
         "|": "t_wall"
       }
     },
@@ -534,7 +534,7 @@
       "terrain": {
         "#": "t_underbrush",
         "$": "t_fence_wire",
-        "&": "t_wall_log_broken",
+        "&": "t_wall_wood_broken",
         ".": "t_grass",
         "4": "t_tree_pine",
         "D": "t_dirtfloor",
@@ -543,7 +543,7 @@
         "W": "t_wall_half",
         "^": "t_dirt",
         "_": "t_dirt",
-        "a": "t_wall_log_half",
+        "a": "t_wall_half",
         "c": "t_floor",
         "d": "t_grass",
         "f": "t_floor",

diff --git a/data/json/mapgen/house/bungalow26.json b/data/json/mapgen/house/bungalow26.json
@@ -71,7 +71,7 @@
         "^^^^^^^^^^^^^^^^^^^^^^^^",
         "^^^^^^^^^^^^^^^^^^^^^^^^"
       ],
-      "terrain": { "[": "t_wall_half", "_": "t_door_frame", ",": "t_floor" },
+      "terrain": { "[": "t_wall_half_domestic", "_": "t_door_frame", ",": "t_floor" },
       "furniture": { "$": "f_home_furnace" },
       "place_loot": [
         { "item": "nail", "x": 17, "y": 13 },

diff --git a/data/json/mapgen/house/house21.json b/data/json/mapgen/house/house21.json
@@ -94,7 +94,7 @@
         ".cgg.ggggg.gggg.g.gggg.g"
       ],
       "terrain": {
-        "#": "t_wall_half",
+        "#": "t_wall_half_domestic",
         ".": "t_dirt",
         "0": "t_window_frame",
         "C": "t_concrete",

diff --git a/data/json/mapgen/house/house22_ab.json b/data/json/mapgen/house/house22_ab.json
@@ -33,7 +33,7 @@
         "________________d__d____"
       ],
       "terrain": {
-        "#": "t_wall_half",
+        "#": "t_wall_half_domestic",
         "+": "t_door_metal_c_peep",
         "-": "t_wall_glass",
         ".": "t_floor",

diff --git a/data/json/mapgen/house/house23.json b/data/json/mapgen/house/house23.json
@@ -106,7 +106,7 @@
         ".......d................"
       ],
       "terrain": {
-        "#": "t_wall_half",
+        "#": "t_wall_half_domestic",
         ".": "t_grass",
         "_": "t_floor",
         "O": "t_window_frame",