Gun modern json name format (#37447)

data/json/items/archery.json

@@ -404,8 +404,7 @@
     "id": "compbow_high",
     "copy-from": "compbow",
     "type": "GUN",
-    "name": "compound bow (high)",
-    "name_plural": "compound bows (high)",
+    "name": { "str": "compound bow (high)", "str_pl": "compound bows (high)" },
     "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by very strong archers.  Currently set to a high weight, and ready to cause some real damage - if you can draw it.",
     "min_strength": 8,
     "reload": 120,
@@ -423,8 +422,7 @@
     "id": "compbow_low",
     "copy-from": "compbow",
     "type": "GUN",
-    "name": "compound bow (low)",
-    "name_plural": "compound bows (low)",
+    "name": { "str": "compound bow (low)", "str_pl": "compound bows (low)" },
     "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by average archers.  Currently set to a low weight, making it much easier to draw.",
     "min_strength": 4,
     "reload": 85,
@@ -556,7 +554,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "yellow",
-    "name": "longbow",
+    "name": { "str": "longbow" },
     "description": "A six-foot wooden bow that takes a fair amount of strength to draw.  It can be used effectively by those of somewhat above-average strength.  Used mainly in medieval England in wartime, but pierces zombie hide just as well as chainmail.",
     "price": 50000,
     "material": "wood",
@@ -582,7 +580,7 @@
     "id": "woodgreatbow",
     "copy-from": "longbow",
     "type": "GUN",
-    "name": "wooden greatbow",
+    "name": { "str": "wooden greatbow" },
     "description": "An extremely large and stiff longbow, made with enormous limbs and a thick string to take an immense amount of energy.  Takes incredible strength to draw.",
     "price": 150000,
     "min_strength": 18,

data/json/items/classes/gun.json

@@ -3,7 +3,7 @@
     "abstract": "gun_base",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "base gun",
+    "name": { "str": "base gun" },
     "symbol": "(",
     "color": "light_gray",
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ]
@@ -13,7 +13,7 @@
     "copy-from": "gun_base",
     "type": "GUN",
     "reload_noise": "slosh.",
-    "name": "base flamethrower",
+    "name": { "str": "base flamethrower" },
     "skill": "launcher",
     "ammo": "flammable",
     "ammo_effects": [ "FLARE" ],
@@ -25,7 +25,7 @@
     "abstract": "launcher_base",
     "copy-from": "gun_base",
     "type": "GUN",
-    "name": "base launcher",
+    "name": { "str": "base launcher" },
     "skill": "launcher",
     "modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ] ],
     "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "sights", 1 ], [ "sling", 1 ] ],
@@ -36,7 +36,7 @@
     "abstract": "pistol_base",
     "copy-from": "gun_base",
     "type": "GUN",
