From b2a41a363b0b5f430f98854f7e26c77621ee5086 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 10 Aug 2022 11:55:18 -0700 Subject: [PATCH 1/5] machete recipe fixes --- data/json/recipes/weapon/cutting.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 048e546225d62..14c9b85252963 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -876,10 +876,8 @@ "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_blacksmithing" }, - { "proficiency": "prof_bladesmith" }, { "proficiency": "prof_quenching", "fail_multiplier": 2 } ], - "components": [ [ [ "machete", 1 ] ], [ [ "duct_tape", 100 ] ], [ [ "coal_lump", 84 ], [ "charcoal", 55 ] ] ] + "components": [ [ [ "machete", 1 ] ], [ [ "duct_tape", 100 ] ] ] } ] From 964f3e6c834dc367d610633eb81e23c97b2df531 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 10 Aug 2022 13:26:08 -0700 Subject: [PATCH 2/5] astyle --- data/json/recipes/weapon/cutting.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 14c9b85252963..04af640965215 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -874,10 +874,7 @@ "using": [ [ "soldering_standard", 20 ], [ "blacksmithing_standard", 10 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 }, { "id": "GRIND", "level": 2 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ], - "proficiencies": [ - { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_quenching", "fail_multiplier": 2 } - ], + "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_quenching", "fail_multiplier": 2 } ], "components": [ [ [ "machete", 1 ] ], [ [ "duct_tape", 100 ] ] ] } ] From f5f4166b12e0f78ed340d67e77c51f3b2633e111 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 10 Aug 2022 17:01:34 -0700 Subject: [PATCH 3/5] grip tweak --- data/json/recipes/weapon/cutting.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 04af640965215..20a438197512c 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -858,7 +858,7 @@ "using": [ [ "soldering_standard", 20 ] ], "proficiencies": [ { "proficiency": "prof_metalworking" } ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "GRIND", "level": 2 } ], - "components": [ [ [ "machete", 1 ], [ "makeshift_machete", 1 ] ], [ [ "duct_tape", 100 ] ] ] + "components": [ [ [ "machete", 1 ] ], [ [ "duct_tape", 150 ] ], [ [ "filament_durable", 20, "LIST" ] ], [ [ "leather", 2 ], [ "chunk_rubber", 1 ] ], [ [ "rubber_cement", 1 ], [ "superglue", 1 ] ] ] }, { "result": "survivor_machete_qt", @@ -873,8 +873,8 @@ "book_learn": [ [ "textbook_weapwest", 5 ], [ "welding_book", 6 ] ], "using": [ [ "soldering_standard", 20 ], [ "blacksmithing_standard", 10 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 }, { "id": "GRIND", "level": 2 } ], - "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ], + "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -80 ] ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_quenching", "fail_multiplier": 2 } ], - "components": [ [ [ "machete", 1 ] ], [ [ "duct_tape", 100 ] ] ] + "components": [ [ [ "machete", 1 ] ], [ [ "duct_tape", 150 ] ], [ [ "filament_durable", 20, "LIST"] ], [ [ "leather", 2 ], [ "chunk_rubber", 1 ] ], [ [ "rubber_cement", 1 ], [ "superglue", 1 ] ] ] } ] From de048f37ee8e3a679f0b4afc17dbfc44660583f3 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 10 Aug 2022 17:06:55 -0700 Subject: [PATCH 4/5] astyle Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/recipes/weapon/cutting.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 20a438197512c..131cd4c967958 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -875,6 +875,12 @@ "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 }, { "id": "GRIND", "level": 2 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -80 ] ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_quenching", "fail_multiplier": 2 } ], - "components": [ [ [ "machete", 1 ] ], [ [ "duct_tape", 150 ] ], [ [ "filament_durable", 20, "LIST"] ], [ [ "leather", 2 ], [ "chunk_rubber", 1 ] ], [ [ "rubber_cement", 1 ], [ "superglue", 1 ] ] ] + "components": [ + [ [ "machete", 1 ] ], + [ [ "duct_tape", 150 ] ], + [ [ "filament_durable", 20, "LIST" ] ], + [ [ "leather", 2 ], [ "chunk_rubber", 1 ] ], + [ [ "rubber_cement", 1 ], [ "superglue", 1 ] ] + ] } ] From 727690adbaecca0efe1df7412d92c70df4f39ae9 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 10 Aug 2022 17:08:30 -0700 Subject: [PATCH 5/5] astyle Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/recipes/weapon/cutting.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 131cd4c967958..c2dad7e3dc03e 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -858,7 +858,13 @@ "using": [ [ "soldering_standard", 20 ] ], "proficiencies": [ { "proficiency": "prof_metalworking" } ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "GRIND", "level": 2 } ], - "components": [ [ [ "machete", 1 ] ], [ [ "duct_tape", 150 ] ], [ [ "filament_durable", 20, "LIST" ] ], [ [ "leather", 2 ], [ "chunk_rubber", 1 ] ], [ [ "rubber_cement", 1 ], [ "superglue", 1 ] ] ] + "components": [ + [ [ "machete", 1 ] ], + [ [ "duct_tape", 150 ] ], + [ [ "filament_durable", 20, "LIST" ] ], + [ [ "leather", 2 ], [ "chunk_rubber", 1 ] ], + [ [ "rubber_cement", 1 ], [ "superglue", 1 ] ] + ] }, { "result": "survivor_machete_qt",