Tool name plural and name to object

data/json/items/tool/cooking.json

@@ -629,8 +629,7 @@
   {
     "id": "mortar_pestle",
     "type": "TOOL",
-    "name": "mortar and pestle",
-    "name_plural": "sets of mortar and pestle",
+    "name": { "str": "mortar and pestle", "str_pl": "sets of mortar and pestle" },
     "description": "This is a simple combination of a small grindstone and a bowl-shaped stone.  Used for grinding grain, but time-consuming compared to more complex methods.",
     "weight": "1632 g",
     "volume": "1 L",

data/json/items/tool/electronics.json

@@ -252,8 +252,7 @@
   {
     "id": "geiger_off",
     "type": "TOOL",
-    "name": "geiger counter (off)",
-    "name_plural": "geiger counters (off)",
+    "name": { "str": "geiger counter (off)", "str_pl": "geiger counters (off)" },
     "description": "This is a tool for measuring radiation.  Using it will prompt you to choose whether to scan yourself or the terrain, or to turn it on, which will provide continuous feedback on ambient radiation.  It is currently off.",
     "weight": "225 g",
     "volume": "500 ml",
@@ -326,8 +325,7 @@
   {
     "id": "mp3",
     "type": "TOOL",
-    "name": "mp3 player (off)",
-    "name_plural": "mp3 players (off)",
+    "name": { "str": "mp3 player (off)", "str_pl": "mp3 players (off)" },
     "description": "This battery-powered device is loaded up with someone's music collection.  Fortunately, there's lots of songs you like, and listening to it will raise your morale slightly.  Use it to turn it on.",
     "weight": "140 g",
     "volume": "50 ml",
@@ -526,8 +524,7 @@
   {
     "id": "vibrator",
     "type": "TOOL",
-    "name": "vibrator",
-    "name_plural": "vibrators",
+    "name": { "str": "vibrator", "str_pl": "vibrators" },
     "description": "This battery-devouring device is just the thing to knead the tension out and help you relax.  Use it to take a break and unwind.",
     "weight": "453 g",
     "volume": "500 ml",

data/json/items/tool/explosives.json

@@ -316,11 +316,10 @@
   {
     "id": "firecracker_pack",
     "type": "TOOL",
-    "name": "pack of firecrackers",
-    "name_plural": "packs of firecrackers",
+    "name": { "str": "pack of firecrackers", "str_pl": "packs of firecrackers" },
     "description": "This is a pack of 25 firecrackers with a starter fuse.  Use this item to light the fuse.  Of course, you will need a lighter or some matches to do so.  Shortly after you light the fuse they will begin to explode, so throw them quickly!",
     "weight": "75 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 100,
     "to_hit": -3,
     "bashing": 1,

data/json/items/tool/lighting.json

@@ -185,8 +185,7 @@
   {
     "id": "flashlight",
     "type": "TOOL",
-    "name": "flashlight (off)",
-    "name_plural": "flashlights (off)",
+    "name": { "str": "flashlight (off)", "str_pl": "flashlights (off)" },
     "description": "This is a typical household flashlight with a plastic handle.  Using this flashlight will turn it on and provide light, assuming it is charged with batteries.",
     "material": [ "plastic", "aluminum" ],
     "symbol": ";",
@@ -365,8 +364,7 @@
   {
     "id": "heavy_flashlight",
     "type": "TOOL",
-    "name": "heavy duty flashlight (off)",
-    "name_plural": "heavy duty flashlights (off)",
+    "name": { "str": "heavy duty flashlight (off)", "str_pl": "heavy duty flashlight (off)" },
     "description": "This is a heavy duty tubular aluminum LED flashlight as often used by security guards.  Makes for a passable melee weapon.  Using this flashlight will turn it on and provide light, assuming it is charged with batteries.",
     "weight": "650 g",
     "volume": "750 ml",
@@ -520,8 +518,7 @@
   {
     "id": "oxylamp",
     "type": "TOOL",
-    "name": "acetylene lamp (off)",
-    "name_plural": "acetylene lamps (off)",
+    "name": { "str": "acetylene lamp (off)", "str_pl": "acetylene lamps (off)" },
     "description": "An antique brass lamp designed to run from a pressurized cylinder of acetylene.  It is an efficient, if not somewhat dangerous light source.",
     "weight": "800 g",
     "volume": "500 ml",
@@ -555,11 +552,10 @@
   {
     "id": "reading_light",
     "type": "TOOL",
-    "name": "reading light",
-    "name_plural": "reading lights",
+    "name": { "str": "reading light", "str_pl": "reading lights" },
     "description": "A little clip-on LED light, meant for reading books in the dark.",
     "weight": "90 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 100,
     "material": [ "plastic", "aluminum" ],
     "symbol": ";",
@@ -646,8 +642,7 @@
   {
     "id": "torch",
     "type": "TOOL",
-    "name": "torch",
-    "name_plural": "torches",
+    "name": { "str": "torch", "str_pl": "torches" },
     "description": "This is a large stick, wrapped in rags that are soaked with a flammable material.  When lit, produces a fair amount of light.  You'll need a lighter or matches to light it.",
     "weight": "831 g",
     "volume": "750 ml",

data/json/items/tool/radio_tools.json

@@ -87,8 +87,7 @@
   {
     "id": "radio",
     "type": "TOOL",
-    "name": "radio (off)",
-    "name_plural": "radios (off)",
+    "name": { "str": "radio (off)", "str_pl": "radios (off)" },
     "description": "This is a portable radio.  Using this radio turns it on.  It will pick up any nearby signals being broadcast and play them audibly.",
     "weight": "295 g",
     "volume": "1 L",

data/json/items/tool/traps.json

@@ -113,8 +113,7 @@
   {
     "id": "caltrops",
     "type": "TOOL",
-    "name": "loose caltrops",
-    "name_plural": "loose caltrops",
+    "name": { "str": "loose caltrops", "str_pl": "loose caltrops" },
     "description": "These are small metal objects covered with many sharp points.  If an unsuspecting victim steps on one, they'll get a spine through the foot.",
     "weight": "264 g",
     "volume": "250 ml",
@@ -136,8 +135,7 @@
   {
     "id": "caltrops_glass",
     "type": "TOOL",
-    "name": "loose glass caltrops",
-    "name_plural": "loose glass caltrops",
+    "name": { "str": "loose glass caltrops", "str_pl": "loose glass caltrops" },
     "description": "These are glass shards glued together to expose their sharp edges.  If an unsuspecting victim steps on one, they'll get cut.",
     "weight": "264 g",
     "volume": "500 ml",

data/json/items/tool/workshop.json

@@ -797,8 +797,7 @@
   {
     "id": "toolbox",
     "type": "TOOL",
-    "name": "toolbox",
-    "name_plural": "toolboxes",
+    "name": { "str": "toolbox", "str_pl": "toolboxes" },
     "description": "This is a stout metal box containing a complete tool kit suitable for most household maintenance and construction activities.",
     "weight": "3522 g",
     "volume": "2500 ml",