Merge branch 'main' into steel-bowstring-rebalance

cataclysmbnteam · Feb 22, 2024 · 0615f8d · 0615f8d
2 parents 0611ec5 + c0cd820
commit 0615f8d
Show file tree

Hide file tree

Showing 33 changed files with 185 additions and 54 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-barriers.json b/data/json/furniture_and_terrain/furniture-barriers.json
@@ -52,7 +52,7 @@
       "sound_fail": "whump.",
       "items": [ { "item": "bag_canvas", "count": [ 10, 16 ] }, { "item": "material_soil", "charges": [ 40, 48 ] } ],
       "//": "reduction and destroy_threshold equal to str_max of full-sized wall version, designed for ballistic protection",
-      "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" }
+      "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "50%" }
     }
   },
   {
@@ -70,13 +70,13 @@
     "deconstruct": { "items": [ { "item": "earthbag", "count": 20 } ], "furn_set": "f_earthbag_half" },
     "bash": {
       "str_min": 24,
-      "str_max": 80,
+      "str_max": 100,
       "sound": "rrrip!",
       "sound_fail": "whump.",
       "furn_set": "f_earthbag_half",
       "items": [ { "item": "bag_canvas", "count": [ 15, 20 ] }, { "item": "material_soil", "charges": [ 50, 60 ] } ],
       "//": "reduction equal to str_max due to being designed for ballistic protection",
-      "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80 }
+      "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100 }
     }
   },
   {
@@ -127,7 +127,7 @@
       "sound_fail": "whump.",
       "items": [ { "item": "bag_canvas", "count": [ 10, 16 ] }, { "item": "material_sand", "charges": [ 800, 960 ] } ],
       "//": "reduction and destroy_threshold equal to str_max of full-sized wall version, designed for ballistic protection",
-      "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" }
+      "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "50%" }
     }
   },
   {
@@ -144,13 +144,13 @@
     "deconstruct": { "items": [ { "item": "sandbag", "count": 20 } ], "furn_set": "f_sandbag_half" },
     "bash": {
       "str_min": 24,
-      "str_max": 80,
+      "str_max": 100,
       "sound": "rrrip!",
       "sound_fail": "whump.",
       "furn_set": "f_sandbag_half",
       "items": [ { "item": "bag_canvas", "count": [ 15, 20 ] }, { "item": "material_sand", "charges": [ 1000, 1200 ] } ],
       "//": "reduction equal to str_max due to being designed for ballistic protection",
-      "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80 }
+      "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100 }
     }
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json
@@ -108,6 +108,7 @@
     "name": "debug beer pump",
     "symbol": "&",
     "color": "white",
+    "looks_like": "f_still",
     "description": "Time to get infinitely drunk",
     "move_cost_mod": 2,
     "coverage": 30,

diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -139,6 +139,7 @@
     "name": "cardboard floor",
     "symbol": "_",
     "color": "brown",
+    "looks_like": "f_tatami",
     "move_cost_mod": 0,
     "description": "A flat floor made of sheets of cardboard duct-taped together overtop a plastic sheet.",
     "required_str": -1,
@@ -164,6 +165,7 @@
     "name": "cardboard roof",
     "symbol": "_",
     "color": "brown",
+    "looks_like": "f_tatami",
     "move_cost_mod": 0,
     "description": "A sloped roof made of cardboard boxes, stuffed with scrap cardboard and paper and layered atop each other.  Sheets of plastic are carefully arrayed on top to shed water.  It looks like it could last a season or two at least before crumbling.",
     "required_str": -1,
@@ -197,6 +199,7 @@
     "name": "cardboard door",
     "symbol": ".",
     "color": "brown",
+    "looks_like": "f_tatami",
     "move_cost_mod": 1,
     "coverage": 100,
     "description": "This is a pile of cardboard boxes that have been filled with rags and junk and stacked together like bricks to form a wall.  The largest box has been cut open and folded to form a makeshift door, which is open.",
@@ -236,6 +239,7 @@
     "name": "cardboard door",
     "symbol": "+",
     "color": "brown",
+    "looks_like": "f_cardboard_box",
     "move_cost_mod": -1,
     "coverage": 100,
     "description": "This is a pile of cardboard boxes that have been filled with rags and junk and stacked together like bricks to form a wall.  The largest box has been cut open and folded to form a makeshift door, which is closed.",

diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json
@@ -12,16 +12,16 @@
     "flags": [ "TRANSPARENT", "DOOR", "NOITEM", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ],
     "open": "t_laminated_door_glass_o",
     "bash": {
-      "str_min": 100,
-      "str_max": 180,
+      "str_min": 60,
+      "str_max": 200,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_mdoor_frame",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "scrap", "count": [ 3, 5 ] } ],
-      "//": "half that of ballistic glass doors",
-      "ranged": { "reduction": [ 20, 20 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 20 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 30, 30 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 60 }
     }
   },
   {
@@ -37,8 +37,8 @@
     "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
     "close": "t_laminated_door_glass_c",
     "bash": {
-      "str_min": 100,
-      "str_max": 180,
+      "str_min": 60,
+      "str_max": 200,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
@@ -60,16 +60,16 @@
     "flags": [ "TRANSPARENT", "DOOR", "NOITEM", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ],
     "open": "t_ballistic_door_glass_o",
     "bash": {
-      "str_min": 200,
+      "str_min": 100,
       "str_max": 400,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_mdoor_frame",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "scrap", "count": [ 3, 5 ] } ],
-      "//": "matches that of the other ballistic glass doors",
-      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 40 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 50, 50 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 100 }
     }
   },
   {
@@ -85,7 +85,7 @@
     "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
     "close": "t_ballistic_door_glass_c",
     "bash": {
-      "str_min": 200,
+      "str_min": 100,
       "str_max": 400,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
@@ -108,16 +108,16 @@
     "flags": [ "TRANSPARENT", "DOOR", "NOITEM", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ],
     "open": "t_reinforced_door_glass_o",
     "bash": {
-      "str_min": 40,
+      "str_min": 80,
       "str_max": 210,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_mdoor_frame",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ],
-      "//": "reduction and destroy_threshold both match str_min for ballistic/reinforced glass doors",
-      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 40 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -133,16 +133,16 @@
     "flags": [ "TRANSPARENT", "DOOR", "NOITEM", "CONNECT_TO_WALL", "MINEABLE" ],
     "open": "t_reinforced_door_glass_lab_o",
     "bash": {
-      "str_min": 40,
+      "str_min": 80,
       "str_max": 210,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_thconc_floor",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ],
-      "//": "reduction and destroy_threshold both match str_min for ballistic/reinforced glass doors",
-      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 40 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -158,7 +158,7 @@
     "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
     "close": "t_reinforced_door_glass_c",
     "bash": {
-      "str_min": 40,
+      "str_min": 80,
       "str_max": 210,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
@@ -181,7 +181,7 @@
     "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
     "close": "t_reinforced_door_glass_lab_c",
     "bash": {
-      "str_min": 40,
+      "str_min": 80,
       "str_max": 210,
       "sound": "glass breaking!",
       "sound_fail": "whack!",

diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json
@@ -499,7 +499,7 @@
     "name": "red deck coating",
     "description": "Thick metal covering of a hull, covered with a military grade epoxy mix, and painted in red color.",
     "copy-from": "t_deck_coating_no_roof",
-    "looks_like": " ",
+    "looks_like": "t_floor_red",
     "flags": [ "FLAT", "ROAD", "TRANSPARENT" ],
     "symbol": ".",
     "color": "red"
@@ -510,7 +510,7 @@
     "name": "white deck coating",
     "description": "Thick metal covering of a hull, covered with a military grade epoxy mix, and painted in white color.",
     "copy-from": "t_deck_coating_no_roof",
-    "looks_like": " ",
+    "looks_like": "t_linoleum_white_no_roof",
     "flags": [ "FLAT", "ROAD", "TRANSPARENT" ],
     "symbol": ".",
     "color": "white"

diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
@@ -1062,16 +1062,16 @@
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "NOITEM", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
     "bash": {
-      "str_min": 100,
-      "str_max": 180,
+      "str_min": 60,
+      "str_max": 200,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_floor",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ],
-      "//": "half that of ballistic glass doors",
-      "ranged": { "reduction": [ 20, 20 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 20 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 30, 30 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 60 }
     }
   },
   {
@@ -1087,16 +1087,16 @@
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "NOITEM", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
     "bash": {
-      "str_min": 200,
+      "str_min": 100,
       "str_max": 400,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_floor",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ],
-      "//": "matches that of ballistic glass doors",
-      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 40 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 50, 50 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 100 }
     }
   },
   {
@@ -1111,16 +1111,16 @@
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "NOITEM", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
     "bash": {
-      "str_min": 40,
+      "str_min": 80,
       "str_max": 210,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_floor",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "wire", "prob": 20 } ],
-      "//": "matches that of ballistic glass doors",
-      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 40 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -1135,16 +1135,16 @@
     "flags": [ "NOITEM", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "OPENCLOSE_INSIDE", "MINEABLE", "BLOCK_WIND" ],
     "open": "t_reinforced_glass_shutter_open",
     "bash": {
-      "str_min": 60,
+      "str_min": 80,
       "str_max": 210,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_floor",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ],
-      "//": "matches that of ballistic glass doors, increased laser protection since closed shutters",
-      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 1, 10 ], "destroy_threshold": 40 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 1, 10 ], "destroy_threshold": 80 }
     }
   },
   {
@@ -1160,16 +1160,16 @@
     "flags": [ "TRANSPARENT", "NOITEM", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "OPENCLOSE_INSIDE", "MINEABLE", "BLOCK_WIND" ],
     "close": "t_reinforced_glass_shutter",
     "bash": {
-      "str_min": 40,
+      "str_min": 80,
       "str_max": 210,
       "sound": "glass breaking!",
       "sound_fail": "whack!",
       "sound_vol": 20,
       "sound_fail_vol": 14,
       "ter_set": "t_floor",
       "items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ],
-      "//": "matches that of ballistic glass doors",
-      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 40 }
+      "//": "reduction half str_min for ballistic-style glass, destroy_threshold equal to str_min for glass",
+      "ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 80 }
     }
   },
   {

diff --git a/data/json/furniture_and_terrain/terrain-zlevel-transitions.json b/data/json/furniture_and_terrain/terrain-zlevel-transitions.json
@@ -334,6 +334,7 @@
     "description": "The upper end of rail track leading down.",
     "symbol": ">",
     "color": "cyan",
+    "looks_like": "t_railroad_track",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "RAIL", "ROAD", "Z_TRANSPARENT" ]
   },
@@ -344,6 +345,7 @@
     "description": "The lower end of rail track leading down.",
     "symbol": ">",
     "color": "cyan",
+    "looks_like": "t_railroad_track",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "RAIL", "ROAD", "RAMP_DOWN", "Z_TRANSPARENT" ]
   },
