From 590138d30051e2cb77490ab6f67048f2ee9c3c2b Mon Sep 17 00:00:00 2001 From: Tamiore <61312205+Tamiore@users.noreply.github.com> Date: Sat, 25 Apr 2020 01:04:46 +0300 Subject: [PATCH 1/6] Adds recipe for rubber hose. Plastic for body, duct tape for flexibility, same difficulty as plastic bottles and the like. --- data/json/recipes/other/tool.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index b3666a1cd52fa..a08be84779eb5 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -661,5 +661,18 @@ "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ], "components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ] ] + }, + { + "result": "hose", + "type": "recipe", + "category": "CC_OTHER", + "id_suffix": "hose_from_plastic", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 5, + "autolearn": true, + "time": "45 m", + "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ], [ [ "wire", -1 ], [ "cable", -1 ] ] ], + "components": [ [ [ "plastic_chunk", 2 ] ], [ [ "duct_tape", 60 ], [ "medical_tape", 60 ] ] ] } ] From 8c56308a96fb5c6cdcc666137ef36d1e034106a3 Mon Sep 17 00:00:00 2001 From: Tamiore <61312205+Tamiore@users.noreply.github.com> Date: Sat, 25 Apr 2020 23:51:35 +0300 Subject: [PATCH 2/6] Adds makeshift plastic hose. Adds craftable makeshift plastic hose for those recipes where it will be good enough. Not a substitute for rubber hose as a tool for fuel siphoning. --- data/json/items/resources/plastic.json | 14 ++++++++++++++ data/json/recipes/armor/head.json | 2 +- data/json/recipes/other/parts.json | 13 +++++++++++++ data/json/recipes/other/tool.json | 15 +-------------- data/json/recipes/recipe_electronics.json | 2 +- data/json/recipes/recipe_others.json | 6 +++--- data/json/recipes/recipe_vehicle.json | 4 ++-- data/json/recipes/weapon/ranged.json | 6 +++++- 8 files changed, 40 insertions(+), 22 deletions(-) diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 3a8735d82dac7..7fae7f5eb871b 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -72,5 +72,19 @@ "material": "plastic", "symbol": ")", "color": "light_blue" + }, + { + "id": "makeshift_hose", + "type": "GENERIC", + "category": "spare_parts", + "name": "makeshift hose", + "description": "This is a simple makeshift hose, made from plastic segments with tape for flexibility. Good enough for liquid transfer in static appliances but lacks in flexibility and durability under stress. Not flexible enough to fit into most fuel tanks to siphon fuel.", + "weight": "200 g", + "volume": "500 ml", + "price": 0, + "price_postapoc": 20, + "material": "plastic", + "symbol": ",", + "color": "green" } ] diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 0fbbe94eb31b1..8a69481884dcd 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -156,7 +156,7 @@ [ "flask_hip", 1 ] ], [ [ "wire", 1 ] ], - [ [ "hose", 1 ] ] + [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json index 3d92677546f09..fb7b25138cd7b 100644 --- a/data/json/recipes/other/parts.json +++ b/data/json/recipes/other/parts.json @@ -89,5 +89,18 @@ "autolearn": true, "using": [ [ "welding_standard", 6 ] ], "components": [ [ [ "material_aluminium_ingot", 8 ] ] ] + }, + { + "result": "makeshift_hose", + "type": "recipe", + "category": "CC_OTHER", + "id_suffix": "DIY_hose_from_plastic", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": true, + "time": "45 m", + "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ], [ [ "wire", -1 ], [ "cable", -1 ] ] ], + "components": [ [ [ "plastic_chunk", 2 ] ], [ [ "duct_tape", 60 ], [ "medical_tape", 60 ] ] ] } ] diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index a08be84779eb5..4812be6eaf877 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -369,7 +369,7 @@ "time": "200 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "brewing_cookbook", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 2 } ], - "components": [ [ [ "pot", 1 ], [ "pot_copper", 1 ] ], [ [ "hose", 2 ] ] ] + "components": [ [ [ "pot", 1 ], [ "pot_copper", 1 ] ], [ [ "hose", 2 ], [ "makeshift_hose", 2 ] ] ] }, { "result": "food_processor", @@ -661,18 +661,5 @@ "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ], "components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ] ] - }, - { - "result": "hose", - "type": "recipe", - "category": "CC_OTHER", - "id_suffix": "hose_from_plastic", - "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "fabrication", - "difficulty": 5, - "autolearn": true, - "time": "45 m", - "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ], [ [ "wire", -1 ], [ "cable", -1 ] ] ], - "components": [ [ [ "plastic_chunk", 2 ] ], [ [ "duct_tape", 60 ], [ "medical_tape", 60 ] ] ] } ] diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json index b53782d13a363..97c31c38e74f0 100644 --- a/data/json/recipes/recipe_electronics.json +++ b/data/json/recipes/recipe_electronics.json @@ -435,7 +435,7 @@ "components": [ [ [ "element", 8 ] ], [ [ "bottle_glass", 2 ], [ "bottle_plastic", 5 ], [ "bottle_plastic_small", 10 ] ], - [ [ "hose", 1 ] ], + [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "scrap", 3 ] ], [ [ "cable", 5 ] ] ] diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index e3bb1ff21d76a..d6ff7d7ab4e2b 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -442,7 +442,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], - "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "hose", 1 ] ], [ [ "rag", 2 ] ] ] + "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "rag", 2 ] ] ] }, { "type": "recipe", @@ -1910,7 +1910,7 @@ "book_learn": [ [ "adv_chemistry", 1 ], [ "textbook_chemistry", 1 ] ], "components": [ [ [ "glasses_safety", 1 ] ], - [ [ "hose", 3 ] ], + [ [ "hose", 3 ], [ "makeshift_hose", 3 ] ], [ [ "flask_glass", 4 ], [ "jar_glass", 4 ], [ "bottle_glass", 4 ], [ "test_tube", 20 ] ], [ [ "box_small", 1 ], [ "bag_canvas", 1 ], [ "backpack", 1 ], [ "backpack_leather", 1 ], [ "rucksack", 1 ] ] ] @@ -3527,7 +3527,7 @@ "reversible": true, "using": [ [ "soldering_standard", 60 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "cable", 650 ] ], [ [ "scrap", 10 ] ], [ [ "duct_tape", 30 ] ], [ [ "hose", 2 ] ] ] + "components": [ [ [ "cable", 650 ] ], [ [ "scrap", 10 ] ], [ [ "duct_tape", 30 ] ], [ [ "hose", 2 ], [ "makeshift_hose", 2 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json index 50a2e6a3e9264..4d35d9ed39cd4 100644 --- a/data/json/recipes/recipe_vehicle.json +++ b/data/json/recipes/recipe_vehicle.json @@ -311,7 +311,7 @@ "components": [ [ [ "sheet_metal", 3 ] ], [ [ "wire", 6 ] ], - [ [ "hose", 1 ] ], + [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "e_scrap", 3 ] ], [ [ "circuit", 1 ] ], [ [ "scrap", 4 ] ], @@ -336,7 +336,7 @@ "components": [ [ [ "sheet_metal", 3 ] ], [ [ "wire", 6 ] ], - [ [ "hose", 1 ] ], + [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "e_scrap", 3 ] ], [ [ "circuit", 1 ] ], [ [ "scrap", 4 ] ], diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 48323569af14e..147d86ca9b811 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -12,7 +12,11 @@ "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "HAMMER", "level": 2 } ], "using": [ [ "welding_standard", 40 ] ], - "components": [ [ [ "pipe", 2 ] ], [ [ "hose", 2 ] ], [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ] ] + "components": [ + [ [ "pipe", 2 ] ], + [ [ "hose", 2 ], [ "makeshift_hose", 2 ] ], + [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ] + ] }, { "type": "recipe", From fd8aea24e77d69f2d58cb97db0eab169e69a8255 Mon Sep 17 00:00:00 2001 From: Tamiore <61312205+Tamiore@users.noreply.github.com> Date: Sun, 26 Apr 2020 23:57:10 +0300 Subject: [PATCH 3/6] it's leather hose now The community has spoken! --- data/json/items/resources/plastic.json | 14 -------------- data/json/items/tool/workshop.json | 14 ++++++++++++++ data/json/recipes/other/parts.json | 13 ------------- data/json/recipes/other/tool.json | 13 +++++++++++++ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 7fae7f5eb871b..3a8735d82dac7 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -72,19 +72,5 @@ "material": "plastic", "symbol": ")", "color": "light_blue" - }, - { - "id": "makeshift_hose", - "type": "GENERIC", - "category": "spare_parts", - "name": "makeshift hose", - "description": "This is a simple makeshift hose, made from plastic segments with tape for flexibility. Good enough for liquid transfer in static appliances but lacks in flexibility and durability under stress. Not flexible enough to fit into most fuel tanks to siphon fuel.", - "weight": "200 g", - "volume": "500 ml", - "price": 0, - "price_postapoc": 20, - "material": "plastic", - "symbol": ",", - "color": "green" } ] diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 501569b9d5d79..558e456fd0de9 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -1078,5 +1078,19 @@ "color": "light_gray", "qualities": [ [ "WRENCH", 2 ], [ "WRENCH_FINE", 1 ] ], "flags": [ "BELT_CLIP" ] + }, + { + "id": "makeshift_hose", + "type": "TOOL", + "name": "leather hose", + "description": "This is a hose made out of leather. Watertight and flexiable, it can be used to siphon fuel from a vehicle tank. However, it's not as elastic a rubber hose.", + "weight": "600 g", + "volume": "500 ml", + "price": 100, + "price_postapoc": 50, + "material": "leather", + "symbol": ",", + "color": "green", + "use_action": "SIPHON" } ] diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json index fb7b25138cd7b..3d92677546f09 100644 --- a/data/json/recipes/other/parts.json +++ b/data/json/recipes/other/parts.json @@ -89,18 +89,5 @@ "autolearn": true, "using": [ [ "welding_standard", 6 ] ], "components": [ [ [ "material_aluminium_ingot", 8 ] ] ] - }, - { - "result": "makeshift_hose", - "type": "recipe", - "category": "CC_OTHER", - "id_suffix": "DIY_hose_from_plastic", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 4, - "autolearn": true, - "time": "45 m", - "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ], [ [ "wire", -1 ], [ "cable", -1 ] ] ], - "components": [ [ [ "plastic_chunk", 2 ] ], [ [ "duct_tape", 60 ], [ "medical_tape", 60 ] ] ] } ] diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index 4812be6eaf877..a29f5fa23bbbf 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -661,5 +661,18 @@ "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ], "components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ] ] + }, + { + "result": "makeshift_hose", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "id_suffix": "DIY_hose_from_leather", + "skill_used": "fabrication", + "difficulty": 4, + "autolearn": true, + "time": "1 h", + "qualities": [ { "id": "SEW", "level": 2 } , { "id": "CUT", "level": 1 } ], + "components": [ [ [ "leather", 2 ] ], [ [ "superglue", 1 ] ], [ [ "filament", 40, "LIST" ] ] ] } ] From dec798279691b190cc16b7f52657de11a02457b6 Mon Sep 17 00:00:00 2001 From: Tamiore <61312205+Tamiore@users.noreply.github.com> Date: Mon, 27 Apr 2020 00:06:59 +0300 Subject: [PATCH 4/6] linting --- data/json/recipes/other/tool.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index a29f5fa23bbbf..b26e5bf599238 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -672,7 +672,7 @@ "difficulty": 4, "autolearn": true, "time": "1 h", - "qualities": [ { "id": "SEW", "level": 2 } , { "id": "CUT", "level": 1 } ], + "qualities": [ { "id": "SEW", "level": 2 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "leather", 2 ] ], [ [ "superglue", 1 ] ], [ [ "filament", 40, "LIST" ] ] ] } ] From 058652dc32018f1acd7a616edf11f5e4022682a0 Mon Sep 17 00:00:00 2001 From: Tamiore <61312205+Tamiore@users.noreply.github.com> Date: Mon, 27 Apr 2020 00:19:17 +0300 Subject: [PATCH 5/6] tailoring and survival skill reqs Becuase why not? --- data/json/recipes/other/tool.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index b26e5bf599238..ebf9cce65680f 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -670,6 +670,7 @@ "id_suffix": "DIY_hose_from_leather", "skill_used": "fabrication", "difficulty": 4, + "skills_required": [ [ "survival", 3 ], [ "tailor", 4 ] ], "autolearn": true, "time": "1 h", "qualities": [ { "id": "SEW", "level": 2 }, { "id": "CUT", "level": 1 } ], From 35679728327a732c19dd6b3695be19b09003266b Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Mon, 27 Apr 2020 03:17:46 +0000 Subject: [PATCH 6/6] Apply suggestions from code review --- data/json/items/tool/workshop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 558e456fd0de9..867988dbf2062 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -1083,7 +1083,7 @@ "id": "makeshift_hose", "type": "TOOL", "name": "leather hose", - "description": "This is a hose made out of leather. Watertight and flexiable, it can be used to siphon fuel from a vehicle tank. However, it's not as elastic a rubber hose.", + "description": "This is a hose made out of leather. Watertight and flexiable, it can be used to siphon fuel from a vehicle tank. However, it's not as elastic a rubber hose.", "weight": "600 g", "volume": "500 ml", "price": 100,