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

Gun name to object

data/json/items/gun/223.json

@@ -486,7 +486,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "handmade carbine",
+    "name": { "str": "handmade carbine" },
     "//": "It's smaller than an M4A1, plus it's a homemade firearm.",
     "description": "A well-designed improvised lever-action carbine with a shortened barrel.  Accepting crude detachable magazines or STANAG magazines, this is one of the better homemade weapons.",
     "weight": "1950 g",

data/json/items/gun/40.json

@@ -156,7 +156,7 @@
     "looks_like": "sw_619",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "handmade six-shooter",
+    "name": { "str": "handmade six-shooter" },
     "description": "A homemade 6-shot revolver.  While it's not as good as the pre-Cataclysm manufactured weapons, it's a decent piece of work, all things considered.",
     "weight": "1333 g",
     "volume": "750 ml",

data/json/items/gun/45.json

@@ -236,7 +236,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "homemade hand cannon",
+    "name": { "str": "homemade hand cannon" },
     "//": "On one hand, it's very big for a handgun. On the other, it's still a scrap weapon.",
     "description": "A large and heavy pistol evidently welded from scrap.  It's not pretty, but the .45 it's chambered with packs a serious punch.  Just watch out for the kick.",
     "weight": "1200 g",

data/json/items/gun/bio.json

@@ -3,7 +3,7 @@
     "id": "bio_shotgun_gun",
     "looks_like": "remington_870",
     "type": "GUN",
-    "name": "bionic shotgun",
+    "name": { "str": "bionic shotgun" },
     "description": "Bionic one-shot retracting shotgun integrated with your arm.",
     "volume": "103 ml",
     "price": 0,

data/json/items/gun/combination.json

@@ -6,7 +6,7 @@
     "reload_noise_volume": 10,
     "symbol": "(",
     "color": "brown",
-    "name": "combination gun",
+    "name": { "str": "combination gun" },
     "description": "A break action firearm comprised of a .30-06 barrel over two 12 gauge smooth bore barrels.  Historically used by egomaniac hunters in Africa, now used by their egomaniac descendants in New England.",
     "price": 259500,
     "material": [ "steel", "wood" ],

data/json/items/gun/flammable.json

@@ -4,7 +4,7 @@
     "copy-from": "flamethrower_base",
     "looks_like": "m79",
     "type": "GUN",
-    "name": "flamethrower",
+    "name": { "str": "flamethrower" },
     "description": "A large flamethrower with substantial gas reserves.  Very menacing and deadly.",
     "weight": "1587 g",
     "volume": "4 L",

data/json/items/gun/flintlock.json

@@ -4,7 +4,7 @@
     "copy-from": "rifle_flintlock",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "flintlock carbine",
