Merge pull request #38348 from snipercup/Ammo-name-to-object

Ammo name to object
CleverRaven · Feb 25, 2020 · 6ee8955 · 6ee8955
2 parents bba7578 + 0b5ba5d
commit 6ee8955
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/data/json/items/ammo/84x246mm.json b/data/json/items/ammo/84x246mm.json
@@ -5,7 +5,7 @@
     "price": 70000,
     "price_postapoc": 70000,
     "//": "Milspec ammo such as grenades and rockets: not available to the general public, so Expensive.",
-    "name": "84x246mm HE rocket",
+    "name": { "str": "84x246mm HE rocket" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "A 84x246mm High Explosive anti-personnel round for the Carl Gustav M3 recoilless rifle.  Designed to be highly effective against personnel.",
@@ -28,7 +28,7 @@
     "copy-from": "84x246mm_he",
     "price": 70000,
     "price_postapoc": 70000,
-    "name": "84x246mm HEDP rocket",
+    "name": { "str": "84x246mm HEDP rocket" },
     "description": "A 84x246mm High Explosive Dual Purpose anti-materiel round for the Carl Gustav M3 recoilless rifle.  Designed to be highly effective against vehicles and structures.",
     "volume": "1500 ml",
     "weight": "3300 g",
@@ -45,7 +45,7 @@
     "copy-from": "84x246mm_he",
     "price": 45000,
     "price_postapoc": 45000,
-    "name": "84x246mm smoke rocket",
+    "name": { "str": "84x246mm smoke rocket" },
     "description": "A 84x246mm smoke marker round for the Carl Gustav M3 recoilless rifle.  Commonly used for signaling, target designation, and for screening troop movements.",
     "volume": "1500 ml",
     "weight": "3100 g",

diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
@@ -12,7 +12,7 @@
   {
     "id": "8mm_caseless",
     "type": "AMMO",
-    "name": "8x40mm caseless",
+    "name": { "str": "8x40mm caseless" },
     "//": "Cased ammo tends to be roughly $1/shot, more or less.  Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
     "description": "8x40mm caseless rounds.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "weight": "12 g",
@@ -36,7 +36,7 @@
     "id": "8mm_civilian",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": "8x40mm sporting",
+    "name": { "str": "8x40mm sporting" },
     "description": "8x40mm caseless rounds, light sporting load sold for civilian use.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.8, "damage": 0.5, "dispersion": 1.2, "recoil": 0.5 },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -45,15 +45,15 @@
     "id": "8mm_fmj",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": "8x40mm FMJ",
+    "name": { "str": "8x40mm FMJ" },
     "description": "8x40mm caseless rounds, full metal jacket.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "relative": { "damage": -5, "pierce": 10 }
   },
   {
     "id": "8mm_hvp",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": "8x40mm HVP",
+    "name": { "str": "8x40mm HVP" },
     "description": "8x40mm caseless rounds, saboted high-velocity penetrator type.  Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 2500,
     "price_postapoc": 50000,
@@ -64,7 +64,7 @@
     "id": "8mm_inc",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": "8x40mm tracer",
+    "name": { "str": "8x40mm tracer" },
     "description": "8x40mm caseless rounds with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "count": 20,
     "proportional": { "dispersion": 0.8 },
@@ -74,7 +74,7 @@
     "id": "8mm_jhp",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": "8x40mm JHP",
+    "name": { "str": "8x40mm JHP" },
     "description": "8x40mm caseless rounds, jacketed hollowpoint.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "relative": { "damage": 5, "pierce": -10 }
   }

diff --git a/data/json/items/ammo/9mm.json b/data/json/items/ammo/9mm.json
@@ -2,7 +2,7 @@
   {
     "id": "9mm",
     "type": "AMMO",
-    "name": "9x19mm JHP",
+    "name": { "str": "9x19mm JHP" },
     "description": "9x19mm ammunition with a 116gr jacketed hollow point bullet.  JHP rounds have inferior penetration to FMJ rounds but their expansion slightly increases stopping power against unarmored targets and reduces overpenetration.",
     "weight": "7 g",
     "volume": "250 ml",
@@ -25,15 +25,15 @@
     "id": "9mmfmj",
     "copy-from": "9mm",
     "type": "AMMO",
-    "name": "9x19mm FMJ",
+    "name": { "str": "9x19mm FMJ" },
     "description": "9x19mm ammunition with a brass jacketed 115gr bullet.  It is a popular round for military, law enforcement, and civilian use even after almost 150 years.",
     "relative": { "damage": -2, "pierce": 4 }
   },
   {
     "id": "9mmP",
     "copy-from": "9mm",
     "type": "AMMO",
-    "name": "9x19mm +P",
+    "name": { "str": "9x19mm +P" },
     "description": "Overpressure 9x19mm ammunition.  The round's increased velocity results in superior accuracy and stopping power at the cost of higher recoil.",
     "price": 300,
     "price_postapoc": 3800,
@@ -45,7 +45,7 @@
     "id": "9mmP2",
     "copy-from": "9mm",
     "type": "AMMO",
-    "name": "9x19mm +P+",
+    "name": { "str": "9x19mm +P+" },
     "description": "A step beyond the high-pressure 9x19mm +P round, the +P+ has even higher internal pressure offering superior damage, accuracy, and penetration.",
     "price": 350,
     "price_postapoc": 5200,
@@ -57,7 +57,7 @@
     "id": "bp_9mm",
     "copy-from": "9mm",
     "type": "AMMO",
-    "name": "9x19mm JHP, black powder",
+    "name": { "str": "9x19mm 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" ] }
@@ -66,7 +66,7 @@
     "id": "bp_9mmfmj",
     "copy-from": "9mmfmj",
     "type": "AMMO",
-    "name": "9x19mm FMJ, black powder",
+    "name": { "str": "9x19mm 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" ] }
@@ -75,7 +75,7 @@
     "id": "reloaded_9mm",
     "copy-from": "9mm",
     "type": "AMMO",
