container name to object, volume to string

data/json/items/containers.json

@@ -3,7 +3,7 @@
     "id": "2lcanteen",
     "type": "CONTAINER",
     "category": "container",
-    "name": "2.5L canteen",
+    "name": { "str": "2.5L canteen" },
     "description": "A large plastic water canteen, with a 2.5 liter capacity and carrying strap.",
     "weight": "155 g",
     "volume": "2500 ml",
@@ -23,7 +23,7 @@
     "id": "30gal_barrel",
     "type": "CONTAINER",
     "category": "container",
-    "name": "30 gallon barrel",
+    "name": { "str": "30 gallon barrel" },
     "description": "A huge plastic barrel with a resealable lid.",
     "weight": "6800 g",
     "volume": "112500 ml",
@@ -80,7 +80,7 @@
     "id": "bag_canvas",
     "type": "CONTAINER",
     "category": "container",
-    "name": "canvas sack",
+    "name": { "str": "canvas sack" },
     "description": "A large and sturdy canvas sack.  Smells faintly of earth and hard work.",
     "weight": "415 g",
     "volume": "1 L",
@@ -97,7 +97,7 @@
     "id": "bag_canvas_small",
     "type": "CONTAINER",
     "category": "container",
-    "name": "canvas bag",
+    "name": { "str": "canvas bag" },
     "description": "Small bag made of canvas.  Looks fine to store dried herbs in.",
     "weight": "5 g",
     "volume": "250 ml",
@@ -149,7 +149,7 @@
     "id": "bag_body_bag",
     "type": "CONTAINER",
     "category": "container",
-    "name": "body bag",
+    "name": { "str": "body bag" },
     "looks_like": "bag_canvas",
     "description": "A large, human size, rectangular bag made of strong plastic, with a zipper in the middle.  Used to hold a dead body.",
     "weight": "500 g",
@@ -167,11 +167,11 @@
     "id": "bag_iv",
     "type": "CONTAINER",
     "category": "container",
-    "name": "IV bag",
+    "name": { "str": "IV bag" },
     "description": "A small, sealed plastic bag for liquids used in intravenous therapy.",
     "looks_like": "bag_plastic",
     "weight": "10 g",
-    "volume": 0,
+    "volume": "50 ml",
     "price": 0,
     "to_hit": -1,
     "rigid": false,
@@ -187,7 +187,7 @@
     "id": "bottle_glass",
     "type": "CONTAINER",
     "category": "container",
-    "name": "glass bottle",
+    "name": { "str": "glass bottle" },
     "description": "A resealable glass bottle, holds 750 ml of liquid.",
     "weight": "200 g",
     "volume": "750 ml",
@@ -257,7 +257,7 @@
     "id": "bowl_clay",
     "type": "CONTAINER",
     "category": "container",
-    "name": "clay bowl",
+    "name": { "str": "clay bowl" },
     "description": "A clay bowl with a waterproofed hide lid.  Can be used as a container or as a tool.  Holds 250 ml of liquid.",
     "weight": "60 g",
     "volume": "250 ml",
@@ -370,7 +370,7 @@
     "id": "can_drink",
     "type": "CONTAINER",
     "category": "container",
-    "name": "aluminum can",
+    "name": { "str": "aluminum can" },
     "description": "An aluminum can, like what soda comes in.",
     "weight": "13 g",
     "volume": "250 ml",
@@ -541,7 +541,7 @@
     "id": "clay_canister",
     "type": "CONTAINER",
     "category": "container",
-    "name": "clay canister",
+    "name": { "str": "clay canister" },
     "description": "A fragile clay vessel.  It can be used to make crude impact grenades or to store liquid.",
     "weight": "268 g",
     "volume": "250 ml",
@@ -559,7 +559,7 @@
     "id": "clay_hydria",
     "type": "CONTAINER",
     "category": "container",
-    "name": "clay hydria",
+    "name": { "str": "clay hydria" },
     "description": "A 15-liter clay pot with three handles for carrying and for pouring.",
     "weight": "1955 g",
     "volume": "15 L",
@@ -624,7 +624,7 @@
     "id": "flask_glass",
     "type": "CONTAINER",
     "category": "container",
-    "name": "glass flask",
+    "name": { "str": "glass flask" },
     "description": "A 250 ml laboratory conical flask, with a rubber bung.",
     "weight": "48 g",
     "volume": "250 ml",