@@ -354,6 +356,7 @@
     "description": "The upper end of rail track leading up.",
     "symbol": "<",
     "color": "cyan",
+    "looks_like": "t_railroad_track",
     "move_cost": 2,
     "flags": [ "RAIL", "ROAD", "RAMP_UP" ]
   },
@@ -364,6 +367,7 @@
     "description": "The lower end of rail track leading up.",
     "symbol": "<",
     "color": "cyan",
+    "looks_like": "t_railroad_track",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "RAIL", "ROAD" ]
   }

diff --git a/data/json/items/armor/pets_medium_quadruped_armor.json b/data/json/items/armor/pets_medium_quadruped_armor.json
@@ -157,6 +157,7 @@
     "color": "light_cyan",
     "name": { "str": "superalloy medium quadruped armor" },
     "description": "A thin mesh interwoven with superalloy plates and pouches for military working medium quadrupeds that covers from the dewlap to the croup, down to the elbows.  You could put this on a friendly medium quadruped.",
+    "looks_like": "chitin_armor_medium_quadruped",
     "price": "2500 USD",
     "price_postapoc": "100 USD",
     "material": [ "superalloy" ],

diff --git a/data/json/items/armor/pets_small_quadruped_armor.json b/data/json/items/armor/pets_small_quadruped_armor.json
@@ -110,6 +110,7 @@
     "color": "green",
     "name": { "str": "small quadruped rain sheet" },
     "description": "A thin plastic covering adapted for small quadrupeds to protect from acid rain and other caustic sources.  You could put this on a friendly small quadruped.",
+    "looks_like": "leather_armor_small_quadruped",
     "price": "50 USD",
     "price_postapoc": "5 USD",
     "material": [ "neoprene", "plastic" ],
@@ -124,6 +125,7 @@
     "color": "light_cyan",
     "name": { "str": "superalloy small quadruped armor" },
     "description": "A thin mesh interwoven with superalloy plates and pouches for military working small quadrupeds that covers from the dewlap to the croup, down to the elbows.  You could put this on a friendly small quadruped.",
+    "looks_like": "chitin_armor_small_quadruped",
     "price": "1300 USD",
     "price_postapoc": "50 USD",
     "material": [ "superalloy" ],