Name to object leave the s, volume to string, flags to array (#38016)

data/json/items/chemicals_and_resources.json

@@ -180,8 +180,7 @@
     "id": "material_zincite",
     "category": "spare_parts",
     "price": 250,
-    "name": "zincite",
-    "name_plural": "zincite",
+    "name": { "str": "zincite", "str_pl": "zincite" },
     "symbol": "*",
     "color": "red",
     "description": "A chunk of zincite.  Could be refined into zinc oxide, then into zinc by reduction with a source of carbon.",

data/json/items/fake.json

@@ -139,8 +139,7 @@
     "id": "fake_smoke_plume",
     "copy-from": "fake_item",
     "type": "GENERIC",
-    "name": "smoldering embers",
-    "name_plural": "smoldering embers",
+    "name": { "str": "smoldering embers", "str_pl": "smoldering embers" },
     "description": "A handful of smoldering embers emitting smoke.  They are fading away even when you look at them.",
     "emits": [ "emit_small_smoke_plume" ],
     "flags": [ "TRADER_AVOID", "FAKE_SMOKE" ]

data/json/items/generic.json

@@ -45,12 +45,11 @@
     "id": "wind",
     "symbol": "?",
     "color": "white",
-    "name": "wind",
-    "name_plural": "none",
+    "name": { "str": "wind", "str_pl": "none" },
     "description": "seeing this is a bug",
     "stackable": true,
     "price": 0,
-    "volume": 0,
+    "volume": "0 ml",
     "flags": [ "PSEUDO", "PERPETUAL" ],
     "fuel": { "energy": 1 }
   },
@@ -60,12 +59,11 @@
     "id": "sunlight",
     "symbol": "?",
     "color": "white",
-    "name": "sun light",
-    "name_plural": "none",
+    "name": { "str": "sun light", "str_pl": "none" },
     "description": "seeing this is a bug",
     "stackable": true,
     "price": 0,
-    "volume": 0,
+    "volume": "0 ml",
     "flags": [ "PSEUDO", "PERPETUAL" ],
     "fuel": { "energy": 1 }
   },
@@ -1368,14 +1366,13 @@
     "id": "lens_small",
     "symbol": ".",
     "color": "light_cyan",
-    "name": "small high-quality lens",
-    "name_plural": "small high-quality lenses",
+    "name": { "str": "small high-quality lens", "str_pl": "small high-quality lenses" },
     "category": "spare_parts",
     "description": "A small high-quality lens, useful for focusing or diffusing light.  Might be useful for crafting.",
     "price": 6000,
     "material": "glass",
     "weight": "15 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",
@@ -1896,8 +1893,7 @@
     "category": "spare_parts",
     "symbol": ",",
     "color": "brown",
-    "name": "soft adobe brick",
-    "name_plural": "soft adobe bricks",
+    "name": { "str": "soft adobe brick" },
     "description": "A compacted mass of soil and natural fibers, still too wet to build with.  Load it onto a pallet and leave it to dry.",
     "price": 0,
     "material": "soil",
@@ -2134,8 +2130,7 @@
     "id": "tanned_hide",
     "symbol": ",",
     "color": "brown",
-    "name": "tanned hide",
-    "name_plural": "tanned hides",
+    "name": { "str": "tanned hide" },
     "description": "A folded sheet of leather made from carefully tanned animal hide.  Can be cut up or used as is.",
     "price": 5000,
     "material": [ "leather" ],
@@ -2164,8 +2159,7 @@
     "id": "tanned_pelt",
     "symbol": ",",
     "color": "brown",
-    "name": "tanned pelt",
-    "name_plural": "tanned pelts",
+    "name": { "str": "tanned pelt" },
     "description": "A folded sheet of leather made from carefully tanned animal hide, with the fur still intact.  Can be cut up or used as is.",
     "price": 5000,
     "material": [ "fur" ],
