[WIP] Skylights and other fragile terrain break when creatures step on them

data/json/construction/covers.json

@@ -0,0 +1,65 @@
+[
+  {
+    "type": "construction",
+    "id": "constr_plank_over_gap",
+    "group": "place_plank",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "1 s",
+    "components": [ [ [ "2x4", 1 ] ] ],
+    "pre_terrain": "t_open_air",
+    "pre_note": "Must be supported on at least two opposite sides.",
+    "pre_special": [ "check_opposite_floor_pair" ],
+    "post_terrain": "t_plank_gap"
+  },
+  {
+    "type": "construction",
+    "id": "cover_pit_grass",
+    "group": "place_cover_pit",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "survival", 2 ] ],
+    "time": "5 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
+    "components": [ [ [ "straw_pile", 12 ] ], [ [ "cordage_long", 8, "LIST" ] ], [ [ "splinter", 16 ], [ "nails", 16, "LIST" ] ] ],
+    "pre_terrain": "t_pit",
+    "post_terrain": "t_pit_conceal_grass"
+  },
+  {
+    "type": "construction",
+    "id": "cover_pit_spiked_grass",
+    "group": "place_cover_pit",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "survival", 2 ] ],
+    "time": "5 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
+    "components": [ [ [ "straw_pile", 12 ] ], [ [ "cordage_long", 8, "LIST" ] ], [ [ "splinter", 16 ], [ "nails", 16, "LIST" ] ] ],
+    "pre_terrain": "t_pit_spiked",
+    "post_terrain": "t_pit_spiked_conceal_grass"
+  },
+  {
+    "type": "construction",
+    "id": "cover_pit_glass_grass",
+    "group": "place_cover_pit",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "survival", 2 ] ],
+    "time": "5 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
+    "components": [ [ [ "straw_pile", 12 ] ], [ [ "cordage_long", 8, "LIST" ] ], [ [ "splinter", 16 ], [ "nails", 16, "LIST" ] ] ],
+    "pre_terrain": "t_pit_glass",
+    "post_terrain": "t_pit_glass_conceal_grass"
+  },
+  {
+    "type": "construction",
+    "id": "cover_air_grass",
+    "group": "place_cover_air",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "survival", 2 ] ],
+    "time": "5 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
+    "components": [ [ [ "straw_pile", 12 ] ], [ [ "cordage_long", 8, "LIST" ] ], [ [ "splinter", 16 ], [ "nails", 16, "LIST" ] ] ],
+    "pre_terrain": "t_open_air",
+    "pre_special": [ "check_opposite_floor_pair" ],
+    "pre_orth": [ [ "t_grass", "t_grass_dead", "t_dirt", "t_moss", "t_forestfloor", "t_grass_long", "t_grass_tall", "t_grass_golf" ] ],
+    "post_terrain": "t_air_cover_grass"
+  }
+]

data/json/construction/terrain.json

@@ -366,5 +366,41 @@
     "byproducts": [ { "group": "digging_soil_loam_50L", "count": 5 } ],
     "activity_level": "EXTRA_EXERCISE",
     "do_turn_special": "do_turn_shovel"
+  },
+  {
+    "type": "construction",
+    "id": "constr_water_channel_still",
+    "skill": "survival",
+    "group": "dig_a_water_channel",
+    "category": "CONSTRUCT",
+    "difficulty": 1,
+    "time": "20m",
+    "on_display": true,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "pre_flags": [ "DIGGABLE", "FLAT" ],
+    "pre_special": [ "check_empty" ],
+    "pre_orth": "t_water_sh",
+    "post_terrain": "t_water_sh",
+    "byproducts": [ { "group": "digging_soil_loam_50L", "count": 5 } ],
+    "activity_level": "EXTRA_EXERCISE",
+    "do_turn_special": "do_turn_shovel"
+  },
+  {
+    "type": "construction",
+    "id": "constr_water_channel_salt",
+    "skill": "survival",
+    "group": "dig_a_water_channel",
+    "category": "CONSTRUCT",
+    "difficulty": 1,
+    "time": "20m",
+    "on_display": true,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "pre_flags": [ "DIGGABLE", "FLAT" ],
+    "pre_special": [ "check_empty" ],
+    "pre_orth": "t_swater_sh",
+    "post_terrain": "t_swater_sh",
+    "byproducts": [ { "group": "digging_soil_loam_50L", "count": 5 } ],
+    "activity_level": "EXTRA_EXERCISE",
+    "do_turn_special": "do_turn_shovel"
   }
 ]

data/json/construction_group.json

@@ -1370,6 +1370,21 @@
     "id": "place_planer",
     "name": "Place Planer"
   },
