Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Craft, Uncraft, Furniture version, and Construction to Fancy Tables #73642

Merged
merged 5 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions data/json/construction/furniture_surfaces.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
29 changes: 29 additions & 0 deletions data/json/furniture_and_terrain/furniture-surfaces.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/tables.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions data/json/recipes/recipe_deconstruction.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
16 changes: 16 additions & 0 deletions data/json/recipes/recipe_others.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading