Change "storage" volume to metric units

data/json/items/armor/ammo_pouch.json

@@ -93,7 +93,7 @@
     "coverage": 20,
     "encumbrance": 2,
     "material_thickness": 2,
-    "storage": 12,
+    "storage": "3 L",
     "use_action": {
       "type": "holster",
       "holster_prompt": "Stash ammo",
@@ -177,7 +177,7 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 7,
-    "storage": 10,
+    "storage": "2500 ml",
     "warmth": 15,
     "material_thickness": 4,
     "use_action": {
@@ -210,7 +210,7 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 15,
-    "storage": 4,
+    "storage": "1 L",
     "warmth": 15,
     "material_thickness": 5,
     "use_action": {
@@ -243,7 +243,7 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 45,
-    "storage": 4,
+    "storage": "1 L",
     "warmth": 15,
     "material_thickness": 4,
     "use_action": {
@@ -276,7 +276,7 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 8,
-    "storage": 4,
+    "storage": "1 L",
     "warmth": 15,
     "material_thickness": 5,
     "use_action": {
@@ -309,7 +309,7 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 30,
-    "storage": 4,
+    "storage": "1 L",
     "warmth": 15,
     "material_thickness": 5,
     "use_action": {
@@ -342,7 +342,7 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 15,
-    "storage": 4,
+    "storage": "1 L",
     "warmth": 15,
     "material_thickness": 5,
     "use_action": {
@@ -375,7 +375,7 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 17,
-    "storage": 10,
+    "storage": "2500 ml",
     "warmth": 15,
     "material_thickness": 4,
     "use_action": {

data/json/items/armor/backpacks.json

@@ -13,7 +13,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 10,
-    "storage": 40,
+    "storage": "10 L",
     "warmth": 6,
     "material_thickness": 2,
     "flags": [ "BELTED" ]
@@ -32,7 +32,7 @@
     "covers": [ "TORSO" ],
     "coverage": 50,
     "encumbrance": 55,
-    "storage": 220,
+    "storage": "55 L",
     "warmth": 10,
     "material_thickness": 2,
     "use_action": {
@@ -61,7 +61,7 @@
     "covers": [ "TORSO", "LEGS" ],
     "coverage": 75,
     "encumbrance": 100,
-    "storage": 140,
+    "storage": "35 L",
     "warmth": 5,
     "material_thickness": 2,
     "flags": [ "BELTED" ]
@@ -80,7 +80,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 11,
-    "storage": 40,
+    "storage": "10 L",
     "warmth": 9,
     "material_thickness": 3,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -99,7 +99,7 @@
     "covers": [ "TORSO" ],
     "coverage": 50,
     "encumbrance": 65,
-    "storage": 260,
+    "storage": "65 L",
     "warmth": 10,
     "material_thickness": 2,
     "flags": [ "BELTED", "WATERPROOF", "ONLY_ONE", "OVERSIZE" ]
@@ -118,7 +118,7 @@
     "covers": [ "TORSO" ],
     "coverage": 50,
     "encumbrance": 100,
-    "storage": 400,
+    "storage": "100 L",
     "warmth": 10,
     "material_thickness": 2,
     "flags": [ "BELTED", "WATERPROOF", "ONLY_ONE", "OVERSIZE" ]
@@ -137,7 +137,7 @@
     "covers": [ "TORSO" ],
     "coverage": 40,
     "encumbrance": 10,
-    "storage": 38,
+    "storage": "9500 ml",
     "material_thickness": 1,
     "flags": [ "WATER_FRIENDLY", "BELTED" ]
   },
@@ -155,7 +155,7 @@
     "covers": [ "TORSO" ],
     "coverage": 50,
     "encumbrance": 30,
-    "storage": 120,
+    "storage": "30 L",
     "warmth": 10,
     "material_thickness": 2,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -174,7 +174,7 @@
     "covers": [ "TORSO" ],
     "coverage": 40,
     "encumbrance": 14,
-    "storage": 15,
+    "storage": "3750 ml",
     "warmth": 8,
     "material_thickness": 2,
     "properties": [ [ "monster_size_capacity", "SMALL" ] ],
@@ -215,7 +215,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 10,
-    "storage": 20,
+    "storage": "5 L",
     "warmth": 5,
     "material_thickness": 1,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -235,7 +235,7 @@
     "covers": [ "TORSO" ],
     "coverage": 40,
     "encumbrance": 40,
-    "storage": 30,
+    "storage": "7500 ml",
     "warmth": 10,
     "material_thickness": 1,
     "flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY" ]
@@ -257,7 +257,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 5,
-    "storage": 25,
+    "storage": "6250 ml",
     "material_thickness": 1,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
   },
@@ -275,7 +275,7 @@
     "covers": [ "TORSO" ],
     "coverage": 35,
     "encumbrance": 9,
-    "storage": 48,
+    "storage": "12 L",
     "warmth": 10,
     "material_thickness": 2,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -296,7 +296,7 @@
     "covers": [ "TORSO" ],
     "coverage": 10,
     "encumbrance": 7,
-    "storage": 20,
+    "storage": "5 L",
     "material_thickness": 2,
     "flags": [ "FANCY", "BELTED", "WATER_FRIENDLY" ]
   },
@@ -314,7 +314,7 @@
     "covers": [ "TORSO" ],
     "coverage": 40,
     "encumbrance": 20,
-    "storage": 80,
+    "storage": "20 L",
     "warmth": 8,
     "material_thickness": 2,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -335,7 +335,7 @@
     "covers": [ "TORSO" ],
     "coverage": 20,
     "encumbrance": 3,
-    "storage": 16,
+    "storage": "4 L",
     "warmth": 2,
     "material_thickness": 1,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -356,7 +356,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 7,
-    "storage": 32,
+    "storage": "8 L",
     "warmth": 2,
     "material_thickness": 1,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -375,7 +375,7 @@
     "covers": [ "TORSO" ],
     "coverage": 40,
     "encumbrance": 25,
-    "storage": 150,
+    "storage": "37500 ml",
     "material_thickness": 2,
     "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ]
   },
@@ -393,7 +393,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 8,
-    "storage": 50,
+    "storage": "12500 ml",
     "material_thickness": 2,
     "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ]
   },
@@ -411,7 +411,7 @@
     "covers": [ "TORSO" ],
     "coverage": 40,
     "encumbrance": 18,
-    "storage": 100,
+    "storage": "25 L",
     "material_thickness": 2,
     "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ]
   },
@@ -429,7 +429,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 2,
-    "storage": 18,
+    "storage": "4500 ml",
     "material_thickness": 2,
     "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ]
   },
@@ -447,7 +447,7 @@
     "covers": [ "TORSO" ],
     "coverage": 35,
     "encumbrance": 16,
-    "storage": 60,
+    "storage": "15 L",
     "warmth": 5,
     "material_thickness": 3,
     "flags": [ "BELTED", "OVERSIZE" ],
@@ -474,7 +474,7 @@
     "covers": [ "TORSO" ],
     "coverage": 40,
     "encumbrance": 25,
-    "storage": 100,
+    "storage": "25 L",
     "warmth": 8,
     "material_thickness": 2,
     "flags": [ "BELTED", "WATERPROOF" ]

data/json/items/armor/holster.json

@@ -111,7 +111,7 @@
     "covers": [ "TORSO" ],
     "coverage": 20,
     "encumbrance": 2,
-    "storage": 12,
+    "storage": "3 L",
     "material_thickness": 2,
     "use_action": { "type": "holster", "max_volume": 15, "min_volume": 5, "skills": [ "smg", "shotgun", "rifle" ] },
     "flags": [ "WATER_FRIENDLY", "STURDY", "WAIST" ]

data/json/items/armor/pets_dog_armor.json

@@ -16,7 +16,7 @@
     "to_hit": -1,
     "flags": [ "IS_PET_ARMOR", "NO_SALVAGE" ],
     "material_thickness": 2,
-    "storage": 50,
+    "storage": "12500 ml",
     "max_pet_vol": "35000 ml",
     "min_pet_vol": "25000 ml",
     "pet_bodytype": "dog"
@@ -114,7 +114,7 @@
     "price_postapoc": 13000,
     "material": [ "superalloy" ],
     "weight": 3125,
-    "storage": 100,
+    "storage": "25 L",
     "min_pet_vol": "20000 ml"
   }
 ]

