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

Ammo name to object

data/json/items/ammo.json

@@ -322,7 +322,7 @@
     "type": "AMMO",
     "id": "marble",
     "price": 200,
-    "name": "marble",
+    "name": { "str": "marble" },
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "pebble",
@@ -456,7 +456,7 @@
     "type": "AMMO",
     "id": "plasma",
     "price": 80000,
-    "name": "hydrogen canister",
+    "name": { "str": "hydrogen canister" },
     "symbol": "=",
     "color": "light_gray",
     "description": "A canister of pressurized hydrogen so heavily compressed it has turned solid.  With proper equipment, it could be heated to plasma.",
@@ -481,7 +481,7 @@
     "id": "gunpowder",
     "category": "chems",
     "price": 500,
-    "name": "mixed smokeless gunpowder",
+    "name": { "str": "mixed smokeless gunpowder" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "Firearm-quality gunpowder, mixed without concern for composition, burn rate or shape.  It has been slightly ground to make its properties more uniform.  Only the truly desperate would attempt to reload with this.",
@@ -564,7 +564,7 @@
     "id": "lye_powder",
     "category": "chems",
     "price": 3000,
-    "name": "lye powder",
+    "name": { "str": "lye powder" },
     "symbol": "=",
     "color": "white",
     "description": "Powdered caustic soda.",
@@ -612,7 +612,7 @@
     "id": "lgpistol_primer",
     "category": "spare_parts",
     "price": 6000,
-    "name": "large pistol primer",
+    "name": { "str": "large pistol primer" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "Primer from a large caliber pistol round.",
@@ -644,7 +644,7 @@
     "id": "lgrifle_primer",
     "category": "spare_parts",
     "price": 8000,
-    "name": "large rifle primer",
+    "name": { "str": "large rifle primer" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "Primer from a large caliber rifle round.",
@@ -690,7 +690,7 @@
     "id": "medical_tape",
     "category": "spare_parts",
     "price": 2000,
-    "name": "medical tape",
+    "name": { "str": "medical tape" },
     "symbol": "=",
     "color": "white",
     "description": "A roll of medical tape, similar to duct tape.",
@@ -847,7 +847,7 @@
     "id": "mininuke_mod",
     "price": 180000,
     "//": "Never marketed pre-Cataclysm.",
-    "name": "modified mininuke",
+    "name": { "str": "modified mininuke" },
     "symbol": "*",
     "color": "green",
     "description": "A heavily modified handheld nuclear device on a rocket.  Intended to be fired from a specialized launcher, it has been rigged to explode on impact instead of on a timer.  It can fly further than the explosion will reach, probably.",
@@ -926,7 +926,7 @@
     "id": "gasfilter_m",
     "category": "spare_parts",
     "price": 2500,
-    "name": "gas mask cartridge",
+    "name": { "str": "gas mask cartridge" },
     "symbol": "=",
     "color": "light_gray",
     "description": "Medium replacement filter cartridge for air filtration masks.",
@@ -1037,7 +1037,7 @@
     "type": "AMMO",
     "id": "incendiary_hm_rocket",
     "price": 1300,
-    "name": "incendiary homemade rocket",
+    "name": { "str": "incendiary homemade rocket" },
     "symbol": ",",
     "color": "red",
     "description": "A hand built rocket, consisting of a container of flammable gel attached onto a pipe, filled with improvised rocket fuel.  Short-range incendiary - handle with care!",

data/json/items/ammo/nail.json

@@ -14,7 +14,7 @@
     "id": "nail",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "nail",
+    "name": { "str": "nail" },
     "description": "A pin-shaped piece of iron, can be used to construct various things with a hammer.",
     "weight": "4 g",
     "volume": "250 ml",

data/json/items/chemicals_and_resources.json

@@ -1131,7 +1131,7 @@
     "category": "chems",
     "price": 250000,
     "price_postapoc": 1500,
-    "name": "nanomaterial canister",
+    "name": { "str": "nanomaterial canister" },
     "symbol": "=",
     "color": "light_gray",
     "flags": [ "TRADER_AVOID" ],

data/json/items/fuel.json

@@ -33,7 +33,7 @@
   },
   {
     "id": "chem_methanol",
-    "name": "methanol",
+    "name": { "str": "methanol" },
     "copy-from": "chem_ethanol",
     "type": "AMMO",
     "description": "High purity methanol suitable for use in chemical reactions.  Could be used in alcohol-burning stoves.  Very toxic.",

data/json/items/ranged/archery.json

@@ -145,7 +145,7 @@
     "type": "AMMO",
     "id": "arrow_wood_heavy",
     "price": 400,
-    "name": "makeshift wooden arrow",
+    "name": { "str": "makeshift wooden arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",

data/json/items/ranged/crossbows.json

@@ -60,7 +60,7 @@
     "type": "AMMO",
     "id": "bolt_makeshift",
     "price": 400,
-    "name": "makeshift wooden bolt",
+    "name": { "str": "makeshift wooden bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A simple fletched wooden crossbow bolt with a makeshift head.  Stands a low chance of remaining intact once fired.",

data/json/items/ranged/spearguns.json

@@ -45,7 +45,7 @@
     "type": "AMMO",
     "id": "m_fishspear",
     "price": 16000,
-    "name": "metal fishing spear",
+    "name": { "str": "metal fishing spear" },
     "symbol": "=",
     "color": "light_gray",
     "description": "An underwater fishing spear made from metal.  It's light, but doesn't have much range.  Stands a very good chance of remaining intact once fired.",

data/json/items/ranged/throwing.json

@@ -49,7 +49,7 @@
     "id": "net",
     "type": "AMMO",
     "category": "weapons",
-    "name": "net",
+    "name": { "str": "net" },
     "description": "A mesh of string and weights, traditionally used to catch fish, and to entangle opponents in combat.",
     "weight": "1100 g",
     "volume": "1500 ml",

data/json/items/resources/fasteners.json

@@ -71,7 +71,7 @@
     "id": "zipper_long_plastic",
     "copy-from": "zipper_short_plastic",
     "type": "AMMO",
-    "name": "long plastic zipper",
+    "name": { "str": "long plastic zipper" },
     "description": "A long zipper made from plastic, usually found on clothing.",
     "proportional": { "weight": 3, "volume": 3, "price": 3 }
   },

data/json/items/resources/home_improvement.json

@@ -109,7 +109,7 @@
     "id": "g_carpet",
     "category": "other",
     "price": 120,
-    "name": "green carpet",
+    "name": { "str": "green carpet" },
     "symbol": "}",
     "color": "green",
     "description": "A roll of green carpet.",

data/json/items/resources/metal.json

@@ -250,7 +250,7 @@
     "id": "steel_lump",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "lump of steel",
+    "name": { "str": "lump of steel" },
     "description": "A heavy formed piece of steel.  Useful for some crafting recipes.",
     "weight": "1000 g",
     "volume": "250 ml",

data/json/items/resources/tailoring.json

@@ -191,7 +191,7 @@
     "id": "sheet_lycra",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "lycra sheet",
+    "name": { "str": "lycra sheet" },
     "description": "A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for making flexible yet strong clothing.",
     "weight": "3 g",
     "volume": "300 ml",
@@ -217,7 +217,7 @@
     "id": "sheet_neoprene",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "neoprene sheet",
+    "name": { "str": "neoprene sheet" },
     "description": "A sheet of neoprene, a synthetic rubber, suitable for making underwater gear.",
     "weight": "6 g",
     "volume": "300 ml",