Ammo name to object 3 (#38302)

CleverRaven · Feb 24, 2020 · 95e95eb · 95e95eb
1 parent dbe55a1
commit 95e95eb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/data/json/items/ammo/45.json b/data/json/items/ammo/45.json
@@ -3,14 +3,14 @@
     "id": "45_acp",
     "copy-from": "45_jhp",
     "type": "AMMO",
-    "name": ".45 ACP FMJ",
+    "name": { "str": ".45 ACP FMJ" },
     "description": ".45 ACP ammunition with 230gr FMJ bullets.  Noted for its stopping power, the .45 ACP round has been common for almost 150 years.",
     "relative": { "damage": -3, "pierce": 6 }
   },
   {
     "id": "45_jhp",
     "type": "AMMO",
-    "name": ".45 ACP JHP",
+    "name": { "str": ".45 ACP JHP" },
     "description": ".45 ACP ammunition with 185gr JHP bullets.  The .45 ACP round was developed to replace the .38 Long Colt cartridge in the early 20th century.  It has good stopping power but above average recoil.",
     "weight": "10 g",
     "volume": "250 ml",
@@ -34,7 +34,7 @@
     "id": "45_super",
     "copy-from": "45_jhp",
     "type": "AMMO",
-    "name": ".45 ACP +P",
+    "name": { "str": ".45 ACP +P" },
     "description": "Overpressure .45 ACP ammunition with 200gr JHP bullets.  This +P ammunition has higher muzzle energy than typical loads leading to greater damage, accuracy and recoil.",
     "price": 210,
     "price_postapoc": 2800,
@@ -45,7 +45,7 @@
     "id": "bp_45_acp",
     "copy-from": "45_acp",
     "type": "AMMO",
-    "name": ".45 ACP FMJ, black powder",
+    "name": { "str": ".45 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" ] }
@@ -54,7 +54,7 @@
     "id": "bp_45_jhp",
     "copy-from": "45_jhp",
     "type": "AMMO",
-    "name": ".45 ACP JHP, black powder",
+    "name": { "str": ".45 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" ] }
@@ -63,7 +63,7 @@
     "id": "reloaded_45_acp",
     "copy-from": "45_acp",
     "type": "AMMO",
