From 7be16397d49f25e2edd69235e074f52bc88bfaee Mon Sep 17 00:00:00 2001 From: ACCount Date: Mon, 21 Jan 2019 03:21:30 +0300 Subject: [PATCH 1/5] Allows for more handle materials on hacksaw and pliers --- data/json/recipes/recipe_others.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 40f479872f9fb..e5056c5b9b1ef 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -2386,7 +2386,7 @@ "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], - "components": [ [ [ "steel_chunk", 1 ], [ "scrap", 3 ] ], [ [ "plastic_chunk", 1 ] ] ] + "components": [ [ [ "steel_chunk", 1 ], [ "scrap", 3 ] ], [ [ "plastic_chunk", 1 ], [ "scrap", 1 ] ] ] }, { "type": "recipe", @@ -2400,7 +2400,7 @@ "book_learn": [ [ "manual_mechanics", 3 ], [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], - "components": [ [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ], [ [ "plastic_chunk", 1 ] ] ] + "components": [ [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ], [ [ "plastic_chunk", 1 ], [ "2x4", 1 ], [ "stick", 1 ] ] ] }, { "type": "recipe", From d4033cb9a5b5ecf80536a18af02840fdce817e73 Mon Sep 17 00:00:00 2001 From: ACCount Date: Mon, 21 Jan 2019 04:38:16 +0300 Subject: [PATCH 2/5] More handle material options for tool crafting --- data/json/recipes/recipe_others.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index e5056c5b9b1ef..c6efb780a8b99 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1121,7 +1121,7 @@ "time": 2000, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 } ], - "components": [ [ [ "steel_chunk", 2 ], [ "scrap", 6 ] ], [ [ "duct_tape", 30 ] ] ] + "components": [ [ [ "steel_chunk", 2 ], [ "scrap", 6 ] ], [ [ "duct_tape", 30 ], [ "2x4", 1 ], [ "stick", 1 ] ] ] }, { "type": "recipe", @@ -1142,7 +1142,7 @@ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "plastic_chunk", 2 ] ] ] + "components": [ [ [ "plastic_chunk", 2 ], [ "2x4", 1 ], [ "stick", 2 ] ] ] }, { "type": "recipe", @@ -2415,7 +2415,7 @@ "book_learn": [ [ "manual_mechanics", 4 ], [ "manual_fabrication", 4 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], - "components": [ [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 24 ] ], [ [ "plastic_chunk", 2 ] ] ] + "components": [ [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 24 ] ], [ [ "plastic_chunk", 2 ], ["2x4", 1 ], [ "stick", 2 ] ] ] }, { "type": "recipe", From 4090eb3e6bf214c321448c7b19505aa14663ca5f Mon Sep 17 00:00:00 2001 From: ACCount Date: Tue, 22 Jan 2019 05:05:17 +0300 Subject: [PATCH 3/5] Allows crafting dive knives with metal handles --- data/json/recipes/recipe_weapon.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 4ab1d84fd389a..1a47d499c36da 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -2394,7 +2394,8 @@ [ "scrap", 6 ] ], [ - [ "plastic_chunk", 2 ] + [ "plastic_chunk", 2 ], + [ "scrap", 2 ] ] ] },{ From 397648b8854b9f9d3959d6aa537fe9fbb3daa5ec Mon Sep 17 00:00:00 2001 From: ACCount Date: Tue, 22 Jan 2019 05:57:47 +0300 Subject: [PATCH 4/5] Update recipe_others.json --- data/json/recipes/recipe_others.json | 40 ++++++++++++++++------------ 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index c6efb780a8b99..03c651b794a4e 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1120,8 +1120,9 @@ "skill_used": "fabrication", "time": 2000, "autolearn": true, + "using": [ [ "steel_tiny", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], - "components": [ [ [ "steel_chunk", 2 ], [ "scrap", 6 ] ], [ [ "duct_tape", 30 ], [ "2x4", 1 ], [ "stick", 1 ] ] ] + "components": [ [ [ "duct_tape", 30 ], [ "2x4", 1 ], [ "stick", 1 ] ] ] }, { "type": "recipe", @@ -2384,9 +2385,10 @@ "difficulty": 2, "time": 300000, "autolearn": true, + "using": [ [ "forging_standard", 5 ], [ "steel_tiny", 1 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], - "components": [ [ [ "steel_chunk", 1 ], [ "scrap", 3 ] ], [ [ "plastic_chunk", 1 ], [ "scrap", 1 ] ] ] + "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "plastic_chunk", 1 ], [ "scrap", 1 ] ] ] }, { "type": "recipe", @@ -2397,10 +2399,11 @@ "difficulty": 4, "time": 320000, "autolearn": true, + "using": [ [ "forging_standard", 10 ], [ "steel_standard", 1 ] ], "book_learn": [ [ "manual_mechanics", 3 ], [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], - "components": [ [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ], [ [ "plastic_chunk", 1 ], [ "2x4", 1 ], [ "stick", 1 ] ] ] + "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ], + "components": [ [ [ "plastic_chunk", 1 ], [ "2x4", 1 ], [ "stick", 1 ] ] ] }, { "type": "recipe", @@ -2412,10 +2415,11 @@ "note": "not so much the engineering as hardening the edge", "time": 380000, "autolearn": true, + "using": [ [ "forging_standard", 15 ], [ "steel_standard", 2 ] ], "book_learn": [ [ "manual_mechanics", 4 ], [ "manual_fabrication", 4 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], - "components": [ [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 24 ] ], [ [ "plastic_chunk", 2 ], ["2x4", 1 ], [ "stick", 2 ] ] ] + "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "plastic_chunk", 2 ], [ "2x4", 1 ], [ "stick", 2 ] ] ] }, { "type": "recipe", @@ -2426,10 +2430,11 @@ "difficulty": 4, "time": 280000, "autolearn": true, + "using": [ [ "forging_standard", 10 ], [ "steel_standard", 2 ] ], "book_learn": [ [ "manual_fabrication", 2 ], [ "textbook_fabrication", 3 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 200 ], [ "oxy_torch", 40 ] ] ], - "components": [ [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 24 ] ], [ [ "2x4", 2 ], [ "stick", 4 ] ] ] + "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "2x4", 2 ], [ "stick", 4 ] ] ] }, { "type": "recipe", @@ -2440,15 +2445,14 @@ "difficulty": 7, "time": 320000, "autolearn": true, + "using": [ [ "forging_standard", 15 ], [ "steel_standard", 4 ] ], "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], - [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], - [ [ "forge", 350 ], [ "oxy_torch", 70 ] ] - ], - "components": [ [ [ "steel_lump", 4 ], [ "steel_chunk", 16 ], [ "scrap", 48 ] ] ] + [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] + ] }, { "type": "recipe", @@ -2459,10 +2463,11 @@ "difficulty": 5, "time": 320000, "autolearn": true, + "using": [ [ "forging_standard", 10 ], [ "steel_standard", 2 ] ], "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ], - "components": [ [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 24 ] ], [ [ "2x4", 2 ], [ "stick", 4 ] ] ] + "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "2x4", 2 ], [ "stick", 4 ] ] ] }, { "type": "recipe", @@ -2473,10 +2478,11 @@ "difficulty": 6, "time": 360000, "autolearn": true, + "using": [ [ "forging_standard", 15 ], [ "steel_standard", 3 ] ], "book_learn": [ [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 300 ], [ "oxy_torch", 60 ] ] ], - "components": [ [ [ "steel_lump", 3 ], [ "steel_chunk", 9 ], [ "scrap", 27 ] ], [ [ "2x4", 3 ], [ "stick", 6 ] ] ] + "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "2x4", 3 ], [ "stick", 6 ] ] ] }, { "type": "recipe", From a87df35aa2751d3cf1fe0cf995b30b6d191bc672 Mon Sep 17 00:00:00 2001 From: ACCount Date: Tue, 22 Jan 2019 15:39:58 +0300 Subject: [PATCH 5/5] Update recipe_others.json --- data/json/recipes/recipe_others.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 03c651b794a4e..323370590d0a7 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -2448,11 +2448,7 @@ "using": [ [ "forging_standard", 15 ], [ "steel_standard", 4 ] ], "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ - [ [ "tongs", -1 ] ], - [ [ "swage", -1 ] ], - [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] - ] + "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ] }, { "type": "recipe",