@@ -2193,8 +2187,7 @@
     "id": "straw_doll",
     "symbol": "o",
     "color": "light_gray",
-    "name": "straw doll",
-    "name_plural": "straw dolls",
+    "name": { "str": "straw doll" },
     "description": "Old straw doll.  Represents a woman in a dress.",
     "price": 100,
     "material": [ "paper" ],

data/json/items/generic/spares.json

@@ -3,8 +3,7 @@
     "abstract": "spare_part",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "spare parts",
-    "name_plural": "spare parts",
+    "name": { "str": "spare parts", "str_pl": "spare parts" },
     "description": "Items with are not themselves useful but are instead requirements for crafting or repairs",
     "symbol": ";",
     "color": "dark_gray"

data/json/items/melee/bludgeons.json

@@ -834,8 +834,7 @@
     "id": "sharp_toothbrush",
     "symbol": ",",
     "color": "light_blue",
-    "name": "sharpened toothbrush",
-    "name_plural": "sharpened toothbrushes",
+    "name": { "str": "sharpened toothbrush", "str_pl": "sharpened toothbrushes" },
     "description": "A personal hygiene item turned into a shank.",
     "category": "weapons",
     "price": 400,

data/json/items/melee/spears_and_polearms.json

@@ -366,8 +366,7 @@
   {
     "type": "GENERIC",
     "id": "spear_survivor",
-    "name": "survivor naginata",
-    "name_plural": "survivor naginata",
+    "name": { "str": "survivor naginata", "str_pl": "survivor naginata" },
     "description": "This sturdy steel shaft with a sword blade at the end is good for both slashing and stabbing.",
     "weight": "1700 g",
     "to_hit": 2,

data/json/items/melee/unarmed_weapons.json

@@ -2,8 +2,7 @@
   {
     "type": "GENERIC",
     "id": "bagh_nakha",
-    "name": "tiger claws",
-    "name_plural": "tiger claws",
+    "name": { "str": "tiger claws", "str_pl": "tiger claws" },
     "description": "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon from India designed to be concealed under and against the palm.",
     "weight": "92 g",
     "to_hit": 3,

data/json/items/newspaper.json

@@ -19,15 +19,14 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "survivor's note",
-    "name_plural": "survivor's notes",
+    "name": { "str": "survivor's note" },
     "snippet_category": "note",
     "description": "A scrap of paper.  Something's written on it, scrawled in bad handwriting.",
     "price": 0,
     "material": "paper",
-    "flags": "TRADER_AVOID",
+    "flags": [ "TRADER_AVOID" ],
     "weight": "3 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",
@@ -150,14 +149,13 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "vault leaflet",
-    "name_plural": "vault leaflets",
+    "name": { "str": "vault leaflet" },
     "snippet_category": "necropolis_intro",
     "description": "A folded glossy handout that appears to be an introduction to living in a massive underground complex.",
     "price": 0,
     "material": "paper",
     "weight": "1 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",

data/json/items/ranged/throwing.json

@@ -98,8 +98,7 @@
     "id": "throwing_knife",
     "category": "weapons",
     "price": 5200,
-    "name": "throwing knife",
-    "name_plural": "throwing knives",
+    "name": { "str": "throwing knife", "str_pl": "throwing knives" },
     "symbol": ";",
     "color": "light_gray",
     "description": "A thin and flat knife made for throwing.  Its ineffective cutting edge and odd shape makes it unsuitable for use as a tool.",

data/json/items/resources/glass.json

@@ -26,8 +26,7 @@
     "id": "glass_sheet",
     "symbol": "]",
     "color": "light_cyan",
-    "name": "sheet of glass",
-    "name_plural": "sheets of glass",
+    "name": { "str": "sheet of glass", "str_pl": "sheets of glass" },
     "description": "A large sheet of glass.  Easily shattered.  Useful for repairing windows.",
     "category": "spare_parts",
     "price": 5000,
@@ -49,8 +48,7 @@
     "id": "reinforced_glass_sheet",
     "symbol": "]",
     "color": "light_blue",
-    "name": "sheet of reinforced glass",
-    "name_plural": "sheets of reinforced glass",
+    "name": { "str": "sheet of reinforced glass", "str_pl": "sheets of reinforced glass" },
     "description": "A large sheet of glass strengthened with steel wiring.",
     "category": "spare_parts",
     "price": 10000,

data/json/items/robot_parts.json

@@ -177,8 +177,7 @@
   {
     "type": "GENERIC",
     "id": "turret_chassis",
-    "name": "turret interior chassis",
-    "name_plural": "turret interior chassis",
+    "name": { "str": "turret interior chassis", "str_pl": "turret interior chassis" },
     "description": "What's left when you remove all moving parts and electronics.  It's the skeleton of a turret.",
     "symbol": "c",
     "color": "light_gray",

data/json/items/software.json

@@ -60,8 +60,7 @@
     "id": "software_train_data",
     "copy-from": "software",
     "type": "GENERIC",
-    "name": "train data",
-    "name_plural": "train data",
+    "name": { "str": "train data", "str_pl": "train data" },
     "description": "Logistical data on subterranean train routes and schedules.",
     "price": 200
   },

data/json/items/vehicle/battery.json

@@ -43,8 +43,7 @@
   {
     "type": "GENERIC",
     "id": "it_battery_mount",
-    "name": "storage battery case",
-    "name_plural": "storage battery cases",
+    "name": { "str": "storage battery case" },
     "description": "An empty case that can hold a storage battery.  Complete with charging controller chip and connecting wires.",
     "weight": "1231 g",
     "to_hit": -3,

data/json/items/vehicle/boat.json

@@ -4,8 +4,7 @@
     "id": "boat_board",
     "symbol": "o",
     "color": "brown",
-    "name": "wood boat hull",
-    "name_plural": "wood boat hulls",
+    "name": { "str": "wood boat hull" },
     "description": "A wooden board that keeps the boat afloat.  Add boat hulls to a vehicle until it floats.  Then attach oars or a motor to get the boat to move.",
     "price": 8000,
     "material": [ "wood" ],

data/json/items/vehicle/controls.json

@@ -30,8 +30,7 @@
   {
     "type": "GENERIC",
     "id": "vehicle_controls",
-    "name": "vehicle controls",
-    "name_plural": "sets of vehicle controls",
+    "name": { "str": "vehicle controls", "str_pl": "sets of vehicle controls" },
     "description": "A set of various vehicle controls.  Useful for crafting.",
     "weight": "6000 g",
     "to_hit": -4,

data/json/items/vehicle/farming.json

@@ -2,10 +2,9 @@
   {
     "type": "GENERIC",
     "id": "v_scoop_item",
-    "name": "vehicle scoop",
+    "name": { "str": "vehicle scoop" },
     "symbol": "u",
     "color": "light_gray",
-    "name_plural": "vehicle scoops",
     "description": "An assembly of motors and sheet metal that allows a vehicle to clean the road surface by removing debris and contaminants.",
     "weight": "22666 g",
     "bashing": 1,

data/json/items/vehicle/utilities.json

@@ -34,8 +34,7 @@
   {
     "type": "GENERIC",
     "id": "mountable_cooler",
-    "name": "vehicle cooler",
-    "name_plural": "vehicle coolers",
+    "name": { "str": "vehicle cooler" },
     "description": "A vehicle-mounted area cooler.",
     "weight": "12500 g",
     "to_hit": -4,
@@ -50,8 +49,7 @@
   {
     "type": "GENERIC",
     "id": "mountable_heater",
-    "name": "vehicle heater",
-    "name_plural": "vehicle heaters",
+    "name": { "str": "vehicle heater" },
     "description": "A vehicle-mounted area heater.",
     "weight": "12500 g",
     "to_hit": -4,