Generic, bionic_item modern json (#37975)

data/json/items/bionics.json

@@ -678,8 +678,7 @@
     "id": "bio_power_storage_mkII",
     "copy-from": "bionic_general_npc_usable",
     "type": "BIONIC_ITEM",
-    "name": "Power Storage CBM Mk. II",
-    "name_plural": "Power Storage CBM Mk. II",
+    "name": { "str": "Power Storage CBM Mk. II", "str_pl": "Power Storage CBM Mk. II" },
     "looks_like": "bio_int_enhancer",
     "description": "A Compact Bionics Module developed at DoubleTech Industries as a replacement for the highly successful Power Storage CBM.  Increases the user's power capacity by 250 units.",
     "price": 1000000,

data/json/items/fluff.json

@@ -32,11 +32,10 @@
     "id": "coin_quarter",
     "type": "GENERIC",
     "category": "other",
-    "name": "coin",
-    "name_plural": "coins",
+    "name": { "str": "coin" },
     "description": "A now-ancient form of currency.  Stripped of its original purpose, it now serves, faithfully, flippant Flippists for free.",
     "weight": "6 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 25,
     "material": [ "silver" ],
     "symbol": "o",

data/json/items/generic.json

@@ -218,8 +218,7 @@
     "id": "felt_patch",
     "symbol": ",",
     "color": "white",
-    "name": "felt patch",
-    "name_plural": "felt patches",
+    "name": { "str": "felt patch", "str_pl": "felt patches" },
     "description": "A smallish patch of felt, could be disassembled for wool fiber.",
     "price": 2000,
     "material": [ "wool" ],
@@ -644,8 +643,7 @@
     "id": "concrete",
     "symbol": "%",
     "color": "light_gray",
-    "name": "concrete",
-    "name_plural": "concrete",
+    "name": { "str": "concrete", "str_pl": "concrete" },
     "description": "Some concrete, ready to be used in a construction project.",
     "category": "spare_parts",
     "container": "bag_canvas",
@@ -692,11 +690,10 @@
     "category": "other",
     "symbol": ";",
     "color": "red",
-    "name": "dead flare",
-    "name_plural": "dead flares",
+    "name": { "str": "dead flare" },
     "description": "This is a spent magnesium flare.  It is essentially trash.",
     "material": "plastic",
-    "flags": "TRADER_AVOID",
+    "flags": [ "TRADER_AVOID" ],
     "weight": "39 g",
     "volume": "250 ml",
     "to_hit": -1
@@ -1547,8 +1544,7 @@
     "id": "fish_bowl",
     "symbol": "u",
     "color": "light_cyan",
-    "name": "fish bowl",
-    "name_plural": "fish bowls",
+    "name": { "str": "fish bowl" },
     "description": "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'.  The fish appears to have tiny antlers.",
     "price": 100,
     "material": "glass",
@@ -2132,8 +2128,7 @@
     "id": "cured_hide",
     "symbol": ",",
     "color": "white",
-    "name": "cured hide",
-    "name_plural": "cured hides",
+    "name": { "str": "cured hide", "str_pl": "cured hides" },
     "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay.  It still requires tanning to become usable leather.",
     "price": 200,
     "material": [ "flesh" ],
@@ -2163,8 +2158,7 @@
     "id": "cured_pelt",
     "symbol": ",",
     "color": "brown",
-    "name": "cured pelt",
-    "name_plural": "cured pelts",
+    "name": { "str": "cured pelt" },
     "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay.  It still requires tanning to become usable fur.",
     "price": 200,
     "material": [ "fur", "flesh" ],

data/json/items/melee/bludgeons.json

@@ -85,8 +85,7 @@
     "type": "GENERIC",
     "id": "baton-extended",
     "category": "weapons",
-    "name": "expandable baton (extended)",
-    "name_plural": "expandable batons (extended)",
+    "name": { "str": "expandable baton (extended)", "str_pl": "expandable batons (extended)" },
     "description": "A telescoping baton that collapses for easy storage.  Makes an excellent melee weapon.  Activate to collapse.",
     "weight": "725 g",
     "to_hit": 2,

data/json/items/melee/spears_and_polearms.json

@@ -504,8 +504,7 @@
   {
     "id": "spear_dory",
     "type": "GENERIC",
-    "name": "dory",
-    "name_plural": "dories",
+    "name": { "str": "dory", "str_pl": "dories" },
     "description": "A well-made spear with a bronze head, Greek in origin.",
     "weight": "1598 g",
     "volume": "3500 ml",

data/json/items/melee/swords_and_blades.json

@@ -1145,14 +1145,13 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "dark_gray",
-    "name": "cutlass",
-    "name_plural": "cutlasses",
+    "name": { "str": "cutlass", "str_pl": "cutlasses" },
     "description": "This is a dull, cheaply made replica of a broad saber known for its use by sailors and pirates.",
     "price": 9600,
     "price_postapoc": 0,
     "material": "aluminum",
     "techniques": "WBLOCK_2",
-    "flags": "SHEATH_SWORD",
+    "flags": [ "SHEATH_SWORD" ],
     "weight": "634 g",
     "volume": "1750 ml",
     "bashing": 8,

data/json/items/resources/misc.json

@@ -98,8 +98,7 @@
     "id": "down_mattress",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "down mattress",
-    "name_plural": "down mattresses",
+    "name": { "str": "down mattress", "str_pl": "down mattresses" },
     "description": "This is a single, or twin, sized down filled mattress.",
     "weight": "6 kg",
     "volume": "300000 ml",

data/json/items/tool/workshop.json

@@ -214,8 +214,7 @@
     "id": "distaff_spindle",
     "type": "GENERIC",
     "category": "tools",
-    "name": "distaff and spindle",
-    "name_plural": "distaves and spindles",
+    "name": { "str": "distaff and spindle", "str_pl": "distaves and spindles" },
     "description": "A pair of specialized wooden rods used to spin fibers into thread and yarn.",
     "weight": "612 g",
     "volume": "1500 ml",

data/json/items/vehicle/controls.json

@@ -103,8 +103,7 @@
   {
     "type": "GENERIC",
     "id": "drive_by_wire_controls",
-    "name": "drive by wire controls",
-    "name_plural": "sets of drive by wire controls",
+    "name": { "str": "drive by wire controls", "str_pl": "sets of drive by wire controls" },
     "description": "Fully electronic vehicle control system.  You could control it remotely if you had proper tools.",
     "weight": "3000 g",
     "color": "red",

data/json/items/vehicle/lights.json

@@ -59,8 +59,7 @@
   {
     "type": "GENERIC",
     "id": "light_emergency_red",
-    "name": "emergency vehicle light (red)",
-    "name_plural": "emergency vehicle lights (red)",
+    "name": { "str": "emergency vehicle light (red)", "str_pl": "emergency vehicle lights (red)" },
     "description": "One of the red-colored lights from the top of an emergency services vehicle.  When turned on, the lights rotate to shine in all directions.",
     "weight": "500 g",
     "to_hit": 1,
@@ -73,8 +72,7 @@
   {
     "type": "GENERIC",
     "id": "light_emergency_blue",
-    "name": "emergency vehicle light (blue)",
-    "name_plural": "emergency vehicle lights (blue)",
+    "name": { "str": "emergency vehicle light (blue)", "str_pl": "emergency vehicle lights (blue)" },
     "description": "One of the blue-colored lights from the top of an emergency services vehicle.  When turned on, the lights rotate to shine in all directions.",
     "color": "blue",
     "copy-from": "light_emergency_red"