Generic modern json

data/json/items/generic.json

@@ -202,8 +202,7 @@
     "id": "leather",
     "symbol": ",",
     "color": "brown",
-    "name": "leather patch",
-    "name_plural": "leather patches",
+    "name": { "str": "leather patch", "str_pl": "leather patches" },
     "description": "A smallish patch of leather, could be used to make tough clothing.",
     "price": 2000,
     "material": [ "leather", "flesh" ],
@@ -1357,14 +1356,13 @@
     "id": "lens",
     "symbol": ".",
     "color": "light_cyan",
-    "name": "high-quality lens",
-    "name_plural": "high-quality lenses",
+    "name": { "str": "high-quality lens", "str_pl": "high-quality lenses" },
     "category": "spare_parts",
     "description": "A high-quality lens, useful for focusing or diffusing light.  Might be useful for starting a fire.",
     "price": 120000,
     "material": "glass",
     "weight": "30 g",
-    "volume": 0,
+    "volume": "1 ml",
     "to_hit": -3,
     "use_action": { "type": "firestarter", "moves": 1000, "moves_slow": 30000, "need_sunlight": true },
     "flags": [ "FIRESTARTER" ]
@@ -1857,8 +1855,7 @@
     "id": "clay_lump",
     "symbol": ",",
     "color": "brown",
-    "name": "lump of clay",
-    "name_plural": "lumps of clay",
+    "name": { "str": "lump of clay", "str_pl": "lumps of clay" },
     "category": "spare_parts",
     "description": "A fresh piece of clay.  Useful for some crafting recipes.",
     "price": 531,
@@ -2397,8 +2394,7 @@
   {
     "type": "GENERIC",
     "id": "joint_roach",
-    "name": "joint roach",
-    "name_plural": "joint roaches",
+    "name": { "str": "joint roach", "str_pl": "joint roaches" },
     "color": "green",
     "symbol": "!",
     "description": "The smoked-down butt of a joint, a reminder of some good times.  Pretty much trash now.  Bummer, man.\nA few of these could probably be used to roll another joint.",

data/json/items/melee/bludgeons.json

@@ -471,8 +471,7 @@
     "id": "i_staff",
     "symbol": "/",
     "color": "brown",
-    "name": "ironshod quarterstaff",
-    "name_plural": "ironshod quarterstaves",
+    "name": { "str": "ironshod quarterstaff", "str_pl": "ironshod quarterstaves" },
     "description": "A smooth and sturdy staff with a leather-wrapped grip, which has been reinforced with metal bands and caps.  Durable and well-balanced, it is surprisingly easy to handle.",
     "price": 6000,
     "material": [ "wood", "iron" ],

data/json/items/melee/spears_and_polearms.json

@@ -522,8 +522,7 @@
   {
     "id": "ji",
     "type": "GENERIC",
-    "name": "ji",
-    "name_plural": "ji",
+    "name": { "str": "ji", "str_pl": "ji" },
     "//": "Couldn't find a good way to pluralize the transliteration.",
     "description": "This is a bronze polearm that originated in the Shang dynasty of China, if not earlier.  It combines a spear head with the perpendicular blade of the earlier ge or dagger-axe.",
     "weight": "3175 g",

data/json/items/melee/swords_and_blades.json

@@ -372,13 +372,12 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "light_gray",
-    "name": "jian",
-    "name_plural": "jian",
+    "name": { "str": "jian", "str_pl": "jian" },
     "description": "This is a dull, cheaply made replica of an ancient Chinese doubled-edged straight sword, with an ornate guard.",
     "price": 10000,
     "price_postapoc": 0,
     "material": "aluminum",
-    "flags": "SHEATH_SWORD",
+    "flags": [ "SHEATH_SWORD" ],
     "techniques": [ "WBLOCK_2" ],
     "weight": "414 g",
     "volume": "2 L",
@@ -1392,8 +1391,7 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "dark_gray",
-    "name": "kris",
-    "name_plural": "krises",
+    "name": { "str": "kris", "str_pl": "krises" },
     "description": "This is a dull, cheap replica of a wavy bladed dagger that comes from Southeast Asia.",
     "price": 3800,
     "price_postapoc": 0,
@@ -1403,7 +1401,7 @@
     "volume": "750 ml",
     "bashing": 2,
     "cutting": 2,
-    "flags": "SHEATH_SWORD",
+    "flags": [ "SHEATH_SWORD" ],
     "to_hit": 1,
     "category": "weapons"
   },

data/json/items/newspaper.json

@@ -5,14 +5,13 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "flyer",
-    "name_plural": "flyers",
+    "name": { "str": "flyer" },
     "snippet_category": "flier",
     "description": "A scrap of paper.",
     "price": 0,
     "material": "paper",
     "weight": "3 g",
-    "volume": 0
+    "volume": "5 ml"
   },
   {
     "type": "GENERIC",

data/json/items/resources/misc.json

@@ -82,8 +82,7 @@
     "id": "mattress",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "mattress",
-    "name_plural": "mattresses",
+    "name": { "str": "mattress", "str_pl": "mattresses" },
     "description": "This is a single, or twin, sized mattress.",
     "weight": "20000 g",
     "volume": "300000 ml",

data/json/items/software.json

@@ -21,8 +21,7 @@
     "id": "software_hacking",
     "copy-from": "software",
     "type": "GENERIC",
-    "name": "hackPRO",
-    "name_plural": "hackPRO",
+    "name": { "str": "hackPRO", "str_pl": "hackPRO" },
     "description": "A piece of hacking software.",
     "price": 800
   },
