From d4fb505ace81b19155903f44959868a5f65c3c77 Mon Sep 17 00:00:00 2001 From: ashGlaw <59815584+lewdregards@users.noreply.github.com> Date: Sun, 26 Jan 2020 20:00:06 -0500 Subject: [PATCH 1/4] Build roofs over dirt, and dig stairs in roofed dirt tiles --- data/json/construction.json | 38 ++++++-- .../terrain-floors_indoor.json | 88 +++++++++++-------- 2 files changed, 82 insertions(+), 44 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index ebd13d3c9715c..738560e48e010 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -854,7 +854,7 @@ "//": "Fills a deep pit with dirt.", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": "40 m", + "time": 40, "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "components": [ [ [ "material_soil", 200 ] ] ], "pre_special": "check_empty", @@ -867,7 +867,7 @@ "//": "Adds wood chippings to a shallow pit to prevent plants growing, or for looks.", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": "40 m", + "time": 40, "components": [ [ [ "splinter", 50 ] ] ], "pre_terrain": "t_pit_shallow", "post_terrain": "t_woodchips" @@ -910,7 +910,7 @@ "//": "Makes an outside wooden paving, similar to what would be used in patios.", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": "100 m", + "time": 100, "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 14 ] ], [ [ "nail", 28 ] ] ], "pre_special": "check_empty", @@ -1215,6 +1215,27 @@ "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", @@ -1735,7 +1756,7 @@ "description": "Build Bed Frame", "category": "FURN", "required_skills": [ [ "fabrication", 4 ] ], - "time": "55 m", + "time": 55, "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 10 ] ] ], "pre_special": "check_empty", @@ -1746,7 +1767,7 @@ "description": "Add Mattress to Bed Frame", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": "5 m", + "time": 5, "components": [ [ [ "mattress", 1 ], [ "down_mattress", 1 ] ] ], "pre_terrain": "f_bed_frame", "post_terrain": "f_bed" @@ -2322,6 +2343,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" }, { @@ -2983,7 +3005,7 @@ "description": "Hang Hanging Meathook", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": "15 m", + "time": 15, "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ], "components": [ [ [ "grip_hook", 1 ] ], [ [ "chain", 1 ] ] ], "pre_special": "check_support", @@ -3050,7 +3072,7 @@ "//": "Step 1: start wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": "120 m", + "time": 120, "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], "components": [ [ [ "adobe_brick", 10 ] ], @@ -3067,7 +3089,7 @@ "//": "Step 2: finish wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": "120 m", + "time": 120, "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], "components": [ [ [ "adobe_brick", 10 ] ], diff --git a/data/json/furniture_and_terrain/terrain-floors_indoor.json b/data/json/furniture_and_terrain/terrain-floors_indoor.json index 9321ff09e9133..14d8d46264938 100644 --- a/data/json/furniture_and_terrain/terrain-floors_indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors_indoor.json @@ -266,42 +266,58 @@ } }, { - "type": "terrain", - "id": "t_dirtfloor", - "name": "dirt floor", - "description": "Floor consisting of finely mixed earth that has been tamped down.", - "symbol": ".", - "color": "brown", - "move_cost": 2, - "roof": "t_shingle_flat_roof", - "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ], - "bash": { - "sound": "SMASH!", - "ter_set": "t_null", - "str_min": 50, - "str_max": 400, - "str_min_supported": 100, - "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] - } - }, - { - "type": "terrain", - "id": "t_dirtfloor_thatchroof", - "name": "dirt floor", - "description": "Floor consisting of finely mixed earth that has been tamped down, with thatched roof above it.", - "symbol": ".", - "color": "brown", - "move_cost": 2, - "roof": "t_thatch_roof", - "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ], - "bash": { - "sound": "SMASH!", - "ter_set": "t_null", - "str_min": 50, - "str_max": 400, - "str_min_supported": 100, - "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "straw_pile", "charges": [ 5, 10 ] } ] - } + "type": "terrain", + "id": "t_dirtfloor", + "name": "dirt floor", + "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", + "FLAMMABLE_HARD", + "SUPPORTS_ROOF", + "COLLAPSES", + "INDOORS", + "FLAT", + "DIGGABLE" + ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_null", + "str_min": 50, + "str_max": 400, + "str_min_supported": 100, + "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] + } + }, + { + "type": "terrain", + "id": "t_dirtfloor_thatchroof", + "name": "dirt floor", + "description": "Floor consisting of finely mixed earth that has been tamped down, with thatched roof above it.", + "symbol": ".", + "color": "brown", + "move_cost": 2, + "roof": "t_thatch_roof", + "flags": [ + "TRANSPARENT", + "FLAMMABLE_ASH", + "SUPPORTS_ROOF", + "COLLAPSES", + "INDOORS", + "FLAT", + "DIGGABLE" + ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_null", + "str_min": 50, + "str_max": 400, + "str_min_supported": 100, + "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "straw_pile", "charges": [ 5, 10 ] } ] + } }, { "type": "terrain", From aa360a7dc9c6873921b7f988f057a313dd09e802 Mon Sep 17 00:00:00 2001 From: ashGlaw <59815584+lewdregards@users.noreply.github.com> Date: Sun, 26 Jan 2020 22:36:10 -0500 Subject: [PATCH 2/4] Fixed some things that got broken somehow --- data/json/construction.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index 738560e48e010..679af7f76db74 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -854,7 +854,7 @@ "//": "Fills a deep pit with dirt.", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "qualities": [ [ { "id": "DIG", "level": 1 } ] ], "components": [ [ [ "material_soil", 200 ] ] ], "pre_special": "check_empty", @@ -867,7 +867,7 @@ "//": "Adds wood chippings to a shallow pit to prevent plants growing, or for looks.", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ] ], - "time": 40, + "time": "40 m", "components": [ [ [ "splinter", 50 ] ] ], "pre_terrain": "t_pit_shallow", "post_terrain": "t_woodchips" @@ -910,7 +910,7 @@ "//": "Makes an outside wooden paving, similar to what would be used in patios.", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": 100, + "time": "100 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 14 ] ], [ [ "nail", 28 ] ] ], "pre_special": "check_empty", @@ -1756,7 +1756,7 @@ "description": "Build Bed Frame", "category": "FURN", "required_skills": [ [ "fabrication", 4 ] ], - "time": 55, + "time": "55 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 10 ] ] ], "pre_special": "check_empty", @@ -1767,7 +1767,7 @@ "description": "Add Mattress to Bed Frame", "category": "FURN", "required_skills": [ [ "fabrication", 0 ] ], - "time": 5, + "time": "5 m", "components": [ [ [ "mattress", 1 ], [ "down_mattress", 1 ] ] ], "pre_terrain": "f_bed_frame", "post_terrain": "f_bed" @@ -3005,7 +3005,7 @@ "description": "Hang Hanging Meathook", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 1 ] ], - "time": 15, + "time": "15 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ], "components": [ [ [ "grip_hook", 1 ] ], [ [ "chain", 1 ] ] ], "pre_special": "check_support", @@ -3072,7 +3072,7 @@ "//": "Step 1: start wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], "components": [ [ [ "adobe_brick", 10 ] ], @@ -3089,7 +3089,7 @@ "//": "Step 2: finish wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 3 ] ], - "time": 120, + "time": "120 m", "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], "components": [ [ [ "adobe_brick", 10 ] ], From 9c9b052f66e27e1104734c4ec8a0b8fd6b9a5dfe Mon Sep 17 00:00:00 2001 From: ashGlaw <59815584+lewdregards@users.noreply.github.com> Date: Mon, 27 Jan 2020 00:39:49 -0500 Subject: [PATCH 3/4] Linted files and added DIGGABLE to outdoor dirt floors --- data/json/construction.json | 29 +++--- .../terrain-floors-outdoors.json | 33 ++++--- .../terrain-floors_indoor.json | 88 ++++++++----------- 3 files changed, 68 insertions(+), 82 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index 679af7f76db74..241506f93cfc9 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -1216,25 +1216,16 @@ "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 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", diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json index a1e81861c7b5b..d1662143f3a26 100644 --- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json +++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json @@ -328,16 +328,27 @@ "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] } }, - { - "type": "terrain", - "id": "t_dirtfloor_no_roof", - "name": "dirt floor", - "description": "Floor consisting of finely mixed earth that has been tamped down.", - "symbol": ".", - "color": "brown", - "move_cost": 2, - "looks_like": "t_dirtfloor", - "flags": [ "TRANSPARENT", "FLAT" ], - "bash": { "sound": "SMASH!", "ter_set": "t_null", "str_min": 50, "str_max": 400, "str_min_supported": 100, "bash_below": true } +{ + "type": "terrain", + "id": "t_dirtfloor_no_roof", + "name": "dirt floor", + "description": "Floor consisting of finely mixed earth that has been tamped down.", + "symbol": ".", + "color": "brown", + "move_cost": 2, + "looks_like": "t_dirtfloor", + "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 index 14d8d46264938..06d4b295a1217 100644 --- a/data/json/furniture_and_terrain/terrain-floors_indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors_indoor.json @@ -266,58 +266,42 @@ } }, { - "type": "terrain", - "id": "t_dirtfloor", - "name": "dirt floor", - "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", - "FLAMMABLE_HARD", - "SUPPORTS_ROOF", - "COLLAPSES", - "INDOORS", - "FLAT", - "DIGGABLE" - ], - "bash": { - "sound": "SMASH!", - "ter_set": "t_null", - "str_min": 50, - "str_max": 400, - "str_min_supported": 100, - "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] - } - }, - { - "type": "terrain", - "id": "t_dirtfloor_thatchroof", - "name": "dirt floor", - "description": "Floor consisting of finely mixed earth that has been tamped down, with thatched roof above it.", - "symbol": ".", - "color": "brown", - "move_cost": 2, - "roof": "t_thatch_roof", - "flags": [ - "TRANSPARENT", - "FLAMMABLE_ASH", - "SUPPORTS_ROOF", - "COLLAPSES", - "INDOORS", - "FLAT", - "DIGGABLE" - ], - "bash": { - "sound": "SMASH!", - "ter_set": "t_null", - "str_min": 50, - "str_max": 400, - "str_min_supported": 100, - "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "straw_pile", "charges": [ 5, 10 ] } ] - } + "type": "terrain", + "id": "t_dirtfloor", + "name": "dirt floor", + "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", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "DIGGABLE" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_null", + "str_min": 50, + "str_max": 400, + "str_min_supported": 100, + "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] + } + }, + { + "type": "terrain", + "id": "t_dirtfloor_thatchroof", + "name": "dirt floor", + "description": "Floor consisting of finely mixed earth that has been tamped down, with thatched roof above it.", + "symbol": ".", + "color": "brown", + "move_cost": 2, + "roof": "t_thatch_roof", + "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "DIGGABLE" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_null", + "str_min": 50, + "str_max": 400, + "str_min_supported": 100, + "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "straw_pile", "charges": [ 5, 10 ] } ] + } }, { "type": "terrain", From b4f9670c98b663a801ca373a0f0bc4674467840b Mon Sep 17 00:00:00 2001 From: ashGlaw <59815584+lewdregards@users.noreply.github.com> Date: Mon, 27 Jan 2020 08:56:55 -0500 Subject: [PATCH 4/4] Linting --- .../terrain-floors-outdoors.json | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json index d1662143f3a26..42199c18e97be 100644 --- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json +++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json @@ -328,27 +328,16 @@ "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] } }, -{ - "type": "terrain", - "id": "t_dirtfloor_no_roof", - "name": "dirt floor", - "description": "Floor consisting of finely mixed earth that has been tamped down.", - "symbol": ".", - "color": "brown", - "move_cost": 2, - "looks_like": "t_dirtfloor", - "flags": [ - "TRANSPARENT", - "FLAT", - "DIGGABLE" - ], - "bash": { - "sound": "SMASH!", - "ter_set": "t_null", - "str_min": 50, - "str_max": 400, - "str_min_supported": 100, - "bash_below": true + { + "type": "terrain", + "id": "t_dirtfloor_no_roof", + "name": "dirt floor", + "description": "Floor consisting of finely mixed earth that has been tamped down.", + "symbol": ".", + "color": "brown", + "move_cost": 2, + "looks_like": "t_dirtfloor", + "flags": [ "TRANSPARENT", "FLAT", "DIGGABLE" ], + "bash": { "sound": "SMASH!", "ter_set": "t_null", "str_min": 50, "str_max": 400, "str_min_supported": 100, "bash_below": true } } -} ]