From 574b271a1a5c47e7b7be3fe6cc7824c15d477526 Mon Sep 17 00:00:00 2001 From: Brian-Otten <47374323+Brian-Otten@users.noreply.github.com> Date: Thu, 6 Feb 2020 02:22:13 +0100 Subject: [PATCH] Nested container wip remainingpockets (#103) * Adds pockets Adds pockets for all of storage.json and some common pants. * Remaining clothes pockets This should hopefully be all the clothes now. Co-authored-by: Curtis Merrill --- data/json/items/armor/power_armor.json | 10 +- data/json/items/armor/suits_clothes.json | 32 ++++- data/json/items/armor/suits_protection.json | 145 +++++++++++++++++--- data/json/items/armor/swimming.json | 22 ++- data/json/items/armor/torso_armor.json | 28 +++- data/json/items/armor/torso_clothes.json | 47 +++++-- 6 files changed, 237 insertions(+), 47 deletions(-) diff --git a/data/json/items/armor/power_armor.json b/data/json/items/armor/power_armor.json index 6189ecb845272..a3e856a10362c 100644 --- a/data/json/items/armor/power_armor.json +++ b/data/json/items/armor/power_armor.json @@ -19,7 +19,7 @@ "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ], "coverage": 95, "encumbrance": 40, - "storage": "2500 ml", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "15 kg", "moves": 200 } ], "warmth": 50, "material_thickness": 8, "environmental_protection": 6, @@ -69,7 +69,7 @@ "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ], "coverage": 100, "encumbrance": 50, - "storage": "2500 ml", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "15 kg", "moves": 200 } ], "warmth": 90, "power_armor": true, "material_thickness": 11, @@ -95,7 +95,7 @@ "color": "light_gray", "coverage": 100, "encumbrance": 40, - "storage": "30 L", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "30 L", "max_contains_weight": "150 kg", "moves": 300 } ], "power_armor": true, "material_thickness": 10, "flags": [ "WATERPROOF", "STURDY", "BELTED" ] @@ -119,7 +119,7 @@ "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ], "coverage": 100, "encumbrance": 60, - "storage": "4 L", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ], "warmth": 60, "power_armor": true, "material_thickness": 12, @@ -224,7 +224,7 @@ "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ], "coverage": 100, "encumbrance": 40, - "storage": "4 L", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ], "warmth": 60, "power_armor": true, "material_thickness": 9, diff --git a/data/json/items/armor/suits_clothes.json b/data/json/items/armor/suits_clothes.json index bfdda81dec8b5..e62fea2fb9ef6 100644 --- a/data/json/items/armor/suits_clothes.json +++ b/data/json/items/armor/suits_clothes.json @@ -38,7 +38,11 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 90, "encumbrance": 30, - "storage": "3250 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "1 kg", "moves": 120 } + ], "warmth": 10, "material_thickness": 2, "flags": [ "VARSIZE", "FANCY", "POCKETS", "OUTER" ] @@ -60,7 +64,7 @@ "covers": [ "LEGS", "TORSO", "ARMS", "HANDS", "HEAD", "FEET", "MOUTH", "EYES" ], "coverage": 100, "encumbrance": 30, - "storage": "1 L", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } ], "warmth": 50, "material_thickness": 5, "environmental_protection": 2, @@ -82,7 +86,12 @@ "covers": [ "LEGS", "ARMS", "TORSO" ], "coverage": 95, "encumbrance": 2, - "storage": "2 L", + "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 } + ], "warmth": 15, "material_thickness": 1, "flags": [ "VARSIZE", "POCKETS" ] @@ -103,7 +112,12 @@ "covers": [ "LEGS", "ARMS", "TORSO" ], "coverage": 95, "encumbrance": 2, - "storage": "2500 ml", + "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 } + ], "warmth": 15, "material_thickness": 1, "flags": [ "POCKETS", "OVERSIZE" ] @@ -135,7 +149,10 @@ "covers": [ "LEGS", "ARMS", "TORSO" ], "coverage": 95, "encumbrance": 7, - "storage": "1 L", + "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 } + ], "warmth": 15, "material_thickness": 2, "flags": [ "VARSIZE", "POCKETS", "OVERSIZE" ] @@ -175,7 +192,10 @@ "covers": [ "LEGS", "TORSO", "ARMS", "HANDS", "HEAD", "FEET", "MOUTH", "EYES" ], "coverage": 100, "encumbrance": 30, - "storage": "1 L", + "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 } + ], "warmth": 50, "material_thickness": 7, "environmental_protection": 2, diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index c7e63dde1dea1..f3d99816f92e0 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -15,7 +15,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 30, - "storage": "4 L", + "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": "1 L", "max_contains_weight": "3 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } + ], "warmth": 35, "material_thickness": 3, "environmental_protection": 9, @@ -60,7 +65,10 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 90, "encumbrance": 22, - "storage": "1 L", + "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 } + ], "warmth": 20, "material_thickness": 5, "valid_mods": [ "steel_padded" ], @@ -117,7 +125,10 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 90, "encumbrance": 25, - "storage": "1 L", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 } + ], "warmth": 60, "material_thickness": 4, "valid_mods": [ "steel_padded" ], @@ -141,7 +152,10 @@ "covers": [ "LEGS", "TORSO" ], "coverage": 90, "encumbrance": 20, - "storage": "2 L", + "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 } + ], "warmth": 25, "material_thickness": 4, "valid_mods": [ "steel_padded" ], @@ -185,7 +199,19 @@ "covers": [ "TORSO", "ARMS", "LEGS" ], "coverage": 95, "encumbrance": 20, - "storage": "20 L", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "8 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "8 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 120 }, + { "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": "8 L", "max_contains_weight": "16 kg", "moves": 150 }, + { "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 } + ], "warmth": 40, "material_thickness": 5, "valid_mods": [ "steel_padded" ], @@ -208,7 +234,18 @@ "covers": [ "TORSO", "ARMS", "LEGS" ], "coverage": 80, "encumbrance": 16, - "storage": "12500 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "8 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "8 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 120 }, + { "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": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 120 } + ], "warmth": 10, "material_thickness": 4, "valid_mods": [ "steel_padded" ], @@ -233,7 +270,12 @@ "looks_like": "armor_larmor", "coverage": 90, "encumbrance": 24, - "storage": "1500 ml", + "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 } + ], "warmth": 25, "material_thickness": 4, "environmental_protection": 1, @@ -368,7 +410,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 17, - "storage": "2 L", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 150 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 150 } + ], "warmth": 25, "material_thickness": 2, "environmental_protection": 1, @@ -493,7 +540,14 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 30, - "storage": "10 L", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 120 } + ], "warmth": 15, "material_thickness": 4, "valid_mods": [ "steel_padded" ], @@ -560,7 +614,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 35, - "storage": "6 L", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 120 } + ], "warmth": 15, "material_thickness": 6, "environmental_protection": 3, @@ -582,7 +641,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 15, - "storage": "7500 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 } + ], "warmth": 15, "material_thickness": 4, "environmental_protection": 3, @@ -625,7 +689,14 @@ "covers": [ "HEAD", "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ], "coverage": 100, "encumbrance": 15, - "storage": "5 L", + "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 }, + { "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": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 } + ], "warmth": 40, "material_thickness": 2, "environmental_protection": 20, @@ -667,7 +738,16 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 95, "encumbrance": 15, - "storage": "2500 ml", + "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 } + ], "warmth": 25, "material_thickness": 2, "flags": [ "VARSIZE", "FANCY", "POCKETS" ] @@ -688,7 +768,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 25, - "storage": "7 L", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 } + ], "warmth": 15, "material_thickness": 4, "valid_mods": [ "steel_padded" ], @@ -715,7 +800,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 95, "encumbrance": 25, - "storage": "5 L", + "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": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 } + ], "warmth": 35, "material_thickness": 7, "valid_mods": [ "steel_padded" ], @@ -740,7 +830,7 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 95, "encumbrance": 15, - "storage": "250 ml", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "2 kg", "moves": 80 } ], "warmth": 25, "material_thickness": 3, "valid_mods": [ "steel_padded" ], @@ -765,7 +855,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 37, - "storage": "6 L", + "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": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 } + ], "warmth": 75, "material_thickness": 5, "valid_mods": [ "steel_padded" ], @@ -790,7 +885,14 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 35, - "storage": "8500 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "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 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 } + ], "warmth": 15, "material_thickness": 4, "valid_mods": [ "steel_padded" ], @@ -815,7 +917,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 45, - "storage": "7500 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 } + ], "warmth": 15, "material_thickness": 6, "environmental_protection": 3, diff --git a/data/json/items/armor/swimming.json b/data/json/items/armor/swimming.json index 9b38db838f1f8..cd21850d6e1f9 100644 --- a/data/json/items/armor/swimming.json +++ b/data/json/items/armor/swimming.json @@ -34,7 +34,12 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 15, - "storage": "1 L", + "pocket_data": [ + { "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 } + ], "warmth": 50, "material_thickness": 1, "environmental_protection": 2, @@ -101,7 +106,13 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 20, - "storage": "11500 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 200 } + ], "warmth": 15, "material_thickness": 2, "environmental_protection": 10, @@ -146,7 +157,12 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 90, "encumbrance": 5, - "storage": "1 L", + "pocket_data": [ + { "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 } + ], "warmth": 30, "material_thickness": 1, "environmental_protection": 2, diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json index 7fbfb34def0e5..a323b47547bbd 100644 --- a/data/json/items/armor/torso_armor.json +++ b/data/json/items/armor/torso_armor.json @@ -210,7 +210,12 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 85, "encumbrance": 24, - "storage": "1 L", + "pocket_data": [ + { "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": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 120 } + ], "warmth": 30, "material_thickness": 3, "environmental_protection": 1, @@ -314,7 +319,14 @@ "covers": [ "TORSO" ], "coverage": 95, "encumbrance": 16, - "storage": "2500 ml", + "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 }, + { "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 }, + { "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 } + ], "warmth": 15, "material_thickness": 4, "environmental_protection": 1, @@ -337,7 +349,10 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 95, "encumbrance": 30, - "storage": "500 ml", + "pocket_data": [ + { "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 } + ], "warmth": 35, "material_thickness": 4, "environmental_protection": 2, @@ -395,7 +410,12 @@ "covers": [ "TORSO" ], "coverage": 90, "encumbrance": 24, - "storage": "1 L", + "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 } + ], "warmth": 30, "material_thickness": 3, "environmental_protection": 1, diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json index 168b4f9e195e3..dd8dd67a1f085 100644 --- a/data/json/items/armor/torso_clothes.json +++ b/data/json/items/armor/torso_clothes.json @@ -15,7 +15,10 @@ "covers": [ "TORSO", "LEGS" ], "coverage": 70, "encumbrance": 5, - "storage": "2 L", + "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 } + ], "warmth": 15, "material_thickness": 3, "environmental_protection": 1, @@ -36,7 +39,12 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 85, "encumbrance": 20, - "storage": "500 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "2 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "2 kg", "moves": 120 } + ], "warmth": 20, "material_thickness": 3, "valid_mods": [ "steel_padded" ], @@ -79,7 +87,7 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 90, "encumbrance": 5, - "storage": "250 ml", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 } ], "warmth": 10, "material_thickness": 1, "flags": [ "VARSIZE", "FANCY" ] @@ -220,7 +228,11 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 95, "encumbrance": 12, - "storage": "2250 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "4 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 } + ], "warmth": 30, "material_thickness": 3, "flags": [ "VARSIZE", "OUTER", "POCKETS", "HOOD" ] @@ -390,7 +402,10 @@ "covers": [ "TORSO", "ARMS", "LEGS" ], "coverage": 75, "encumbrance": 7, - "storage": "500 ml", + "pocket_data": [ + { "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 } + ], "warmth": 5, "material_thickness": 1, "flags": [ "VARSIZE", "FANCY" ] @@ -429,7 +444,10 @@ "color": "light_blue", "covers": [ "TORSO" ], "coverage": 90, - "storage": "1 L", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 } + ], "warmth": 5, "material_thickness": 1, "flags": [ "VARSIZE" ] @@ -450,7 +468,7 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 90, "encumbrance": 5, - "storage": "500 ml", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 } ], "warmth": 15, "material_thickness": 1, "flags": [ "VARSIZE" ] @@ -550,7 +568,7 @@ "covers": [ "TORSO" ], "coverage": 40, "encumbrance": 5, - "storage": "250 ml", + "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 } ], "warmth": 8, "material_thickness": 1, "snippet_category": [ @@ -665,7 +683,12 @@ "covers": [ "TORSO" ], "coverage": 90, "encumbrance": 8, - "storage": "1 L", + "pocket_data": [ + { "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": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 120 } + ], "warmth": 20, "material_thickness": 3, "environmental_protection": 1, @@ -687,7 +710,11 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 95, "encumbrance": 12, - "storage": "2250 ml", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "4 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 } + ], "warmth": 45, "material_thickness": 3, "valid_mods": [ "steel_padded" ],