data/json/items/armor/pets_horse_armor.json

@@ -139,7 +139,7 @@
     "covers": [ "HANDS" ],
     "coverage": 50,
     "encumbrance": 30,
-    "storage": 120,
+    "storage": "30 L",
     "warmth": 10,
     "material_thickness": 2,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]

data/json/items/armor/power_armor.json

@@ -17,7 +17,7 @@
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 95,
     "encumbrance": 40,
-    "storage": 10,
+    "storage": "2500 ml",
     "warmth": 50,
     "material_thickness": 8,
     "environmental_protection": 6,
@@ -63,7 +63,7 @@
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
     "encumbrance": 50,
-    "storage": 10,
+    "storage": "2500 ml",
     "warmth": 90,
     "power_armor": true,
     "material_thickness": 11,
@@ -87,7 +87,7 @@
     "color": "light_gray",
     "coverage": 100,
     "encumbrance": 40,
-    "storage": 120,
+    "storage": "30 L",
     "power_armor": true,
     "material_thickness": 10,
     "flags": [ "WATERPROOF", "STURDY", "BELTED" ]
@@ -109,7 +109,7 @@
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
     "encumbrance": 60,
-    "storage": 16,
+    "storage": "4 L",
     "warmth": 60,
     "power_armor": true,
     "material_thickness": 12,
@@ -206,7 +206,7 @@
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
     "encumbrance": 40,
-    "storage": 16,
+    "storage": "4 L",
     "warmth": 60,
     "power_armor": true,
     "material_thickness": 9,

data/json/items/tool_armor.json

@@ -511,7 +511,7 @@
     "ammo": "plutonium",
     "use_action": "RM13ARMOR_OFF",
     "covers": [ "HEAD", "MOUTH", "EYES", "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
-    "storage": 32,
+    "storage": "8 L",
     "warmth": 30,
     "environmental_protection": 15,
     "encumbrance": 30,
@@ -1319,7 +1319,7 @@
     "weight": 3390,
     "color": "brown",
     "covers": [ "TORSO" ],
-    "storage": 2,
+    "storage": "500 ml",
     "symbol": "[",
     "description": "A custom-built leather utility belt covered with straps and pouches containing many useful hand tools and a sheath to carry a smaller blade.  Durable and carefully crafted to be comfortable to wear.  Activate to sheathe/draw a weapon.",
     "price": 50000,

tools/json_tools/cddaUpdateJsonVolume.js

@@ -9,7 +9,7 @@ const PATH = require('path');
 const pad = (str, n = 3) => String(str).padStart(n);
 const L = (str, ...args) => console.info(pad(str, 30), ...args);
 
-const matchVolume = /( *)("(?:min_|max_|min_pet_|min_pet_|integral_)?volume": )(\d+)(,\r?\n)/g;
+const matchVolume = /( *)("(?:min_|max_|min_pet_|min_pet_|integral_)?volume|storage": )(\d+)(,\r?\n)/g;
 
 if (process.argv.length !== 3) {
   L('must have exactly one argument');