Merge pull request #38309 from snipercup/Gun-name-to-object-2

Gun name to object

data/json/items/gun/12mm.json

@@ -4,7 +4,7 @@
     "copy-from": "gun_base",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "H&K G80 railgun",
+    "name": { "str": "H&K G80 railgun" },
     "description": "Developed by Heckler & Koch, this railgun magnetically propels a ferromagnetic projectile using an alternating current.  Powered by UPS.",
     "weight": "3914 g",
     "volume": "2750 ml",

data/json/items/gun/22.json

@@ -304,7 +304,7 @@
     "copy-from": "pistol_backup",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "Jennings J-22",
+    "name": { "str": "Jennings J-22" },
     "description": "One of the quintessential 'saturday night specials', the Jennings J-22 was very affordably priced with its injection molded zinc slide and frame.  Intended to fill the void left after small pocket pistols were banned from import, these were more commonly used by criminals unfazed by their glaring safety issues.",
     "weight": "370 g",
     "volume": "123ml",

data/json/items/gun/223.json

@@ -50,7 +50,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "HK416 A5",
+    "name": { "str": "HK416 A5" },
     "//": "*Current* milspec gear is now ridiculously overpriced, as seen with the M2010 IRL.",
     "description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable.",
     "weight": "3490 g",
@@ -74,7 +74,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "H&K G36",
+    "name": { "str": "H&K G36" },
     "description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.",
     "weight": "3630 g",
     "volume": "2500 ml",
@@ -96,7 +96,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "L2037 Backup",
+    "name": { "str": "L2037 Backup" },
     "//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.",
     "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle.  The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "weight": "2370 g",
@@ -124,7 +124,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "L523 platform",
+    "name": { "str": "L523 platform" },
     "//": "Current milspec, so Expensive.",
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The base mechanism could--theoretically--be used on its own, but such use is inadvisable and will void your warranty.  There's no real place to incorporate aftermarket modifications on this barren proto-weapon.",
     "weight": "2500 g",
@@ -405,7 +405,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "FN SCAR-L",
+    "name": { "str": "FN SCAR-L" },
     "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command.  The 'L' in its name stands for light, as it uses the lightweight .223 round.",
     "weight": "3300 g",
     "volume": "2250 ml",

data/json/items/gun/3006.json

@@ -44,7 +44,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "M1 Garand",
+    "name": { "str": "M1 Garand" },
     "description": "A semi-automatic .30-06 battle rifle, developed to replace the M1903 Springfield.  It didn't completely supplant the older bolt-action until after World War II.",
     "weight": "4280 g",
     "volume": "2500 ml",

data/json/items/gun/300BLK.json

@@ -29,7 +29,7 @@
     "copy-from": "rifle_semi",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "IWI Tavor X95 .300BLK",
+    "name": { "str": "IWI Tavor X95 .300BLK" },
     "description": "The IWI Tavor X95 (also called Micro-Tavor or MTAR) is an Israeli bullpup assault rifle designed and produced by Israel Weapon Industries.  This is the civilian version chambered for .300 AAC Blackout.",
     "weight": "3610 g",
     "volume": "1500 ml",

data/json/items/gun/308.json

@@ -51,7 +51,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "M134D-H Minigun",
+    "name": { "str": "M134D-H Minigun" },
     "description": "The M134D-H Minigun is a (relatively) lightweight heavy rotary machine gun.  Its six barrels are rotated by an electric motor, powered by UPS or vehicle.  If you could find enough ammo for it, it would become a devastating weapon.  It must be mounted on a vehicle before use.",
     "weight": "19770 g",
     "volume": "6 L",
@@ -331,7 +331,7 @@
     "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "HK417 A2",
+    "name": { "str": "HK417 A2" },
     "description": "A German battle rifle with a 13\" barrel and telescopic stock.  It is a gas operated, rotating bolt rifle with a short-stroke piston design similar to that of the G36.",
     "weight": "4220 g",
     "volume": "1750 ml",
@@ -355,7 +355,7 @@
     "copy-from": "rifle_semi",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "M110A1",
+    "name": { "str": "M110A1" },
     "description": "A derivative of H&K's G28 with an aluminum upper receiver to meet US Army weight requirements.  It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.",
     "weight": "4330 g",
     "volume": "2 L",

data/json/items/gun/32.json

@@ -118,7 +118,7 @@
     "looks_like": "glock_17",
     "copy-from": "pistol_backup",
     "type": "GUN",
-    "name": "Kel-Tec P32",
+    "name": { "str": "Kel-Tec P32" },
     "description": "One of Kel-tec's oldest designs, the P32 is a popular option for deep concealment and backup usage.  Despite its extreme light weight and small size, its .32 ACP chambering makes for good handling and recoil control.",
     "weight": "186 g",
     "volume": "186ml",

data/json/items/gun/380.json

@@ -33,7 +33,7 @@
     "copy-from": "pistol_backup",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "FN 1910 .380",
+    "name": { "str": "FN 1910 .380" },
     "description": "Made infamous in Sarajevo in 1914, the FN1910 was a popular pocket pistol, albeit in .32 ACP.  Collectors value the .380 model for its notoriety and more modern terminal performance.  If such a humble firearm could start a world war, could it perhaps protect you from the undead?",
     "weight": "590 g",
     "volume": "186ml",
@@ -73,7 +73,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "Hi-Point CF-380",
+    "name": { "str": "Hi-Point CF-380" },
     "description": "The Hi-Point CF-380 is a blowback operated semi-automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable.  Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
     "weight": "820 g",
     "volume": "539 ml",

data/json/items/gun/40.json

@@ -265,7 +265,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "Hi-Point Model JCP",
+    "name": { "str": "Hi-Point Model JCP" },
     "description": "The Hi-Point Model JCP is a blowback operated semi-automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable.  Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
     "weight": "990 g",
     "volume": "703 ml",

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

@@ -23,7 +23,7 @@
     "copy-from": "pistol_revolver_cap_ball",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "LeMat revolver",
+    "name": { "str": "LeMat revolver" },
     "description": "A Pietta reproduction of the civil war era LeMat revolver, a rare and unusual cap & ball .44-caliber revolver.  While its original non-standard .42 or .35 caliber curbed its usefulness for the CSA army, this reproduction is offered in more prevalent .44 caliber.  Despite modern quality materials, the design is still rather delicate.",
     "weight": "1410 g",
     "volume": "851 ml",

data/json/items/gun/45.json

@@ -43,7 +43,7 @@
     "looks_like": "hk_mp5",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "H&K UMP45",
+    "name": { "str": "H&K UMP45" },
     "description": "Developed as a successor to the MP5 submachine gun, the UMP45 retains the earlier model's supreme accuracy and low recoil, but in the higher .45 caliber.",
     "weight": "2300 g",
     "volume": "1250 ml",
@@ -341,7 +341,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "Hi-Point Model JHP",
+    "name": { "str": "Hi-Point Model JHP" },
     "description": "The Hi-Point Model JHP is a blowback operated semi-automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable.  Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
     "weight": "990 g",
     "volume": "720 ml",

data/json/items/gun/46.json

@@ -4,7 +4,7 @@
     "looks_like": "hk_mp5",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "H&K MP7A2",
+    "name": { "str": "H&K MP7A2" },
     "description": "Designed as a personal defense weapon, the MP7 fires the high-powered 4.6x30mm round while being lightweight, compact in size, and practically recoil free.",
     "weight": "1800 g",
     "volume": "2034 ml",

data/json/items/gun/57.json

@@ -4,7 +4,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "FN Five-Seven",
+    "name": { "str": "FN Five-Seven" },
     "description": "Designed to work with FN's proprietary 5.7x28mm round, the Five-Seven is a lightweight pistol with a very high capacity, best used against armored opponents.",
     "weight": "600 g",
     "volume": "551 ml",
@@ -41,7 +41,7 @@
     "looks_like": "hk_mp5",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "FN P90",
+    "name": { "str": "FN P90" },
     "description": "The first in a new genre of guns, termed \"personal defense weapons.\"  FN designed the P90 to use their proprietary 5.7x28mm ammunition.  It is made for firing bursts manageably.",
     "weight": "2640 g",
     "volume": "3817 ml",

data/json/items/gun/700nx.json

@@ -4,7 +4,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Elephant gun",
+    "name": { "str": "Elephant gun" },
     "description": "A custom-made single shot rifle specially designed for the hunting of huge game.  You could obviously kill everything with this, EVERYTHING.  If you ever find enough ammo of course.",
     "weight": "8082 g",
     "volume": "3 L",

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

@@ -45,7 +45,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Cx4 Storm",
+    "name": { "str": "Cx4 Storm" },
     "description": "A small pistol caliber carbine designed for police use and civilian self-defense, the Cx4 Storm uses magazines that are interchangeable with other Beretta 9x19mm handguns.",
     "weight": "2580 g",
     "volume": "1500 ml",
@@ -86,7 +86,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "Glock 19",
+    "name": { "str": "Glock 19" },
     "description": "Possibly the most popular pistol in existence.  The Glock 19 is often derided for its plastic construction, but it is easy to shoot.",
     "weight": "600 g",
     "volume": "500 ml",
@@ -307,7 +307,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "L39",
+    "name": { "str": "L39" },
     "//": "L39s are based off the Robocop Auto-9, in turn a dolled-up Beretta 93R.",
     "description": "A semiautomatic 9x19mm handgun introduced by Leadworks LLC's, L39 provides accurate single-shot placement in a very robust frame with built in red dot and laser sights.  Several urban legends describe using it in ways that would have destroyed a lesser weapon.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "weight": "935 g",
@@ -711,7 +711,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "Hi-Point C-9",
+    "name": { "str": "Hi-Point C-9" },
     "description": "The Hi-Point C-9 is a blowback operated semi-automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable.  Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
     "weight": "820 g",
     "volume": "539 ml",

data/json/items/gun/shot.json

@@ -529,7 +529,7 @@
     "id": "SPAS_12",
     "copy-from": "shotgun_base",
     "type": "GUN",
-    "name": "Franchi SPAS-12",
+    "name": { "str": "Franchi SPAS-12" },
     "description": "Mean and intimidating looking, the SPAS 12 has the dubious honor of being declared a destructive device and being banned from import by name, adding to its already considerable appeal.  It is a combination pump-action and semi-automatic firearm, with an arm stabilizing hook for one handed shooting.",
     "weight": "4400 g",
     "volume": "2768 ml",