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

Added hiking pants #61945

Merged
merged 9 commits into from
Oct 30, 2022
Merged

Added hiking pants #61945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3cd675b
Added hiking pants
bean-b Oct 27, 2022
98ac69b
removed __filename from json
bean-b Oct 27, 2022
4e0085b
also removed a comma, oops
bean-b Oct 27, 2022
6e52c69
Update data/json/itemgroups/Clothing_Gear/clothing.json
bean-b Oct 29, 2022
b90ad0e
Update data/json/itemgroups/Clothing_Gear/clothing.json
bean-b Oct 29, 2022
d769c28
Update data/json/itemgroups/Clothing_Gear/clothing.json
bean-b Oct 29, 2022
194408a
Update data/json/itemgroups/Clothing_Gear/clothing.json
bean-b Oct 29, 2022
5a2a877
added spaces to spawn rate, slightly changed rates
bean-b Oct 29, 2022
2707751
lint
bean-b Oct 29, 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
8 changes: 7 additions & 1 deletion data/json/itemgroups/Clothing_Gear/clothing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@
{ "item": "leg_bag", "prob": 15 },
{ "item": "leg_small_bag", "prob": 10 },
{ "item": "armrig", "prob": 10 },
{ "item": "ankle_wallet_pouch", "prob": 5 }
{ "item": "ankle_wallet_pouch", "prob": 5 },
{ "item": "pants_hiking", "prob": 10 }
]
},
{
Expand Down Expand Up @@ -1406,6 +1407,7 @@
[ "leather_belt", 30 ],
[ "pants_leather", 60 ],
[ "pants_cargo", 70 ],
[ "pants_hiking", 1 ],
[ "shorts_cargo", 50 ],
[ "motorbike_pants", 5 ],
[ "breeches", 5 ],
Expand Down Expand Up @@ -1637,6 +1639,7 @@
[ "pants_checkered", 5 ],
[ "shorts", 70 ],
[ "shorts_denim", 35 ],
[ "pants_hiking", 2 ],
[ "pants", 75 ],
[ "leather_belt", 30 ],
[ "pants_leather", 60 ],
Expand Down Expand Up @@ -2077,6 +2080,7 @@
{ "item": "glasses_monocle", "prob": 2 },
{ "item": "pants_leather", "prob": 60 },
{ "item": "pants_cargo", "prob": 70 },
{ "item": "pants_hiking", "prob": 2 },
{ "item": "shorts_cargo", "prob": 50 },
{ "item": "skirt", "prob": 75 },
{ "item": "skirt_leather", "prob": 5 },
Expand Down Expand Up @@ -2762,6 +2766,7 @@
[ "gartersheath1", 1 ],
[ "gartersheath2", 1 ],
[ "pants_cargo", 70 ],
[ "pants_hiking", 15 ],
[ "shorts_cargo", 50 ],
[ "pants_army", 30 ],
[ "jacket_army", 6 ],
Expand Down Expand Up @@ -3032,6 +3037,7 @@
"id": "survivorzed_bottoms",
"items": [
[ "pants_survivor", 10 ],
[ "pants_hiking", 12 ],
[ "pants_cargo", 40 ],
[ "shorts_cargo", 22 ],
[ "pants_army", 28 ],
Expand Down
56 changes: 56 additions & 0 deletions data/json/items/armor/legs_clothes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,5 +1538,61 @@
"material_thickness": 0.5,
"flags": [ "VARSIZE", "STURDY" ],
"armor": [ { "coverage": 80, "covers": [ "leg_l", "leg_r" ] } ]
},
{
"id": "pants_hiking",
"repairs_like": "pants",
"type": "ARMOR",
"name": { "str": "hiking pants", "str_pl": "pairs of hiking pants" },
"description": "A water-resistant pair of lightweight, flexible hiking pants with a good number of pockets.",
"weight": "250 g",
"volume": "1750 ml",
"price": 5000,
"price_postapoc": 300,
"material": [ "nylon" ],
"symbol": "[",
"looks_like": "pants",
"color": "light_gray",
"pocket_data": [
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "4 kg",
"max_item_length": "19 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "4 kg",
"max_item_length": "19 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "4 kg",
"max_item_length": "19 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1080 ml",
"max_contains_weight": "4 kg",
"max_item_length": "165 mm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1080 ml",
"max_contains_weight": "4 kg",
"max_item_length": "165 mm",
"moves": 100
}
],
"warmth": 5,
"material_thickness": 0.25,
"flags": [ "VARSIZE", "POCKETS", "WATERPROOF" ],
"armor": [ { "encumbrance": 1, "coverage": 100, "covers": [ "leg_l", "leg_r" ], "volume_encumber_modifier": 0.6 } ]
}
]