+    "name": { "str": "flintlock carbine" },
     "description": "This short rifle design once dominated the battlefields of ancient Europe, and may yet re-earn its feared status due to its ease of handling and ability to use easily-crafted ammunition.",
     "valid_mod_locations": [
       [ "accessories", 1 ],
@@ -34,7 +34,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "flintlock pistol",
+    "name": { "str": "flintlock pistol" },
     "description": "A beautifully decorated flintlock pistol.  If using this doesn't make you feel a pirate, nothing will.",
     "weight": "753 g",
     "volume": "750 ml",
@@ -68,7 +68,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "flintlock rifle",
+    "name": { "str": "flintlock rifle" },
     "description": "For once, something *good* came back from the dead.  This ancient design lacks the fire-rate of modern weapons, but packs as much punch as the best of 'em and rewards the skilled shooter with easily-crafted ammunition.",
     "weight": "1950 g",
     "volume": "2500 ml",

data/json/items/gun/metal_rail.json

@@ -4,7 +4,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "heavy rail rifle",
+    "name": { "str": "heavy rail rifle" },
     "description": "This overpowered and overengineered variant of the ferromagnetic rail rifle was designed to deliver electromagnetically-driven obliteration right through whatever obstacles that lies in front of it, be it buildings, vehicles or hordes of walking dead.  However, the hefty bulk and weight of this weapon compared to most contemporary rifles makes it somewhat cumbersome to wield; not to mention that it consumes UPS charges at a tremendous rate, making it impractical for use in prolonged engagements.",
     "weight": "11500 g",
     "volume": "4500 ml",
@@ -41,7 +41,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "ferromagnetic rail rifle",
+    "name": { "str": "ferromagnetic rail rifle" },
     "description": "A single-shot, electrically propelled, steel rail launcher handcrafted from scrap.  The hypervelocity metal stake that it fires is accelerated to the point of spontaneous combustion by a Lorentz force generated by electromagnetic induction, powered by a standard UPS.",
     "weight": "4213 g",
     "volume": "2500 ml",

data/json/items/gun/nail.json

@@ -4,7 +4,7 @@
     "copy-from": "gun_base",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "coilgun",
+    "name": { "str": "coilgun" },
     "//": "Hard to make, plentiful and cheap ammo, and silent - people will want this thing.",
     "description": "A homemade gun, using electromagnets to accelerate a ferromagnetic projectile to high velocity.  Powered by UPS.",
     "weight": "3341 g",

data/json/items/gun/shot.json

@@ -221,7 +221,7 @@
     "copy-from": "pipe_shotgun",
     "looks_like": "remington_870",
     "type": "GUN",
-    "name": "double-barrel pipe shotgun",
+    "name": { "str": "double-barrel pipe shotgun" },
     "description": "A home-made double-barreled shotgun.  It is simply two pipes attached to a stock, with a pair of hammers to strike the two rounds it holds.",
     "clip_size": 2,
     "modes": [ [ "DEFAULT", "single", 1 ], [ "DOUBLE", "double", 2 ] ],

data/json/items/gun/signal_flare.json

@@ -4,7 +4,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "flaregun",
+    "name": { "str": "flaregun" },
     "description": "A plastic single shot pistol that can be loaded with signal flares.",
     "weight": "213 g",
     "volume": "500 ml",

data/json/items/gun/ups.json

@@ -116,7 +116,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "handheld laser cannon",
+    "name": { "str": "handheld laser cannon" },
     "description": "This is a laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret that has been modified to use UPS power for firing.",
     "weight": "5140 g",
     "volume": "1500 ml",

data/json/items/ranged/archery.json

@@ -391,7 +391,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "yellow",
-    "name": "compound bow",
+    "name": { "str": "compound bow" },
     "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by fairly strong archers.  Currently set to a medium weight.",
     "price": 55000,
     "material": [ "steel", "plastic" ],
@@ -462,7 +462,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "yellow",
-    "name": "composite bow",
+    "name": { "str": "composite bow" },
     "description": "A bow made from multiple materials for increased energy efficiency.  Complicated to make, but stronger than an all-wood short bow.",
     "price": 32000,
     "material": [ "wood", "bone" ],
@@ -546,7 +546,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "yellow",
-    "name": "hybrid longbow",
+    "name": { "str": "hybrid longbow" },
     "description": "A modernized, six-foot longbow that curves away from the archer at the tips for increased power.  It can be used effectively by those of somewhat above-average strength.  Designed for archers that appreciate the smoothness of a traditional longbow, but desire the superior power of a modern recurve.",
     "price": 38000,
     "material": [ "steel", "plastic", "wood" ],
@@ -619,7 +619,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "yellow",
-    "name": "compound greatbow",
+    "name": { "str": "compound greatbow" },
     "description": "An extremely large and powerful compound bow, made with enormous limbs and a thick string to take an immense amount of energy.  Takes incredible strength to draw.",
     "price": 160000,
     "material": [ "steel", "plastic" ],

data/json/items/ranged/crossbows.json

@@ -373,7 +373,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "green",
-    "name": "composite crossbow",
+    "name": { "str": "composite crossbow" },
     "reload_noise_volume": 4,
     "description": "A slightly larger, more powerful crossbow utilizing composite material limbs and somewhat more modern design practices.",
     "price": 89000,
@@ -410,7 +410,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "green",
-    "name": "compound crossbow",
+    "name": { "str": "compound crossbow" },
     "reload_noise_volume": 4,
     "description": "A high-power crossbow with shaped cams and extra cables for high-power shots.  Takes less time to reload due to a modern string-pulling system.",
     "price": 200000,
@@ -448,7 +448,7 @@
     "reload_noise_volume": 10,
     "symbol": "(",
     "color": "green",
-    "name": "heavy crossbow",
+    "name": { "str": "heavy crossbow" },
     "description": "A HUGE medieval crossbow from Germany with a very slow, difficult reloading process not suited for unskilled users.  Its tension is so powerful that you feel it shake after firing.  Bolts fired from this weapon have a good chance of remaining intact for re-use.",
     "price": 324000,
     "//": "Modern crossbows can come in anywhere from $300 to $2K.  Large plus Antique = expensive.",

data/json/items/ranged/launchers.json

@@ -95,7 +95,7 @@
     "reload_noise_volume": 10,
     "symbol": "/",
     "color": "light_gray",
-    "name": "crude rocket launcher",
+    "name": { "str": "crude rocket launcher" },
     "description": "An improvised, direct ignition launcher for home-made rockets.  Essentially, a thick-walled steel pipe, equipped with a pilot light, several batteries and a simple circuit board.  Effective only at medium range, barely.",
     "price": 5000,
     "material": "steel",

data/json/items/ranged/slings.json

@@ -85,7 +85,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "dark_gray",
-    "name": "brace slingshot",
+    "name": { "str": "brace slingshot" },
     "description": "A modern slingshot with a wrist brace, it is easy to use, accurate, and quite powerful.",
     "price": 3000,
     "material": [ "steel", "plastic" ],

data/json/items/ranged/spearguns.json

@@ -104,7 +104,7 @@
     "reload_noise_volume": 10,
     "symbol": "(",
     "color": "brown",
-    "name": "double speargun",
+    "name": { "str": "double speargun" },
     "description": "A double-loading underwater fishing implement designed to fire a specialized type of spear using tension in a rubber band.  While highly effective when used underwater, it is nearly useless on dry land.",
     "price": 17500,
     "material": [ "wood", "plastic" ],