From b5d4c3db38b1e88e6fe2335a8d64fed2e54b0ea0 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Fri, 10 May 2024 21:15:27 -0400 Subject: [PATCH 1/5] Adjust fancy table description --- data/json/items/vehicle/tables.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/vehicle/tables.json b/data/json/items/vehicle/tables.json index e504f985316fb..73db394d394f0 100644 --- a/data/json/items/vehicle/tables.json +++ b/data/json/items/vehicle/tables.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "v_table", "name": { "str": "fancy table" }, - "description": "A very fancy table from a very fancy RV. If times were better, it might be useful for something other than firewood.", + "description": "A very fancy table for those with fancy lives. If times were better, it might be useful for something other than firewood.", "weight": "9071 g", "to_hit": -8, "color": "red", From 227d74aa977036dadb6823e82341279d6dedab63 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Fri, 10 May 2024 21:16:54 -0400 Subject: [PATCH 2/5] Add recipe for fancy table --- data/json/recipes/recipe_others.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index a7b0edb00c1a9..58757bb77b77a 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -613,6 +613,22 @@ "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_W", "level": 1 } ], "components": [ [ [ "2x4", 4 ] ], [ [ "wood_panel", 1 ] ], [ [ "nails", 8, "LIST" ] ] ] }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "v_table", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "35 m", + "decomp_learn": 1, + "autolearn": true, + "proficiencies": [ { "proficiency": "prof_carpentry_basic" }, { "proficiency": "prof_carving" } ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_W", "level": 1 }, { "id": "CHISEL_WOOD", "level": 1 } ], + "components": [ [ [ "2x4", 5 ] ], [ [ "wood_panel", 1 ] ], [ [ "nails", 14, "LIST" ] ] ], + "byproducts": [ [ "splinter", 5 ] ] + }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", From 00dbde4df7694c711a159b4c899cc69843e9f527 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Fri, 10 May 2024 21:19:16 -0400 Subject: [PATCH 3/5] Add Disassembly to fancy table --- data/json/recipes/recipe_deconstruction.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 2667c46967544..84b78ad608aff 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -7336,6 +7336,14 @@ [ [ "splinter", 22 ] ] ] }, + { + "result": "v_table", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "30 m", + "qualities": [ { "id": "PRY", "level": 1 } ], + "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 14 ] ], [ [ "wood_panel", 1 ] ], [ [ "plank_short", 1 ] ], [ [ "splinter", 4 ] ] ] + }, { "result": "chair_wood", "type": "uncraft", From 4aef15fa88ad2f729010db802b5ea9161eefbc11 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Fri, 10 May 2024 21:20:26 -0400 Subject: [PATCH 4/5] Add Fancy Table Furniture --- .../furniture-surfaces.json | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/data/json/furniture_and_terrain/furniture-surfaces.json b/data/json/furniture_and_terrain/furniture-surfaces.json index a0226f53a6ecb..217b99c7ec6ba 100644 --- a/data/json/furniture_and_terrain/furniture-surfaces.json +++ b/data/json/furniture_and_terrain/furniture-surfaces.json @@ -293,6 +293,35 @@ "examine_action": "workbench", "workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" } }, + { + "type": "furniture", + "id": "f_table_fancy", + "name": "fancy table", + "description": "A fancy table for a fancy person. Functions as both a table and status symbol.", + "symbol": "#", + "color": "red", + "looks_like": "f_table", + "move_cost_mod": 2, + "coverage": 50, + "required_str": 5, + "crafting_pseudo_item": "medium_surface_pseudo", + "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF", "SMALL_HIDE", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "v_table", "count": 1 } ] }, + "bash": { + "str_min": 12, + "str_max": 50, + "sound": "smash!", + "sound_fail": "whump.", + "items": [ + { "item": "2x4", "count": [ 1, 3 ] }, + { "item": "wood_panel", "prob": 30 }, + { "item": "nail", "charges": [ 4, 8 ] }, + { "item": "splinter", "count": [ 3, 6 ] } + ] + }, + "examine_action": "workbench", + "workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75 L" } + }, { "type": "furniture", "id": "f_coffee_table", From 66afda0389137b4b1d64594dd9dfa30b04d760f8 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Fri, 10 May 2024 21:21:41 -0400 Subject: [PATCH 5/5] Fancy Table Furniture Placed (construction) --- data/json/construction/furniture_surfaces.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/json/construction/furniture_surfaces.json b/data/json/construction/furniture_surfaces.json index b61e64b1dbde3..4c3d4f475312b 100644 --- a/data/json/construction/furniture_surfaces.json +++ b/data/json/construction/furniture_surfaces.json @@ -59,6 +59,18 @@ "post_terrain": "f_table", "activity_level": "LIGHT_EXERCISE" }, + { + "type": "construction", + "id": "constr_place_table_fancy", + "group": "place_table", + "category": "FURN", + "required_skills": [ [ "fabrication", 0 ] ], + "time": "1 m", + "components": [ [ [ "v_table", 1 ] ] ], + "pre_special": "check_empty", + "post_terrain": "f_table_fancy", + "activity_level": "LIGHT_EXERCISE" + }, { "type": "construction", "id": "constr_place_workbench",