Change all instances of 'volume' in JSONs to be a metric string II: T…

…he Empre Strikes Back (#33551) * update * fix acorn
CleverRaven · Aug 26, 2019 · dbdebf7 · dbdebf7
1 parent 3fdaf32
commit dbdebf7
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 72 deletions.
diff --git a/data/json/items/armor/backpacks.json b/data/json/items/armor/backpacks.json
@@ -198,7 +198,7 @@
     "encumbrance": 30,
     "warmth": 5,
     "material_thickness": 2,
-    "container_data": { "contains": 40, "seals": true, "watertight": true },
+    "container_data": { "contains": "10 L", "seals": true, "watertight": true },
     "flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY" ]
   },
   {

diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -422,7 +422,7 @@
     "description": "Stiff leather boots with intricate embroidery and one-inch heels.  They look good, but aren't made for running.  Each boot is large enough to conceal a small holdout pistol.",
     "coverage": 95,
     "proportional": { "weight": 1.2, "volume": 1.2, "price": 2, "encumbrance": 2 },
-    "use_action": { "type": "holster", "max_volume": 1, "max_weight": 600, "draw_cost": 80, "multi": 2, "skills": [ "pistol" ] },
+    "use_action": { "type": "holster", "max_volume": "250 ml", "max_weight": 600, "draw_cost": 80, "multi": 2, "skills": [ "pistol" ] },
     "extend": { "flags": [ "FANCY" ] }
   },
   {

diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
@@ -14,7 +14,7 @@
     "coverage": 5,
     "encumbrance": 5,
     "material_thickness": 1,
-    "use_action": { "type": "holster", "max_volume": 15, "draw_cost": 150, "skills": [ "smg", "shotgun", "rifle", "launcher" ] },
+    "use_action": { "type": "holster", "max_volume": "3750 ml", "draw_cost": 150, "skills": [ "smg", "shotgun", "rifle", "launcher" ] },
     "flags": [ "BELTED", "OVERSIZE", "NO_QUICKDRAW" ]
   },
   {
@@ -33,7 +33,14 @@
     "encumbrance": 4,
     "material_thickness": 1,
     "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ],
-    "use_action": { "type": "holster", "max_volume": 2, "min_volume": 0, "max_weight": 1000, "draw_cost": 150, "skills": [ "pistol" ] }
+    "use_action": {
+      "type": "holster",
+      "max_volume": "500 ml",
+      "min_volume": 0,
+      "max_weight": 1000,
+      "draw_cost": 150,
+      "skills": [ "pistol" ]
+    }
   },
   {
     "id": "bow_sling",
@@ -52,7 +59,7 @@
     "encumbrance": 7,
     "material_thickness": 1,
     "flags": [ "OVERSIZE", "WAIST" ],
-    "use_action": { "type": "holster", "max_volume": 20, "min_volume": 2, "skills": [ "archery" ] }
+    "use_action": { "type": "holster", "max_volume": "5 L", "min_volume": "500 ml", "skills": [ "archery" ] }
   },
   {
     "id": "holster",
@@ -69,7 +76,7 @@
     "coverage": 5,
     "encumbrance": 5,
     "material_thickness": 1,
-    "use_action": { "type": "holster", "max_volume": 5, "min_volume": 2, "skills": [ "pistol", "smg", "shotgun" ] },
+    "use_action": { "type": "holster", "max_volume": "1250 ml", "min_volume": "500 ml", "skills": [ "pistol", "smg", "shotgun" ] },
     "flags": [ "WAIST", "OVERSIZE" ]
   },
   {
@@ -79,7 +86,7 @@
     "name": "fast draw holster",
     "description": "A comfortable quick draw holster for small guns.  Activate to holster/draw a gun.",
     "encumbrance": 2,
-    "use_action": { "type": "holster", "max_volume": 4, "draw_cost": 80, "skills": [ "pistol", "shotgun" ] }
+    "use_action": { "type": "holster", "max_volume": "1 L", "draw_cost": 80, "skills": [ "pistol", "shotgun" ] }
   },
   {
     "id": "bholster",
@@ -93,7 +100,14 @@
     "material": "plastic",
     "covers": [ "LEGS" ],
     "encumbrance": 1,
-    "use_action": { "type": "holster", "max_volume": 2, "min_volume": 0, "max_weight": 1000, "draw_cost": 210, "skills": [ "pistol" ] },
+    "use_action": {
+      "type": "holster",
+      "max_volume": "500 ml",
+      "min_volume": 0,
+      "max_weight": 1000,
+      "draw_cost": 210,
+      "skills": [ "pistol" ]
+    },
     "flags": [ "SKINTIGHT", "WATER_FRIENDLY" ]
   },
   {
@@ -113,7 +127,7 @@
     "encumbrance": 2,
     "storage": "3 L",
     "material_thickness": 2,
-    "use_action": { "type": "holster", "max_volume": 15, "min_volume": 5, "skills": [ "smg", "shotgun", "rifle" ] },
+    "use_action": { "type": "holster", "max_volume": "3750 ml", "min_volume": "1250 ml", "skills": [ "smg", "shotgun", "rifle" ] },
     "flags": [ "WATER_FRIENDLY", "STURDY", "WAIST" ]
   },
   {
@@ -132,7 +146,7 @@
     "coverage": 10,
     "encumbrance": 2,
     "material_thickness": 1,
-    "use_action": { "type": "holster", "min_volume": 5, "max_volume": 8, "skills": [ "pistol", "smg", "shotgun", "rifle" ] },
+    "use_action": { "type": "holster", "min_volume": "1250 ml", "max_volume": "2 L", "skills": [ "pistol", "smg", "shotgun", "rifle" ] },
     "flags": [ "WAIST", "OVERSIZE" ]
   }
 ]
