Ammo name to object

data/json/items/ammo.json

@@ -436,7 +436,7 @@
     "type": "AMMO",
     "id": "120mm_HEAT",
     "price": 999999,
-    "name": "120mm HEAT",
+    "name": { "str": "120mm HEAT" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "A 120mm high-explosive anti-tank round.  It could ruin anyone's whole day.",

data/json/items/ammo/10mm.json

@@ -2,7 +2,7 @@
   {
     "id": "10mm_fmj",
     "type": "AMMO",
-    "name": "10mm Auto FMJ",
+    "name": { "str": "10mm Auto FMJ" },
     "description": "A jacketed 10mm Auto round.  The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.",
     "weight": "9 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "bp_10mm_fmj",
     "copy-from": "10mm_fmj",
     "type": "AMMO",
-    "name": "10mm Auto FMJ, black powder",
+    "name": { "str": "10mm Auto FMJ, black powder" },
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -35,7 +35,7 @@
     "id": "reloaded_10mm_fmj",
     "copy-from": "10mm_fmj",
     "type": "AMMO",
-    "name": "10mm Auto FMJ, reloaded",
+    "name": { "str": "10mm Auto FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/ammo/50.json

@@ -3,7 +3,7 @@
     "id": "50_incendiary",
     "copy-from": "50bmg",
     "type": "AMMO",
-    "name": ".50 BMG M17 tracer",
+    "name": { "str": ".50 BMG M17 tracer" },
     "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.",
     "count": 10,
     "effects": [ "INCENDIARY" ],
@@ -12,7 +12,7 @@
   {
     "id": "50bmg",
     "type": "AMMO",
-    "name": ".50 BMG M33 Ball",
+    "name": { "str": ".50 BMG M33 Ball" },
     "description": ".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
     "weight": "114 g",
     "volume": "250 ml",
@@ -36,7 +36,7 @@
     "id": "50match",
     "copy-from": "50bmg",
     "type": "AMMO",
-    "name": ".50 BMG Match",
+    "name": { "str": ".50 BMG Match" },
     "description": ".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for long-range competition shooting or other precision rifle use.",
     "count": 10,
     "relative": { "damage": 2, "pierce": -4 },
@@ -46,7 +46,7 @@
     "id": "50ss",
     "copy-from": "50bmg",
     "type": "AMMO",
-    "name": ".50 BMG M2 AP",
+    "name": { "str": ".50 BMG M2 AP" },
     "description": "Variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel.  Penetration is increased, but damage is reduced.",
     "count": 10,
     "relative": { "damage": -10, "pierce": 20 },
@@ -56,7 +56,7 @@
     "id": "50_mk211",
     "copy-from": "50bmg",
     "type": "AMMO",
-    "name": ".50 BMG Raufoss Mk 211",
+    "name": { "str": ".50 BMG Raufoss Mk 211" },
     "price": 60000,
     "price_postapoc": 120000,
     "description": "This variant of the .50 BMG round makes the most of the caliber's potential payload delivery: the tip is loaded with an incendiary mix, which ignites on impact, detonating the RDX or PETN charge.  This also ignites a secondary zirconium powder incendiary charge that surrounds a tungsten carbide penetrator, both encased by a mild steel cup.  Fragments from the cup and burning metallic powder follow the penetrator through armored targets, increasing lethality.  These rare, complicated, and expensive rounds are not likely to be manufactured again; use them wisely.",
@@ -69,7 +69,7 @@
     "id": "reloaded_50_incendiary",
     "copy-from": "50_incendiary",
     "type": "AMMO",
-    "name": ".50 BMG tracer, reloaded",
+    "name": { "str": ".50 BMG tracer, reloaded" },
     "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.  This one has been hand-reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -79,7 +79,7 @@
     "id": "reloaded_50bmg",
     "copy-from": "50match",
     "type": "AMMO",
-    "name": ".50 BMG Match, reloaded",
+    "name": { "str": ".50 BMG Match, reloaded" },
     "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -89,7 +89,7 @@
     "id": "reloaded_50ss",
     "copy-from": "50ss",
     "type": "AMMO",
-    "name": ".50 BMG AP, reloaded",
+    "name": { "str": ".50 BMG AP, reloaded" },
     "description": "Variant of the .50 BMG round that uses a core hardened steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },

data/json/items/ammo/500.json

@@ -2,7 +2,7 @@
   {
     "id": "500_Magnum",
     "type": "AMMO",
-    "name": ".500 S&W Magnum",
+    "name": { "str": ".500 S&W Magnum" },
     "description": ".500 S&W Magnum ammunition with 500gr bullets.  The .500 S&W Magnum round is a colossally powerful handgun cartridge capable of killing almost any target with one hit.  It has extremely high damage and recoil to match.",
     "weight": "15 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "bp_500_Magnum",
     "copy-from": "500_Magnum",
     "type": "AMMO",
-    "name": ".500 S&W Magnum, black powder",
+    "name": { "str": ".500 S&W Magnum, black powder" },
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -35,7 +35,7 @@
     "id": "reloaded_500_Magnum",
     "copy-from": "500_Magnum",
     "type": "AMMO",
-    "name": ".500 S&W Magnum, reloaded",
+    "name": { "str": ".500 S&W Magnum, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/ammo/700nx.json

@@ -2,7 +2,7 @@
   {
     "id": "700nx",
     "type": "AMMO",
-    "name": ".700 NX",
+    "name": { "str": ".700 NX" },
     "description": "The .700 Nitro Express is a very powerful rifle round designed for long-range use.  Its stupendous accuracy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
     "weight": "80 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "reloaded_700nx",
     "copy-from": "700nx",
     "type": "AMMO",
-    "name": ".700 NX, reloaded",
+    "name": { "str": ".700 NX, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/ammo/atgm.json

@@ -3,7 +3,7 @@
     "type": "AMMO",
     "id": "atgm_heat",
     "price": 70000,
-    "name": "152mm ATGM HEAT",
+    "name": { "str": "152mm ATGM HEAT" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "A tube-launched, optically tracked, wire-guided missile contained in a steel tube.  Designed to be highly effective against vehicles and structures.",

data/json/items/ammo/shot.json

@@ -21,7 +21,7 @@
     "id": "reloaded_shot_00",
     "copy-from": "shot_00",
     "type": "AMMO",
-    "name": "00 shot, reloaded",
+    "name": { "str": "00 shot, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -66,7 +66,7 @@
     "id": "bp_shot_00",
     "copy-from": "shot_00",
     "type": "AMMO",
-    "name": "00 shot, black powder",
+    "name": { "str": "00 shot, black powder" },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -91,7 +91,7 @@
   {
     "id": "shot_00",
     "type": "AMMO",
-    "name": "00 shot",
+    "name": { "str": "00 shot" },
     "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces.",
     "weight": "32 g",
     "volume": "250 ml",
@@ -173,7 +173,7 @@
     "id": "shot_scrap",
     "copy-from": "shot_00",
     "type": "AMMO",
-    "name": "00 shot, scrap loaded",
+    "name": { "str": "00 shot, scrap loaded" },
     "description": "A shotgun shell filled with whatever was lying around.  They are more damaging than birdshot, but fairly inaccurate.",
     "proportional": { "price": 0.4, "damage": 0.6, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -183,7 +183,7 @@
     "id": "bp_shot_scrap",
     "copy-from": "shot_scrap",
     "type": "AMMO",
-    "name": "00 shot, black powder, scrap loaded",
+    "name": { "str": "00 shot, black powder, scrap loaded" },
     "proportional": { "price": 0.6, "damage": 0.8 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/ammo/shotpaper.json

@@ -36,7 +36,7 @@
     "id": "shot_paper_slug",
     "copy-from": "shot_paper_00",
     "type": "AMMO",
-    "name": ".62 paper cartridge",
+    "name": { "str": ".62 paper cartridge" },
     "description": "A paper cartridge containing a premeasured amount of black powder and a .605 inch lead ball.",
     "relative": { "range": 12, "pierce": 4 },
     "delete": { "effects": [ "SHOT" ] },