Replace volume ints with strings for furn and ter (#36328)

Volume strings specifying the units are more readable and easily understandable, so they should be used instead of raw ints.
CleverRaven · Dec 21, 2019 · b830be5 · b830be5
1 parent e04ddf1
commit b830be5
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 51 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -91,7 +91,7 @@
     "move_cost_mod": -1,
     "coverage": 60,
     "required_str": 13,
-    "max_volume": 800,
+    "max_volume": "200 L",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "MINEABLE" ],
     "deconstruct": {
       "items": [
@@ -135,7 +135,7 @@
     "move_cost_mod": -1,
     "coverage": 60,
     "required_str": 12,
-    "max_volume": 150,
+    "max_volume": "37500 ml",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "MINEABLE" ],
     "deconstruct": {
       "items": [
@@ -191,7 +191,7 @@
         { "item": "motor_tiny", "count": 1 }
       ]
     },
-    "max_volume": 800,
+    "max_volume": "200 L",
     "bash": {
       "str_min": 18,
       "str_max": 50,
@@ -235,7 +235,7 @@
         { "item": "motor_tiny", "count": 1 }
       ]
     },
-    "max_volume": 1000,
+    "max_volume": "250 L",
     "bash": {
       "str_min": 12,
       "str_max": 50,
@@ -306,7 +306,7 @@
     "move_cost_mod": -1,
     "coverage": 60,
     "required_str": 12,
-    "max_volume": 120,
+    "max_volume": "30 L",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "MINEABLE" ],
     "deconstruct": {
       "items": [
@@ -361,7 +361,7 @@
         { "item": "pilot_light", "count": 1 }
       ]
     },
-    "max_volume": 160,
+    "max_volume": "40 L",
     "bash": {
       "str_min": 8,
       "str_max": 30,
@@ -398,7 +398,7 @@
         { "item": "wire", "count": [ 1, 4 ] }
       ]
     },
-    "max_volume": 160,
+    "max_volume": "40 L",
     "bash": {
       "str_min": 8,
       "str_max": 30,
@@ -434,7 +434,7 @@
         { "item": "pipe", "count": [ 1, 3 ] }
       ]
     },
