Removing legacy json name / name_plural convention.

data/core/basic.json

@@ -10,8 +10,7 @@
     "type": "COMESTIBLE",
     "comestible_type": "DRINK",
     "category": "food",
-    "name": "water",
-    "name_plural": "water",
+    "name": { "str": "water", "str_pl": "water" },
     "description": "Water, the stuff of life, the best thirst-quencher available.  It would be safer to drink once purified.",
     "weight": 250,
     "volume": 1,

data/json/items/ammo.json

@@ -4,8 +4,7 @@
     "id": "battery",
     "category": "spare_parts",
     "price": 12000,
-    "name": "battery",
-    "name_plural": "batteries",
+    "name": { "str": "battery", "str_pl": "batteries" },
     "symbol": "=",
     "color": "yellow",
     "description": "Some free-floating battery charge.  This can be reloaded into rechargable battery cells, but can never be unloaded.",
@@ -343,8 +342,7 @@
     "type": "AMMO",
     "id": "bearing",
     "price": 100,
-    "name": "bearings",
-    "name_plural": "bearings",
+    "name": { "str": "bearings", "str_pl": "bearings" },
     "symbol": "=",
     "color": "dark_gray",
     "looks_like": "pebble",
@@ -829,8 +827,7 @@
     "id": "cac2powder",
     "category": "spare_parts",
     "price": 200,
-    "name": "calcium carbide premix",
-    "name_plural": "calcium carbide premix",
+    "name": { "str": "calcium carbide premix", "str_pl": "calcium carbide premix" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "A powdered mixture of coke and lime ready to be smelted into usable calcium carbide in an arc furnace.",
@@ -1004,8 +1001,7 @@
     "category": "spare_parts",
     "price": 12000,
     "//": "This seems like the larger medical tank, not an instant-use model with mask attached",
-    "name": "oxygen",
-    "name_plural": "oxygen",
+    "name": { "str": "oxygen", "str_pl": "oxygen" },
     "symbol": "=",
     "color": "light_gray",
     "description": "A canister of oxygen.",
@@ -1120,8 +1116,7 @@
     "id": "nitrox",
     "category": "chems",
     "price": 500,
-    "name": "nitrox",
-    "name_plural": "nitrox",
+    "name": { "str": "nitrox", "str_pl": "nitrox" },
     "symbol": "=",
     "color": "white",
     "container": "bottle_plastic",
@@ -1135,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",
@@ -1154,8 +1148,7 @@
     "type": "AMMO",
     "id": "RPG_die",
     "price": 10,
-    "name": "RPG die",
-    "name_plural": "RPG dice",
+    "name": { "str": "RPG die", "str_pl": "RPG dice" },
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "marble",
@@ -1176,8 +1169,7 @@
     "type": "AMMO",
     "id": "metal_RPG_die",
     "price": 50,
-    "name": "metal RPG die",
-    "name_plural": "metal RPG dice",
+    "name": { "str": "metal RPG die", "str_pl": "metal RPG dice" },
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "marble",
@@ -1198,8 +1190,7 @@
     "id": "scrap_bronze",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "bronze",
-    "name_plural": "bronze",
+    "name": { "str": "bronze", "str_pl": "bronze" },
     "description": "Decent-sized chunks of bronze, for fashioning some old-school items.",
     "weight": "218 g",
     "volume": "250 ml",

data/json/items/ammo/357mag.json

@@ -52,16 +52,14 @@
     "id": "reloaded_357mag_fmj",
     "copy-from": "357mag_fmj",
     "type": "AMMO",
-    "name": ".357 Magnum FMJ, reloaded",
-    "name_plural": ".357 Magnum FMJ, reloaded",
+    "name": { "str": ".357 Magnum FMJ, reloaded", "str_pl": ".357 Magnum FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
   },
   {
     "id": "reloaded_357mag_jhp",
     "copy-from": "357mag_jhp",
     "type": "AMMO",
-    "name": ".357 Magnum JHP, reloaded",
-    "name_plural": ".357 Magnum JHP, reloaded",
+    "name": { "str": ".357 Magnum JHP, reloaded", "str_pl": ".357 Magnum JHP, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
   }
 ]

data/json/items/archery.json

@@ -404,8 +404,7 @@
     "id": "compbow_high",
     "copy-from": "compbow",
     "type": "GUN",
-    "name": "compound bow (high)",
-    "name_plural": "compound bows (high)",
+    "name": { "str": "compound bow (high)", "str_pl": "compound bows (high)" },
     "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by very strong archers.  Currently set to a high weight, and ready to cause some real damage - if you can draw it.",
     "min_strength": 8,
     "dispersion": 85,
@@ -424,8 +423,7 @@
     "id": "compbow_low",
     "copy-from": "compbow",
     "type": "GUN",
-    "name": "compound bow (low)",
-    "name_plural": "compound bows (low)",
+    "name": { "str": "compound bow (low)", "str_pl": "compound bows (low)" },
     "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by average archers.  Currently set to a low weight, making it much easier to draw.",
     "min_strength": 4,
     "dispersion": 115,
@@ -658,8 +656,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.",