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

Ammo name to object
CleverRaven · Feb 25, 2020 · b8ab72a · b8ab72a
2 parents 65b99a1 + 8762f74
commit b8ab72a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
@@ -2,7 +2,7 @@
   {
     "abstract": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm grenade",
+    "name": { "str": "40x46mm grenade" },
     "price": 10000,
     "price_postapoc": 40000,
     "material": [ "steel", "powder" ],
@@ -21,7 +21,7 @@
     "id": "40x46mm_m1006",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm M1006",
+    "name": { "str": "40x46mm M1006" },
     "description": "A low velocity less-lethal 40x46mm round with a foam and plastic projectile intended to cause pain and disorientation to the target.  May still injure or kill.",
     "weight": "68 g",
     "damage": 20,
@@ -32,7 +32,7 @@
     "id": "40x46mm_m433",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm M433",
+    "name": { "str": "40x46mm M433" },
     "description": "A low velocity 40x46mm HEDP grenade.  It can penetrate 2 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
     "weight": "230 g",
     "damage": 200,
@@ -44,7 +44,7 @@
     "id": "40x46mm_m576",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm M576",
+    "name": { "str": "40x46mm M576" },
     "description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
     "weight": "120 g",
     "range": 12,
@@ -58,7 +58,7 @@
     "id": "40x46mm_m651",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm M651",
+    "name": { "str": "40x46mm M651" },
     "description": "A low velocity 40mm tear gas canister.  It is effective for riot control and driving infantry from entrenched positions",
     "weight": "290 g",
     "damage": 15,
@@ -70,7 +70,7 @@
     "id": "40x46mm_buckshot_m118",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm buckshot",
+    "name": { "str": "40x46mm buckshot" },
     "description": "An improvised 40x46mm buckshot load somewhat resembling M576.",
     "weight": "120 g",
     "range": 10,
@@ -84,7 +84,7 @@
     "id": "40x46mm_buckshot_m199",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm buckshot",
+    "name": { "str": "40x46mm buckshot" },
     "description": "An improvised 40x46mm buckshot load somewhat resembling M576.",
     "weight": "120 g",
     "range": 10,
@@ -98,7 +98,7 @@
     "id": "40x46mm_slug_m118",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm slug",
+    "name": { "str": "40x46mm slug" },
     "description": "An improvised 40x46mm load resembling an oversized shotgun slug.",
     "weight": "120 g",
     "range": 10,
@@ -111,7 +111,7 @@
     "id": "40x46mm_slug_m199",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm slug",
+    "name": { "str": "40x46mm slug" },
     "description": "An improvised 40x46mm load resembling an oversized shotgun slug.",
     "weight": "120 g",
     "range": 10,
@@ -124,7 +124,7 @@
     "id": "40x46mm_flechette_m118",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm flechette",
+    "name": { "str": "40x46mm flechette" },
     "description": "An improvised 40x46mm flechette load containing 70 steel darts.",
     "weight": "120 g",
     "range": 10,
@@ -138,7 +138,7 @@
     "id": "40x46mm_flechette_m199",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": "40x46mm flechette",
+    "name": { "str": "40x46mm flechette" },
     "description": "An improvised 40x46mm flechette load containing 70 steel darts.",
     "weight": "120 g",
     "range": 10,

diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
@@ -2,7 +2,7 @@
   {
     "abstract": "40x53mm_grenade",
     "type": "AMMO",
-    "name": "40x53mm grenade",
+    "name": { "str": "40x53mm grenade" },
     "price": 10000,
     "price_postapoc": 40000,
     "material": [ "steel", "powder" ],
@@ -21,7 +21,7 @@
     "id": "40x53mm_m1001",
     "copy-from": "40x53mm_grenade",
     "type": "AMMO",
-    "name": "40x53mm M1001",
+    "name": { "str": "40x53mm M1001" },
     "description": "40x53mm canister shot loaded with 17 grain flechettes.",
     "weight": "340 g",
     "volume": "137 ml",
@@ -36,7 +36,7 @@
     "id": "40x53mm_m430a1",
     "copy-from": "40x53mm_grenade",
     "type": "AMMO",
-    "name": "40x53mm M430A1",
+    "name": { "str": "40x53mm M430A1" },
     "description": "A high velocity 40x53mm HEDP grenade.  It can penetrate 3 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
     "weight": "340 g",
     "volume": "132 ml",
@@ -49,7 +49,7 @@
     "id": "40x53mm_buckshot_m169",
     "copy-from": "40x53mm_grenade",
     "type": "AMMO",
-    "name": "40x53mm buckshot",
+    "name": { "str": "40x53mm buckshot" },
     "description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
     "weight": "340 g",
     "range": 10,
@@ -63,7 +63,7 @@
     "id": "40x53mm_slug_m169",
     "copy-from": "40x53mm_grenade",
     "type": "AMMO",
-    "name": "40x53mm slug",
+    "name": { "str": "40x53mm slug" },
     "description": "An improvised 40x53mm load resembling an oversized shotgun slug.",
     "weight": "340 g",
     "range": 10,
@@ -76,7 +76,7 @@
     "id": "40x53mm_flechette_m169",
     "copy-from": "40x53mm_grenade",
     "type": "AMMO",
-    "name": "40x53mm flechette",
+    "name": { "str": "40x53mm flechette" },
     "description": "An improvised 40x53mm flechette load containing 100 steel darts.",
     "weight": "340 g",
     "range": 10,

diff --git a/data/json/items/ammo/46.json b/data/json/items/ammo/46.json
@@ -2,7 +2,7 @@
   {
     "id": "46mm",
     "type": "AMMO",
-    "name": "4.6x30mm",
+    "name": { "str": "4.6x30mm" },
     "description": "4.6x30mm ammunition with 31gr copper plated steel bullets.  The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge.  It has low recoil and excellent armor penetration.",
     "weight": "5 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "bp_46mm",
     "copy-from": "46mm",
     "type": "AMMO",
-    "name": "4.6x30mm, black powder",
+    "name": { "str": "4.6x30mm, black powder" },
     "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
     "proportional": { "price": 0.3, "damage": 0.46, "recoil": 0.46, "pierce": 0.1, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
@@ -36,7 +36,7 @@
     "id": "reloaded_46mm",
     "copy-from": "46mm",
     "type": "AMMO",
-    "name": "4.6x30mm, reloaded",
+    "name": { "str": "4.6x30mm, reloaded" },
     "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
     "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.2, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },

diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json
@@ -2,7 +2,7 @@
   {
     "id": "545",
     "type": "AMMO",
-    "name": "5.45x39mm 7N10",
+    "name": { "str": "5.45x39mm 7N10" },
     "//": "Mainlined from Icecoon's Weapons Pack.",
     "description": "5.45x39mm 7N10 ammunition with 56gr FMJ bullets.  The 5.45x39mm round was introduced along with the AK-74 in 1974.  It has superior wounding potential to the older 7.62x39mm round and quickly replaced it in Soviet military use.",
     "weight": "10 g",
@@ -27,7 +27,7 @@
     "id": "545_ap",
     "copy-from": "545",
     "type": "AMMO",
-    "name": "5.45x39mm 7N22",
+    "name": { "str": "5.45x39mm 7N22" },
     "description": "Armor piercing 5.45x39mm ammunition with 57gr bullets containing a steel penetrator.  Developed in 1998 by the Russian military.",
     "price": 350,
     "price_postapoc": 6500,
@@ -39,7 +39,7 @@
     "id": "reloaded_545",
     "copy-from": "545",
     "type": "AMMO",
-    "name": "5.45x39mm, reloaded",
+    "name": { "str": "5.45x39mm, reloaded" },
     "description": "The 5.45x39mm was the standard ammunition for the AK series from 1974.  Its designers were inspired by the 5.56x45mm NATO cartridge.  This one has been hand-reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -49,7 +49,7 @@
     "id": "reloaded_545_ap",
     "copy-from": "545_ap",
     "type": "AMMO",
-    "name": "5.45x39mm AP, reloaded",
+    "name": { "str": "5.45x39mm AP, reloaded" },
     "description": "Armor piercing 5.45x39mm ammunition with hand-reloaded bullets containing a steel penetrator.  Developed in 1998 by the Russian military.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },