Build roofs over dirt, and dig stairs in roofed dirt tiles (#37427)

* Build roofs over dirt, and dig stairs in roofed dirt tiles * Fixed some things that got broken somehow * Linted files and added DIGGABLE to outdoor dirt floors * Linting Co-authored-by: ColdandDead <[email protected]>
CleverRaven · Jan 27, 2020 · 6c29cba · 6c29cba
1 parent 00ce335
commit 6c29cba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -1215,6 +1215,18 @@
     "pre_special": "check_support",
     "post_terrain": "t_floor_primitive"
   },
+  {
+    "type": "construction",
+    "description": "Build Roof Over Dirt Floor",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 3 ] ],
+    "time": "60 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
+    "components": [ [ [ "wood_panel", 1 ] ], [ [ "2x4", 8 ] ], [ [ "nail", 20 ] ] ],
+    "pre_note": "Must be supported on at least two sides.",
+    "pre_special": "check_support",
+    "post_terrain": "t_dirtfloor"
+  },
   {
     "type": "construction",
     "description": "Build Rope & Pulley System",
@@ -2322,6 +2334,7 @@
     "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 140 ], [ "elec_jackhammer", 7000 ] ] ],
     "components": [ [ [ "2x4", 8 ], [ "log", 8 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
     "pre_flags": "DIGGABLE",
+    "pre_special": "check_down_OK",
     "post_special": "done_dig_stair"
   },
   {

diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json
@@ -337,7 +337,7 @@
     "color": "brown",
     "move_cost": 2,
     "looks_like": "t_dirtfloor",
-    "flags": [ "TRANSPARENT", "FLAT" ],
+    "flags": [ "TRANSPARENT", "FLAT", "DIGGABLE" ],
     "bash": { "sound": "SMASH!", "ter_set": "t_null", "str_min": 50, "str_max": 400, "str_min_supported": 100, "bash_below": true }
   }
 ]
diff --git a/data/json/furniture_and_terrain/terrain-floors_indoor.json b/data/json/furniture_and_terrain/terrain-floors_indoor.json
@@ -269,12 +269,12 @@
     "type": "terrain",
     "id": "t_dirtfloor",
     "name": "dirt floor",
-    "description": "Floor consisting of finely mixed earth that has been tamped down.",
+    "description": "Floor consisting of finely mixed earth that has been tamped down, with a wooden ceiling above it.",
     "symbol": ".",
     "color": "brown",
     "move_cost": 2,
     "roof": "t_shingle_flat_roof",
-    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "DIGGABLE" ],
     "bash": {
       "sound": "SMASH!",
       "ter_set": "t_null",
@@ -293,7 +293,7 @@
     "color": "brown",
     "move_cost": 2,
     "roof": "t_thatch_roof",
-    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "DIGGABLE" ],
     "bash": {
       "sound": "SMASH!",
       "ter_set": "t_null",