From caf81ee1590de345325443b75783f649a8fd8c7f Mon Sep 17 00:00:00 2001
From: Tamiore <61312205+Tamiore@users.noreply.github.com>
Date: Mon, 27 Apr 2020 06:20:33 +0300
Subject: [PATCH] Adds recipe for makeshift leather hose. (#39882)

---
 data/json/items/tool/workshop.json        | 14 ++++++++++++++
 data/json/recipes/armor/head.json         |  2 +-
 data/json/recipes/other/tool.json         | 16 +++++++++++++++-
 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 +++++-
 7 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
index 231ce3d34cd36..59cc1cadb82b3 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/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/tool.json b/data/json/recipes/other/tool.json
index b3666a1cd52fa..ebf9cce65680f 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,5 +661,19 @@
     "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,
+    "skills_required": [ [ "survival", 3 ], [ "tailor", 4 ] ],
+    "autolearn": true,
+    "time": "1 h",
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "leather", 2 ] ], [ [ "superglue", 1 ] ], [ [ "filament", 40, "LIST" ] ] ]
   }
 ]
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",