+  {
+    "type": "construction_group",
+    "id": "place_plank",
+    "name": "Place Plank Across Gap"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_cover_air",
+    "name": "Place Cover Over Gap"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_cover_pit",
+    "name": "Place Cover Over Pit"
+  },
   {
     "type": "construction_group",
     "id": "place_jointer",

data/json/furniture_and_terrain/terrain-roofs.json

@@ -182,7 +182,7 @@
     "color": "cyan",
     "move_cost": 2,
     "//": "TODO: Should break when you step on it if there's no supporting terrain below, might want some warning akin to examine_action ledge",
-    "flags": [ "TRANSPARENT", "TRANSPARENT_FLOOR" ],
+    "flags": [ "TRANSPARENT", "TRANSPARENT_FLOOR", "FRAGILE" ],
     "bash": {
       "str_min": 3,
       "str_max": 6,
@@ -192,6 +192,19 @@
       "items": [ { "item": "glass_shard", "count": [ 21, 29 ] } ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_ice",
+    "name": "thin ice",
+    "description": "A thin,transparent sheet of ice is here.  Watch your step.",
+    "symbol": "o",
+    "looks_like": "t_linoleum_white",
+    "color": "cyan",
+    "move_cost": 2,
+    "//": "TODO: Should break when you step on it if there's no supporting terrain below, might want some warning akin to examine_action ledge",
+    "flags": [ "TRANSPARENT", "TRANSPARENT_FLOOR", "FRAGILE" ],
+    "bash": { "str_min": 3, "str_max": 6, "sound": "crunch!", "sound_fail": "crack!", "ter_set": "t_null" }
+  },
   {
     "type": "terrain",
     "id": "t_rock_roof",

data/json/furniture_and_terrain/terrain-traps.json

@@ -10,6 +10,25 @@
     "flags": [ "TRANSPARENT", "DIGGABLE", "DIGGABLE_CAN_DEEPEN" ],
     "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
   },
+  {
+    "type": "terrain",
+    "id": "t_plank_gap",
+    "name": "plank",
+    "description": "A 2x4 precariously positioned.  Mind the gap.",
+    "looks_like": "2x4",
+    "symbol": "l",
+    "color": "yellow",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "TRANSPARENT_FLOOR", "FRAGILE" ],
+    "bash": {
+      "sound": "thump",
+      "ter_set": "t_open_air",
+      "str_min": 12,
+      "str_max": 30,
+      "items": [ { "item": "plank_short", "count": [ 1, 2 ] } ]
+    },
+    "examine_action": "ledge"
+  },
   {
     "type": "terrain",
     "id": "t_pit",
@@ -40,15 +59,21 @@
   {
     "type": "terrain",
     "id": "t_pit_covered",
-    "name": "covered pit",
+    "name": "board over a pit",
     "description": "A deep pit with a plank placed across it, looks sturdy enough to cross safely.  The plank could be removed to make it dangerous again.",
     "symbol": "#",
     "color": "light_red",
     "connect_groups": "PIT_DEEP",
     "connects_to": "PIT_DEEP",
     "move_cost": 2,
-    "flags": [ "TRANSPARENT", "ROAD" ],
-    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 40, "str_max": 100, "str_min_supported": 100, "bash_below": true },
+    "flags": [ "TRANSPARENT", "ROAD", "OPEN_PIT", "FRAGILE" ],
+    "bash": {
+      "sound": "crack",
+      "ter_set": "t_pit",
+      "str_min": 12,
+      "str_max": 30,
+      "items": [ { "item": "plank_short", "count": [ 1, 2 ] } ]
+    },
     "examine_action": "pit_covered"
   },
   {
@@ -69,15 +94,21 @@
   {
     "type": "terrain",
     "id": "t_pit_spiked_covered",
-    "name": "covered spiked pit",
+    "name": "board over a spiked pit",
     "description": "Menacing with sharp spears along the bottom, this pit has a plank across it to allow someone or something to cross safely.  The plank could be removed to make it dangerous again.",
     "symbol": "#",
     "color": "light_red",
     "connect_groups": "PIT_DEEP",
     "connects_to": "PIT_DEEP",
     "move_cost": 2,
-    "flags": [ "TRANSPARENT", "ROAD" ],
-    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 40, "str_max": 100, "str_min_supported": 100, "bash_below": true },
+    "flags": [ "TRANSPARENT", "ROAD", "OPEN_PIT", "FRAGILE" ],
+    "bash": {
+      "sound": "crack",
+      "ter_set": "t_pit_spiked",
+      "str_min": 12,
+      "str_max": 30,
+      "items": [ { "item": "plank_short", "count": [ 1, 2 ] } ]
+    },
     "examine_action": "pit_covered"
   },
   {
@@ -98,17 +129,119 @@
   {
     "type": "terrain",
     "id": "t_pit_glass_covered",
-    "name": "covered glass pit",
+    "name": "board over a glass pit",
     "description": "A plank has been placed carefully to allow traversal over this ditch full of large glass shards.  The plank could be removed to make it dangerous again.",
     "symbol": "#",
     "color": "light_cyan",
     "connect_groups": "PIT_DEEP",
     "connects_to": "PIT_DEEP",
     "move_cost": 2,
-    "flags": [ "TRANSPARENT", "ROAD" ],
-    "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 40, "str_max": 100, "str_min_supported": 100, "bash_below": true },
+    "flags": [ "TRANSPARENT", "ROAD", "OPEN_PIT", "FRAGILE" ],
+    "bash": {
+      "sound": "crack",
+      "ter_set": "t_pit_glass",
+      "str_min": 12,
+      "str_max": 30,
+      "items": [ { "item": "plank_short", "count": [ 1, 2 ] } ]
+    },
     "examine_action": "pit_covered"
   },
+  {
+    "type": "terrain",
+    "id": "t_pit_glass_conceal_grass",
+    "looks_like": "t_grass_dead",
+    "name": "concealed glass pit",
+    "description": "A cover of grass has been placed carefully over this ditch full of large glass shards.  Watch your step.",
+    "symbol": ".",
+    "color": "brown",
+    "connect_groups": "PIT_DEEP",
+    "connects_to": "PIT_DEEP",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "FRAGILE", "PLAYER_MADE" ],
+    "bash": {
+      "sound": "snap!",
+      "ter_set": "t_pit_glass",
+      "str_min": 1,
+      "str_max": 2,
+      "items": [
+        { "item": "straw_pile", "count": [ 6, 11 ] },
+        { "item": "cordage_6", "count": [ 0, 24 ] },
+        { "item": "cordage_36", "count": [ 0, 4 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_pit_spiked_conceal_grass",
+    "looks_like": "t_grass_dead",
+    "name": "concealed spike pit",
+    "description": "A cover of grass has been placed carefully over this ditch full of upright spears.  Watch your step.",
+    "symbol": ".",
+    "color": "brown",
+    "connect_groups": "PIT_DEEP",
+    "connects_to": "PIT_DEEP",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "FRAGILE", "PLAYER_MADE" ],
+    "bash": {
+      "sound": "snap!",
+      "ter_set": "t_pit_spiked",
+      "str_min": 1,
+      "str_max": 2,
+      "items": [
+        { "item": "straw_pile", "count": [ 6, 11 ] },
+        { "item": "cordage_6", "count": [ 0, 24 ] },
+        { "item": "cordage_36", "count": [ 0, 4 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_pit_conceal_grass",
+    "looks_like": "t_grass_dead",
+    "name": "concealed pit",
+    "description": "A cover of grass has been placed carefully over this ditch.  Watch your step.",
+    "symbol": ".",
+    "color": "brown",
+    "connect_groups": "PIT_DEEP",
+    "connects_to": "PIT_DEEP",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "FRAGILE", "PLAYER_MADE" ],
+    "bash": {
+      "sound": "snap!",
+      "ter_set": "t_pit",
+      "str_min": 1,
+      "str_max": 2,
+      "items": [
+        { "item": "straw_pile", "count": [ 6, 11 ] },
+        { "item": "cordage_6", "count": [ 0, 24 ] },
+        { "item": "cordage_36", "count": [ 0, 4 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_air_cover_grass",
+    "looks_like": "t_grass_dead",
+    "name": "concealed gap",
+    "description": "A cover of grass has been placed carefully over this gap.  Watch your step.",
+    "symbol": ".",
+    "color": "brown",
+    "connect_groups": "PIT_DEEP",
+    "connects_to": "PIT_DEEP",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FRAGILE", "PLAYER_MADE" ],
+    "bash": {
+      "sound": "snap!",
+      "ter_set": "t_open_air",
+      "str_min": 1,
+      "str_max": 2,
+      "items": [
+        { "item": "straw_pile", "count": [ 6, 11 ] },
+        { "item": "cordage_6", "count": [ 0, 24 ] },
+        { "item": "cordage_36", "count": [ 0, 4 ] }
+      ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_pit_BEM_human_sample",

data/json/furniture_and_terrain/terrain-windows.json

@@ -4457,15 +4457,18 @@
     "move_cost": 2,
     "coverage": 0,
     "examine_action": "ledge",
-    "deconstruct": { "ter_set": "t_null", "items": [ { "item": "2x4", "count": [ 3, 4 ] }, { "item": "nail", "charges": [ 12, 16 ] } ] },
+    "deconstruct": {
+      "ter_set": "t_open_air",
+      "items": [ { "item": "2x4", "count": [ 3, 4 ] }, { "item": "nail", "charges": [ 12, 16 ] } ]
+    },
     "bash": {
       "str_min": 1,
       "str_max": 1,
       "sound": "whump!",
       "sound_fail": "whack!",
       "sound_vol": 12,
       "sound_fail_vol": 8,
-      "ter_set": "t_null",
+      "ter_set": "t_open_air",
       "items": [ { "item": "2x4", "count": [ 2, 4 ] } ]
     },
     "flags": [ "TRANSPARENT", "NO_FLOOR", "FLAMMABLE" ]

data/json/move_modes.json

@@ -34,7 +34,8 @@
     "sound_multiplier": 1.5,
     "move_speed_multiplier": 2.0,
     "stamina_multiplier": 7.0,
-    "swim_speed_mod": -80
+    "swim_speed_mod": -80,
+    "bash_weight_modifier": 2
   },
   {
     "type": "movement_mode",
@@ -68,6 +69,7 @@
     "move_type": "prone",
     "sound_multiplier": 0.2,
     "move_speed_multiplier": 0.2,
-    "swim_speed_mod": 50
+    "swim_speed_mod": 50,
+    "bash_weight_modifier": 0.25
   }
 ]