diff --git a/data/json/items/comestibles/irradiated_veggy.json b/data/json/items/comestibles/irradiated_veggy.json
@@ -120,7 +120,7 @@
     "price": 320,
     "material": "veggy",
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "COMESTIBLE",
@@ -136,7 +136,7 @@
     "description": "An irradiated cluster of celery will remain edible nearly forever.  Sterilized using radiation, so it's safe to eat.",
     "price": 220,
     "material": "veggy",
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json
@@ -434,7 +434,7 @@
     "volume": "250 ml",
     "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
     "charges": 4,
-    "//": "no vitamins here",
+    "//2": "no vitamins here",
     "fun": -20
   },
   {
@@ -465,6 +465,6 @@
     "price": 90,
     "material": "nut",
     "vitamins": [ [ "calcium", 4 ], [ "iron", 4 ] ],
-    "volume": 1
+    "volume": "250 ml"
   }
 ]
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -12,7 +12,7 @@
     "calories": 1000,
     "description": "Not very nutritious.  Warning: contains calories, unsuitable for breatharians.",
     "price": 100,
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "COMESTIBLE",
@@ -640,7 +640,7 @@
     "price": 0,
     "material": "veggy",
     "flags": "TRADER_AVOID",
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "COMESTIBLE",
@@ -657,7 +657,7 @@
     "price": 0,
     "material": "veggy",
     "flags": "TRADER_AVOID",
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "COMESTIBLE",
@@ -673,6 +673,6 @@
     "description": "Some nectar.  Seeing this item is a bug.",
     "price": 0,
     "flags": "TRADER_AVOID",
-    "volume": 1
+    "volume": "250 ml"
   }
 ]
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
@@ -266,7 +266,7 @@
     "material": "paper",
     "symbol": ")",
     "color": "white",
