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

Update some clothing pockets #68060

Merged
merged 3 commits into from
Sep 10, 2023
Merged

Update some clothing pockets #68060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fbe0d0
Update some clothing pockets
marimarigi Sep 9, 2023
b4a21a7
Update data/json/items/armor/suits_clothes.json
marimarigi Sep 9, 2023
7d7ad6c
Apply suggestions from code review
marimarigi Sep 9, 2023
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
112 changes: 98 additions & 14 deletions data/json/items/armor/suits_clothes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,34 @@
{ "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 1, 1 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 }
{
"pocket_type": "CONTAINER",
"max_contains_volume": "700 ml",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "700 ml",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "10 cm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "10 cm",
"moves": 100
}
],
"warmth": 10,
"material_thickness": 0.2,
Expand All @@ -331,10 +355,34 @@
{ "covers": [ "leg_l", "leg_r" ], "coverage": 80, "encumbrance": [ 1, 2 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 }
{
"pocket_type": "CONTAINER",
"max_contains_volume": "700 ml",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "700 ml",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "10 cm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "10 cm",
"moves": 100
}
],
"warmth": 15,
"material_thickness": 0.2,
Expand All @@ -360,10 +408,34 @@
{ "covers": [ "leg_l", "leg_r" ], "coverage": 80, "encumbrance": [ 1, 2 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 }
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1 L",
"max_contains_weight": "3 kg",
"max_item_length": "18 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1 L",
"max_contains_weight": "3 kg",
"max_item_length": "18 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "10 cm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "10 cm",
"moves": 100
}
],
"warmth": 15,
"material_thickness": 1,
Expand Down Expand Up @@ -396,8 +468,20 @@
{ "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": [ 1, 2 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 }
{
"pocket_type": "CONTAINER",
"max_contains_volume": "700 ml",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "700 ml",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 80
}
],
"use_action": {
"type": "transform",
Expand Down
64 changes: 56 additions & 8 deletions data/json/items/armor/suits_protection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4806,14 +4806,62 @@
{ "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 7, 7 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 120 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 120 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 }
{
"pocket_type": "CONTAINER",
"max_contains_volume": "700 ml",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "700 ml",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "12 cm",
"moves": 120
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "12 cm",
"moves": 120
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "350 ml",
"max_contains_weight": "1 kg",
"max_item_length": "12 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "350 ml",
"max_contains_weight": "1 kg",
"max_item_length": "12 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "10 cm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "10 cm",
"moves": 100
}
],
"warmth": 25,
"material_thickness": 0.8,
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/armor/torso_clothes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,14 @@
"max_contains_weight": "3 kg",
"max_item_length": "10 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "200 ml",
"max_contains_weight": "1 kg",
"max_item_length": "15 cm",
"moves": 120,
"description": "Hidden pocket."
}
],
"warmth": 10,
Expand Down Expand Up @@ -947,6 +955,16 @@
"encumbrance": 2
}
],
"pocket_data": [
{
"pocket_type": "CONTAINER",
"max_contains_volume": "200 ml",
"max_contains_weight": "1 kg",
"max_item_length": "15 cm",
"moves": 120,
"description": "Hidden pocket."
}
],
"warmth": 2,
"material_thickness": 0.1,
"flags": [ "VARSIZE" ]
Expand Down