@@ -662,7 +662,7 @@
     "id": "beaker",
     "type": "CONTAINER",
     "category": "container",
-    "name": "beaker",
+    "name": { "str": "beaker" },
     "description": "A 250ml laboratory beaker.  Basically a cup with delusions of grandeur.",
     "weight": "150 g",
     "volume": "250ml",
@@ -680,7 +680,7 @@
     "id": "gradcylinder",
     "type": "CONTAINER",
     "category": "container",
-    "name": "graduated cylinder",
+    "name": { "str": "graduated cylinder" },
     "description": "A tall, narrow glass cylinder with precise markings for measuring fluid quantities.  An important science tool, it is also useful for anal retentive chefs.",
     "weight": "150 g",
     "volume": "100ml",
@@ -737,7 +737,7 @@
     "id": "jar_3l_glass",
     "type": "CONTAINER",
     "category": "container",
-    "name": "3L glass jar",
+    "name": { "str": "3L glass jar" },
     "description": "A three-liter glass jar with a metal screw top lid, used for canning.",
     "weight": "365 g",
     "volume": "3 L",
@@ -768,7 +768,7 @@
     "id": "jar_glass",
     "type": "CONTAINER",
     "category": "container",
-    "name": "glass jar",
+    "name": { "str": "glass jar" },
     "description": "A half-liter glass jar with a metal screw top lid, used for canning.",
     "weight": "150 g",
     "volume": "500 ml",
@@ -835,7 +835,7 @@
     "id": "jug_clay",
     "type": "CONTAINER",
     "category": "container",
-    "name": "clay jug",
+    "name": { "str": "clay jug" },
     "description": "A clay container with a lid, used to hold and pour liquids.",
     "weight": "400 g",
     "volume": "1 L",
@@ -853,7 +853,7 @@
     "id": "jug_plastic",
     "type": "CONTAINER",
     "category": "container",
-    "name": "gallon jug",
+    "name": { "str": "gallon jug" },
     "description": "A standard plastic jug used for milk and household cleaning chemicals.",
     "weight": "190 g",
     "volume": "3750 ml",
@@ -870,7 +870,7 @@
     "id": "keg",
     "type": "CONTAINER",
     "category": "container",
-    "name": "aluminum keg",
+    "name": { "str": "aluminum keg" },
     "description": "A reusable lightweight aluminum keg, used for shipping beer.  It has a capacity of 50 liters.",
     "weight": "5040 g",
     "volume": "50 L",
@@ -1135,10 +1135,10 @@
     "id": "condom",
     "type": "CONTAINER",
     "category": "container",
-    "name": "condom",
+    "name": { "str": "condom" },
     "description": "A gentleman's balloon.  A single use life preventer.  A thumbless latex mitten.  This could be used as a makeshift water container, but otherwise it's anyone's guess what it's for.",
     "weight": "5 g",
-    "volume": 0,
+    "volume": "15 ml",
     "price": 0,
     "to_hit": -5,
     "rigid": false,
@@ -1155,7 +1155,7 @@
     "type": "CONTAINER",
     "category": "other",
     "looks_like": "condom",
-    "name": "balloon",
+    "name": { "str": "balloon" },
     "description": "A child's balloon.  This could be used as a makeshift water container.",
     "copy-from": "condom"
   },

data/json/items/tool/container.json

@@ -22,10 +22,10 @@
     "id": "bottle_folding",
     "type": "CONTAINER",
     "category": "other",
-    "name": "foldable plastic bottle",
+    "name": { "str": "foldable plastic bottle" },
     "description": "A non-rigid plastic bottle for easy storage, holds 500 ml of liquid.",
     "weight": "13 g",
-    "volume": 0,
+    "volume": "50 ml",
     "price": 0,
     "to_hit": 1,
     "rigid": false,

data/json/items/tool/med.json

@@ -158,7 +158,7 @@
     "id": "vacutainer",
     "type": "CONTAINER",
     "category": "tools",
-    "name": "blood draw kit",
+    "name": { "str": "blood draw kit" },
     "description": "This is a kit for drawing blood, including a test tube for holding the sample.  Use this tool to draw blood, either from yourself or from a corpse you are standing on.",
     "weight": "13 g",
     "volume": "250 ml",