-    "contains": 1
+    "contains": "250 ml"
   },
   {
     "id": "box_small",
@@ -281,7 +281,7 @@
     "material": "paper",
     "symbol": ")",
     "color": "brown",
-    "contains": 4
+    "contains": "1 L"
   },
   {
     "id": "box_medium",
@@ -297,7 +297,7 @@
     "material": "paper",
     "symbol": ")",
     "color": "brown",
-    "contains": 12
+    "contains": "3 L"
   },
   {
     "id": "box_large",
@@ -350,7 +350,7 @@
     "contains": "2 L",
     "seals": true,
     "watertight": true,
-    "armor_data": { "covers": [ "TORSO" ], "coverage": 15, "storage": 4, "material_thickness": 1 },
+    "armor_data": { "covers": [ "TORSO" ], "coverage": 15, "storage": "1 L", "material_thickness": 1 },
     "flags": [ "BELTED" ]
   },
   {

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -205,7 +205,7 @@
     "material": [ "nomex" ],
     "flags": [ "NO_SALVAGE" ],
     "weight": 42,
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -696,7 +696,7 @@
     "price_postapoc": 100,
     "material": "iron",
     "weight": 3220,
-    "volume": 3
+    "volume": "750 ml"
   },
   {
     "type": "GENERIC",
@@ -710,7 +710,7 @@
     "price_postapoc": 500,
     "material": "steel",
     "weight": 8440,
-    "volume": 20
+    "volume": "5 L"
   },
   {
     "type": "GENERIC",
@@ -770,7 +770,7 @@
     "price_postapoc": 100,
     "material": "iron",
     "weight": 226,
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -784,7 +784,7 @@
     "price_postapoc": 100,
     "material": "iron",
     "weight": 226,
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -824,7 +824,7 @@
     "price": 1000,
     "material": [ "aluminum", "plastic" ],
     "weight": 725,
-    "volume": 3
+    "volume": "750 ml"
   },
   {
     "type": "GENERIC",
@@ -836,7 +836,7 @@
     "price": 1000,
     "material": [ "steel", "plastic" ],
     "weight": 11339,
-    "volume": 12
+    "volume": "3 L"
   },
   {
     "type": "GENERIC",
@@ -1450,7 +1450,7 @@
     "price": 1000,
     "material": [ "steel", "plastic" ],
     "weight": 110,
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1506,7 +1506,7 @@
     "price_postapoc": 100,
     "material": [ "aluminum", "plastic" ],
     "weight": 2857,
-    "volume": 4
+    "volume": "1 L"
   },
   {
     "type": "GENERIC",
@@ -1547,7 +1547,7 @@
     "material": "cotton",
     "flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
     "weight": 80,
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "id": "pipe_cleaner",
@@ -1589,7 +1589,7 @@
     "price_postapoc": 0,
     "material": "steel",
     "weight": 50,
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "id": "l_HFPack",
@@ -2372,7 +2372,7 @@
     "price": 100,
     "material": [ "paper" ],
     "weight": 80,
-    "volume": 2
+    "volume": "500 ml"
   },
   {
     "type": "GENERIC",
@@ -2564,7 +2564,7 @@
     "price": 2000,
     "material": "veggy",
     "weight": 420,
-    "volume": 4
+    "volume": "1 L"
   },
   {
     "type": "GENERIC",
@@ -2578,7 +2578,7 @@
     "price": 300,
     "material": "veggy",
     "weight": 100,
-    "volume": 1
+    "volume": "250 ml"
   },
   {
     "id": "cash_card",
@@ -2985,7 +2985,7 @@
     "price_postapoc": 2000,
     "material": [ "steel", "plastic", "wood" ],
     "weight": 11339,
-    "volume": 12
+    "volume": "3 L"
   },
   {
     "type": "GENERIC",

diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
@@ -330,7 +330,7 @@
     "description": "An empty steel tube which once contained a 152mm ATGM.  Now it's essentially just a huge pipe.",
     "material": "steel",
     "weight": 9500,
-    "volume": 30
+    "volume": "7500 ml"
   },
   {
     "id": "shot_hull",