Gun name to object (#37795)

data/json/items/gun/22.json

@@ -4,8 +4,7 @@
     "looks_like": "hk_mp5",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "American-180",
-    "name_plural": "American-180",
+    "name": { "str": "American-180", "str_pl": "American-180" },
     "description": "The American-180 is a submachine gun developed in the 1960's that fires .22 LR, unusual for an SMG.  Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon.",
     "weight": "2600 g",
     "volume": "1250 ml",

data/json/items/gun/3006.json

@@ -4,8 +4,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Browning BLR",
-    "name_plural": "Browning BLR",
+    "name": { "str": "Browning BLR", "str_pl": "Browning BLR" },
     "description": "A highly accurate lever-action hunting rifle chambered for the powerful .30-06 round.  Notable for using a detachable magazine instead of a traditional tube.",
     "weight": "3300 g",
     "volume": "3 L",

data/json/items/gun/308.json

@@ -4,8 +4,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "FN FAL",
-    "name_plural": "FN FAL",
+    "name": { "str": "FN FAL", "str_pl": "FN FAL" },
     "description": "Originally designed during the Cold War, the FN FAL is probably the most successful battle rifle ever designed.  Even though often labeled as obsolete, its high rate of fire and powerful ammunition make it perfectly capable of holding its ground against modern competitors.",
     "weight": "4250 g",
     "volume": "2 L",
@@ -284,8 +283,7 @@
     "copy-from": "scar_l",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "FN SCAR-H",
-    "name_plural": "FN SCAR-H",
+    "name": { "str": "FN SCAR-H", "str_pl": "FN SCAR-H" },
     "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command.  The 'H' in its name stands for heavy, as it uses the powerful .308 round.",
     "weight": "3640 g",
     "ammo": "308",

data/json/items/gun/36paper.json

@@ -4,8 +4,7 @@
     "copy-from": "pistol_revolver_cap_ball",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "Colt M1861 Navy",
-    "name_plural": "Colt M1861 Navy",
+    "name": { "str": "Colt M1861 Navy", "str_pl": "Colt M1861 Navy" },
     "description": "The Colt Model 1861 Navy cap & ball .36-caliber revolver was a six-shot, single-action percussion weapon produced by Colt's Manufacturing Company from 1861 until 1873.",
     "weight": "1190 g",
     "volume": "750 ml",
@@ -18,6 +17,6 @@
     "durability": 7,
     "blackpowder_tolerance": 96,
     "clip_size": 6,
-    "proportional": { "reload": 2 }
+    "proportional": { "reload": 2.0 }
   }
 ]

data/json/items/gun/38super.json

@@ -4,8 +4,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "AF2011A1 .38 Super",
-    "name_plural": "AF2011A1 .38 Super",
+    "name": { "str": "AF2011A1 .38 Super", "str_pl": "AF2011A1 .38 Super" },
     "description": "A double-barrel semi-automatic pistol of Italian origin, firing two bullets per shot, a derivative of the M1911 pistol.",
     "weight": "2041 g",
     "volume": "716 ml",

data/json/items/gun/40.json

@@ -4,8 +4,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Glock 22",
-    "name_plural": "Glock 22",
+    "name": { "str": "Glock 22", "str_pl": "Glock 22" },
     "description": "A .40 S&W variant of the popular Glock 17 pistol.  The standard-issue firearm of the FBI and of countless other law enforcement agencies worldwide.",
     "weight": "650 g",
     "volume": "500 ml",

data/json/items/gun/44.json

@@ -4,8 +4,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Desert Eagle .44",
-    "name_plural": "Desert Eagle .44",
+    "name": { "str": "Desert Eagle .44", "str_pl": "Desert Eagle .44" },
     "description": "One of the most recognizable handguns due to its popularity in movies and video games, the Desert Eagle is better known for its menacing appearance than its performance.  It's a large pistol, but its heavy weight reduces recoil.",
     "weight": "1700 g",
     "volume": "750 ml",

data/json/items/gun/44paper.json

@@ -4,8 +4,7 @@
     "copy-from": "pistol_revolver_cap_ball",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "Colt M1860 Army",
-    "name_plural": "Colt M1860 Army",
+    "name": { "str": "Colt M1860 Army", "str_pl": "Colt M1860 Army" },
     "description": "The Colt Army Model 1860 is a cap & ball .44-caliber revolver.  It was used during the American Civil War, and made by Colt's Manufacturing Company.",
     "weight": "1200 g",
     "volume": "750 ml",

data/json/items/gun/4570.json

@@ -68,8 +68,7 @@
     "copy-from": "gun_base",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "1874 Sharps",
-    "name_plural": "1874 Sharps",
+    "name": { "str": "1874 Sharps", "str_pl": "1874 Sharps" },
     "description": "A reproduction of an antique single-shot .45-70 rifle once used to hunt buffalo and other large game in the late 19th Century.  Highly accurate and powerful for the time, this one is made to handle modern smokeless ammunition.",
     "weight": "5000 g",
     "volume": "3250 ml",

data/json/items/gun/50.json

@@ -4,8 +4,7 @@
     "copy-from": "rifle_base",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "Barrett M107A1",
-    "name_plural": "Barrett M107A1",
+    "name": { "str": "Barrett M107A1", "str_pl": "Barrett M107A1" },
     "//": "Price based on unit cost quote for fiscal year 2005 listed at inetres.com, with gunmod modifiers to be added later.",
     "description": "A large, shoulder-fired, .50 caliber anti-materiel rifle.  Its large size, recoil, and noise is offset by its damage and range.",
     "weight": "12602 g",

data/json/items/gun/500.json

@@ -4,8 +4,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "Big Horn Model 89",
-    "name_plural": "Big Horn Model 89",
+    "name": { "str": "Big Horn Model 89", "str_pl": "Big Horn Model 89" },
     "description": "Built in the image of the venerable Winchester Model 1886, Big Horn Armory's Model 89 rifle packs all the power of the .500 S&W Magnum cartridge in to a package less likely to break one's wrist.",
     "weight": "3447 g",
     "volume": "3 L",

data/json/items/gun/762.json

@@ -42,8 +42,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Beretta ARX-160",
-    "name_plural": "Beretta ARX-160",
+    "name": { "str": "Beretta ARX-160", "str_pl": "Beretta ARX-160" },
     "//": "Total unloaded weight of gun 3000 grams.  Current weight of folding stock 200 grams.",
     "description": "The Beretta ARX-160 was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine.  It failed to replace it, but it is widely used by military all around the world.  This version is chambered for 7.62x39mm.",
     "weight": "3450 g",

data/json/items/gun/9mm.json

@@ -4,8 +4,7 @@
     "looks_like": "hk_mp5",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Calico M960",
-    "name_plural": "Calico M960",
+    "name": { "str": "Calico M960", "str_pl": "Calico M960" },
     "//": "Automatic variant.  Cyclic fire rate: 750 rpm",
     "description": "The Calico M960 is an automatic carbine with a unique circular magazine that allows for high capacities and reduced recoil.",
     "weight": "2270 g",

data/json/items/gun/atgm.json

@@ -4,8 +4,7 @@
     "copy-from": "gun_base",
     "looks_like": "m79",
     "type": "GUN",
-    "name": "BGM-71F TOW",
-    "name_plural": "BGM-71F TOW",
+    "name": { "str": "BGM-71F TOW", "str_pl": "BGM-71F TOW" },
     "description": "A launcher for anti-tank guided missiles, capable of being deployed as a crew-served weapon or mounted on vehicles.  While fairly accurate, it isn't fire-and-forget.",
     "weight": "93000 g",
     "volume": "25 L",