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

Jump to bottom

Revise Fire drills #55589

Merged
merged 5 commits into from
Mar 9, 2022
Merged

Revise Fire drills #55589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7e8e9c
Remove ability of spike pit to spawn on stairs
oosyrag Feb 22, 2022
23ccf4f
Fire Drills Revision
oosyrag Feb 22, 2022
de98bcb
Attempt to revert/delete unintended commit changes from parent branch
oosyrag Feb 24, 2022
29c03a7
Merge branch 'CleverRaven:master' into fire_drills
oosyrag Mar 5, 2022
c1eb3bf
Linted
oosyrag Mar 5, 2022
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
16 changes: 8 additions & 8 deletions data/json/items/tool/fire.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
{
"id": "fire_drill",
"type": "TOOL",
"name": { "str": "fire drill" },
"description": "This fire drill is a simple item for starting fires; it is made from two pieces of wood and some string. Since it is constructed out of simple materials, it's slow and rather difficult to get a fire started using this tool.",
"name": { "str": "bow fire drill" },
"description": "This fire drill is a simple item for starting fires by friction between a notched plank and wooden shaft. The shaft is spun rapidly with a sawing motion by a bowstring wrapped around it. Very slow to acquire a usable ember.",
"weight": "240 g",
"volume": "250 ml",
"price": 0,
Expand All @@ -45,17 +45,17 @@
{
"id": "fire_drill_large",
"type": "TOOL",
"name": { "str": "camp fire drill" },
"description": "This stout fire drill is a simple item for starting fires; it is made from two pieces of wood and some string. Since it is constructed out of simple materials, it's slow and rather difficult to get a fire started using this tool.",
"weight": "1280 g",
"volume": "1250 ml",
"name": { "str": "pump fire drill" },
"description": "This fire drill is a simple item for starting fires by friction between a notched plank and wooden shaft with a flywheel attached. The shaft is spun rapidly with a pumping motion by a cord wrapped around it. Slow to acquire a usable ember.",
"weight": "900 g",
"volume": "500 ml",
"price": 0,
"price_postapoc": 10,
"material": [ "wood", "stone" ],
"symbol": ",",
"color": "brown",
"initial_charges": 500,
"max_charges": 500,
"initial_charges": 50,
"max_charges": 50,
"charges_per_use": 1,
"use_action": { "type": "firestarter", "moves": 200, "moves_slow": 10000 },
"flags": [ "FIRESTARTER" ]
Expand Down
8 changes: 4 additions & 4 deletions data/json/recipes/tools/tools_primitive.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,11 @@
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "survival",
"difficulty": 2,
"time": "10 m",
"time": "30 m",
"autolearn": true,
"using": [ [ "cordage", 2 ] ],
"qualities": [ { "id": "CUT", "level": 2 } ],
"components": [ [ [ "stick", 4 ], [ "2x4", 2 ] ], [ [ "rock", 1 ], [ "ceramic_shard", 1 ] ] ]
"using": [ [ "cordage_short", 1 ] ],
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "DRILL_ROCK", "level": 1 } ],
"components": [ [ [ "stick", 2 ], [ "2x4", 1 ] ], [ [ "rock", 1 ], [ "ceramic_shard", 1 ] ] ]
},
{
"type": "recipe",
Expand Down