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

Reduce too high encumbrance on clothing with pockets covering multiple body parts #45760

Merged
merged 6 commits into from
Jan 13, 2021
Merged

Reduce too high encumbrance on clothing with pockets covering multiple body parts #45760

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01df1a6
A few changes to start
Salty-Panda Dec 1, 2020
7a8d7ac
Proper clothing's encumbrance spread over bodyparts
Salty-Panda Dec 6, 2020
0aafce0
Remove forgotten line
Salty-Panda Dec 6, 2020
e20d5d0
Lint fix
Salty-Panda Dec 6, 2020
e19b9d4
Lint fix
Salty-Panda Dec 6, 2020
ec7edff
Remove "covers" line from faux fur items which is "copy-from"'ed from…
Salty-Panda Dec 6, 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
93 changes: 49 additions & 44 deletions data/json/items/armor/coats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"symbol": "[",
"looks_like": "coat_winter",
"color": "yellow",
"covers": [ "torso", "arm_l", "arm_r" ],
"coverage": 100,
"encumbrance": 22,
"max_encumbrance": 30,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 22, 26 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": 22 }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 },
Expand Down Expand Up @@ -66,10 +66,10 @@
"symbol": "[",
"looks_like": "coat_winter",
"color": "brown",
"covers": [ "torso", "arm_l", "arm_r" ],
"coverage": 95,
"encumbrance": 26,
"max_encumbrance": 30,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 26, 30 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 26, 26 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 }
Expand Down Expand Up @@ -108,10 +108,10 @@
"symbol": "[",
"looks_like": "coat_fur",
"color": "brown",
"covers": [ "torso", "arm_l", "arm_r" ],
"coverage": 95,
"encumbrance": 30,
"max_encumbrance": 35,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 30, 35 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 30, 30 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "3 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "3 kg", "moves": 80 }
Expand All @@ -137,10 +137,10 @@
"symbol": "[",
"looks_like": "coat_winter",
"color": "white",
"covers": [ "torso", "arm_l", "arm_r" ],
"coverage": 90,
"encumbrance": 2,
"max_encumbrance": 5,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 90, "encumbrance": [ 2, 5 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 90, "encumbrance": [ 2, 2 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 80 },
Expand All @@ -163,10 +163,10 @@
"symbol": "[",
"looks_like": "coat_winter",
"color": "yellow",
"covers": [ "torso", "arm_l", "arm_r" ],
"coverage": 95,
"encumbrance": 7,
"max_encumbrance": 15,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 7, 15 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 7, 7 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 120 }
Expand Down Expand Up @@ -212,10 +212,10 @@
"symbol": "[",
"looks_like": "coat_rain",
"color": "light_red",
"covers": [ "torso", "arm_l", "arm_r" ],
"coverage": 95,
"encumbrance": 18,
"max_encumbrance": 30,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 18, 27 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 18, 21 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1250 ml", "max_contains_weight": "3kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "1250 ml", "max_contains_weight": "3 kg", "moves": 80 },
Expand All @@ -242,10 +242,11 @@
"symbol": "[",
"looks_like": "trenchcoat",
"color": "dark_gray",
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 90,
"encumbrance": 7,
"max_encumbrance": 15,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 90, "encumbrance": [ 7, 13 ] },
{ "covers": [ "leg_l", "leg_r" ], "coverage": 90, "encumbrance": [ 7, 9 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 90, "encumbrance": [ 7, 7 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 },
Expand Down Expand Up @@ -273,10 +274,11 @@
"symbol": "[",
"looks_like": "duster_leather",
"color": "brown",
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 90,
"encumbrance": 9,
"max_encumbrance": 19,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 90, "encumbrance": [ 9, 16 ] },
{ "covers": [ "leg_l", "leg_r" ], "coverage": 90, "encumbrance": [ 9, 11 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 90, "encumbrance": [ 9, 9 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 },
Expand Down Expand Up @@ -317,10 +319,11 @@
"symbol": "[",
"looks_like": "duster",
"color": "brown",
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 90,
"encumbrance": 8,
"max_encumbrance": 17,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 90, "encumbrance": [ 8, 15 ] },
{ "covers": [ "leg_l", "leg_r" ], "coverage": 90, "encumbrance": [ 8, 10 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 90, "encumbrance": [ 8, 8 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 },
Expand Down Expand Up @@ -350,10 +353,11 @@
"symbol": "[",
"looks_like": "duster_leather",
"color": "brown",
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 85,
"encumbrance": 7,
"max_encumbrance": 15,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 85, "encumbrance": [ 7, 13 ] },
{ "covers": [ "leg_l", "leg_r" ], "coverage": 85, "encumbrance": [ 7, 9 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 85, "encumbrance": [ 7, 7 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 80 },
Expand Down Expand Up @@ -382,10 +386,11 @@
"symbol": "[",
"looks_like": "coat_winter",
"color": "blue",
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 95,
"encumbrance": 11,
"max_encumbrance": 23,
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 11, 20 ] },
{ "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": [ 11, 13 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 11, 11 ] }
],
"pocket_data": [
{ "pocket_type": "CONTAINER", "max_contains_volume": "1750 ml", "max_contains_weight": "4 kg", "moves": 80 },
{ "pocket_type": "CONTAINER", "max_contains_volume": "1750 ml", "max_contains_weight": "4 kg", "moves": 80 },
Expand Down
6 changes: 5 additions & 1 deletion data/json/items/armor/suits_protection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,11 @@
"symbol": "[",
"looks_like": "touring_suit",
"color": "dark_gray",
"armor_portion_data": [ { "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 12, 25 ] } ],
"armor_portion_data": [
{ "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 12, 19 ] },
{ "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": [ 12, 15 ] },
{ "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 12, 12 ] }
],
"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 },
Expand Down