Ammo name to object (#38274)

CleverRaven · Feb 24, 2020 · e55bd75 · e55bd75
1 parent 1d6cc0e
commit e55bd75
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/data/json/items/ammo/38.json b/data/json/items/ammo/38.json
@@ -3,7 +3,7 @@
     "id": "38_fmj",
     "copy-from": "38_special",
     "type": "AMMO",
-    "name": ".38 FMJ",
+    "name": { "str": ".38 FMJ" },
     "description": ".38 Special ammunition with brass jacketed 130gr bullets.  The .38 Special round has been known from its inception for its accuracy and low recoil.",
     "relative": { "damage": -2, "pierce": 4 }
   },
@@ -33,7 +33,7 @@
     "id": "38_super",
     "copy-from": "38_special",
     "type": "AMMO",
-    "name": ".38 Super",
+    "name": { "str": ".38 Super" },
     "description": ".38 Super ammunition with 90gr JHP bullets.  Designed in 1929, the .38 super cartridge was designed to penetrate body armor and vehicles.",
     "price": 240,
     "price_postapoc": 2700,
@@ -63,7 +63,7 @@
     "id": "reloaded_38_super",
     "copy-from": "38_super",
     "type": "AMMO",
-    "name": ".38 Super, reloaded",
+    "name": { "str": ".38 Super, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

diff --git a/data/json/items/ammo/380.json b/data/json/items/ammo/380.json
@@ -2,7 +2,7 @@
   {
     "id": "380_FMJ",
     "type": "AMMO",
-    "name": ".380 ACP FMJ",
+    "name": { "str": ".380 ACP FMJ" },
     "description": ".380 ACP ammunition with a brass jacketed 95gr bullet.  Popular in pocket pistols for over a century, it is often considered the weakest caliber to consider carrying.  One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.",
     "weight": "6 g",
     "volume": "250 ml",
@@ -26,15 +26,15 @@
     "id": "380_JHP",
     "copy-from": "380_FMJ",
     "type": "AMMO",
-    "name": ".380 ACP JHP",
+    "name": { "str": ".380 ACP JHP" },
     "description": ".380 ACP ammunition with a 95gr jacketed hollow point bullet.  It is a popular round for small concealable backup pistols, and often the weakest recommended defensive caliber.  One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.",
     "relative": { "damage": 2, "pierce": -2 }
   },
   {
     "id": "380_p",
     "copy-from": "380_FMJ",
     "type": "AMMO",
-    "name": ".380 ACP +P",
+    "name": { "str": ".380 ACP +P" },
     "description": "Overpressure .380 ACP ammunition with a 90gr jacketed hollow point bullet.  These defensive loadings are designed to maximize performance and tend to be more accurate than practice ammo.  One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.",
     "price": 190,
     "price_postapoc": 3800,
@@ -46,7 +46,7 @@
     "id": "bp_380_FMJ",
     "copy-from": "380_FMJ",
     "type": "AMMO",
-    "name": ".380 ACP FMJ, black powder",
+    "name": { "str": ".380 ACP 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" ] }
@@ -55,7 +55,7 @@
     "id": "bp_380_JHP",
     "copy-from": "380_JHP",
     "type": "AMMO",
-    "name": ".380 ACP JHP, black powder",
+    "name": { "str": ".380 ACP JHP, 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" ] }
@@ -64,7 +64,7 @@
     "id": "reloaded_380_FMJ",
     "copy-from": "380_FMJ",
     "type": "AMMO",