-    "name": "base pistol",
+    "name": { "str": "base pistol" },
     "skill": "pistol",
     "valid_mod_locations": [
       [ "accessories", 2 ],
@@ -57,7 +57,7 @@
     "abstract": "pistol_backup",
     "copy-from": "pistol_base",
     "type": "GUN",
-    "name": "backup pistol",
+    "name": { "str": "backup pistol" },
     "//": "diminuitive backup pistols that lack underbarrel rails, sight dovetails and decent places to affix stocks.",
     "valid_mod_locations": [
       [ "accessories", 2 ],
@@ -77,7 +77,7 @@
     "abstract": "pistol_revolver",
     "copy-from": "pistol_base",
     "type": "GUN",
-    "name": "revolver",
+    "name": { "str": "revolver" },
     "proportional": { "reload": 0.7 },
     "extend": { "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ] },
     "//": "Revolvers exclude the muzzle location preventing installation of suppressors",
@@ -98,7 +98,7 @@
     "abstract": "pistol_revolver_cap_ball",
     "copy-from": "pistol_base",
     "type": "GUN",
-    "name": "cap & ball revolver",
+    "name": { "str": "cap & ball revolver" },
     "reload": 150,
     "extend": { "flags": [ "RELOAD_ONE", "NO_UNLOAD" ] },
     "//": "Slower reloads, no unloading.  Base, unskilled person should take 1.5 seconds per chamber.  No underbarrel mods, that's where the ram goes.",
@@ -117,7 +117,7 @@
     "abstract": "rifle_base",
     "copy-from": "gun_base",
     "type": "GUN",
-    "name": "base rifle",
+    "name": { "str": "base rifle" },
     "skill": "rifle",
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -139,8 +139,7 @@
     "abstract": "rifle_manual",
     "copy-from": "rifle_base",
     "type": "GUN",
-    "name": "rifle with manual actions",
-    "name_plural": "rifles with manual actions",
+    "name": { "str": "rifle with manual actions", "str_pl": "rifles with manual actions" },
     "//": "Manual actions exclude the magazine location preventing installation of belt-feed adaptors",
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "valid_mod_locations": [
@@ -162,19 +161,19 @@
     "abstract": "rifle_semi",
     "copy-from": "rifle_base",
     "type": "GUN",
-    "name": "semi-automatic rifle"
+    "name": { "str": "semi-automatic rifle" }
   },
   {
     "abstract": "rifle_auto",
     "copy-from": "rifle_base",
     "type": "GUN",
-    "name": "fully automatic rifle"
+    "name": { "str": "fully automatic rifle" }
   },
   {
     "abstract": "shotgun_base",
     "copy-from": "gun_base",
     "type": "GUN",
-    "name": "base shotgun",
+    "name": { "str": "base shotgun" },
     "skill": "shotgun",
     "ammo": "shot",
     "valid_mod_locations": [
@@ -196,7 +195,7 @@
     "abstract": "shotgun_pump",
     "copy-from": "shotgun_base",
     "type": "GUN",
-    "name": "pump action shotgun",
+    "name": { "str": "pump action shotgun" },
     "reload_noise": "chuk chuk.",
     "flags": [ "RELOAD_ONE", "PUMP_ACTION" ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
@@ -227,7 +226,7 @@
     "abstract": "smg_base",
     "copy-from": "gun_base",
     "type": "GUN",
-    "name": "base SMG",
+    "name": { "str": "base SMG" },
     "skill": "smg"
   }
 ]

data/json/items/crossbows.json

@@ -303,7 +303,7 @@
     "reload_noise_volume": 5,
     "symbol": "(",
     "color": "green",
-    "name": "crossbow",
+    "name": { "str": "crossbow" },
     "description": "A slow-loading hand weapon that launches bolts.  Stronger people can reload it much faster.  Bolts fired from this weapon have a good chance of remaining intact for re-use.",
     "price": 69000,
     "material": [ "steel", "wood" ],

data/json/items/fake.json

@@ -88,7 +88,7 @@
     "id": "acid_spit",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": "acid spit gun",
+    "name": { "str": "acid spit gun" },
     "description": "Fake gun that fires acid globs.",
     "flags": [ "NEVER_JAMS" ],
     "ammo_effects": [ "BLINDS_EYES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING" ],
@@ -103,7 +103,7 @@
     "type": "GUN",
     "symbol": "(",
     "color": "yellow",
-    "name": "reach bow",
+    "name": { "str": "reach bow" },
     "description": "A test item that is both a ranged weapon and a reach weapon",
     "price": 16000,
     "material": "steel",
@@ -158,7 +158,7 @@
     "id": "migo_bio_gun",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": "mi-go bio-gun",
+    "name": { "str": "mi-go bio-gun" },
     "description": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion.",
     "flags": [ "NEVER_JAMS" ],
     "ammo_effects": [ "NEVER_MISFIRES" ],

data/json/items/gun/223.json

@@ -28,7 +28,7 @@
     "id": "ar15",
     "copy-from": "rifle_semi",
     "type": "GUN",
-    "name": "AR-15",
+    "name": { "str": "AR-15" },
     "//": "This is assumed to be the standard model matching the (currently not in-game) M16. Tileset whitelist for rifles",
     "description": "This ubiquitous rifle is the forefather of M16 rifle series.  It is lightweight and accurate, but will malfunction if not properly maintained.  This one is a semi automatic civilian version.",
     "weight": "3500 g",
@@ -147,7 +147,7 @@
     "id": "l_car_223",
     "copy-from": "l_base_223",
     "type": "GUN",
-    "name": "L523-CAR carbine",
+    "name": { "str": "L523-CAR carbine" },
     "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 carbine model incorporates Leadworks' proprietary gyro-stabilization technology and includes a red-dot sight and an integral laser sight.  Additionally it comes with underslung shotgun for close range encounters.  Like the rest of the family, doesn't accept third-party modifications.",
     "price": 520000,
     "durability": 9,
@@ -169,7 +169,7 @@
     "id": "l_dsr_223",
     "copy-from": "l_base_223",
     "type": "GUN",
-    "name": "L523-DSR rifle",
+    "name": { "str": "L523-DSR rifle" },
     "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 designated-shootist rifle incorporates a specially-designed extended barrel with integral bipod and foregrip, along with an integral 8x optic, and trades selective-fire for the Leadworks gyro-stabilization system.  Like the rest of the family, though, it doesn't accept third-party modifications.",
     "price": 580000,
     "durability": 9,
@@ -193,7 +193,7 @@
     "id": "l_lmg_223",
     "copy-from": "l_base_223",
     "type": "GUN",
-    "name": "L523-LMG",
+    "name": { "str": "L523-LMG" },
     "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 rather ambitious light machine gun variant incorporates ACOG scope, a heavy-duty barrel, foregrip, bipod and as well as the Leadworks gyro system.  Unlike the other configurations, the L523 LMG can be loaded with ammo belts.",
     "price": 620000,
     "durability": 9,
@@ -216,7 +216,7 @@
     "id": "l_mbr_223",
     "copy-from": "l_base_223",
     "type": "GUN",
-    "name": "L523-MBR rifle",
+    "name": { "str": "L523-MBR rifle" },
     "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 battle rifle's (proprietary) combination optic & red-dot sights provide quick and accurate targeting, with Leadworks gyro-stabilization system and foregrip available for greater control.  Additionally it comes with grenade launcher module for dealing with hard targets.  Like the rest of the family, though, it doesn't accept third-party modifications.",
     "price": 520000,
     "durability": 9,
@@ -273,7 +273,7 @@
     "id": "m27iar",
     "copy-from": "h&k416a5",
     "type": "GUN",
-    "name": "M27 IAR",
+    "name": { "str": "M27 IAR" },
     "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.",
     "weight": "3710 g",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],

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

@@ -64,7 +64,7 @@
     "id": "ar15_retool_300blk",
     "copy-from": "ar15",
     "type": "GUN",
-    "name": "AR-15",
+    "name": { "str": "AR-15" },
     "default_mods": [ "retool_ar15_300blk" ]
   }
 ]

data/json/items/gun/308.json

@@ -81,8 +81,7 @@
     "id": "m14ebr",
     "copy-from": "m1a",
     "type": "GUN",
-    "name": "M14 EBR-RI",
-    "name_plural": "M14 EBR-RI",
+    "name": { "str": "M14 EBR-RI", "str_pl": "M14 EBR-RI" },
     "description": "A highly modified version of the M14 rifle designed to cover both CQB and designated marksman roles.  A very powerful and versatile rifle, if somewhat heavy.",
     "weight": "5070 g",
     "price": 195000,

data/json/items/gun/357sig.json

@@ -24,7 +24,7 @@
     "id": "glock_31",
     "copy-from": "glock_22",
     "type": "GUN",
-    "name": "Glock 31",
+    "name": { "str": "Glock 31" },
     "description": "A full size .357 SIG Glock pistol.  It is extremely similar to the Glock 22, and could be converted to fire .40 S&W by switching the barrel.",
     "weight": "660 g",
     "ammo": [ "357sig" ],

data/json/items/gun/38.json

@@ -166,8 +166,7 @@
     "copy-from": "pistol_revolver",
     "//": "Tileset whitelist for revolvers.",
     "type": "GUN",
-    "name": "S&W 619",
-    "name_plural": "S&W 619",
+    "name": { "str": "S&W 619", "str_pl": "S&W 619" },
     "description": "A seven-round .38 revolver sold by Smith & Wesson.  It features a fixed rear sight and a reinforced frame.",
     "weight": "1074 g",
     "volume": "500 ml",

data/json/items/gun/380.json

@@ -19,7 +19,7 @@
     "id": "kp3at",
     "copy-from": "kp32",
     "type": "GUN",
-    "name": "Kel-Tec P3AT",
+    "name": { "str": "Kel-Tec P3AT" },
     "description": "Essentially a slightly scaled up Kel-tec P32 in .380 ACP, the ever popular P3AT offers better ballistics in a small, concealable lightweight package.  Handling leaves something to be desired due to snappier recoil and diminuitive controls.",
     "weight": "220 g",
     "volume": "231ml",

data/json/items/gun/40x46mm.json

@@ -53,7 +53,7 @@
     "copy-from": "launcher_base",
     "//": "Tileset whitelist for launchers.",
     "type": "GUN",
-    "name": "M79 launcher",
+    "name": { "str": "M79 launcher" },
     "description": "A widely-used grenade launcher that first saw use by American forces in the Vietnam war.  Though mostly replaced by more modern launchers, the M79 still sees use with many units worldwide.",
     "weight": "2930 g",
     "volume": "1 L",
@@ -143,7 +143,7 @@
     "id": "triple_launcher_simple",
     "copy-from": "launcher_simple",
     "type": "GUN",
-    "name": "triple-barrel 40mm launcher",
+    "name": { "str": "triple-barrel 40mm launcher" },
     "description": "A homemade triple-barrel 40mm grenade launcher.  Capable of launching all three grenades at once, it is extremely powerful for a homemade weapon.",
     "clip_size": 3,
     "modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ], [ "MULTI", "multi", 3, [ "NPC_AVOID", "SIMULTANEOUS" ] ] ],

data/json/items/gun/45.json

@@ -301,7 +301,7 @@
     "id": "usp_45",
     "copy-from": "usp_9mm",
     "type": "GUN",
-    "name": "USP .45",
+    "name": { "str": "USP .45" },
     "weight": "930 g",
     "ammo": "45",
     "ranged_damage": 0,
@@ -312,7 +312,7 @@
     "id": "mk23",
     "copy-from": "usp_45",
     "type": "GUN",
-    "name": "MK 23 MOD 0",
+    "name": { "str": "MK 23 MOD 0" },
     "description": "Jokingly referred to as \"The World's Only Crew-Served Pistol\", this massive pistol was designed as a primary weapon for select \"special operators\".  Its cumbersome nature, the introduction of the derivative HK USP series and the logistics of getting .45 ACP ammunition in theater doomed this behemoth to US SOCOM armories.  Like the USP, the Mk 23 is a remarkably reliable gun; someone could probably take out a nuclear equipped walking tank with this in their holster.",
     "weight": "1120 g",
     "volume": "1607 ml",

data/json/items/gun/460.json

@@ -3,7 +3,7 @@
     "id": "l_sp_45",
     "copy-from": "l_sp_9mm",
     "type": "GUN",
-    "name": "L39-460",
+    "name": { "str": "L39-460" },
     "description": "Developed as a testament to the L39 family of pistols' strength, this hefty pistol chambers powerful .460 Rowland.  In addition to the heavy slide and L39 standard sighting package, this pistol sports a large compensator.  Notably, normal .45ACP can also be fired through the weapon.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "price": 90000,
     "ammo": [ "460", "45" ],
@@ -16,7 +16,7 @@
     "id": "l_mp_45",
     "copy-from": "l_mp_9mm",
     "type": "GUN",
-    "name": "L39B-45",
+    "name": { "str": "L39B-45" },
     "description": "After the success of their 9x19mm machine pistol, Leadworks LLC developed the L39B-45 from their .460 Rowland semi-autos, intending them to be used with .45ACP.  Because it shares most of its parts with the L39-460, this variant retains the ability to fire fearsome .460 Rowland, though users are strongly advised not to do so during automatic fire.  Comes with built in red dot, recoil compensator and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "ammo": [ "460", "45" ],
     "magazines": [ [ "460", [ "lw12mag" ] ], [ "45", [ "lw12mag" ] ] ],

data/json/items/gun/50.json

@@ -66,7 +66,7 @@
     "id": "m2browning_sawn",
     "copy-from": "m2browning",
     "type": "GUN",
-    "name": ".50 caliber rifle",
+    "name": { "str": ".50 caliber rifle" },
     "description": "Modified from the massive M2 Browning, this pared down rifle has been altered to be fired unmounted.  The burst fire has been disabled, and its belt fed mechanism has been modified into a much smaller single round chamber.",
     "material": [ "steel", "wood" ],
     "clip_size": 1,

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

@@ -3,8 +3,7 @@
     "id": "mosin44",
     "copy-from": "mosin91_30",
     "type": "GUN",
-    "name": "Mosin-Nagant M44",
-    "name_plural": "Mosin-Nagant M44",
+    "name": { "str": "Mosin-Nagant M44", "str_pl": "Mosin-Nagant M44" },
     "description": "The Model 44 is the carbine sized variant of the standard 1891/30.  It has a shorter barrel, therefore it is weaker than the 1891/30, but easier to carry.",
     "weight": "4100 g",
     "price": 23000,
@@ -14,8 +13,7 @@
     "id": "mosin44_ebr",
     "copy-from": "mosin44",
     "type": "GUN",
-    "name": "Mosin-Nagant M44-EBR",
-    "name_plural": "Mosin-Nagant M44-EBR",
+    "name": { "str": "Mosin-Nagant M44-EBR", "str_pl": "Mosin-Nagant M44-EBR" },
     "description": "This carbine packs the classic Mosin-Nagant model 44 action in a modern-day stock capable of accepting modifications.",
     "weight": "4330 g",
     "material": [ "steel", "plastic" ],
@@ -72,8 +70,7 @@
     "id": "mosin91_30_ebr",
     "copy-from": "mosin91_30",
     "type": "GUN",
-    "name": "Mosin-Nagant 1891/30-EBR",
-    "name_plural": "Mosin-Nagant 1891/30-EBR",
+    "name": { "str": "Mosin-Nagant 1891/30-EBR", "str_pl": "Mosin-Nagant 1891/30-EBR" },
     "description": "This Mosin-Nagant has exchanged the classic wooden stock for a modern synthetic model, carefully balanced to the same weight and handling yet offering support for modern accessories.",
     "weight": "4230 g",
     "material": [ "steel", "plastic" ],

data/json/items/gun/84x246mm.json

@@ -35,7 +35,7 @@
     "id": "AT4",
     "type": "GUN",
     "copy-from": "m3_carlgustav",
-    "name": "AT4",
+    "name": { "str": "AT4" },
     "description": "Mil-Spec rocket launcher.  An 84-mm unguided, portable, single-shot recoilless smoothbore weapon used primarily by the US military.",
     "extend": { "flags": [ "FIRE_TWOHAND", "NO_REPAIR" ] },
     "ammo": "84x246mm",