Merge pull request #78421 from harakka/lab_glass

Microlab glass walls and door should break into reinf concrete floor
CleverRaven · Dec 9, 2024 · e9b215d · e9b215d
2 parents e9911ee + 4d789c7
commit e9b215d
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 11 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json
@@ -3019,7 +3019,7 @@
       "sound_fail": "whack!",
       "sound_vol": 16,
       "sound_fail_vol": 10,
-      "ter_set": "t_thconc_floor",
+      "ter_set": "t_strconc_floor",
       "items": [ { "item": "glass_shard", "count": [ 42, 84 ] } ]
     }
   },
@@ -3071,7 +3071,7 @@
       "sound_fail": "whack!",
       "sound_vol": 16,
       "sound_fail_vol": 10,
-      "ter_set": "t_thconc_floor",
+      "ter_set": "t_strconc_floor",
       "items": [ { "item": "glass_shard", "count": [ 42, 84 ] } ]
     }
   },
@@ -3103,7 +3103,17 @@
     "rotates_to": "INDOORFLOOR",
     "flags": [ "DOOR", "NOITEM", "SUPPORTS_ROOF", "TRANSLUCENT" ],
     "open": "t_door_glass_frosted_lab_o",
-    "copy-from": "t_door_glass_frosted_c"
+    "copy-from": "t_door_glass_frosted_c",
+    "bash": {
+      "str_min": 4,
+      "str_max": 20,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_strconc_floor",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] } ]
+    }
   },
   {
     "type": "terrain",
@@ -3117,7 +3127,17 @@
     "connects_to": "WALL",
     "flags": [ "TRANSPARENT", "FLAT", "ROAD", "SUPPORTS_ROOF" ],
     "close": "t_door_glass_frosted_c",
-    "copy-from": "t_door_glass_o"
+    "copy-from": "t_door_glass_o",
+    "bash": {
+      "str_min": 4,
+      "str_max": 20,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_floor",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] } ]
+    }
   },
   {
     "type": "terrain",

diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
@@ -1460,6 +1460,21 @@
     "description": "A barrier made of glass, it's nothing complicated, and looks extremely fragile.  Some contain glass break sensors or window sensors that trigger an alarm if the glass is damaged.",
     "extend": { "flags": [ "ALARMED" ] }
   },
+  {
+    "type": "terrain",
+    "id": "t_wall_glass_lab",
+    "copy-from": "t_wall_glass",
+    "bash": {
+      "str_min": 4,
+      "str_max": 12,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_strconc_floor",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] } ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_laminated_glass",
@@ -1526,6 +1541,21 @@
       "no_laser_destroy": true
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_reinforced_glass_lab",
+    "copy-from": "t_reinforced_glass",
+    "bash": {
+      "str_min": 40,
+      "str_max": 210,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 20,
+      "sound_fail_vol": 14,
+      "ter_set": "t_strconc_floor",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, { "item": "mc_wire", "prob": 20 } ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_reinforced_glass_shutter",

diff --git a/data/json/mapgen_palettes/microlab.json b/data/json/mapgen_palettes/microlab.json
@@ -36,20 +36,20 @@
     "type": "palette",
     "id": "microlab_generic",
     "terrain": {
-      "+": "t_door_c",
+      "+": "t_door_lab_c",
       ".": "t_metal_floor",
       "3": "t_door_locked",
       "2": "t_door_glass_frosted_lab_c",
       "4": "t_door_metal_pickable",
       "X": "t_region_shrub_decorative",
       "P": "t_carpet_concrete_red",
       "5": "t_door_metal_locked",
-      "[": "t_door_glass_c",
+      "[": "t_door_glass_lab_c",
       "-": "t_wall_metal",
       "y": "t_pavement_y",
       "|": "t_concrete_wall",
-      "=": "t_wall_glass",
-      "(": "t_reinforced_glass",
+      "=": "t_wall_glass_lab",
+      "(": "t_reinforced_glass_lab",
       "e": "t_elevator",
       "E": "t_elevator_control",
       "<": "t_stairs_up",
@@ -130,11 +130,11 @@
       "P": [ [ "t_thconc_floor_flesh", 1 ], [ "t_carpet_concrete_red", 2 ] ],
       "4": "t_door_metal_pickable",
       "5": "t_door_metal_locked",
-      "[": "t_door_glass_c",
+      "[": "t_door_glass_lab_c",
       "-": "t_wall_metal",
       "y": "t_pavement_y",
-      "=": [ [ "t_wall_glass", 3 ], [ "t_thconc_floor_flesh", 1 ] ],
-      "(": "t_reinforced_glass",
+      "=": [ [ "t_wall_glass_lab", 3 ], [ "t_thconc_floor_flesh", 1 ] ],
+      "(": "t_reinforced_glass_lab",
       "e": "t_elevator",
       "E": "t_elevator_control",
       "<": "t_stairs_up",