From c7b243a9c85d101071fdb51933f322238d84fbc9 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 25 Dec 2020 12:50:43 +0100 Subject: [PATCH 1/5] Added disassembly recipes for several items Tried adding several disassembly recipes for random items missing them Why? Well, since atm some of these, such as hammers, are pretty common And once you have one the rest are useless without being able to be disassembled I'll list them here but I'll assume you'll see then in the code anyway - butter knife - clamp - hip flask - harmonica with a holder - entrenching tool - coin (apparently there are two types according to the code, only made a recipe for one) - spray can - medium tin can - large tin can - multitool - thermos - pair of scissors - shaving kit - hammer - pair of metal tongs - umbrella - dust mask - deck of Sorcerer cards - bicycle horn - webbing belt There's more I wanted to try out but they'd require more effort or time I'll just submit them separately when I get to work on them --- data/json/recipes/recipe_deconstruction.json | 159 +++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index df77766082d73..a67603d72750f 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -5040,5 +5040,164 @@ "time": "5 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "material_rocksalt", 10 ] ] ] + }, + { + "result": "knife_butter", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "scrap", 1 ] ] ] + }, + { + "result": "flask_hip", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "scrap", 2 ] ] ] + }, + { + "result": "clamp", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "scrap", 6 ] ] ] + }, + { + "result": "e_tool", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "2 m", + "qualities": [ { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "sheet_metal_small", 2 ] ], [ [ "scrap", 2 ] ] ] + }, + { + "result": "harmonica_holder", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "scrap", 2 ] ] ] + }, + { + "result": "coin_quarter", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "2 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 5 ] ] ] + }, + { + "result": "spray_can", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "2 m", + "qualities": [ { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "scrap", 1 ] ] ] + }, + { + "result": "can_medium", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "scrap", 1 ] ] ] + }, + { + "result": "can_food_big", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 m", + "qualities": [ { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "sheet_metal_small", 2 ] ], [ [ "scrap", 3 ] ] ] + }, + { + "result": "multitool", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "scrap", 3 ] ] ] + }, + { + "result": "thermos", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "2 m", + "qualities": [ { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "sheet_metal_small", 2 ] ] ] + }, + { + "result": "scissors", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "scrap", 2 ] ] ] + }, + { + "result": "shavingkit", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "plastic_chunk", 2 ] ] ] + }, + { + "result": "hammer", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "splinter", 1 ] ], [ [ "steel_chunk", 2 ] ] ] + }, + { + "result": "tongs", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "steel_chunk", 2 ] ] ] + }, + { + "result": "umbrella", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "plastic_chunk", 2 ] ] ] + }, + { + "result": "mask_dust", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "12 s", + "components": [ [ [ "string_6", 1 ] ], [ [ "rag", 1 ] ] ] + }, + { + "result": "horn_bicycle", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "12 s", + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "plastic_chunk", 3 ] ] ] + }, + { + "result": "cards_magic", + "type": "uncraft", + "activity_level": "NO_EXERCISE", + "time": "2 s", + "components": [ [ [ "paper", 20 ] ] ], + "flags": [ "BLIND_EASY" ] + }, + { + "result": "webbing_belt", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "30 s", + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "nylon", 3 ] ], [ [ "scrap", 1 ] ] ] } ] From 87fd9a20840f2d66ff737d9a675716445ce2db55 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 25 Dec 2020 18:17:26 +0100 Subject: [PATCH 2/5] Update recipe_deconstruction.json --- data/json/recipes/recipe_deconstruction.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index a67603d72750f..a7a121015c20f 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -5041,7 +5041,7 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "material_rocksalt", 10 ] ] ] }, - { + { "result": "knife_butter", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", From 6fc1b1da5ea3eacbff620dfe363861b47c82f6ff Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 25 Dec 2020 19:32:55 +0100 Subject: [PATCH 3/5] Increased time for disassembling umbrellas --- data/json/recipes/recipe_deconstruction.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index a7a121015c20f..50324c453b21a 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -5165,7 +5165,7 @@ "result": "umbrella", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", - "time": "12 s", + "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "plastic_chunk", 2 ] ] ] }, From cba2cd73eb6d5f5225593b2056f7010b4bcc2a6d Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 25 Dec 2020 20:12:58 +0100 Subject: [PATCH 4/5] Changed qualities for clamp, tongs and multitool --- data/json/recipes/recipe_deconstruction.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 50324c453b21a..53c07ca2bee4b 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -5061,8 +5061,8 @@ "result": "clamp", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", - "time": "12 s", - "qualities": [ { "id": "HAMMER", "level": 1 } ], + "time": "1 m", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "scrap", 6 ] ] ] }, { @@ -5117,8 +5117,8 @@ "result": "multitool", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", - "time": "12 s", - "qualities": [ { "id": "HAMMER", "level": 1 } ], + "time": "40 s", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 3 ] ] ] }, { @@ -5157,8 +5157,8 @@ "result": "tongs", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", - "time": "30 s", - "qualities": [ { "id": "HAMMER", "level": 1 } ], + "time": "2 m", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "steel_chunk", 2 ] ] ] }, { From 3ce93797108376b76cb180a7398adb2b0b37ae16 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Wed, 6 Jan 2021 13:30:12 +0100 Subject: [PATCH 5/5] Added a disassembly recipe for the copper coin I was really annoyed that I had to specify only one coin had a disassembly recipe and so I added it to the other one --- 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 53c07ca2bee4b..93bf29cb90c87 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -5089,6 +5089,14 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 5 ] ] ] }, + { + "result": "coin_nickel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "2 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "copper", 5 ] ] ] + }, { "result": "spray_can", "type": "uncraft",