Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds recipe for makeshift leather hose. #39882

Merged
merged 6 commits into from
Apr 27, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions data/json/items/tool/workshop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
kevingranade marked this conversation as resolved.
Show resolved Hide resolved
"weight": "600 g",
"volume": "500 ml",
"price": 100,
"price_postapoc": 50,
"material": "leather",
"symbol": ",",
"color": "green",
"use_action": "SIPHON"
}
]
2 changes: 1 addition & 1 deletion data/json/recipes/armor/head.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
[ "flask_hip", 1 ]
],
[ [ "wire", 1 ] ],
[ [ "hose", 1 ] ]
[ [ "hose", 1 ], [ "makeshift_hose", 1 ] ]
],
"flags": [ "BLIND_HARD" ]
},
Expand Down
16 changes: 15 additions & 1 deletion data/json/recipes/other/tool.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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" ] ] ]
}
]
2 changes: 1 addition & 1 deletion data/json/recipes/recipe_electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
]
Expand Down
6 changes: 3 additions & 3 deletions data/json/recipes/recipe_others.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 ] ]
]
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/recipe_vehicle.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
"components": [
[ [ "sheet_metal", 3 ] ],
[ [ "wire", 6 ] ],
[ [ "hose", 1 ] ],
[ [ "hose", 1 ], [ "makeshift_hose", 1 ] ],
[ [ "e_scrap", 3 ] ],
[ [ "circuit", 1 ] ],
[ [ "scrap", 4 ] ],
Expand All @@ -336,7 +336,7 @@
"components": [
[ [ "sheet_metal", 3 ] ],
[ [ "wire", 6 ] ],
[ [ "hose", 1 ] ],
[ [ "hose", 1 ], [ "makeshift_hose", 1 ] ],
[ [ "e_scrap", 3 ] ],
[ [ "circuit", 1 ] ],
[ [ "scrap", 4 ] ],
Expand Down
6 changes: 5 additions & 1 deletion data/json/recipes/weapon/ranged.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down