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.

Sign up for GitHub

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

Mainline hobo stove and tinder from More Survival Tools #30138

Merged
merged 2 commits into from
May 8, 2019
Merged

Mainline hobo stove and tinder from More Survival Tools #30138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
272760d
Mainline hobo stove and tinder from More Survival Tools
curstwist May 1, 2019
15602ae
changes per comments
curstwist May 1, 2019
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
22 changes: 22 additions & 0 deletions data/json/items/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,5 +1159,27 @@
"weight": 1,
"phase": "gas",
"ammo_type": "nitrox"
},
{
"id": "tinder",
"type": "AMMO",
"category": "spare_parts",
"name": "tinder",
"name_plural": "tinder",
"description": "Flammable material, finely divided for easy combustion.",
"weight": 10,
"volume": 1,
"price": 0,
"bashing": 1,
"material": "wood",
"flags": [ "NO_SALVAGE" ],
"symbol": "=",
"color": "brown",
"count": 50,
"ammo_type": "tinder",
"range": 0,
"damage": 0,
"dispersion": 0,
curstwist marked this conversation as resolved.
Show resolved Hide resolved
"effects": [ "NEVER_MISFIRES" ]
}
]
6 changes: 6 additions & 0 deletions data/json/items/ammo_types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,5 +496,11 @@
"id": "nitrox",
"name": "compressed air",
"default": "nitrox"
},
{
"id": "tinder",
"name": "tinder",
"default": "tinder",
"type": "ammunition_type"
}
]
60 changes: 60 additions & 0 deletions data/json/items/tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8762,5 +8762,65 @@
"qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
"use_action": "HEAT_FOOD",
"flags": [ "ALLOWS_REMOTE_USE" ]
},
{
"id": "hobo_stove",
"type": "TOOL",
"name": "hobo stove",
"description": "This is a small improvised wood stove, made from a metal can or similar container of the right size. Useful for defrosting and reheating food, uses simple tinder.",
"weight": 1366,
"volume": 6,
"price": 0,
"to_hit": -1,
"bashing": 2,
"material": "steel",
"symbol": ",",
"color": "light_gray",
"ammo": "tinder",
"max_charges": 50,
"charges_per_use": 25,
"use_action": [
{
"target": "hobo_stove_on",
"msg": "The hobo stove is lit.",
"need_fire": 1,
"need_fire_msg": "You need a lighter!",
curstwist marked this conversation as resolved.
Show resolved Hide resolved
"active": false,
"menu_text": "Light",
"type": "transform"
}
]
},
{
"id": "hobo_stove_on",
"type": "TOOL",
"name": "hobo stove (lit)",
"name_plural": "hobo stoves (lit)",
"description": "This is a small improvised wood stove, made from a metal can or similar container of the right size. Useful for defrosting and reheating food, uses simple tinder.",
"weight": 1366,
"volume": 6,
"price": 0,
"to_hit": -1,
"bashing": 2,
"material": "steel",
"symbol": ",",
"color": "light_gray",
"ammo": "tinder",
"max_charges": 50,
"charges_per_use": 25,
"turns_per_charge": 300,
"revert_to": "hobo_stove",
"qualities": [ [ "BOIL", 1 ] ],
"use_action": [
{ "type": "HOTPLATE", "moves": 60, "msg": "You heat up the food.", "menu_text": "Heat up food" },
{
"target": "hobo_stove",
"msg": "The ember is extinguished.",
"active": false,
"menu_text": "Extinguish",
"type": "transform"
}
],
"flags": [ "LIGHT_3", "ALLOWS_REMOTE_USE" ]
}
]
14 changes: 14 additions & 0 deletions data/json/recipes/other/tool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,5 +163,19 @@
"autolearn": true,
"qualities": [ { "id": "SAW_M_FINE", "level": 1 } ],
"components": [ [ [ "wire", 4 ] ] ]
},
{
"type": "recipe",
"result": "hobo_stove",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "survival",
"skills_required": [ "fabrication", 1 ],
"difficulty": 4,
"time": 5000,
"autolearn": true,
"book_learn": [ [ "mag_survival", 2 ], [ "textbook_survival", 1 ], [ "cookbook", 2 ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "can_food_unsealed", 2 ], [ "scrap", 4 ] ] ]
}
]
27 changes: 27 additions & 0 deletions data/json/recipes/recipe_ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,5 +884,32 @@
"qualities": [ { "id": "CHEM", "level": 1 } ],
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "oxy_powder", 100 ] ], [ [ "lye_powder", 100 ] ] ]
},
{
"type": "recipe",
"result": "tinder",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"difficulty": 1,
"time": 1000,
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[
[ "stick", 1 ],
[ "2x4", 1 ],
[ "splinter", 2 ],
[ "pine_bough", 1 ],
[ "rag", 1 ],
[ "paper", 5 ],
[ "rolling_paper", 30 ],
[ "wrapper", 5 ],
[ "withered", 2 ],
[ "cattail_stalk", 1 ],
[ "birchbark", 1 ],
[ "willowbark", 1 ]
]
]
}
]
22 changes: 0 additions & 22 deletions data/mods/More_Survival_Tools/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
[
{
"id": "tinder",
"type": "AMMO",
"category": "spare_parts",
"name": "tinder",
"name_plural": "tinder",
"description": "Flammable material, finely divided for easy combustion.",
"weight": 10,
"volume": 1,
"price": 0,
"bashing": 1,
"material": "wood",
"flags": [ "NO_SALVAGE" ],
"symbol": "=",
"color": "brown",
"count": 50,
"ammo_type": "tinder",
"range": 0,
"damage": 0,
"dispersion": 0,
"effects": [ "NEVER_MISFIRES" ]
},
{
"id": "bearing_lead",
"type": "AMMO",
Expand Down
6 changes: 0 additions & 6 deletions data/mods/More_Survival_Tools/ammo_types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
[
{
"id": "tinder",
"name": "tinder",
"default": "tinder",
"type": "ammunition_type"
},
{
"id": "javelin",
"name": "javelin",
Expand Down
52 changes: 0 additions & 52 deletions data/mods/More_Survival_Tools/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,4 @@
[
{
"id": "hobo_stove",
"type": "TOOL",
"name": "hobo stove",
"description": "This is a small improvised wood stove, made from a metal can or similar container of the right size. Useful for cooking, uses simple tinder.",
"weight": 1366,
"volume": 6,
"price": 0,
"to_hit": -1,
"bashing": 2,
"material": "steel",
"symbol": ",",
"color": "light_gray",
"ammo": "tinder",
"sub": "hotplate",
"max_charges": 50,
"charges_per_use": 1,
"use_action": [ "HOTPLATE", "HEAT_FOOD" ]
},
{
"id": "hobo_stove_on",
"type": "TOOL",
"name": "hobo stove (lit)",
"name_plural": "hobo stoves (lit)",
"//": "Dummied out due to reverting hobo stove behavior, to be consistent with existing items. -Chaosvolt",
"description": "This is a small improvised wood stove, made from a metal can or similar container of the right size. Useful for cooking, uses simple tinder.",
"weight": 1366,
"volume": 6,
"price": 0,
"to_hit": -1,
"bashing": 2,
"material": "steel",
"symbol": ",",
"color": "light_gray",
"ammo": "tinder",
"sub": "hotplate",
"max_charges": 50,
"charges_per_use": 1,
"turns_per_charge": 300,
"revert_to": "hobo_stove",
"qualities": [ [ "COOK", 1 ] ],
"use_action": [
{
"target": "hobo_stove",
"msg": "The ember is extinguished.",
"active": false,
"menu_text": "Extinguish",
"type": "transform"
}
],
"flags": [ "LIGHT_3" ]
},
{
"id": "flint_steel",
"type": "TOOL",
Expand Down
41 changes: 0 additions & 41 deletions data/mods/More_Survival_Tools/recipes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,47 +28,6 @@
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ], [ "scrap", 2 ] ] ]
},
{
"type": "recipe",
"result": "hobo_stove",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "survival",
"skills_required": [ "fabrication", 1 ],
"difficulty": 4,
"time": 5000,
"autolearn": true,
"book_learn": [ [ "mag_survival", 2 ], [ "textbook_survival", 1 ], [ "cookbook", 2 ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "can_drink_unsealed", 2 ], [ "can_food_unsealed", 2 ], [ "scrap", 4 ] ] ]
},
{
"type": "recipe",
"result": "tinder",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"difficulty": 1,
"time": 1000,
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[
[ "stick", 1 ],
[ "2x4", 1 ],
[ "splinter", 2 ],
[ "pine_bough", 1 ],
[ "rag", 1 ],
[ "paper", 5 ],
[ "rolling_paper", 30 ],
[ "wrapper", 5 ],
[ "withered", 2 ],
[ "cattail_stalk", 1 ],
[ "birchbark", 1 ],
[ "willowbark", 1 ]
]
]
},
{
"type": "recipe",
"result": "torch",
Expand Down