Merge pull request #37756 from snipercup/tool-name-to-object-2

tool Name to object

data/json/items/melee/bludgeons.json

@@ -491,8 +491,7 @@
     "id": "l-stick",
     "type": "TOOL",
     "category": "weapons",
-    "name": "L-stick (off)",
-    "name_plural": "L-sticks (off)",
+    "name": { "str": "L-stick (off)", "str_pl": "L-sticks (off)" },
     "description": "Produced by the Light corporation, this stylish staff not only functions as a light source, but doubles as a light-weight weapon, due to the superalloy materials it is made of.  Due to proprietary efficiency improvements over standard light sources, the L-stick or light stick as it is commonly called, batteries last longer than other light sources.",
     "weight": "1000 g",
     "volume": "3 L",
@@ -908,8 +907,7 @@
     "id": "shock_staff",
     "type": "TOOL",
     "category": "weapons",
-    "name": "powered quarterstaff",
-    "name_plural": "powered quarterstaves",
+    "name": { "str": "powered quarterstaff", "str_pl": "powered quarterstaves" },
     "description": "This is an ironshod quarterstaff that has a high-voltage stun gun built into the handle.  The stun gun is wired to the metal caps at either end of the staff, allowing you to zap a dangerous opponent should beating them senseless with it prove too hazardous.",
     "weight": "2351 g",
     "volume": "3250 ml",
@@ -937,8 +935,7 @@
     "id": "shocktonfa_off",
     "type": "TOOL",
     "category": "weapons",
-    "name": "tactical tonfa (off)",
-    "name_plural": "tactical tonfas (off)",
+    "name": { "str": "tactical tonfa (off)", "str_pl": "tactical tonfas (off)" },
     "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 tonfa, and by extension to anyone unfortunate enough to be in contact with them.  It also has a nifty flashlight, which is off at the moment.",
     "weight": "726 g",
     "volume": "2250 ml",

data/json/items/melee/swords_and_blades.json

@@ -1487,8 +1487,7 @@
   {
     "id": "ecs_lajatang_off",
     "type": "TOOL",
-    "name": "electric chainsaw lajatang (off)",
-    "name_plural": "electric chainsaw lajatangs (off)",
+    "name": { "str": "electric chainsaw lajatang (off)", "str_pl": "electric chainsaw lajatangs (off)" },
     "description": "A long wooden pole with electric chainsaws impractically attached to both ends.  The product of either genius or insanity, but not both; the weight ensures that only someone both strong and very skilled could possibly hope to use it.",
     "weight": "14254 g",
     "volume": "7500 ml",
@@ -1602,8 +1601,7 @@
     "id": "e_combatsaw_off",
     "type": "TOOL",
     "category": "weapons",
-    "name": "electric combat chainsaw (off)",
-    "name_plural": "electric combat chainsaws (off)",
+    "name": { "str": "electric combat chainsaw (off)", "str_pl": "electric combat chainsaws (off)" },
     "description": "This is an electric chainsaw that has been lightened, tuned, and extensively modified to be a more effective weapon.  Unfortunately these modifications have rendered it much less effective as a woodcutting tool.",
     "weight": "5122 g",
     "volume": "2250 ml",

data/json/items/tool/cooking.json

@@ -51,8 +51,7 @@
   {
     "id": "carver_off",
     "type": "TOOL",
-    "name": "electric carver (off)",
-    "name_plural": "electric carvers (off)",
+    "name": { "str": "electric carver (off)", "str_pl": "electric carvers (off)" },
     "description": "An electric meat carver powered by batteries.  Two serrated blades that vibrate together to slice just about anything from turkey to ham… even zombies!",
     "weight": "1106 g",
     "volume": "1500 ml",

data/json/items/tool/electronics.json

@@ -499,8 +499,7 @@
   {
     "id": "UPS_off",
     "type": "TOOL",
-    "name": "UPS",
-    "name_plural": "UPS's",
+    "name": { "str": "UPS", "str_pl": "UPS's" },
     "description": "This is a unified power supply, or UPS.  It is a device developed jointly by military and scientific interests for use in combat and the field.  The UPS is designed to power bionics, armor and some guns, but drains batteries quickly.",
     "weight": "680 g",
     "volume": "2500 ml",

data/json/items/tool/lighting.json

@@ -135,8 +135,7 @@
   {
     "id": "electric_lantern",
     "type": "TOOL",
-    "name": "electric lantern (off)",
-    "name_plural": "electric lanterns (off)",
+    "name": { "str": "electric lantern (off)", "str_pl": "electric lanterns (off)" },
     "description": "This is a battery-powered lamp.  It does not provide much light, but it lasts a long time.  Use it to turn it on.",
     "weight": "980 g",
     "volume": "1 L",
@@ -586,8 +585,7 @@
   {
     "id": "smart_lamp",
     "type": "TOOL",
-    "name": "smart lamp (off)",
-    "name_plural": "smart lamps (off)",
+    "name": { "str": "smart lamp (off)", "str_pl": "smart lamps (off)" },
     "description": "This is a smart lamp, it can be activated remotely.",
     "weight": "400 g",
     "volume": "500 ml",

data/json/items/tool/woodworking.json

@@ -136,8 +136,7 @@
   {
     "id": "elec_chainsaw_off",
     "type": "TOOL",
-    "name": "electric chainsaw (off)",
-    "name_plural": "electric chainsaws (off)",
+    "name": { "str": "electric chainsaw (off)", "str_pl": "electric chainsaws (off)" },
     "description": "This is a lumbering tool moonlighting as weapon of opportunity.  If loaded with batteries, using this item will cause it to turn on, turning it into a very powerful but unwieldy melee weapon.",
     "weight": "6577 g",
     "volume": "2500 ml",