-    "name": ".380 ACP FMJ, reloaded",
+    "name": { "str": ".380 ACP FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -73,7 +73,7 @@
     "id": "reloaded_380_JHP",
     "copy-from": "380_JHP",
     "type": "AMMO",
-    "name": ".380 ACP JHP, reloaded",
+    "name": { "str": ".380 ACP JHP, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -82,7 +82,7 @@
     "id": "reloaded_380_p",
     "copy-from": "380_p",
     "type": "AMMO",
-    "name": ".380 ACP +P, reloaded",
+    "name": { "str": ".380 ACP +P, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

diff --git a/data/json/items/ammo/40.json b/data/json/items/ammo/40.json
@@ -3,14 +3,14 @@
     "id": "40fmj",
     "copy-from": "40sw",
     "type": "AMMO",
-    "name": ".40 S&W FMJ",
+    "name": { "str": ".40 S&W FMJ" },
     "description": ".40 S&W ammunition with 180gr FMJ bullets.  Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.",
     "relative": { "damage": -3, "pierce": 6 }
   },
   {
     "id": "40sw",
     "type": "AMMO",
-    "name": ".40 S&W JHP",
+    "name": { "str": ".40 S&W JHP" },
     "description": ".40 S&W ammunition with 135gr JHP bullets.  The .40 S&W round is a descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil.",
     "weight": "9 g",
     "volume": "250 ml",
@@ -34,7 +34,7 @@
     "id": "bp_40fmj",
     "copy-from": "40fmj",
     "type": "AMMO",
-    "name": ".40 S&W FMJ, black powder",
+    "name": { "str": ".40 S&W 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" ] }
@@ -43,7 +43,7 @@
     "id": "bp_40sw",
     "copy-from": "40sw",
     "type": "AMMO",
-    "name": ".40 S&W JHP, black powder",
+    "name": { "str": ".40 S&W JHP, 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" ] }
@@ -52,7 +52,7 @@
     "id": "reloaded_40fmj",
     "copy-from": "40fmj",
     "type": "AMMO",
-    "name": ".40 S&W FMJ, reloaded",
+    "name": { "str": ".40 S&W FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -61,7 +61,7 @@
     "id": "reloaded_40sw",
     "copy-from": "40sw",
     "type": "AMMO",
-    "name": ".40 S&W JHP, reloaded",
+    "name": { "str": ".40 S&W JHP, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

diff --git a/data/json/items/ammo/410shot.json b/data/json/items/ammo/410shot.json
@@ -2,7 +2,7 @@
   {
     "id": "410shot_000",
     "type": "AMMO",
-    "name": ".410 000 shot",
+    "name": { "str": ".410 000 shot" },
     "description": "A .410 shell with 5 000 pellets.  Good for a hunting or combat load.",
     "weight": "16 g",
     "volume": "250 ml",
@@ -25,7 +25,7 @@
     "id": "reloaded_410shot_000",
     "copy-from": "410shot_000",
     "type": "AMMO",
-    "name": ".410 000 shot, reloaded",
+    "name": { "str": ".410 000 shot, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

diff --git a/data/json/items/ammo/44.json b/data/json/items/ammo/44.json
@@ -3,14 +3,14 @@
     "id": "44fmj",
     "copy-from": "44magnum",
     "type": "AMMO",
-    "name": ".44 Magnum FMJ",
+    "name": { "str": ".44 Magnum FMJ" },
     "description": "A brass-jacketed variant of the .44 Magnum round.  This increases penetration slightly at the cost of reduced damage from expansion.",
     "relative": { "damage": -4, "pierce": 8 }
   },
   {
     "id": "44magnum",
     "type": "AMMO",
-    "name": ".44 Magnum",
+    "name": { "str": ".44 Magnum" },
     "description": ".44 magnum ammunition with 240gr JHP bullets.  The .44 magnum round is one of the most powerful handgun cartridges available.  It has excellent stopping power but suffers from extremely high recoil for a handgun round.",
     "weight": "13 g",
     "volume": "250 ml",
@@ -34,7 +34,7 @@
     "id": "reloaded_44fmj",
     "copy-from": "44fmj",
     "type": "AMMO",
-    "name": ".44 Magnum FMJ, reloaded",
+    "name": { "str": ".44 Magnum FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -43,7 +43,7 @@
     "id": "reloaded_44magnum",
     "copy-from": "44magnum",
     "type": "AMMO",
-    "name": ".44 Magnum, reloaded",
+    "name": { "str": ".44 Magnum, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -52,7 +52,7 @@
     "id": "bp_44magnum",
     "copy-from": "44magnum",
     "type": "AMMO",
-    "name": ".44 Magnum, black powder",
+    "name": { "str": ".44 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" ] }
@@ -61,7 +61,7 @@
     "id": "bp_44fmj",
     "copy-from": "44fmj",
     "type": "AMMO",
-    "name": ".44 Magnum FMJ, black powder",
+    "name": { "str": ".44 Magnum 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" ] }

diff --git a/data/json/items/ammo/44paper.json b/data/json/items/ammo/44paper.json
@@ -2,7 +2,7 @@
   {
     "id": "44army",
     "type": "AMMO",
-    "name": ".44 paper cartridge",
+    "name": { "str": ".44 paper cartridge" },
     "description": "A paper cartridge containing a premeasured amount of black powder and a .44 projectile.  Used by the Colt M1860 Army.",
     "weight": "7 g",
     "volume": "250 ml",