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

Tool belt rework #37599

Merged
merged 7 commits into from
Apr 2, 2020
Merged

Tool belt rework #37599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae99b66
Modified tool_belt
RarkGrames Jan 31, 2020
b65c137
Update data/json/items/armor/belts.json
RarkGrames Jan 31, 2020
f3d95f5
Updated recipe
RarkGrames Jan 31, 2020
4839b17
Requested changes
RarkGrames Feb 1, 2020
2b9d68a
Update data/json/items/armor/belts.json
RarkGrames Feb 2, 2020
53411d0
Update belts.json
RarkGrames Feb 15, 2020
ab807e2
Merge branch 'master' into Tool-belt-rework
kevingranade Apr 2, 2020
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: 12 additions & 10 deletions data/json/items/armor/belts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,10 @@
"id": "tool_belt",
"type": "ARMOR",
"name": { "str": "tool belt" },
"description": "A common belt with pockets and four small belt loops. Widely used by handymen and electricians.",
"weight": "960 g",
"volume": "1750 ml",
"description": "A common belt with pockets, loops and sheaths to store up to six tools or blades. Widely used by handymen and electricians.",
"weight": "2000 g",
"rigid": false,
"volume": "2250 ml",
"price": 4500,
"bashing": 5,
"material": [ "leather" ],
Expand All @@ -209,17 +210,18 @@
"covers": [ "TORSO" ],
"coverage": 20,
"storage": "1 L",
"encumbrance": 10,
"encumbrance": 2,
"material_thickness": 2,
"use_action": {
"type": "holster",
"holster_prompt": "Attach what to belt loop?",
"holster_msg": "You clip your %s to your %s",
"multi": 4,
"max_volume": "1 L",
"max_weight": 1000,
"holster_prompt": "Store tool or blade",
"holster_msg": "You put your %1$s in your %2$s",
"multi": 6,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this require increasing the recipe requirements to 6 pouches(or 7, since the 1L storage is still there)?

"min_volume": "50 ml",
"max_volume": "1500 ml",
"max_weight": "1500 g",
"draw_cost": 50,
"flags": [ "BELT_CLIP" ]
"flags": [ "BELT_CLIP", "SHEATH_KNIFE" ]
},
"flags": [ "WAIST", "NO_QUICKDRAW", "WATER_FRIENDLY" ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/armor/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@
"time": "16 m",
"autolearn": true,
"using": [ [ "sewing_standard", 8 ] ],
"components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ], [ "leather_belt", 1 ] ], [ [ "leather_pouch", 5 ] ] ]
"components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ], [ "leather_belt", 1 ] ], [ [ "leather_pouch", 7 ] ] ]
},
{
"result": "javelin_bag",
Expand Down