From 3d90ebdb1d8c743d9036611d0743660835cda7b4 Mon Sep 17 00:00:00 2001 From: Delta <37035514+Delta5861@users.noreply.github.com> Date: Thu, 3 Jun 2021 16:41:56 +1000 Subject: [PATCH 1/6] Update construction.json --- data/json/construction.json | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/data/json/construction.json b/data/json/construction.json index 6d173f3604e9f..a068d63a78052 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -656,6 +656,50 @@ "pre_terrain": "t_floor", "post_terrain": "t_bars" }, + { + "type": "construction", + "id": "constr_wall_wattle_post", + "group": "build_woven_wattle_wall", + "//": "Step 1: narrow fence posts for a woven wattle wall", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 0 ], [ "survival", 1 ] ], + "time": "20 m", + "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ], [ { "id": "DIG", "level": 1 } ] ], + "components": [ [ [ "stick", 4 ], [ "pointy_stick", 4 ] ] ], + "pre_flags": "DIGGABLE", + "post_terrain": "t_wattle_fence_posts" + }, + { + "type": "construction", + "id": "constr_wall_wattle_woven", + "group": "build_woven_wattle_wall", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ], + "time": "50 m", + "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ], + "components": [ [ [ "stick", 10 ] ] ], + "pre_terrain": "t_wattle_fence_posts", + "post_terrain": "t_wattle_fence" + }, + { + "type": "construction", + "id": "constr_wall_wattle_from_fence", + "group": "build_wattle_and_daub_wall", + "//": "Upgrade a woven wattle fence to a full wall", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 3 ], [ "survival", 3 ] ], + "time": "60 m", + "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ], + "components": [ + [ [ "2x4", 5 ], [ "stick", 10 ] ], + [ [ "material_quicklime", 8 ], [ "material_limestone", 8 ], [ "clay_lump", 8 ] ], + [ [ "pebble", 10 ], [ "material_sand", 10 ] ], + [ [ "straw_pile", 8 ], [ "cattail_stalk", 8 ], [ "dogbane", 8 ], [ "pine_bough", 8 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ], + "pre_terrain": "t_wattle_fence", + "post_terrain": "t_wall_wattle" + }, { "type": "construction", "id": "constr_wall_wattle_half", From 1ec744371ba703bb1b3c875c9ce11eb6f7b5ff7f Mon Sep 17 00:00:00 2001 From: Delta <37035514+Delta5861@users.noreply.github.com> Date: Thu, 3 Jun 2021 16:44:08 +1000 Subject: [PATCH 2/6] Update construction_group.json --- data/json/construction_group.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/json/construction_group.json b/data/json/construction_group.json index c66778037d128..d518d8cb74466 100644 --- a/data/json/construction_group.json +++ b/data/json/construction_group.json @@ -804,6 +804,11 @@ "id": "build_workbench", "name": "Build Workbench" }, + { + "type": "construction_group", + "id": "build_woven_wattle_fence", + "name": "Build Woven Wattle Fence" + }, { "type": "construction_group", "id": "carpet_floor_green", From 666d223db63c770b698812bb05a9865f58fdc6e8 Mon Sep 17 00:00:00 2001 From: Delta <37035514+Delta5861@users.noreply.github.com> Date: Thu, 3 Jun 2021 16:44:50 +1000 Subject: [PATCH 3/6] Update construction.json --- data/json/construction.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index a068d63a78052..3a53fd657c1dd 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -659,7 +659,7 @@ { "type": "construction", "id": "constr_wall_wattle_post", - "group": "build_woven_wattle_wall", + "group": "build_woven_wattle_fence", "//": "Step 1: narrow fence posts for a woven wattle wall", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 0 ], [ "survival", 1 ] ], @@ -672,7 +672,7 @@ { "type": "construction", "id": "constr_wall_wattle_woven", - "group": "build_woven_wattle_wall", + "group": "build_woven_wattle_fence", "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ], "time": "50 m", From e570d573bbe6703a062a3605453b63ecc6f00ca3 Mon Sep 17 00:00:00 2001 From: Delta <37035514+Delta5861@users.noreply.github.com> Date: Thu, 3 Jun 2021 16:47:48 +1000 Subject: [PATCH 4/6] Update terrain-fences-gates.json --- .../terrain-fences-gates.json | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/data/json/furniture_and_terrain/terrain-fences-gates.json b/data/json/furniture_and_terrain/terrain-fences-gates.json index 56281da8f0a36..b7fe39d251b88 100644 --- a/data/json/furniture_and_terrain/terrain-fences-gates.json +++ b/data/json/furniture_and_terrain/terrain-fences-gates.json @@ -439,6 +439,60 @@ "items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": 1 } ] } }, + { + "type": "terrain", + "id": "t_wattle_fence", + "alias": [ "t_wattle_fence_h", "t_wattle_fence_v" ], + "name": "woven wattle fence", + "description": "A flimsy barrier made of woven sticks. Suitable for small animals.", + "symbol": "LINE_OXOX", + "color": "brown", + "looks_like": "t_fence", + "move_cost": 0, + "examine_action": "chainfence", + "flags": [ + "TRANSPARENT", + "DIGGABLE", + "FLAMMABLE_ASH", + "THIN_OBSTACLE", + "SHORT", + "NOITEM", + "PERMEABLE", + "UNSTABLE", + "CLIMBABLE", + "AUTO_WALL_SYMBOL", + "BURROWABLE" + ], + "connects_to": "WOODFENCE", + "deconstruct": { "ter_set": "t_fence_post", "items": [ { "item": "splinter", "count": 20 } ] }, + "bash": { + "str_min": 4, + "str_max": 20, + "sound": "crack.", + "sound_fail": "wham.", + "ter_set": "t_null", + "items": [ { "item": "pointy_stick", "count": [ 0, 2 ] }, { "item": "splinter", "count": [ 5, 15 ] } ] + } + }, + { + "type": "terrain", + "id": "t_wattle_fence_posts", + "name": "narrow fence posts", + "description": "A set of narrow wooden posts for a woven wattle fence.", + "symbol": "#", + "color": "brown", + "looks_like": "t_fence_post", + "move_cost": 2, + "flags": [ "TRANSPARENT", "THIN_OBSTACLE", "SHORT" ], + "bash": { + "str_min": 4, + "str_max": 20, + "sound": "crack.", + "sound_fail": "wham.", + "ter_set": "t_null", + "items": [ { "item": "stick", "count": [ 1, 4 ] } ] + } + }, { "type": "terrain", "id": "t_chainfence", From 1d0401cb844329f56a936e63bd7c91815f782531 Mon Sep 17 00:00:00 2001 From: Delta <37035514+Delta5861@users.noreply.github.com> Date: Sun, 6 Jun 2021 18:11:09 +1000 Subject: [PATCH 5/6] lint x2 Co-authored-by: Binrui Dong --- data/json/furniture_and_terrain/terrain-fences-gates.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/furniture_and_terrain/terrain-fences-gates.json b/data/json/furniture_and_terrain/terrain-fences-gates.json index b7fe39d251b88..bb2af37451f42 100644 --- a/data/json/furniture_and_terrain/terrain-fences-gates.json +++ b/data/json/furniture_and_terrain/terrain-fences-gates.json @@ -444,7 +444,7 @@ "id": "t_wattle_fence", "alias": [ "t_wattle_fence_h", "t_wattle_fence_v" ], "name": "woven wattle fence", - "description": "A flimsy barrier made of woven sticks. Suitable for small animals.", + "description": "A flimsy barrier made of woven sticks. Suitable for small animals.", "symbol": "LINE_OXOX", "color": "brown", "looks_like": "t_fence", From 9e98f1c5e1b0e31e77f333d1b8c13aeb7d2e8aff Mon Sep 17 00:00:00 2001 From: Delta <37035514+Delta5861@users.noreply.github.com> Date: Fri, 11 Jun 2021 13:58:56 +1000 Subject: [PATCH 6/6] Reorder wattle wall from fence recipe --- data/json/construction.json | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index 3a53fd657c1dd..b79cf8995a356 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -681,25 +681,6 @@ "pre_terrain": "t_wattle_fence_posts", "post_terrain": "t_wattle_fence" }, - { - "type": "construction", - "id": "constr_wall_wattle_from_fence", - "group": "build_wattle_and_daub_wall", - "//": "Upgrade a woven wattle fence to a full wall", - "category": "CONSTRUCT", - "required_skills": [ [ "fabrication", 3 ], [ "survival", 3 ] ], - "time": "60 m", - "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ], - "components": [ - [ [ "2x4", 5 ], [ "stick", 10 ] ], - [ [ "material_quicklime", 8 ], [ "material_limestone", 8 ], [ "clay_lump", 8 ] ], - [ [ "pebble", 10 ], [ "material_sand", 10 ] ], - [ [ "straw_pile", 8 ], [ "cattail_stalk", 8 ], [ "dogbane", 8 ], [ "pine_bough", 8 ] ], - [ [ "water", 10 ], [ "water_clean", 10 ] ] - ], - "pre_terrain": "t_wattle_fence", - "post_terrain": "t_wall_wattle" - }, { "type": "construction", "id": "constr_wall_wattle_half", @@ -738,6 +719,25 @@ "pre_terrain": "t_wall_wattle_half", "post_terrain": "t_wall_wattle" }, + { + "type": "construction", + "id": "constr_wall_wattle_from_fence", + "group": "build_wattle_and_daub_wall", + "//": "Upgrade a woven wattle fence to a full wall", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 3 ], [ "survival", 3 ] ], + "time": "60 m", + "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ], + "components": [ + [ [ "2x4", 5 ], [ "stick", 10 ] ], + [ [ "material_quicklime", 8 ], [ "material_limestone", 8 ], [ "clay_lump", 8 ] ], + [ [ "pebble", 10 ], [ "material_sand", 10 ] ], + [ [ "straw_pile", 8 ], [ "cattail_stalk", 8 ], [ "dogbane", 8 ], [ "pine_bough", 8 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ], + "pre_terrain": "t_wattle_fence", + "post_terrain": "t_wall_wattle" + }, { "type": "construction", "id": "constr_repair_wall_wattle",