From 82e1ed4ae8997f56d91d231b6acd99d4b349885a Mon Sep 17 00:00:00 2001 From: soulclump <46012267+descende@users.noreply.github.com> Date: Thu, 16 May 2024 18:05:24 -0500 Subject: [PATCH 1/5] Add a crafting recipe for propane lanterns copied the existing recipe for gasoline lantern in lights.json --- data/json/recipes/tools/lights.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/json/recipes/tools/lights.json b/data/json/recipes/tools/lights.json index 658ec28175b28..348050e56a9e3 100644 --- a/data/json/recipes/tools/lights.json +++ b/data/json/recipes/tools/lights.json @@ -341,6 +341,24 @@ [ [ "clay_teapot", 1 ], [ "jug_clay", 1 ], [ "can_food", 1 ], [ "can_drink", 1 ], [ "canister_empty", 1 ] ] ] }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "propane_lantern", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 5, + "time": "1 h", + "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ + [ [ "scrap", 1 ] ], + [ [ "cotton_patchwork", 1 ], [ "cordage_superior_short", 1, "LIST" ] ], + [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "jar_glass_sealed", 1 ] ], + [ [ "clay_teapot", 1 ], [ "jug_clay", 1 ], [ "can_food", 1 ], [ "can_drink", 1 ], [ "canister_empty", 1 ] ] + ] + }, { "type": "recipe", "activity_level": "ACTIVE_EXERCISE", From 7133874a7efb2ae45d0042d53fcaa93701504fd0 Mon Sep 17 00:00:00 2001 From: soulclump <46012267+descende@users.noreply.github.com> Date: Fri, 17 May 2024 17:15:54 -0500 Subject: [PATCH 2/5] realismified propane lantern recipe --- data/json/recipes/tools/lights.json | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/data/json/recipes/tools/lights.json b/data/json/recipes/tools/lights.json index 348050e56a9e3..d1aad585840bd 100644 --- a/data/json/recipes/tools/lights.json +++ b/data/json/recipes/tools/lights.json @@ -343,20 +343,26 @@ }, { "type": "recipe", - "activity_level": "LIGHT_EXERCISE", + "activity_level": "MODERATE_EXERCISE", "result": "propane_lantern", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "difficulty": 5, - "time": "1 h", - "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 1 } ], + "skills_required": [ [ "mechanics", 3 ] ], + "difficulty": 6, + "time": "2 h", + "book_learn": [ [ "textbook_fabrication", 6 ] ], + "qualities": [ + { "id": "WRENCH", "level": 1 }, + { "id": "SAW_M", "level": 1 } + { "id": "HAMMER", "level": 2 } ], + "using": [ [ "welding_standard", 50 ] ], + "proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_welding" } ], "components": [ - [ [ "scrap", 1 ] ], - [ [ "cotton_patchwork", 1 ], [ "cordage_superior_short", 1, "LIST" ] ], - [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "jar_glass_sealed", 1 ] ], - [ [ "clay_teapot", 1 ], [ "jug_clay", 1 ], [ "can_food", 1 ], [ "can_drink", 1 ], [ "canister_empty", 1 ] ] + [ [ "scrap", 2 ] ], + [ [ "pipe", 2 ] ], + [ [ "pipe_fittings", 4 ] ], + [ [ "pilot_light", 1 ] ] ] }, { From 85ad030206e2b3ce58017ea16a0b48ba3cceefe6 Mon Sep 17 00:00:00 2001 From: soulclump <46012267+descende@users.noreply.github.com> Date: Fri, 17 May 2024 17:25:21 -0500 Subject: [PATCH 3/5] missing comma --- data/json/recipes/tools/lights.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/tools/lights.json b/data/json/recipes/tools/lights.json index d1aad585840bd..c5f4040ad2444 100644 --- a/data/json/recipes/tools/lights.json +++ b/data/json/recipes/tools/lights.json @@ -354,7 +354,7 @@ "book_learn": [ [ "textbook_fabrication", 6 ] ], "qualities": [ { "id": "WRENCH", "level": 1 }, - { "id": "SAW_M", "level": 1 } + { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 2 } ], "using": [ [ "welding_standard", 50 ] ], "proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_welding" } ], From 6e9090e1b8af7abc3b836174dffb082e061744dd Mon Sep 17 00:00:00 2001 From: soulclump <46012267+descende@users.noreply.github.com> Date: Fri, 17 May 2024 17:27:49 -0500 Subject: [PATCH 4/5] condense formatting Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/recipes/tools/lights.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/json/recipes/tools/lights.json b/data/json/recipes/tools/lights.json index c5f4040ad2444..99a9b3260ebab 100644 --- a/data/json/recipes/tools/lights.json +++ b/data/json/recipes/tools/lights.json @@ -352,10 +352,7 @@ "difficulty": 6, "time": "2 h", "book_learn": [ [ "textbook_fabrication", 6 ] ], - "qualities": [ - { "id": "WRENCH", "level": 1 }, - { "id": "SAW_M", "level": 1 }, - { "id": "HAMMER", "level": 2 } ], + "qualities": [ { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 2 } ], "using": [ [ "welding_standard", 50 ] ], "proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_welding" } ], "components": [ From b33b9c63fb721069f5c3292feee10616d6910476 Mon Sep 17 00:00:00 2001 From: soulclump <46012267+descende@users.noreply.github.com> Date: Fri, 17 May 2024 17:28:01 -0500 Subject: [PATCH 5/5] condense formatting 2 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/recipes/tools/lights.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/json/recipes/tools/lights.json b/data/json/recipes/tools/lights.json index 99a9b3260ebab..c7f9fc4444f65 100644 --- a/data/json/recipes/tools/lights.json +++ b/data/json/recipes/tools/lights.json @@ -355,12 +355,7 @@ "qualities": [ { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 2 } ], "using": [ [ "welding_standard", 50 ] ], "proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_welding" } ], - "components": [ - [ [ "scrap", 2 ] ], - [ [ "pipe", 2 ] ], - [ [ "pipe_fittings", 4 ] ], - [ [ "pilot_light", 1 ] ] - ] + "components": [ [ [ "scrap", 2 ] ], [ [ "pipe", 2 ] ], [ [ "pipe_fittings", 4 ] ], [ [ "pilot_light", 1 ] ] ] }, { "type": "recipe",