Tool name to object, volume to string

data/json/items/fake.json

@@ -73,7 +73,7 @@
     "type": "TOOL",
     "symbol": "v",
     "color": "red",
-    "name": "clairvoyance rod",
+    "name": { "str": "clairvoyance rod" },
     "description": "Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's a bug.",
     "price": 5000,
     "material": [ "steel" ],

data/json/items/generic.json

@@ -2419,14 +2419,14 @@
     "type": "TOOL",
     "symbol": ",",
     "color": "yellow",
-    "name": "cash card",
+    "name": { "str": "cash card" },
     "description": "A yellow plastic card used to store money.  These became popular once the government officially moved to all electronic money.  It holds up to 2 million dollars.",
     "price": 1000,
     "price_postapoc": 1,
     "material": "plastic",
     "flags": [ "NO_UNLOAD", "NO_RELOAD" ],
     "weight": "6 g",
-    "volume": 0,
+    "volume": "5 ml",
     "to_hit": -3,
     "max_charges": 200000000,
     "rand_charges": [

data/json/items/generic/storage.json

@@ -2,7 +2,7 @@
   {
     "id": "clothes_hanger",
     "type": "TOOL",
-    "name": "clothes hanger",
+    "name": { "str": "clothes hanger" },
     "description": "A plastic clothes hanger with a metal hook to hang something on a rail.",
     "weight": "100 g",
     "volume": "150 ml",

data/json/items/melee/swords_and_blades.json

@@ -276,7 +276,7 @@
     "id": "cavalry_sabre",
     "type": "TOOL",
     "category": "weapons",
-    "name": "cavalry saber",
+    "name": { "str": "cavalry saber" },
     "description": "This is a curved sword associated with cavalry from the Early Modern period onwards.  Lightweight but a deadly slashing weapon.",
     "weight": "910 g",
     "volume": "1250 ml",

data/json/items/tool/cooking.json

@@ -91,7 +91,7 @@
   {
     "id": "char_purifier",
     "type": "TOOL",
-    "name": "charcoal water purifier",
+    "name": { "str": "charcoal water purifier" },
     "description": "Using this item on a container full of water will purify the water using layered charcoal.  Once the charcoal has purified enough water, it will become unusable and can be disassembled and recycled.  Water taken from uncertain sources like a river may be dirty.",
     "weight": "1820 g",
     "volume": "3750 ml",
@@ -110,7 +110,7 @@
   {
     "id": "char_smoker",
     "type": "TOOL",
-    "name": "charcoal smoker",
+    "name": { "str": "charcoal smoker" },
     "description": "This is a portable charcoal smoker.  Good for weekend barbecuing and preserving meat with smoke.",
     "weight": "2600 g",
     "volume": "5 L",
@@ -127,7 +127,7 @@
   {
     "id": "charcoal_cooker",
     "type": "TOOL",
-    "name": "charcoal cooker",
+    "name": { "str": "charcoal cooker" },
     "description": "This is a little metal tank for holding charcoal with a pilot light attached.  You could use it for cooking food.",
     "weight": "405 g",
     "volume": "1250 ml",
@@ -195,7 +195,7 @@
   {
     "id": "coffeemaker",
     "type": "TOOL",
-    "name": "coffeemaker",
+    "name": { "str": "coffeemaker" },
     "description": "This is a heating element with pot and frame for holding coffee or other powders.  It's got a battery compartment for use when the power goes out.  You can use it to make coffee, or other drinks if you so choose.",
     "weight": "3100 g",
     "volume": "750 ml",

data/json/items/tool/deployable.json

@@ -50,7 +50,7 @@
   {
     "id": "camp_chair",
     "type": "TOOL",
-    "name": "camp chair",
+    "name": { "str": "camp chair" },
     "description": "Folded camp chair, deploy to sit down.",
     "weight": "1000 g",
     "volume": "2500 ml",

data/json/items/tool/electronics.json

@@ -19,7 +19,7 @@
   {
     "id": "camera",
     "type": "TOOL",
-    "name": "camera",
+    "name": { "str": "camera" },
     "description": "A point-and-shoot digital camera, with digital viewfinder, a backup 'iron-sight', and flash.  You can look at your photos on the digital screen, or transfer them with a memory card.  Takes conventional batteries.",
     "weight": "907 g",
     "volume": "250 ml",
@@ -50,7 +50,7 @@
   {
     "id": "camera_pro",
     "type": "TOOL",
-    "name": "camera pro",
+    "name": { "str": "camera pro" },
     "description": "A 35 mm digital SLR (single-lens reflex) camera, with optical and digital viewfinders, zoom lens with auto-focus and stabilizer, and flash.  You can view your photos on it or transfer them with a memory card; it runs on conventional batteries.  Before the Cataclysm, you could have taken professional-grade photos using this.",
     "weight": "2268 g",
     "volume": "1250 ml",
@@ -131,7 +131,7 @@
   {
     "id": "control_laptop",
     "type": "TOOL",
-    "name": "control laptop",
+    "name": { "str": "control laptop" },
     "description": "A modified laptop, now capable of transmitting in the ultra-high frequencies utilized by robots.  Activate it to command robots from afar.",
     "weight": "2721 g",
     "volume": "1 L",

data/json/items/tool/explosives.json

@@ -20,7 +20,7 @@
     "id": "can_bomb",
     "type": "TOOL",
     "category": "weapons",
-    "name": "can bomb",
+    "name": { "str": "can bomb" },
     "description": "This is a tin can filled to the brim with explosive and with a bit of fuse sticking out of it.  Will produce metal shrapnel that can deal with armor… you think.",
     "//": "40g of tin can and 250ml/412g of gunpowder",
     "weight": "452 g",

data/json/items/tool/fire.json

@@ -50,7 +50,7 @@
   {
     "id": "fire_drill_large",
     "type": "TOOL",
-    "name": "camp fire drill",
+    "name": { "str": "camp fire drill" },
     "description": "This stout fire drill is a simple item for starting fires; it is made from two pieces of wood and some string.  Since it is constructed out of simple materials, it's slow and rather difficult to get a fire started using this tool.",
     "weight": "1280 g",
     "volume": "1250 ml",

data/json/items/tool/lighting.json

@@ -87,7 +87,7 @@
   {
     "id": "candle",
     "type": "TOOL",
-    "name": "candle",
+    "name": { "str": "candle" },
     "description": "This is a thick candle.  It doesn't provide very much light, but it can burn for quite a long time.  You'll need a lighter or matches to light it.",
     "weight": "100 g",
     "volume": "250 ml",

data/json/items/tool/metalworking.json

@@ -51,7 +51,7 @@
   {
     "id": "char_forge",
     "type": "TOOL",
-    "name": "charcoal forge",
+    "name": { "str": "charcoal forge" },
     "description": "This is a portable, charcoal fired, metalworking forge.  If combined with the right tools, you could use this for metalworking.",
     "weight": "8600 g",
     "volume": "8 L",
@@ -117,7 +117,7 @@
   {
     "id": "crucible_clay",
     "type": "TOOL",
-    "name": "clay crucible",
+    "name": { "str": "clay crucible" },
     "description": "This is a primitive metalworking crucible made of clay.  You could use it for metalworking.",
     "weight": "1642 g",
     "volume": "2500 ml",
@@ -213,7 +213,7 @@
     "id": "link_sheet",
     "type": "TOOL",
     "category": "spare_parts",
-    "name": "chainmail sheet",
+    "name": { "str": "chainmail sheet" },
     "description": "This is a sheet of riveted chainmail.  With some skill, several of these sheets could be connected to make effective armor.",
     "weight": "1000 g",
     "volume": "500 ml",

data/json/items/tool/misc.json

@@ -2,7 +2,7 @@
   {
     "id": "airhorn",
     "type": "TOOL",
-    "name": "compressed air horn",
+    "name": { "str": "compressed air horn" },
     "description": "This is a small can of compressed air attached to a plastic horn.  Pressing the button on top causes it to emit a loud honking sound.",
     "weight": "467 g",
     "volume": "250 ml",
@@ -225,7 +225,7 @@
     "id": "horn_car",
     "type": "TOOL",
     "category": "veh_parts",
-    "name": "car horn",
+    "name": { "str": "car horn" },
     "description": "This is a car horn meant to be attached to a car's electrical system.",
     "weight": "270 g",
     "volume": "500 ml",

data/json/items/tool/pets.json

@@ -2,7 +2,7 @@
   {
     "id": "chicken_cage",
     "type": "TOOL",
-    "name": "chicken cage",
+    "name": { "str": "chicken cage" },
     "description": "A wire container made for transporting chickens, but you can use it to hold any tiny animal.  Use it on a suitable animal to capture, use it on an empty tile to release.",
     "weight": "250 g",
     "volume": "2500 ml",

data/json/items/tool/science.json

@@ -36,7 +36,7 @@
   {
     "id": "chemistry_set",
     "type": "TOOL",
-    "name": "chemistry set",
+    "name": { "str": "chemistry set" },
     "description": "This is a chemistry set stored in a box.  The contents include glass containers, hoses, metal wire, a hotplate, and safety glasses.  It might be used to craft some chemistry projects if you're so inclined.",
     "weight": "5200 g",
     "volume": "4500 ml",

data/json/items/tool/woodworking.json

@@ -99,7 +99,7 @@
   {
     "id": "copper_ax",
     "type": "TOOL",
-    "name": "copper axe",
+    "name": { "str": "copper axe" },
     "description": "This is a decent-sized chunk of worked copper affixed to a wooden shaft, to make a crude yet effective axe.",
     "weight": "3700 g",
     "volume": "3500 ml",

data/json/items/tool/workshop.json

@@ -130,7 +130,7 @@
   {
     "id": "clamp",
     "type": "TOOL",
-    "name": "clamp",
+    "name": { "str": "clamp" },
     "description": "This clamp is useful for keeping things still, especially if you have several of them.",
     "weight": "320 g",
     "volume": "500 ml",
@@ -146,7 +146,7 @@
   {
     "id": "claw_bar",
     "type": "TOOL",
-    "name": "claw bar",
+    "name": { "str": "claw bar" },
     "description": "This is a small prying tool with a clawed bend at one end for pulling spikes.  Use it to open locked doors without destroying them or to lift manhole covers.  You could also wield it to bash some heads in.",
     "weight": "340 g",
     "volume": "375 ml",
@@ -164,7 +164,7 @@
   {
     "id": "con_mix",
     "type": "TOOL",
-    "name": "concrete mixer",
+    "name": { "str": "concrete mixer" },
     "description": "A portable concrete mixer.  It is still large and heavy, but it can be operated solo, and runs on batteries.  It also has a heater built in.",
     "weight": "9071 g",
     "volume": "5 L",
@@ -189,7 +189,7 @@
   {
     "id": "cordless_drill",
     "type": "TOOL",
-    "name": "cordless drill",
+    "name": { "str": "cordless drill" },
     "description": "This is a cordless battery-powered drill with a selection of drill bits.",
     "weight": "2721 g",
     "volume": "750 ml",