-    "name": ".45 FMJ, reloaded",
+    "name": { "str": ".45 FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -72,7 +72,7 @@
     "id": "reloaded_45_jhp",
     "copy-from": "45_jhp",
     "type": "AMMO",
-    "name": ".45 ACP JHP, reloaded",
+    "name": { "str": ".45 ACP JHP, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -81,7 +81,7 @@
     "id": "reloaded_45_super",
     "copy-from": "45_super",
     "type": "AMMO",
-    "name": ".45 ACP +P, reloaded",
+    "name": { "str": ".45 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/454.json b/data/json/items/ammo/454.json
@@ -2,7 +2,7 @@
   {
     "id": "454_Casull",
     "type": "AMMO",
-    "name": ".454 Casull",
+    "name": { "str": ".454 Casull" },
     "description": ".454 Casull ammunition with 300gr jacketed soft point bullets.  The .454 Casull round is derived from .45 Long Colt with a stronger, lengthened case.  It is an exceptionally powerful cartridge with higher stopping power than many rifle rounds, although it suffers from extreme recoil making it unsuitable for most purposes.",
     "weight": "16 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "reloaded_454_Casull",
     "copy-from": "454_Casull",
     "type": "AMMO",
-    "name": ".454 Casull, reloaded",
+    "name": { "str": ".454 Casull, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -35,7 +35,7 @@
     "id": "bp_454_Casull",
     "copy-from": "454_Casull",
     "type": "AMMO",
-    "name": ".454 Casull, black powder",
+    "name": { "str": ".454 Casull, 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/4570.json b/data/json/items/ammo/4570.json
@@ -2,7 +2,7 @@
   {
     "id": "4570_sp",
     "type": "AMMO",
-    "name": ".45-70 SP",
+    "name": { "str": ".45-70 SP" },
     "description": ".45-70 Government ammunition loaded with a 305 grain soft point round.  One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.",
     "weight": "35 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "4570_pen",
     "copy-from": "4570_sp",
     "type": "AMMO",
-    "name": ".45-70 +P penetrator",
+    "name": { "str": ".45-70 +P penetrator" },
     "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile.  Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.",
     "price": 175,
     "price_postapoc": 5000,
@@ -37,7 +37,7 @@
     "id": "4570_low",
     "copy-from": "4570_sp",
     "type": "AMMO",
-    "name": ".45-70 LFN cowboy",
+    "name": { "str": ".45-70 LFN cowboy" },
     "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms.  Quite a bit less powerful than modern ammo, but still packs a punch.",
     "price": 250,
     "price_postapoc": 3500,
@@ -47,7 +47,7 @@
     "id": "reloaded_4570_sp",
     "copy-from": "4570_sp",
     "type": "AMMO",
-    "name": ".45-70 SP, reloaded",
+    "name": { "str": ".45-70 SP, reloaded" },
     "description": ".45-70 Government ammunition loaded with a 305 grain soft point round.  One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.  This one has been hand-loaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -57,7 +57,7 @@
     "id": "reloaded_4570_pen",
     "copy-from": "4570_pen",
     "type": "AMMO",
-    "name": ".45-70 +P penetrator, reloaded",
+    "name": { "str": ".45-70 +P penetrator, reloaded" },
     "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile.  Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.  This one has been hand-loaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -67,7 +67,7 @@
     "id": "reloaded_4570_low",
     "copy-from": "4570_low",
     "type": "AMMO",
-    "name": ".45-70 LFN cowboy, reloaded",
+    "name": { "str": ".45-70 LFN cowboy, reloaded" },
     "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms.  Quite a bit less powerful than modern ammo, but still packs a punch.  This one has been hand-loaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -78,7 +78,7 @@
     "//": "***Add blackpowder effects once #30944 gets merged***",
     "copy-from": "4570_low",
     "type": "AMMO",
-    "name": ".45-70, black powder",
+    "name": { "str": ".45-70, black powder" },
     "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications.  Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch.  This one has been hand-loaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.3 },
     "extend": { "effects": [ "RECYCLED" ] },

diff --git a/data/json/items/ammo/45colt.json b/data/json/items/ammo/45colt.json
@@ -2,7 +2,7 @@
   {
     "id": "45colt_jhp",
     "type": "AMMO",
-    "name": ".45 Colt JHP",
+    "name": { "str": ".45 Colt JHP" },
     "description": ".45 Colt ammunition with 250gr jacketed hollow point bullets.  Originally designed for the Colt Single Action Army, and still used for modern reproduction revolvers.  Originally a black powder cartridge, modern loads can make this round competitive in the new era.",
     "weight": "12 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "reloaded_45colt_jhp",
     "copy-from": "45colt_jhp",
     "type": "AMMO",
-    "name": ".45 Colt JHP, reloaded",
+    "name": { "str": ".45 Colt 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/460.json b/data/json/items/ammo/460.json
@@ -3,15 +3,15 @@
     "id": "460_fmj",
     "copy-from": "460_rowland",
     "type": "AMMO",
-    "name": ".460 Rowland HCFN",
+    "name": { "str": ".460 Rowland HCFN" },
     "description": "A plated, hard cast flat nosed variant of the .460 Rowland round.  This increases penetration slightly at the cost of reduced damage from expansion.",
     "relative": { "damage": -4, "pierce": 8 }
   },
   {
     "id": "460_rowland",
     "copy-from": "44magnum",
     "type": "AMMO",
-    "name": ".460 Rowland",
+    "name": { "str": ".460 Rowland" },
     "description": ".460 Rowland ammunition with 185gr JHP bullets.  The .460 Rowland round is designed to emulate hard-hitting .44 magnum in common autoloading pistols.  Like the .44, .460 Rowland has exceptional power - and recoil.  It is almost dimensionally identical to .45ACP, save for having a longer case and deeper seated bullets to prevent ammunition mix-ups.",
     "ammo_type": "460",
     "casing": "460_casing",
@@ -21,7 +21,7 @@
     "id": "bp_460_fmj",
     "copy-from": "460_fmj",
     "type": "AMMO",
-    "name": ".460 Rowland FMJ, black powder",
+    "name": { "str": ".460 Rowland 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" ] }
@@ -30,7 +30,7 @@
     "id": "bp_460_rowland",
     "copy-from": "460_rowland",
     "type": "AMMO",
-    "name": ".460 Rowland, black powder",
+    "name": { "str": ".460 Rowland, 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" ] }
@@ -39,7 +39,7 @@
     "id": "reloaded_460_fmj",
     "copy-from": "460_fmj",
     "type": "AMMO",
-    "name": ".460 Rowland FMJ, reloaded",
+    "name": { "str": ".460 Rowland FMJ, reloaded" },
     "description": "A brass-jacketed variant of the .460 Rowland round.  This increases penetration slightly at the cost of reduced damage from expansion.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -49,7 +49,7 @@
     "id": "reloaded_460_rowland",
     "copy-from": "460_rowland",
     "type": "AMMO",
-    "name": ".460 Rowland, reloaded",
+    "name": { "str": ".460 Rowland, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }