Gun name to object (#37941)

data/json/items/gun/22.json

@@ -84,8 +84,7 @@
     "looks_like": "glock_17",
     "copy-from": "pistol_base",
     "type": "GUN",
-    "name": "Mossberg Brownie",
-    "name_plural": "Mossberg Brownie",
+    "name": { "str": "Mossberg Brownie", "str_pl": "Mossberg Brownie" },
     "description": "The first gun produced by O.F. Mossberg & Sons.  A small pocket pistol, marketed to trappers during the early 20th century.  Its four barrels can accept .22 Short and .22 LR cartridges.",
     "weight": "280 g",
     "volume": "137ml",
@@ -196,8 +195,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Ruger 10/22",
-    "name_plural": "Ruger 10/22",
+    "name": { "str": "Ruger 10/22", "str_pl": "Ruger 10/22" },
     "description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters.  Even though it fires the weak .22 round, it's perfectly capable of killing.",
     "weight": "2270 g",
     "volume": "2500 ml",
@@ -237,8 +235,7 @@
     "looks_like": "sw_619",
     "copy-from": "ruger_lcr_38",
     "type": "GUN",
-    "name": "Ruger LCR .22",
-    "name_plural": "Ruger LCR .22",
+    "name": { "str": "Ruger LCR .22", "str_pl": "Ruger LCR .22" },
     "weight": "420 g",
     "ammo": "22",
     "clip_size": 8,
@@ -288,8 +285,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "S&W 22A",
-    "name_plural": "S&W 22A",
+    "name": { "str": "S&W 22A", "str_pl": "S&W 22A" },
     "description": "A popular .22 pistol.",
     "weight": "1000 g",
     "volume": "500 ml",

data/json/items/gun/270win.json

@@ -4,8 +4,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "Remington 700 .270 Win",
-    "name_plural": "Remington 700 .270 Win",
+    "name": { "str": "Remington 700 .270 Win", "str_pl": "Remington 700 .270 Win" },
     "description": "A classic bolt action rifle chambered for .270 Winchester, very popular among hunters.  This is a CDL SF model with a forged, fluted, 416 stainless steel barrel threaded into the receiver and a recessed bolt face.  It has checkered walnut furniture and a recoil pad to reduce perceived recoil.",
     "weight": "3410 g",
     "volume": "2202 ml",

data/json/items/gun/3006.json

@@ -158,8 +158,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "Remington 700 .30-06",
-    "name_plural": "Remington 700 .30-06",
+    "name": { "str": "Remington 700 .30-06", "str_pl": "Remington 700 .30-06" },
     "description": "A very popular and durable hunting or sniping rifle.  Popular among SWAT and US Marine snipers.  Highly damaging, but perhaps not as accurate as the competing Browning BLR.",
     "weight": "3410 g",
     "volume": "3 L",

data/json/items/gun/38.json

@@ -71,8 +71,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "S&W Model 10",
-    "name_plural": "S&W Model 10",
+    "name": { "str": "S&W Model 10", "str_pl": "S&W Model 10" },
     "description": "A six-shot revolver, produced since 1899 and known as the most popular handgun of the 20th century.  It has a swing-out cylinder for ease of reloading.",
     "weight": "975 g",
     "volume": "402 ml",
@@ -131,8 +130,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "Ruger LCR .38",
-    "name_plural": "Ruger LCR .38",
+    "name": { "str": "Ruger LCR .38", "str_pl": "Ruger LCR .38" },
     "description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame.",
     "weight": "382 g",
     "volume": "321 ml",

data/json/items/gun/40.json

@@ -195,8 +195,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "S&W 610",
-    "name_plural": "S&W 610",
+    "name": { "str": "S&W 610", "str_pl": "S&W 610" },
     "description": "The Smith and Wesson 610 is a classic six-shooter revolver chambered for 10mm rounds, or for S&W's own .40 round.",
     "weight": "1200 g",
     "volume": "500 ml",

data/json/items/gun/44.json

@@ -115,8 +115,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "Ruger Redhawk",
-    "name_plural": "Ruger Redhawk",
+    "name": { "str": "Ruger Redhawk", "str_pl": "Ruger Redhawk" },
     "description": "One of the most powerful handguns in the world when it was released in 1979, the Redhawk offers very sturdy construction, with an appearance that is reminiscent of \"Wild West\" revolvers.",
     "weight": "1386 g",
     "volume": "750 ml",
@@ -149,8 +148,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "S&W 629",
-    "name_plural": "S&W 629",
+    "name": { "str": "S&W 629", "str_pl": "S&W 629" },
     "description": "A stainless steel, six-shot, double-action revolver with a matte black plastic handle manufactured by Smith & Wesson.  Though hardly the most powerful handgun in the world any more, it could still blow a zombie's head clean off.",
     "weight": "1267 g",
     "volume": "750 ml",

data/json/items/gun/500.json

@@ -39,8 +39,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "S&W 500",
-    "name_plural": "S&W 500",
+    "name": { "str": "S&W 500", "str_pl": "S&W 500" },
     "description": "The 5-shot Smith and Wesson 500 revolver fires the comparably-named .500 S&W Magnum.  It's an impressive weapon.",
     "weight": "1960 g",
     "volume": "750 ml",

data/json/items/gun/762R.json

@@ -38,8 +38,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "Mosin-Nagant 1891/30",
-    "name_plural": "Mosin-Nagant 1891/30",
+    "name": { "str": "Mosin-Nagant 1891/30", "str_pl": "Mosin-Nagant 1891/30" },
     "description": "The Mosin-Nagant 1891/30 is a bolt action, internal magazine-fed, military rifle, developed by the Russian Empire, and later used and perfected by the Soviet Union.",
     "weight": "4000 g",
     "volume": "3 L",

data/json/items/gun/shot.json

@@ -141,8 +141,7 @@
     "copy-from": "shotgun_pump_3gun",
     "looks_like": "remington_870",
     "type": "GUN",
-    "name": "Mossberg 500 Field",
-    "name_plural": "Mossberg 500 Field",
+    "name": { "str": "Mossberg 500 Field", "str_pl": "Mossberg 500 Field" },
     "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use.  It is noted for its high durability and low recoil.  This one is fitted with a 28 inch barrel with sight rib.",
     "weight": "3180 g",
     "volume": "2500 ml",
@@ -160,8 +159,7 @@
     "id": "mossberg_500_security",
     "copy-from": "mossberg_500",
     "type": "GUN",
-    "name": "Mossberg 500 Security",
-    "name_plural": "Mossberg 500 Security",
+    "name": { "str": "Mossberg 500 Security", "str_pl": "Mossberg 500 Security" },
     "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use.  It is noted for its high durability and low recoil.  This one is fitted with an 18.5 inch barrel.",
     "weight": "3062 g",
     "volume": "2900 ml",
@@ -176,8 +174,7 @@
     "id": "mossberg_590",
     "copy-from": "mossberg_500_security",
     "type": "GUN",
-    "name": "Mossberg 590A1",
-    "name_plural": "Mossberg 590A1",
+    "name": { "str": "Mossberg 590A1", "str_pl": "Mossberg 590A1" },
     "description": "The Mossberg 590A1 is a military and police oriented version of the Mossberg 500.  It features a heavier barrel, a bayonet lug, and a different magazine tube for easier cleaning and maintenance.",
     "weight": "3289 g",
     "volume": "2990 ml",

data/json/items/ranged/launchers.json

@@ -62,8 +62,7 @@
     "reload_noise_volume": 10,
     "symbol": "(",
     "color": "brown",
-    "name": "RPG-7",
-    "name_plural": "RPG-7",
+    "name": { "str": "RPG-7", "str_pl": "RPG-7" },
     "description": "The emblematic RPG-7 launcher.  Its simple, inexpensive, and reliable design made it a popular choice among armies and insurgent groups worldwide.",
     "price": 150000,
     "//": "Like the LAW, this thing is basically a tube with a lever.  It's even cheaper in terms of construction, but there's a premium due to being imported.  Also not disposable.",