-    "max_volume": 160,
+    "max_volume": "40 L",
     "bash": {
       "str_min": 12,
       "str_max": 30,

diff --git a/data/json/furniture_and_terrain/furniture-domestic_plants.json b/data/json/furniture_and_terrain/furniture-domestic_plants.json
@@ -8,7 +8,7 @@
     "move_cost_mod": 2,
     "description": "A variety of plant, used for decoration.",
     "required_str": 5,
-    "max_volume": 40,
+    "max_volume": "10 L",
     "flags": [ "CONTAINER", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "TINY", "TRANSPARENT", "EASY_DECONSTRUCT" ],
     "deconstruct": {
       "items": [
@@ -44,7 +44,7 @@
     "color": "yellow",
     "move_cost_mod": 2,
     "required_str": 5,
-    "max_volume": 40,
+    "max_volume": "10 L",
     "flags": [ "CONTAINER", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "TINY", "TRANSPARENT", "EASY_DECONSTRUCT" ],
     "deconstruct": {
       "items": [

diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json
@@ -29,7 +29,7 @@
     "move_cost_mod": 2,
     "coverage": 60,
     "required_str": 10,
-    "max_volume": 1000,
+    "max_volume": "250 L",
     "flags": [ "TRANSPARENT", "CONTAINER", "FIRE_CONTAINER", "SUPPRESS_SMOKE", "PLACE_ITEM", "MOUNTABLE" ],
     "examine_action": "fireplace",
     "bash": {

diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json
@@ -177,7 +177,7 @@
     "move_cost_mod": 2,
     "coverage": 80,
     "required_str": 18,
-    "max_volume": 7000,
+    "max_volume": "1750 L",
     "looks_like": "f_fridge",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR" ],
     "deconstruct": {
@@ -234,7 +234,7 @@
         { "item": "sheet_metal_small", "count": [ 0, 4 ] }
       ]
     },
-    "max_volume": 7000,
+    "max_volume": "1750 L",
     "bash": {
       "str_min": 35,
       "str_max": 80,

diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json
@@ -10,7 +10,7 @@
     "coverage": 30,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ],
-    "max_volume": 800,
+    "max_volume": "200 L",
     "examine_action": "keg",
     "keg_capacity": 600,
     "bash": {

diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -356,7 +356,7 @@
     "color": "blue",
     "move_cost_mod": -1,
     "coverage": 50,
-    "max_volume": 15,
+    "max_volume": "3750 ml",
     "required_str": 7,
     "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM" ],
     "deconstruct": {

diff --git a/data/json/furniture_and_terrain/furniture-rural.json b/data/json/furniture_and_terrain/furniture-rural.json
@@ -28,7 +28,7 @@
     "description": "Pile of chipped wood pieces.  You can move it with a shovel.",
     "color": "brown",
     "move_cost_mod": 6,
-    "max_volume": 3000,
+    "max_volume": "750 L",
     "required_str": -1,
     "flags": [
       "TRANSPARENT",

diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json
@@ -148,7 +148,7 @@
     "required_str": 3,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "deconstruct": { "items": [ { "item": "2x4", "count": 3 }, { "item": "nail", "charges": [ 2, 6 ] } ] },
-    "max_volume": 3500,
+    "max_volume": "875 L",
     "bash": {
       "str_min": 6,
       "str_max": 20,
@@ -173,7 +173,7 @@
     "deployed_item": "camp_chair",
     "examine_action": "deployed_furniture",
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
-    "max_volume": 3500,
+    "max_volume": "875 L",
     "deconstruct": { "items": [ { "item": "camp_chair", "count": 1 } ] }
   },
   {
@@ -213,7 +213,7 @@
     "bonus_fire_warmth_feet": 1000,
     "required_str": 5,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ],
-    "max_volume": 3000,
+    "max_volume": "750 L",
     "deconstruct": { "items": [ { "item": "log", "count": 1 } ] },
     "bash": {
       "str_min": 12,

diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
@@ -17,7 +17,7 @@
         { "item": "nail", "charges": [ 12, 16 ] }
       ]
     },
-    "max_volume": 8000,
+    "max_volume": "2000 L",
     "bash": {
       "str_min": 6,
       "str_max": 40,
@@ -41,7 +41,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 14 }, { "item": "wood_panel", "count": 2 }, { "item": "nail", "charges": [ 12, 20 ] } ]
     },
-    "max_volume": 8000,
+    "max_volume": "2000 L",
     "bash": {
       "str_min": 6,
       "str_max": 40,
@@ -85,7 +85,7 @@
         { "item": "rag", "count": [ 15, 20 ] }
       ]
     },
-    "max_volume": 3500,
+    "max_volume": "875 L",
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -118,7 +118,7 @@
         { "item": "rag", "count": [ 15, 20 ] }
       ]
     },
-    "max_volume": 3500,
+    "max_volume": "875 L",
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -200,7 +200,7 @@
     "floor_bedding_warmth": 200,
     "required_str": 3,
     "deconstruct": { "items": [ { "item": "box_large", "count": 1 } ] },
-    "max_volume": 6000,
+    "max_volume": "1500 L",
     "deployed_item": "box_large",
     "examine_action": "deployed_furniture",
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "EASY_DECONSTRUCT", "BASHABLE", "HIDE_PLACE", "NO_SIGHT" ],
@@ -253,7 +253,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 6 }, { "item": "wood_panel", "count": [ 0, 1 ] }, { "item": "nail", "charges": [ 6, 8 ] } ]
     },
-    "max_volume": 8000,
+    "max_volume": "2000 L",
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -283,7 +283,7 @@
         { "item": "pipe", "count": [ 0, 4 ] }
       ]
     },
