Name to object leave the s, volume to string, flags to array

data/json/items/chemicals_and_resources.json

@@ -151,8 +151,7 @@
     "id": "material_rocksalt",
     "category": "food",
     "price": 50,
-    "name": "rock salt",
-    "name_plural": "rock salt",
+    "name": { "str": "rock salt", "str_pl": "rock salt" },
     "symbol": "*",
     "color": "light_gray",
     "description": "A handful of rock salt crystals.  Could be refined into table salt.",
@@ -166,8 +165,7 @@
     "id": "material_rhodonite",
     "category": "spare_parts",
     "price": 250,
-    "name": "rhodonite",
-    "name_plural": "rhodonite",
+    "name": { "str": "rhodonite", "str_pl": "rhodonite" },
     "symbol": "*",
     "color": "red",
     "description": "A chunk of rhodonite.  It has manganese dioxide covering and going through it in veins, which can be obtained using a chisel.",

data/json/items/generic.json

@@ -1383,14 +1383,13 @@
     "id": "glass_tinted",
     "symbol": ".",
     "color": "dark_gray",
-    "name": "pair of tinted glass",
-    "name_plural": "pairs of tinted glass",
+    "name": { "str": "pair of tinted glass", "str_pl": "pairs of tinted glass" },
     "category": "spare_parts",
     "description": "A pair of small darkened glass, like the one that sunglasses are made of.",
     "price": 1000,
     "material": "glass",
     "weight": "30 g",
