Skip to content

Commit

Permalink
Backpack Update (#33151)
Browse files Browse the repository at this point in the history 
Makes backpacks use variable encumbrance
  • Loading branch information
@Andrew-Fall @kevingranade
Andrew-Fall authored and kevingranade committed Sep 6, 2019
1 parent 25c0373 commit e12c331
Show file tree
Hide file tree
Showing 8 changed files with 164 additions and 63 deletions.
122 changes: 82 additions & 40 deletions data/json/items/armor/backpacks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
"weight": "633 g",
"volume": "2 L",
"price": 3900,
"rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 30,
"encumbrance": 10,
"storage": "10 L",
"encumbrance": 2,
"max_encumbrance": 15,
"storage": "15 L",
"warmth": 6,
"material_thickness": 2,
"flags": [ "BELTED" ]
Expand All @@ -26,12 +28,14 @@
"weight": "2291 g",
"volume": "14 L",
"price": 10000,
"rigid": false,
"material": [ "leather" ],
"symbol": "[",
"color": "brown",
"covers": [ "TORSO" ],
"coverage": 50,
"encumbrance": 55,
"encumbrance": 10,
"max_encumbrance": 40,
"storage": "55 L",
"warmth": 10,
"material_thickness": 2,
Expand All @@ -55,13 +59,15 @@
"weight": "1200 g",
"volume": "8750 ml",
"price": 4500,
"rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO", "LEGS" ],
"coverage": 75,
"encumbrance": 100,
"storage": "35 L",
"encumbrance": 10,
"max_encumbrance": 40,
"storage": "45 L",
"warmth": 5,
"material_thickness": 2,
"flags": [ "BELTED" ]
Expand All @@ -74,13 +80,15 @@
"weight": "818 g",
"volume": "2 L",
"price": 11900,
"rigid": false,
"material": [ "leather" ],
"symbol": "[",
"color": "brown",
"covers": [ "TORSO" ],
"coverage": 30,
"encumbrance": 11,
"storage": "10 L",
"encumbrance": 4,
"max_encumbrance": 17,
"storage": "15 L",
"warmth": 9,
"material_thickness": 3,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
Expand All @@ -93,12 +101,14 @@
"weight": "2291 g",
"volume": "15 L",
"price": 9000,
"rigid": false,
"material": [ "leather" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 50,
"encumbrance": 65,
"encumbrance": 10,
"max_encumbrance": 55,
"storage": "65 L",
"warmth": 10,
"material_thickness": 2,
Expand All @@ -112,13 +122,14 @@
"weight": "3539 g",
"volume": "21 L",
"price": 20000,
"material": [ "leather" ],
"rigid": false,
"symbol": "[",
"color": "black",
"covers": [ "TORSO" ],
"coverage": 50,
"encumbrance": 100,
"storage": "100 L",
"encumbrance": 16,
"max_encumbrance": 65,
"storage": "80 L",
"warmth": 10,
"material_thickness": 2,
"flags": [ "BELTED", "WATERPROOF", "ONLY_ONE", "OVERSIZE" ]
Expand All @@ -131,13 +142,15 @@
"weight": "512 g",
"volume": "1500 ml",
"price": 10900,
"rigid": false,
"material": [ "plastic" ],
"symbol": "[",
"color": "yellow",
"covers": [ "TORSO" ],
"coverage": 40,
"encumbrance": 10,
"storage": "9500 ml",
"encumbrance": 2,
"max_encumbrance": 12,
"storage": "12 L",
"material_thickness": 1,
"flags": [ "WATER_FRIENDLY", "BELTED" ]
},
Expand All @@ -149,13 +162,15 @@
"weight": "933 g",
"volume": "6 L",
"price": 12000,
"rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 50,
"encumbrance": 30,
"storage": "30 L",
"encumbrance": 5,
"max_encumbrance": 35,
"storage": "35 L",
"warmth": 10,
"material_thickness": 2,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
Expand All @@ -173,8 +188,8 @@
"color": "blue",
"covers": [ "TORSO" ],
"coverage": 40,
"encumbrance": 14,
"storage": "3750 ml",
"encumbrance": 10,
"storage": "4 L",
"warmth": 8,
"material_thickness": 2,
"properties": [ [ "monster_size_capacity", "SMALL" ] ],
Expand Down Expand Up @@ -209,12 +224,14 @@
"weight": "560 g",
"volume": "2 L",
"price": 1000,
"rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "light_gray",
"covers": [ "TORSO" ],
"coverage": 30,
"encumbrance": 10,
"encumbrance": 2,
"max_encumbrance": 9,
"storage": "5 L",
"warmth": 5,
"material_thickness": 1,
Expand All @@ -228,14 +245,16 @@
"weight": "771 g",
"volume": "5 L",
"price": 100,
"rigid": false,
"to_hit": -2,
"material": [ "cotton" ],
"symbol": "[",
"color": "light_gray",
"covers": [ "TORSO" ],
"coverage": 40,
"encumbrance": 40,
"storage": "7500 ml",
"encumbrance": 4,
"max_encumbrance": 15,
"storage": "10 L",
"warmth": 10,
"material_thickness": 1,
"flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY" ]
Expand All @@ -249,15 +268,17 @@
"weight": "760 g",
"volume": "1 L",
"price": 7900,
"rigid": false,
"to_hit": 1,
"bashing": 1,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 30,
"encumbrance": 5,
"storage": "6250 ml",
"encumbrance": 1,
"max_encumbrance": 6,
"storage": "6 L",
"material_thickness": 1,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
},
Expand All @@ -269,12 +290,14 @@
"weight": "966 g",
"volume": "2500 ml",
"price": 6700,
"rigid": false,
"material": [ "cotton", "kevlar" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 35,
"encumbrance": 9,
"encumbrance": 2,
"max_encumbrance": 9,
"storage": "12 L",
"warmth": 10,
"material_thickness": 2,
Expand All @@ -288,14 +311,16 @@
"weight": "297 g",
"volume": "1 L",
"price": 7500,
"rigid": false,
"to_hit": 2,
"bashing": 2,
"material": [ "leather" ],
"symbol": "[",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 10,
"encumbrance": 7,
"encumbrance": 2,
"max_encumbrance": 7,
"storage": "5 L",
"material_thickness": 2,
"flags": [ "FANCY", "BELTED", "WATER_FRIENDLY" ]
Expand All @@ -308,13 +333,15 @@
"weight": "1140 g",
"volume": "4 L",
"price": 9200,
"rigid": false,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 40,
"encumbrance": 20,
"storage": "20 L",
"encumbrance": 2,
"max_encumbrance": 20,
"storage": "22 L",
"warmth": 8,
"material_thickness": 2,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
Expand All @@ -327,15 +354,17 @@
"weight": "840 g",
"volume": "1500 ml",
"price": 24000,
"rigid": false,
"to_hit": 1,
"bashing": 1,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 20,
"encumbrance": 3,
"storage": "4 L",
"encumbrance": 1,
"max_encumbrance": 6,
"storage": "7 L",
"warmth": 2,
"material_thickness": 1,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
Expand All @@ -349,13 +378,15 @@
"weight": "566 g",
"volume": "1500 ml",
"price": 2900,
"rigid": false,
"bashing": 1,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 30,
"encumbrance": 7,
"encumbrance": 2,
"max_encumbrance": 9,
"storage": "8 L",
"warmth": 2,
"material_thickness": 1,
Expand All @@ -369,13 +400,15 @@
"weight": "1000 g",
"volume": "7500 ml",
"price": 24000,
"rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 40,
"encumbrance": 25,
"storage": "37500 ml",
"encumbrance": 8,
"max_encumbrance": 28,
"storage": "38 L",
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ]
},
Expand All @@ -387,13 +420,15 @@
"weight": "600 g",
"volume": "2500 ml",
"price": 24000,
"rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"color": "brown",
"covers": [ "TORSO" ],
"coverage": 30,
"encumbrance": 8,
"storage": "12500 ml",
"encumbrance": 3,
"max_encumbrance": 12,
"storage": "16 L",
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ]
},
Expand All @@ -405,12 +440,14 @@
"weight": "800 g",
"volume": "5 L",
"price": 24000,
"rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 40,
"encumbrance": 18,
"encumbrance": 3,
"max_encumbrance": 18,
"storage": "25 L",
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ]
Expand All @@ -423,13 +460,15 @@
"weight": "440 g",
"volume": "1750 ml",
"price": 24000,
"rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"color": "brown",
"covers": [ "TORSO" ],
"coverage": 30,
"encumbrance": 2,
"storage": "4500 ml",
"encumbrance": 1,
"max_encumbrance": 6,
"storage": "8 L",
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ]
},
Expand All @@ -441,13 +480,14 @@
"weight": "1900 g",
"volume": "15 L",
"price": 800,
"rigid": false,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 35,
"encumbrance": 16,
"storage": "15 L",
"encumbrance": 2,
"max_encumbrance": 15,
"warmth": 5,
"material_thickness": 3,
"flags": [ "BELTED", "OVERSIZE" ],
Expand All @@ -468,13 +508,15 @@
"weight": "636 g",
"volume": "3 L",
"price": 7000,
"rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "yellow",
"covers": [ "TORSO" ],
"coverage": 40,
"encumbrance": 25,
"storage": "25 L",
"encumbrance": 3,
"max_encumbrance": 25,
"storage": "30 L",
"warmth": 8,
"material_thickness": 2,
"flags": [ "BELTED", "WATERPROOF" ]
Expand Down
Loading

0 comments on commit e12c331

Please sign in to comment.