-    "max_volume": 1600,
+    "max_volume": "400 L",
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -308,7 +308,7 @@
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 14,
-    "max_volume": 1000,
+    "max_volume": "250 L",
     "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
     "examine_action": "gunsafe_ml",
     "bash": {
@@ -333,7 +333,7 @@
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 14,
-    "max_volume": 1000,
+    "max_volume": "250 L",
     "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
     "bash": {
       "str_min": 40,
@@ -357,7 +357,7 @@
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 14,
-    "max_volume": 1000,
+    "max_volume": "250 L",
     "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
     "examine_action": "gunsafe_el",
     "bash": {
@@ -391,7 +391,7 @@
         { "item": "pipe", "count": [ 4, 8 ] }
       ]
     },
-    "max_volume": 2000,
+    "max_volume": "500 L",
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -417,7 +417,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 2 }, { "item": "nail", "charges": [ 2, 5 ] }, { "item": "sheet_metal", "count": 1 } ]
     },
-    "max_volume": 40,
+    "max_volume": "10 L",
     "bash": {
       "str_min": 12,
       "str_max": 50,
@@ -450,7 +450,7 @@
         { "item": "wheel_caster", "count": 1 }
       ]
     },
-    "max_volume": 7000,
+    "max_volume": "1750 L",
     "bash": {
       "str_min": 6,
       "str_max": 30,
@@ -483,7 +483,7 @@
         { "item": "sheet_metal_small", "count": [ 0, 4 ] }
       ]
     },
-    "max_volume": 7000,
+    "max_volume": "1750 L",
     "bash": {
       "str_min": 6,
       "str_max": 30,
@@ -516,7 +516,7 @@
         { "item": "nail", "charges": [ 32, 40 ] }
       ]
     },
-    "max_volume": 6000,
+    "max_volume": "1500 L",
     "bash": {
       "str_min": 6,
       "str_max": 40,
@@ -537,7 +537,7 @@
     "required_str": 4,
     "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ],
     "deconstruct": { "items": [ { "item": "nail", "charges": [ 2, 6 ] }, { "item": "2x4", "count": 2 } ] },
-    "max_volume": 120,
+    "max_volume": "30 L",
     "bash": {
       "str_min": 6,
       "str_max": 30,
@@ -556,7 +556,7 @@
     "move_cost_mod": -1,
     "coverage": 40,
     "required_str": 5,
-    "max_volume": 80,
+    "max_volume": "20 L",
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "SHORT" ],
     "bash": {
       "str_min": 8,
@@ -576,7 +576,7 @@
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 14,
-    "max_volume": 1000,
+    "max_volume": "250 L",
     "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
     "open": "f_safe_o",
     "examine_action": "open_safe",
@@ -602,7 +602,7 @@
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 14,
-    "max_volume": 1000,
+    "max_volume": "250 L",
     "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
     "examine_action": "safe",
     "bash": {
@@ -627,7 +627,7 @@
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 14,
-    "max_volume": 1000,
+    "max_volume": "250 L",
     "flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
     "close": "f_safe_c",
     "bash": {
@@ -651,7 +651,7 @@
     "color": "light_cyan",
     "move_cost_mod": 1,
     "required_str": 5,
-    "max_volume": 80,
+    "max_volume": "20 L",
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "SHORT" ],
     "bash": {
       "str_min": 8,
@@ -676,7 +676,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 20 }, { "item": "nail", "charges": [ 16, 24 ] }, { "item": "pipe", "count": 2 } ]
     },
-    "max_volume": 2000,
+    "max_volume": "500 L",
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -710,7 +710,7 @@
         { "item": "lock", "count": [ 0, 1 ] }
       ]
     },
-    "max_volume": 800,
+    "max_volume": "200 L",
     "bash": {
       "str_min": 8,
       "str_max": 30,
@@ -738,7 +738,7 @@
         { "item": "pipe", "count": [ 4, 8 ] }
       ]
     },
-    "max_volume": 2000,
+    "max_volume": "500 L",
     "bash": {
       "str_min": 16,
       "str_max": 40,