-    "volume": 0,
+    "volume": "2 ml",
     "to_hit": -3
   },
   {
@@ -2181,12 +2180,11 @@
     "id": "straw_pile",
     "symbol": ",",
     "color": "light_gray",
-    "name": "pile of straw",
-    "name_plural": "piles of straw",
+    "name": { "str": "pile of straw", "str_pl": "piles of straw" },
     "category": "spare_parts",
     "description": "A pile of dry grass.  Can be used to craft a straw bed if there is nothing else to sleep on.",
     "material": [ "paper" ],
-    "flags": "TRADER_AVOID",
+    "flags": [ "TRADER_AVOID" ],
     "weight": "20 g",
     "volume": "250 ml",
     "to_hit": -2
@@ -2708,8 +2706,7 @@
   {
     "id": "refrigerant_tank",
     "type": "GENERIC",
-    "name": "refrigerant tank",
-    "name_plural": "refrigerant tanks",
+    "name": { "str": "refrigerant tank" },
     "description": "A small tank containing some sort of refrigerant often used in devices such as freezers.  Hermetically sealed to prevent evaporation - cannot be opened without prior connection to compatible valve.",
     "weight": "410 g",
     "volume": "1L",

data/json/items/melee/bludgeons.json

@@ -801,8 +801,7 @@
     "id": "q_staff",
     "symbol": "/",
     "color": "brown",
-    "name": "quarterstaff",
-    "name_plural": "quarterstaves",
+    "name": { "str": "quarterstaff", "str_pl": "quarterstaves" },
     "description": "A smooth and sturdy staff with a leather-wrapped grip.  Light and well-balanced, it is surprisingly easy to handle.",
     "price": 4000,
     "material": "wood",
@@ -819,8 +818,7 @@
     "id": "rock_sock",
     "symbol": ";",
     "color": "white",
-    "name": "rock in a sock",
-    "name_plural": "rocks in socks",
+    "name": { "str": "rock in a sock", "str_pl": "rocks in socks" },
     "description": "A pair of nested socks filled with a stone.  A true weapon of despair.",
     "price": 1000,
     "price_postapoc": 300,

data/json/items/melee/unarmed_weapons.json

@@ -34,8 +34,7 @@
     "id": "knuckle_brass",
     "symbol": "3",
     "color": "yellow",
-    "name": "pair of brass knuckles",
-    "name_plural": "pairs of brass knuckles",
+    "name": { "str": "pair of brass knuckles", "str_pl": "pairs of brass knuckles" },
     "category": "weapons",
     "description": "A metal weapon made of brass, designed to be gripped in the palm and cause punches to do extra damage.  A good, quick weapon - but you have to get within punching range to use it.",
     "material": "brass",
@@ -64,8 +63,7 @@
     "id": "knuckle_nail",
     "symbol": "]",
     "color": "brown",
-    "name": "pair of nail knuckles",
-    "name_plural": "pairs of nail knuckles",
+    "name": { "str": "pair of nail knuckles", "str_pl": "pairs of nail knuckles" },
     "description": "A pair of knuckles consisting of two small squares of wood with several nails coming through them.  Useful in nasty street fights.",
     "material": "wood",
     "volume": "250 ml",
@@ -79,8 +77,7 @@
     "id": "knuckle_steel",
     "symbol": "3",
     "color": "dark_gray",
-    "name": "pair of steel knuckles",
-    "name_plural": "pairs of steel knuckles",
+    "name": { "str": "pair of steel knuckles", "str_pl": "pairs of steel knuckles" },
     "description": "A mass of scrap metal crudely beat into shape, with folded rags underneath to protect the wearers knuckles.  A good, quick weapon - but you have to get within punching range to use it.",
     "material": "steel",
     "volume": "250 ml",

data/json/items/resources/glass.json

@@ -65,8 +65,7 @@
     "id": "reinforced_glass_pane",
     "symbol": "]",
     "color": "light_blue",
-    "name": "pane of reinforced glass",
-    "name_plural": "panes of reinforced glass",
+    "name": { "str": "pane of reinforced glass", "str_pl": "panes of reinforced glass" },
     "description": "A small pane of glass strengthened with steel wiring.",
     "category": "spare_parts",
     "price": 5000,

data/json/items/robot_parts.json

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

data/json/items/tool/radio_tools.json

@@ -3,8 +3,7 @@
     "id": "radio_car_box",
     "type": "GENERIC",
     "category": "other",
-    "name": "radio car box",
-    "name_plural": "radio car boxes",
+    "name": { "str": "radio car box", "str_pl": "radio car boxes" },
     "description": "A RC car, with radio-control and batteries included!  Disassemble to unpack and enjoy.",
     "weight": "3200 g",
     "volume": "2 L",

data/json/items/vehicle/boat.json

@@ -20,8 +20,7 @@
     "id": "plastic_boat_hull",
     "symbol": "o",
     "color": "brown",
-    "name": "plastic boat hull",
-    "name_plural": "plastic boat hulls",
+    "name": { "str": "plastic boat hull" },
     "description": "A rigid plastic sheet 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": 16000,
     "price_postapoc": 8000,
@@ -66,8 +65,7 @@
   {
     "type": "GENERIC",
     "id": "sail",
-    "name": "sail",
-    "name_plural": "sails",
+    "name": { "str": "sail" },
     "description": "Sails for a boat.",
     "weight": "7904 g",
     "to_hit": -1,

data/json/items/vehicle/controls.json

@@ -115,8 +115,7 @@
   {
     "type": "GENERIC",
     "id": "robot_controls",
-    "name": "robot driving unit",
-    "name_plural": "robot driving units",
+    "name": { "str": "robot driving unit" },
     "description": "A set of servos, microcontrollers and other devices, together capable of driving an unmanned vehicle.  Its AI is not functional, but it should still have some sort of maintenance mode.",
     "weight": "2000 g",
     "color": "white",

data/json/items/vehicle/farming.json

@@ -28,8 +28,7 @@
     "type": "GENERIC",
     "id": "v_reaper_item",
     "symbol": "/",
-    "name": "reaper",
-    "name_plural": "reapers",
+    "name": { "str": "reaper" },
     "description": "An assembly of a blade, wheels, and a small lever for engaging/disengaging used to cut down crops prior to picking them up.",
     "material": [ "steel", "plastic" ],
     "copy-from": "v_scoop_item"
@@ -63,8 +62,7 @@
     "type": "GENERIC",
     "id": "v_plow_item",
     "symbol": "&",
-    "name": "plow",
-    "name_plural": "plows",
+    "name": { "str": "plow" },
     "color": "dark_gray",
     "description": "A heavy assembly of wheels and steel blades that turn up the ground.",
     "weight": "32666 g",