Ammo name to object (#38002)

data/json/items/ammo.json

@@ -1130,8 +1130,7 @@
     "id": "tinder",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "tinder",
-    "name_plural": "tinder",
+    "name": { "str": "tinder", "str_pl": "tinder" },
     "description": "Flammable material, finely divided for easy combustion.",
     "weight": "10 g",
     "volume": "250 ml",

data/json/items/battery.json

@@ -3,8 +3,7 @@
     "id": "battery_test",
     "type": "BATTERY",
     "category": "spare_parts",
-    "name": "test battery",
-    "name_plural": "test batteries",
+    "name": { "str": "test battery", "str_pl": "test batteries" },
     "description": "This is a testing item for the BATTERY item type.  If you found one in game it's a bug.",
     "weight": "200 g",
     "volume": "250 ml",

data/json/items/chemicals_and_resources.json

@@ -21,8 +21,7 @@
     "id": "chem_sulphur",
     "category": "chems",
     "price": 50,
-    "name": "sulfur",
-    "name_plural": "sulfur",
+    "name": { "str": "sulfur", "str_pl": "sulfur" },
     "symbol": "=",
     "color": "yellow",
     "description": "A handful of pure sulfur.  Primarily used to make battery acid, sulfur is sometimes used as fuel for explosives.  Can be burned to produce acidic smoke, that is deadly to bacteria and humans alike, or oxidized to make paper-bleaching agents.",
@@ -88,8 +87,7 @@
     "id": "material_quicklime",
     "category": "spare_parts",
     "price": 100,
-    "name": "quicklime",
-    "name_plural": "quicklime",
+    "name": { "str": "quicklime", "str_pl": "quicklime" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "The product of burning limestone, this white powder is a crucial ingredient in making cement.  That said, it is also extremely caustic and will cause severe burns to any tissue it comes in contact with.  This property could probably be exploited.",
@@ -105,8 +103,7 @@
     "id": "material_sand",
     "category": "spare_parts",
     "price": 0,
-    "name": "sand",
-    "name_plural": "sand",
+    "name": { "str": "sand", "str_pl": "sand" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "A handful of New England sand.  If you had a stoked furnace, you could turn it into glass.  Otherwise, it's only good for making cement.",
@@ -122,8 +119,7 @@
     "id": "material_soil",
     "category": "spare_parts",
     "price": 0,
-    "name": "soil",
-    "name_plural": "soil",
+    "name": { "str": "soil", "str_pl": "soil" },
     "symbol": "=",
     "color": "brown",
     "description": "A pile of loosely packed, slightly damp loamy soil.  This mixture of sand, silt and clay is ideal for growing plants.",
@@ -480,8 +476,7 @@
     "id": "chem_zinc_powder",
     "category": "chems",
     "price": 600,
-    "name": "zinc powder",
-    "name_plural": "zinc powder",
+    "name": { "str": "zinc powder", "str_pl": "zinc powder" },
     "symbol": "=",
     "color": "white",
     "description": "A handful of zinc powder.  While commercially used mostly in cosmetics and for paints, hobbyists used to mix it with sulfur to make basic rocket fuel / smokescreen.  When treated with a strong acid, it will produce hydrogen.",
@@ -499,8 +494,7 @@
     "id": "chem_zinc",
     "category": "chems",
     "price": 200,
-    "name": "zinc oxide",
-    "name_plural": "zinc oxide",
+    "name": { "str": "zinc oxide", "str_pl": "zinc oxide" },
     "symbol": "=",
     "color": "white",
     "description": "A handful of zinc oxide.  It can be reduced into zinc, or used for some other reactions of its own.",
@@ -536,8 +530,7 @@
     "id": "chem_potassium_chloride",
     "category": "chems",
     "price": 600,
-    "name": "potassium chloride",
-    "name_plural": "potassium chloride",
+    "name": { "str": "potassium chloride", "str_pl": "potassium chloride" },
     "symbol": "=",
     "color": "white",
     "description": "A handful of potassium chloride.  Although it occurs naturally in the mineral sylvite, it can be produced as a byproduct of the reaction of saltpeter and hydrochloric acid.  It can be used for making fertilizer, or potassium hydroxide by way of electrolysis.",
@@ -555,8 +548,7 @@
     "id": "chem_potassium_hydroxide",
     "category": "chems",
     "price": 600,
-    "name": "potassium hydroxide",
-    "name_plural": "potassium hydroxide",
+    "name": { "str": "potassium hydroxide", "str_pl": "potassium hydroxide" },
     "symbol": "=",
     "color": "white",
     "description": "A handful of potassium hydroxide.  Commonly called caustic potash, it was mainly used industrially for its caustic nature.  It can be used as an electrolyte in alkaline batteries, among other applications.",
@@ -574,8 +566,7 @@
     "id": "chem_sulphuric_acid",
     "category": "chems",
     "price": 250,
-    "name": "sulfuric acid",
-    "name_plural": "sulfuric acid",
+    "name": { "str": "sulfuric acid", "str_pl": "sulfuric acid" },
     "symbol": "=",
     "color": "white",
     "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ],
@@ -734,8 +725,7 @@
     "id": "chem_saltpetre",
     "category": "chems",
     "price": 200,
-    "name": "saltpeter",
-    "name_plural": "saltpeter",
+    "name": { "str": "saltpeter", "str_pl": "saltpeter" },
     "symbol": "=",
     "color": "white",
     "description": "A handful of saltpeter.  Sometimes used as a fertilizer, this ubiquitous nitrate is the principal constituent of black gunpowder and simple rocket propellants, such as rocket candy.",
@@ -816,8 +806,7 @@
     "id": "chem_thermite",
     "category": "chems",
     "price": 2500,
-    "name": "thermite",
-    "name_plural": "thermite",
+    "name": { "str": "thermite", "str_pl": "thermite" },
     "symbol": "=",
     "color": "white",
     "description": "A handful of silvery-greenish powder, produced by mixing aluminum and chromium oxide.  This mixture, burning at a constant pace and at extremely high temperature, was once used for on-the-spot welding.  Can be used as an incendiary material in a pinch.",
@@ -1116,8 +1105,7 @@
     "id": "soap_flakes",
     "category": "chems",
     "price": 500,
-    "name": "soap flakes",
-    "name_plural": "soap flakes",
+    "name": { "str": "soap flakes", "str_pl": "soap flakes" },
     "looks_like": "detergent",
     "symbol": "=",
     "color": "white",
@@ -1167,8 +1155,7 @@
     "id": "ash",
     "category": "chems",
     "price": 0,
-    "name": "wood ash",
-    "name_plural": "wood ashes",
+    "name": { "str": "wood ash", "str_pl": "wood ashes" },
     "symbol": "=",
     "looks_like": "f_ash",
     "color": "light_gray",

data/json/items/resources/home_improvement.json

@@ -4,8 +4,7 @@
     "id": "r_paint",
     "category": "other",
     "price": 120,
-    "name": "red paint",
-    "name_plural": "red paint",
+    "name": { "str": "red paint", "str_pl": "red paint" },
     "symbol": "o",
     "color": "red",
     "description": "A can of red paint.",
@@ -35,8 +34,7 @@
     "id": "w_paint",
     "category": "other",
     "price": 120,
-    "name": "white paint",
-    "name_plural": "white paint",
+    "name": { "str": "white paint", "str_pl": "white paint" },
     "symbol": "o",
     "color": "white",
     "description": "A can of white paint.",
@@ -66,8 +64,7 @@
     "id": "p_paint",
     "category": "other",
     "price": 120,
-    "name": "purple paint",
-    "name_plural": "purple paint",
+    "name": { "str": "purple paint", "str_pl": "purple paint" },
     "symbol": "o",
     "color": "magenta",
     "description": "A can of purple paint.",
@@ -82,8 +79,7 @@
     "id": "y_paint",
     "category": "other",
     "price": 120,
-    "name": "yellow paint",
-    "name_plural": "yellow paint",
+    "name": { "str": "yellow paint", "str_pl": "yellow paint" },
     "symbol": "o",
     "color": "yellow",
     "description": "A can of yellow paint.",

data/json/items/resources/metal.json

@@ -124,8 +124,7 @@
     "id": "platinum_small",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "platinum",
-    "name_plural": "platinum",
+    "name": { "str": "platinum", "str_pl": "platinum" },
     "description": "A soft shiny metal.  Before the apocalypse this would've been worth a small fortune but now its value is greatly diminished.",
     "weight": "5 g",
     "//": "Density 21.45g/cm³ ~ 5.4kg/250ml @ stack 1000 = 5g/unit",
@@ -143,8 +142,7 @@
     "id": "zinc_metal",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "zinc",
-    "name_plural": "zinc",
+    "name": { "str": "zinc", "str_pl": "zinc" },
     "description": "A slightly brittle metal.  Apart from being an essential mineral that the body needs, it reacts readily with acids, alkalis and other non-metals.  It can be crushed to make zinc powder, used in the production of batteries, among other things.",
     "weight": "7 g",
     "volume": "50ml",
@@ -196,8 +194,7 @@
     "id": "silver_small",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "silver",
-    "name_plural": "silver",
+    "name": { "str": "silver", "str_pl": "silver" },
     "description": "A soft shiny metal.  Before the Cataclysm it was worth quite a bit but its value is now greatly diminished.",
     "weight": "3 g",
     "//": "Density 10.40g/cm³ ~ 2.6kg/250ml @ stack 1000 = 3g/unit",

data/json/items/resources/tailoring.json

@@ -80,8 +80,7 @@
     "id": "scrap_nylon",
     "copy-from": "scrap_cotton",
     "type": "AMMO",
-    "name": "synthetic fabric scraps",
-    "name_plural": "synthetic fabric scraps",
+    "name": { "str": "synthetic fabric scraps", "str_pl": "synthetic fabric scraps" },
     "description": "Oddly-shaped smallish bits of synthetic fabric, waste material from tailoring projects.  Not useful for much and usually disposed of.",
     "price": 0,
     "material": "nylon"
@@ -114,8 +113,7 @@
     "id": "sheet_cotton_patchwork",
     "copy-from": "sheet_cotton",
     "type": "AMMO",
-    "name": "patchwork cotton clothing parts",
-    "name_plural": "patchwork cotton clothing parts",
+    "name": { "str": "patchwork cotton clothing parts", "str_pl": "patchwork cotton clothing parts" },
     "description": "A selection of various clothing parts, sewn together from cotton patches in a patchwork fashion.  Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.",
     "weight": "100 g",
     "volume": "60 ml",
@@ -141,8 +139,7 @@
     "id": "sheet_faux_fur_patchwork",
     "copy-from": "sheet_faux_fur",
     "type": "AMMO",
-    "name": "patchwork faux fur clothing parts",
-    "name_plural": "patchwork faux fur clothing parts",
+    "name": { "str": "patchwork faux fur clothing parts", "str_pl": "patchwork faux fur clothing parts" },
     "description": "A selection of various clothing parts, sewn together from faux fur patches in a patchwork fashion.  Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.",
     "weight": "200 g",
     "volume": "900 ml",
@@ -168,8 +165,7 @@
     "id": "sheet_felt_patchwork",
     "copy-from": "sheet_felt",
     "type": "AMMO",
-    "name": "patchwork felt clothing parts",
-    "name_plural": "patchwork felt clothing parts",
+    "name": { "str": "patchwork felt clothing parts", "str_pl": "patchwork felt clothing parts" },
     "description": "A selection of various clothing parts, sewn together from felt patches in a patchwork fashion.  Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.",
     "weight": "160 g",
     "volume": "360 ml",
@@ -210,8 +206,7 @@
     "id": "sheet_lycra_patchwork",
     "copy-from": "sheet_lycra",
     "type": "AMMO",
-    "name": "patchwork lycra clothing parts",
-    "name_plural": "patchwork lycra clothing parts",
+    "name": { "str": "patchwork lycra clothing parts", "str_pl": "patchwork lycra clothing parts" },
     "description": "A selection of various clothing parts, sewn together from lycra patches in a patchwork fashion.  Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.",
     "weight": "60 g",
     "volume": "60 ml",
@@ -237,8 +232,7 @@
     "id": "sheet_neoprene_patchwork",
     "copy-from": "sheet_neoprene",
     "type": "AMMO",
-    "name": "patchwork neoprene clothing parts",
-    "name_plural": "patchwork neoprene clothing parts",
+    "name": { "str": "patchwork neoprene clothing parts", "str_pl": "patchwork neoprene clothing parts" },
     "description": "A selection of various clothing parts, sewn together from neoprene patches in a patchwork fashion, with waterproofed seams.  Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.",
     "weight": "120 g",
     "volume": "60 ml",
@@ -264,8 +258,7 @@
     "id": "sheet_nomex_patchwork",
     "copy-from": "sheet_nomex",
     "type": "AMMO",
-    "name": "patchwork Nomex clothing parts",
-    "name_plural": "patchwork Nomex clothing parts",
+    "name": { "str": "patchwork Nomex clothing parts", "str_pl": "patchwork Nomex clothing parts" },
     "description": "A selection of various clothing parts, sewn together with Nomex thread from Nomex patches in a patchwork fashion.  Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.",
     "weight": "100 g",
     "volume": "60 ml",
@@ -291,8 +284,7 @@
     "id": "sheet_nylon_patchwork",
     "copy-from": "sheet_nylon",
     "type": "AMMO",
-    "name": "patchwork synthetic fabric clothing parts",
-    "name_plural": "patchwork synthetic fabric clothing parts",
+    "name": { "str": "patchwork synthetic fabric clothing parts", "str_pl": "patchwork synthetic fabric clothing parts" },
     "description": "A selection of various clothing parts, sewn together from synthetic fabric patches in a patchwork fashion.  Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.",
     "weight": "60 g",
     "volume": "60 ml",