@@ -46,17 +45,15 @@
     "id": "software_blood_data",
     "copy-from": "software",
     "type": "GENERIC",
-    "name": "infection data",
-    "name_plural": "infection data",
+    "name": { "str": "infection data", "str_pl": "infection data" },
     "description": "Medical data on zombie blood.",
     "price": 200
   },
   {
     "id": "software_lab_data",
     "copy-from": "software",
     "type": "GENERIC",
-    "name": "lab data",
-    "name_plural": "lab data",
+    "name": { "str": "lab data", "str_pl": "lab data" },
     "description": "Research archives from a government laboratory.",
     "price": 200
   },
@@ -83,8 +80,7 @@
     "id": "software_electronics_reference",
     "copy-from": "software",
     "type": "GENERIC",
-    "name": "integrated circuit datasheet archives",
-    "name_plural": "misc software",
+    "name": { "str": "integrated circuit datasheet archives", "str_pl": "misc software" },
     "description": "Huge archives of numerous IC circuit datasheets from several major manufacturers.  Probably valuable to the right person, as it would be hard to salvage and reuse these components without them.",
     "price": 40000
   }

data/json/items/tool/tailoring.json

@@ -34,11 +34,10 @@
     "id": "knitting_needles",
     "type": "GENERIC",
     "category": "tools",
-    "name": "knitting needles",
-    "name_plural": "pairs of knitting needles",
+    "name": { "str": "knitting needles", "str_pl": "pairs of knitting needles" },
     "description": "A pair of stout wooden needles with round ends used to turn thread and yarn into cloth.",
     "weight": "56 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 600,
     "cutting": 1,
     "material": "wood",

data/json/items/vehicle/boat.json

@@ -85,8 +85,7 @@
     "id": "inflatable_section",
     "symbol": "o",
     "color": "green",
-    "name": "inflatable section",
-    "name_plural": "inflatable section",
+    "name": { "str": "inflatable section", "str_pl": "inflatable section" },
     "description": "An inflatable boat section.",
     "price": 8000,
     "material": [ "plastic" ],
@@ -101,8 +100,7 @@
     "id": "inflatable_airbag",
     "symbol": "o",
     "color": "dark_gray",
-    "name": "inflatable airbag",
-    "name_plural": "inflatable airbag",
+    "name": { "str": "inflatable airbag", "str_pl": "inflatable airbag" },
     "description": "An inflatable airbag.",
     "price": 8000,
     "material": [ "plastic" ],