-    "name": "9x19mm JHP, reloaded",
+    "name": { "str": "9x19mm JHP, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -84,7 +84,7 @@
     "id": "reloaded_9mmfmj",
     "copy-from": "9mmfmj",
     "type": "AMMO",
-    "name": "9x19mm FMJ, reloaded",
+    "name": { "str": "9x19mm FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -93,7 +93,7 @@
     "id": "reloaded_9mmP",
     "copy-from": "9mmP",
     "type": "AMMO",
-    "name": "9x19mm +P, reloaded",
+    "name": { "str": "9x19mm +P, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -102,7 +102,7 @@
     "id": "reloaded_9mmP2",
     "copy-from": "9mmP2",
     "type": "AMMO",
-    "name": "9x19mm +P+, reloaded",
+    "name": { "str": "9x19mm +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/9x18.json b/data/json/items/ammo/9x18.json
@@ -2,7 +2,7 @@
   {
     "id": "9x18mm",
     "type": "AMMO",
-    "name": "9x18mm 57-N-181S",
+    "name": { "str": "9x18mm 57-N-181S" },
     "description": "9x18mm Makarov ammunition with 93gr steel core FMJ bullets.  The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century.",
     "weight": "8 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "9x18mmP2",
     "copy-from": "9x18mm",
     "type": "AMMO",
-    "name": "9x18mm SP-7",
+    "name": { "str": "9x18mm SP-7" },
     "description": "9x18mm Makarov SP-7 ammunition.  The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century.",
     "price": 150,
     "price_postapoc": 2900,
@@ -38,7 +38,7 @@
     "id": "9x18mmfmj",
     "copy-from": "9x18mm",
     "type": "AMMO",
-    "name": "9x18mm RG028",
+    "name": { "str": "9x18mm RG028" },
     "description": "9x18mm Makarov RG028 ammunition.  The RG028 round uses bullets with a hardened steel core to improve armor penetration.",
     "price": 200,
     "price_postapoc": 3100,
@@ -48,7 +48,7 @@
     "id": "bp_9x18mm",
     "copy-from": "9x18mm",
     "type": "AMMO",
-    "name": "9x18mm, black powder",
+    "name": { "str": "9x18mm, 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" ] }
@@ -57,7 +57,7 @@
     "id": "bp_9x18mmfmj",
     "copy-from": "9x18mmfmj",
     "type": "AMMO",
-    "name": "9x18mm FMJ, black powder",
+    "name": { "str": "9x18mm 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" ] }
@@ -66,7 +66,7 @@
     "id": "reloaded_9x18mm",
     "copy-from": "9x18mm",
     "type": "AMMO",
-    "name": "9x18mm, reloaded",
+    "name": { "str": "9x18mm, reloaded" },
     "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  As the designation implies, it is a bit shorter in case length compared to 9mm Parabellum.  This one has been hand-reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -76,7 +76,7 @@
     "id": "reloaded_9x18mmP2",
     "copy-from": "9x18mmP2",
     "type": "AMMO",
-    "name": "9x18mm +P+, reloaded",
+    "name": { "str": "9x18mm +P+, reloaded" },
     "//": "Rather than give it a military designation, this is simply handmade overpressure ammo.",
     "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  This one has been hand-reloaded to generate higher internal pressure, boosting flight stability and damage.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
@@ -87,7 +87,7 @@
     "id": "reloaded_9x18mmfmj",
     "copy-from": "9x18mmfmj",
     "type": "AMMO",
-    "name": "9x18mm FMJ, reloaded",
+    "name": { "str": "9x18mm FMJ, reloaded" },
     "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  This brass-jacketed round increases penetration slightly, at the cost of reduced expansion.  This one has been hand-reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },