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

Ammo name to object

data/json/items/ammo.json

@@ -96,7 +96,7 @@
     "id": "sinew",
     "category": "spare_parts",
     "price": 0,
-    "name": "sinew",
+    "name": { "str": "sinew" },
     "symbol": "=",
     "color": "light_red",
     "looks_like": "thread",
@@ -499,39 +499,39 @@
     "id": "gunpowder_shotgun",
     "copy-from": "gunpowder",
     "price": 3000,
-    "name": "smokeless shotgun powder",
+    "name": { "str": "smokeless shotgun powder" },
     "description": "Firearm-quality gunpowder, intended for use in shotgun shells."
   },
   {
     "type": "AMMO",
     "id": "gunpowder_pistol",
     "copy-from": "gunpowder",
     "price": 3000,
-    "name": "smokeless pistol powder",
+    "name": { "str": "smokeless pistol powder" },
     "description": "Firearm-quality gunpowder, intended for use in pistol ammunition."
   },
   {
     "type": "AMMO",
     "id": "gunpowder_magnum_pistol",
     "copy-from": "gunpowder",
     "price": 3000,
-    "name": "smokeless magnum powder",
+    "name": { "str": "smokeless magnum powder" },
     "description": "Firearm-quality gunpowder intended for use in magnum pistol ammunition."
   },
   {
     "type": "AMMO",
     "id": "gunpowder_rifle",
     "copy-from": "gunpowder",
     "price": 3000,
-    "name": "smokeless rifle powder",
+    "name": { "str": "smokeless rifle powder" },
     "description": "Firearm-quality gunpowder intended for use in rifle ammunition."
   },
   {
     "type": "AMMO",
     "id": "gunpowder_large_rifle",
     "copy-from": "gunpowder",
     "price": 3000,
-    "name": "smokeless overbore rifle powder",
+    "name": { "str": "smokeless overbore rifle powder" },
     "description": "Firearm-quality gunpowder intended for use in large rifle ammunition."
   },
   {
@@ -580,7 +580,7 @@
     "id": "shotgun_primer",
     "category": "spare_parts",
     "price": 3000,
-    "name": "shotgun primer",
+    "name": { "str": "shotgun primer" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "Primer from a shotgun shell.",
@@ -596,7 +596,7 @@
     "id": "smpistol_primer",
     "category": "spare_parts",
     "price": 4000,
-    "name": "small pistol primer",
+    "name": { "str": "small pistol primer" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "Primer from a small caliber pistol round.",
@@ -628,7 +628,7 @@
     "id": "smrifle_primer",
     "category": "spare_parts",
     "price": 6000,
-    "name": "small rifle primer",
+    "name": { "str": "small rifle primer" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "Primer from a small caliber rifle round.",

data/json/items/ammo/shot.json

@@ -39,7 +39,7 @@
     "id": "reloaded_shot_slug",
     "copy-from": "shot_slug",
     "type": "AMMO",
-    "name": "shotgun slug, reloaded",
+    "name": { "str": "shotgun slug, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -83,7 +83,7 @@
     "id": "bp_shot_slug",
     "copy-from": "shot_slug",
     "type": "AMMO",
-    "name": "shotgun slug, black powder",
+    "name": { "str": "shotgun slug, black powder" },
     "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -114,7 +114,7 @@
     "id": "shot_beanbag",
     "copy-from": "shot_00",
     "type": "AMMO",
-    "name": "shotgun beanbag",
+    "name": { "str": "shotgun beanbag" },
     "description": "A beanbag round for shotguns, not deadly but designed to disable.",
     "price": 500,
     "price_postapoc": 3500,
@@ -192,7 +192,7 @@
     "id": "shot_slug",
     "copy-from": "shot_00",
     "type": "AMMO",
-    "name": "shotgun slug",
+    "name": { "str": "shotgun slug" },
     "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle.  Extremely damaging but rather inaccurate.",
     "price": 400,
     "price_postapoc": 4500,

data/json/items/ammo/shotcanister.json

@@ -4,7 +4,7 @@
     "id": "shotcanister_scrap",
     "price": 1000,
     "price_postapoc": 1000,
-    "name": "scrap shotcanister",
+    "name": { "str": "scrap shotcanister" },
     "symbol": "=",
     "color": "green",
     "description": "This small paper canister resembling a crude shotshell is filled to the brim with assorted pieces of scrap metal.",

data/json/items/ammo/signal_flare.json

@@ -2,7 +2,7 @@
   {
     "id": "signal_flare",
     "type": "AMMO",
-    "name": "signal flare",
+    "name": { "str": "signal flare" },
     "description": "A heavy plastic cartridge made for use in flare guns.  It appears to be a modified 12 gauge shotgun shell.",
     "weight": "32 g",
     "volume": "250 ml",

data/json/items/generic.json

@@ -2615,7 +2615,7 @@
   {
     "id": "shrapnel",
     "type": "AMMO",
-    "name": "shrapnel",
+    "name": { "str": "shrapnel" },
     "description": "A twisted shard of jagged metal.",
     "weight": "5 g",
     "volume": "250 ml",

data/json/items/ranged/archery.json

@@ -63,7 +63,7 @@
     "type": "AMMO",
     "id": "arrow_small_game_fletched",
     "price": 300,
-    "name": "simple wooden small game arrow",
+    "name": { "str": "simple wooden small game arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",
@@ -105,7 +105,7 @@
     "type": "AMMO",
     "id": "arrow_heavy_fire_hardened_fletched",
     "price": 300,
-    "name": "simple wooden arrow",
+    "name": { "str": "simple wooden arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",
@@ -166,7 +166,7 @@
     "type": "AMMO",
     "id": "arrow_metal_sharpened_fletched",
     "price": 500,
-    "name": "simple metal arrow",
+    "name": { "str": "simple metal arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",

data/json/items/ranged/crossbows.json

@@ -22,7 +22,7 @@
     "type": "AMMO",
     "id": "bolt_simple_wood",
     "price": 300,
-    "name": "simple wooden bolt",
+    "name": { "str": "simple wooden bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A simple fletched wooden crossbow bolt with a fire-hardened and sharpened tip.  Stands a low chance of remaining intact once fired.",
@@ -41,7 +41,7 @@
     "type": "AMMO",
     "id": "bolt_simple_small_game",
     "price": 300,
-    "name": "simple wooden small game bolt",
+    "name": { "str": "simple wooden small game bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A simple fletched wooden crossbow bolt with a blunted tip.  Useful for hunting small woodland creatures without splattering them all over the ground.  Stands a low chance of remaining intact once fired.",
@@ -139,7 +139,7 @@
     "type": "AMMO",
     "id": "bolt_metal",
     "price": 500,
-    "name": "simple metal bolt",
+    "name": { "str": "simple metal bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A simple fletched steel crossbow bolt with a flattened and sharpened tip.  Stands a somewhat low chance of remaining intact once fired.",

data/json/items/resources/fasteners.json

@@ -79,7 +79,7 @@
     "id": "zipper_short_plastic",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "short plastic zipper",
+    "name": { "str": "short plastic zipper" },
     "description": "A short zipper made from plastic, usually found on footwear or clothing pockets.",
     "weight": "4 g",
     "volume": "4 ml",

data/json/items/resources/metal.json

@@ -21,7 +21,7 @@
     "id": "scrap",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "scrap metal",
+    "name": { "str": "scrap metal" },
     "description": "A bulky assortment of small bits of scrap steel useful in all kinds of crafting.",
     "weight": "50 g",
     "volume": "250 ml",
@@ -212,7 +212,7 @@
     "id": "sheet_metal_small",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "small metal sheet",
+    "name": { "str": "small metal sheet" },
     "description": "A small sheet of metal.",
     "looks_like": "sheet_metal",
     "weight": "250 g",