Tool name to object (#37775)

data/json/items/melee/bludgeons.json

@@ -962,8 +962,7 @@
     "id": "shocktonfa_on",
     "copy-from": "shocktonfa_off",
     "type": "TOOL",
-    "name": "tactical tonfa (on)",
-    "name_plural": "tactical tonfas (on)",
+    "name": { "str": "tactical tonfa (on)", "str_pl": "tactical tonfas (on)" },
     "description": "This is a reinforced plastic tonfa; the core is hollowed out and is filled with capacitors and a high-yield rechargeable storage battery.  When a switch on the handle is pressed, a high-voltage current is transmitted to the two electrodes mounted in the end of the weapon, and by extension to anyone unfortunate enough to be in contact with them.  The integral flashlight is turned on, continually draining power and lighting the surrounding area.",
     "power_draw": 15000,
     "revert_to": "shocktonfa_off",

data/json/items/melee/knives_kitchen.json

@@ -25,8 +25,7 @@
   },
   {
     "id": "knife_steak",
-    "name": "steak knife",
-    "name_plural": "steak knives",
+    "name": { "str": "steak knife", "str_pl": "steak knives" },
     "type": "TOOL",
     "category": "weapons",
     "description": "This is a sharp knife, designed for cutting meat.  It makes a poor melee weapon, but is decent at butchering corpses.",
@@ -42,8 +41,7 @@
   },
   {
     "id": "knife_paring",
-    "name": "paring knife",
-    "name_plural": "paring knives",
+    "name": { "str": "paring knife", "str_pl": "paring knives" },
     "type": "TOOL",
     "category": "weapons",
     "description": "This is a short-bladed knife with a sharp blade, made for fine controlled cuts to vegetables without using a cutting board.",

data/json/items/melee/swords_and_blades.json

@@ -67,8 +67,7 @@
   {
     "id": "knife_folding",
     "type": "TOOL",
-    "name": "folding knife",
-    "name_plural": "folding knives",
+    "name": { "str": "folding knife", "str_pl": "folding knives" },
     "description": "This is a small folding knife, with a locking blade and a pocket clip.  Not as good a weapon as a solid fixed-blade knife, but better than a penknife.",
     "weight": "256 g",
     "volume": "40 ml",
@@ -124,8 +123,7 @@
     "id": "knife_hunting",
     "type": "TOOL",
     "category": "weapons",
-    "name": "hunting knife",
-    "name_plural": "hunting knives",
+    "name": { "str": "hunting knife", "str_pl": "hunting knives" },
     "//": "Highest non-powertool butchering quality.  It's made for skinning and butchering game, which is what you're generally doing.",
     "description": "Commonly used by hunters, this single-edge sheath knife is designed for cutting and skinning game rather than combat.",
     "weight": "390 g",
@@ -142,8 +140,7 @@
     "id": "knife_rambo",
     "type": "TOOL",
     "category": "weapons",
-    "name": "survival knife",
-    "name_plural": "survival knives",
+    "name": { "str": "survival knife", "str_pl": "survival knives" },
     "//": "This isn't really supposed to be a very good knife, or a very good saw.  It's more for looking scary.",
     "description": "This massive knife features a hollow handle with a compass built into the pommel and a row of fearsome looking saw teeth along the back of its blade.",
     "weight": "612 g",
@@ -224,8 +221,7 @@
   {
     "id": "makeshift_knife",
     "type": "TOOL",
-    "name": "makeshift knife",
-    "name_plural": "makeshift knives",
+    "name": { "str": "makeshift knife", "str_pl": "makeshift knives" },
     "description": "A knife consisting of a long, somewhat sharpened, spike and a tightly wrapped rag as a handle.  It makes a good melee weapon.",
     "weight": "550 g",
     "volume": "500 ml",
@@ -300,8 +296,7 @@
     "id": "kris",
     "type": "TOOL",
     "category": "weapons",
-    "name": "kris",
-    "name_plural": "krises",
+    "name": { "str": "kris", "str_pl": "krises" },
     "description": "This wavy bladed dagger comes from Southeast Asia.  The design of the blade causes it to make broad, painful wounds.",
     "weight": "558 g",
     "volume": "750 ml",
@@ -340,8 +335,7 @@
     "type": "TOOL",
     "symbol": "/",
     "color": "light_gray",
-    "name": "jian",
-    "name_plural": "jian",
+    "name": { "str": "jian", "str_pl": "jian" },
     "description": "This is an ancient Chinese doubled-edged straight sword, with an ornate guard and a tassel attached to the pommel.  One of the four major weapons in folklore, alongside the dao sabre, qiang spear, and gun staff.",
     "price": 100000,
     "material": "steel",
@@ -360,8 +354,7 @@
     "type": "TOOL",
     "symbol": "/",
     "color": "light_gray",
-    "name": "jian",
-    "name_plural": "jian",
+    "name": { "str": "jian", "str_pl": "jian" },
     "description": "This is an ancient Chinese doubled-edged straight sword.  The sword is quite worn, and bent at an odd angle.",
     "price": 100000,
     "material": "budget_steel",
@@ -629,8 +622,7 @@
     "id": "sword_xiphos",
     "type": "TOOL",
     "category": "weapons",
-    "name": "xiphos",
-    "name_plural": "xiphoses",
+    "name": { "str": "xiphos", "str_pl": "xiphoses" },
     "description": "A bronze sword of ancient Greek origin, wielded as a sidearm to the dory spear.",
     "weight": "800 g",
     "volume": "2 L",
@@ -649,8 +641,7 @@
     "id": "khopesh",
     "type": "TOOL",
     "category": "weapons",
-    "name": "khopesh",
-    "name_plural": "khopeshes",
+    "name": { "str": "khopesh", "str_pl": "khopeshes" },
     "description": "This ancient bronze weapon features a curved, sickle-like blade sharpened on the outside edge.  Associated with the New Kingdom period of ancient Egypt, it was designed mainly to hack through the light armor common to the region.",
     "weight": "750 g",
     "volume": "1750 ml",
@@ -759,8 +750,7 @@
     "id": "wakizashi",
     "type": "TOOL",
     "category": "weapons",
-    "name": "wakizashi",
-    "name_plural": "wakizashi",
+    "name": { "str": "wakizashi", "str_pl": "wakizashi" },
     "description": "This is a comparatively-common Japanese short sword.  Smaller and lighter than a katana, but still effective in combat.",
     "weight": "835 g",
     "volume": "1500 ml",
@@ -1385,8 +1375,7 @@
     "type": "TOOL",
     "symbol": "/",
     "color": "light_gray",
-    "name": "wakizashi",
-    "name_plural": "wakizashi",
+    "name": { "str": "wakizashi", "str_pl": "wakizashi" },
     "description": "This is a comparatively-common Japanese short sword.  There's something not quite right about this sword.",
     "price": 17800,
     "material": "budget_steel",

data/json/items/resources/plastic.json

@@ -31,8 +31,7 @@
     "id": "lycra_patch",
     "type": "TOOL",
     "category": "spare_parts",
-    "name": "lycra patch",
-    "name_plural": "lycra patches",
+    "name": { "str": "lycra patch", "str_pl": "lycra patches" },
     "description": "This is a small bolt of a synthetic fabric blended with stretchy lycra fibers.  It could be used to make flexible yet strong clothing.  Stylish, but bad for the environment; at least you're recycling it.",
     "weight": "87 g",
     "volume": "250 ml",

data/json/items/tool/deployable.json

@@ -18,8 +18,7 @@
   {
     "id": "55gal_firebarrel",
     "type": "TOOL",
-    "name": "fire barrel (200L)",
-    "name_plural": "fire barrels (200L)",
+    "name": { "str": "fire barrel (200L)", "str_pl": "fire barrels (200L)" },
     "description": "A large metal barrel used to contain a fire.  It has multiple holes punched in its walls for air supply.  Fires set in a fire barrel will not spread to surrounding flammable objects.",
     "weight": "20000 g",
     "volume": "200 L",

data/json/items/tool/electronics.json

@@ -280,8 +280,7 @@
     "id": "geiger_on",
     "copy-from": "geiger_off",
     "type": "TOOL",
-    "name": "geiger counter (on)",
-    "name_plural": "geiger counters (on)",
+    "name": { "str": "geiger counter (on)", "str_pl": "geiger counters (on)" },
     "description": "This is a tool for measuring radiation.  It is in continuous scan mode, and will produce quiet clicking sounds in the presence of ambient radiation.  Using it allows you to turn it off, or scan yourself or the ground.  It is currently on.",
     "power_draw": 200,
     "revert_to": "geiger_off",
@@ -469,8 +468,7 @@
     "id": "smartphone_music",
     "copy-from": "smart_phone",
     "type": "TOOL",
-    "name": "smartphone - music",
-    "name_plural": "smartphones - music",
+    "name": { "str": "smartphone - music", "str_pl": "smartphones - music" },
     "description": "This phone is playing music, steadily raising your morale.  You can't hear anything else while you're listening.",
     "power_draw": 300,
     "revert_to": "smart_phone",

data/json/items/tool/fire.json

@@ -67,8 +67,7 @@
   {
     "id": "flint_steel",
     "type": "TOOL",
-    "name": "flint and steel",
-    "name_plural": "sets of flint and steel",
+    "name": { "str": "flint and steel", "str_pl": "sets of flint and steel" },
     "description": "This is a magnesium bar and a carbon steel striker.  Use it to spark a flame.",
     "weight": "400 g",
     "volume": "250 ml",
@@ -103,8 +102,7 @@
   {
     "id": "magnifying_glass",
     "type": "TOOL",
-    "name": "magnifying glass",
-    "name_plural": "magnifying glasses",
+    "name": { "str": "magnifying glass", "str_pl": "magnifying glasses" },
     "description": "This is a magnifying glass.  May be useful for starting fires during sunny skies.",
     "weight": "400 g",
     "volume": "250 ml",
@@ -165,8 +163,7 @@
   {
     "id": "ref_lighter_on",
     "type": "TOOL",
-    "name": "refillable lighter",
-    "name_plural": "refillable lighters",
+    "name": { "str": "refillable lighter", "str_pl": "refillable lighters" },
     "description": "This is a lighter featuring a flip top cover and refuelable tank.  It is lit.",
     "weight": "20 g",
     "volume": "31 ml",

data/json/items/tool/knives.json

@@ -53,11 +53,10 @@
   {
     "id": "pockknife",
     "type": "TOOL",
-    "name": "pocket knife",
-    "name_plural": "pocket knives",
+    "name": { "str": "pocket knife", "str_pl": "pocket knives" },
     "description": "This is a small pocket knife.  It isn't great for combat, but it's better than nothing.  It's sharp enough to butcher with.",
     "weight": "141 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 1000,
     "to_hit": -2,
     "cutting": 7,
@@ -70,8 +69,7 @@
   {
     "id": "primitive_knife",
     "type": "TOOL",
-    "name": "stone knife",
-    "name_plural": "stone knives",
+    "name": { "str": "stone knife", "str_pl": "stone knives" },
     "description": "This is a sharpened stone set into a hollowed handle.  Not nearly as usable as a proper knife, but it's better than nothing.",
     "weight": "453 g",
     "volume": "250 ml",

data/json/items/tool/landscaping.json

@@ -121,8 +121,7 @@
   {
     "id": "trimmer_off",
     "type": "TOOL",
-    "name": "hedge trimmer (off)",
-    "name_plural": "hedge trimmers (off)",
+    "name": { "str": "hedge trimmer (off)", "str_pl": "hedge trimmers (off)" },
     "description": "A cordless, double-sided, gasoline-powered hedge trimmer.  A long line of sharp-edged teeth extends from the engine; turning the trimmer on will make them rapidly vibrate.  The poor man's chainsaw as far as the zombies are concerned.",
     "weight": "4500 g",
     "volume": "2500 ml",
@@ -143,8 +142,7 @@
     "id": "trimmer_on",
     "copy-from": "trimmer_off",
     "type": "TOOL",
-    "name": "hedge trimmer (on)",
-    "name_plural": "hedge trimmers (on)",
+    "name": { "str": "hedge trimmer (on)", "str_pl": "hedge trimmers (on)" },
     "description": "A cordless, double-sided, gasoline-powered hedge trimmer.  It is currently on, ready to do some zombie topiary; use this item to turn it off.",
     "cutting": 40,
     "power_draw": 500000,

data/json/items/tool/lighting.json

@@ -223,8 +223,7 @@
     "id": "flashlight_on",
     "copy-from": "flashlight",
     "type": "TOOL",
-    "name": "flashlight (on)",
-    "name_plural": "flashlights (on)",
+    "name": { "str": "flashlight (on)", "str_pl": "flashlights (on)" },
     "power_draw": 10000,
     "revert_to": "flashlight",
     "use_action": { "menu_text": "Turn off", "type": "transform", "msg": "You turn the flashlight off.", "target": "flashlight" },
@@ -233,8 +232,7 @@
   {
     "id": "gasoline_lantern",
     "type": "TOOL",
-    "name": "gasoline lantern (off)",
-    "name_plural": "gasoline lanterns (off)",
+    "name": { "str": "gasoline lantern (off)", "str_pl": "gasoline lanterns (off)" },
     "description": "This is a small gasoline powered lantern.  It does not provide much light, but it lasts a long time.  Use it to turn it on.",
     "weight": "1400 g",
     "volume": "750 ml",
@@ -403,8 +401,7 @@
     "id": "heavy_flashlight_on",
     "copy-from": "heavy_flashlight",
     "type": "TOOL",
-    "name": "heavy duty flashlight (on)",
-    "name_plural": "heavy duty flashlights (on)",
+    "name": { "str": "heavy duty flashlight (on)", "str_pl": "heavy duty flashlights (on)" },
     "power_draw": 15000,
     "revert_to": "heavy_flashlight",
     "use_action": {
@@ -430,8 +427,7 @@
   {
     "id": "lightstrip",
     "type": "TOOL",
-    "name": "lightstrip",
-    "name_plural": "lightstrips",
+    "name": { "str": "lightstrip" },
     "copy-from": "lightstrip_base",
     "description": "This is a light-emitting circuit that has been wired directly to a battery.  It provides some weak light and can't be turned off until the battery dies.",
     "color": "green",
@@ -475,8 +471,7 @@
   {
     "id": "oil_lamp",
     "type": "TOOL",
-    "name": "oil lamp (off)",
-    "name_plural": "oil lamps (off)",
+    "name": { "str": "oil lamp (off)", "str_pl": "oil lamps (off)" },
     "description": "This is an oil fueled lamp.  It does not provide much light, but it lasts a long time.  Use it to turn it on.",
     "weight": "1720 g",
     "volume": "1 L",
@@ -573,8 +568,7 @@
     "id": "reading_light_on",
     "copy-from": "reading_light",
     "type": "TOOL",
-    "name": "reading light (active)",
-    "name_plural": "reading lights (active)",
+    "name": { "str": "reading light (active)", "str_pl": "reading lights (active)" },
     "description": "A little clip-on LED light, meant for reading books in the dark.  This one is turned on.",
     "power_draw": 1000,
     "revert_to": "reading_light",
@@ -625,8 +619,7 @@
     "id": "smart_lamp_on",
     "copy-from": "smart_lamp",
     "type": "TOOL",
-    "name": "smart lamp (on)",
-    "name_plural": "smart lamps (on)",
+    "name": { "str": "smart lamp (on)", "str_pl": "smart lamps (on)" },
     "description": "This is a smart lamp, this smart lamp is turned on.  It can be deactivated remotely.",
     "power_draw": 10000,
     "revert_to": "smart_lamp",

data/json/items/tool/med.json

@@ -124,8 +124,7 @@
     "id": "thermometer",
     "type": "TOOL",
     "category": "tools",
-    "name": "thermometer",
-    "name_plural": "thermometers",
+    "name": { "str": "thermometer", "str_pl": "thermometers" },
     "description": "A plastic thermometer that can read the air temperature.",
     "weight": "1 g",
     "volume": "250 ml",

data/json/items/tool/misc.json

@@ -283,8 +283,7 @@
     "id": "large_space_heater_on",
     "copy-from": "large_space_heater",
     "type": "TOOL",
-    "name": "large space heater (on)",
-    "name_plural": "large space heaters (on)",
+    "name": { "str": "large space heater (on)", "str_pl": "large space heaters (on)" },
     "description": "A portable electric heater that steadily emits warm air.  Raises temperature about 10 degrees C and fills a larger volume of air than the smaller version.",
     "power_draw": 1000000,
     "emits": [ "emit_hot_air2_blast" ],
@@ -383,11 +382,10 @@
   {
     "id": "pocketwatch",
     "type": "TOOL",
-    "name": "pocket watch",
-    "name_plural": "pocket watches",
+    "name": { "str": "pocket watch", "str_pl": "pocket watches" },
     "description": "An old fashioned pocket watch.  This one tells you the time and looks good doing it.  Can also be disassembled into some useful parts.",
     "weight": "65 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 25000,
     "price_postapoc": 1000,
     "to_hit": -3,
@@ -421,8 +419,7 @@
     "id": "safe_box",
     "type": "TOOL",
     "category": "other",
-    "name": "safe deposit box",
-    "name_plural": "safe deposit boxes",
+    "name": { "str": "safe deposit box", "str_pl": "safe deposit boxes" },
     "description": "This is a secure combination lock box.  Sadly, you don't know the combination.  Breaking inside it would destroy anything of value.",
     "weight": "2267 g",
     "volume": "3750 ml",
@@ -485,8 +482,7 @@
     "id": "small_space_heater_on",
     "copy-from": "small_space_heater",
     "type": "TOOL",
-    "name": "small space heater (on)",
-    "name_plural": "small space heaters (on)",
+    "name": { "str": "small space heater (on)", "str_pl": "small space heaters (on)" },
     "description": "A portable electric heater that steadily emits warm air.  Raises temperature about 10 degrees C.",
     "power_draw": 500000,
     "emits": [ "emit_hot_air2_stream" ],
@@ -547,8 +543,7 @@
   {
     "id": "survivor_scope",
     "type": "TOOL",
-    "name": "survivor telescope",
-    "name_plural": "survivor telescopes",
+    "name": { "str": "survivor telescope", "str_pl": "survivor telescopes" },
     "description": "A homemade collapsible telescope.  Too large and inaccurate to use as a weapon scope, but carrying this item in your inventory will double the distance that is mapped around you during your travels.",
     "weight": "500 g",
     "volume": "250 ml",

data/json/items/tool/radio_tools.json

@@ -119,8 +119,7 @@
     "id": "radio_on",
     "copy-from": "radio",
     "type": "TOOL",
-    "name": "radio (on)",
-    "name_plural": "radios (on)",
+    "name": { "str": "radio (on)", "str_pl": "radios (on)" },
     "description": "This portable radio is turned on, and continually draining its batteries.  It is playing the broadcast being sent from any nearby radio towers.",
     "power_draw": 500,
     "revert_to": "radio",