Comestible Name to object

data/json/items/chemicals_and_resources.json

@@ -260,8 +260,7 @@
   {
     "type": "COMESTIBLE",
     "id": "fertilizer_commercial",
-    "name": "commercial fertilizer",
-    "name_plural": "commercial fertilizer",
+    "name": { "str": "commercial fertilizer", "str_pl": "commercial fertilizer" },
     "weight": "350 g",
     "color": "yellow",
     "flags": [ "FERTILIZER" ],
@@ -412,8 +411,7 @@
   {
     "type": "COMESTIBLE",
     "id": "acid",
-    "name": "concentrated acid",
-    "name_plural": "concentrated acid",
+    "name": { "str": "concentrated acid", "str_pl": "concentrated acid" },
     "weight": "250 g",
     "color": "green",
     "flags": [ "ACID", "DROP_ACTION_ONLY_IF_LIQUID" ],

data/json/items/comestibles/carnivore.json

@@ -32,8 +32,7 @@
     "id": "fish_cooked",
     "copy-from": "fish",
     "type": "COMESTIBLE",
-    "name": "cooked fish",
-    "name_plural": "cooked fish",
+    "name": { "str": "cooked fish", "str_pl": "cooked fish" },
     "description": "Freshly cooked fish.  Very nutritious.",
     "proportional": { "price": 1.5 },
     "spoils_in": "1 day",
@@ -218,8 +217,7 @@
     "id": "meat_scrap_cooked",
     "copy-from": "meat_scrap",
     "type": "COMESTIBLE",
-    "name": "cooked scrap of meat",
-    "name_plural": "cooked scraps of meat",
+    "name": { "str": "cooked scrap of meat", "str_pl": "cooked scraps of meat" },
     "parasites": 0,
     "fun": 0,
     "healthy": 0,
@@ -243,8 +241,7 @@
     "id": "mutant_meat_scrap_cooked",
     "type": "COMESTIBLE",
     "copy-from": "mutant_meat_scrap",
-    "name": "cooked scrap of mutant meat",
-    "name_plural": "cooked scraps of mutant meat",
+    "name": { "str": "cooked scrap of mutant meat", "str_pl": "cooked scraps of mutant meat" },
     "looks_like": "meat_scrap_cooked",
     "parasites": 0,
     "calories": 25,
@@ -266,8 +263,7 @@
     "id": "offal_cooked",
     "copy-from": "offal",
     "type": "COMESTIBLE",
-    "name": "cooked offal",
-    "name_plural": "cooked offal",
+    "name": { "str": "cooked offal", "str_pl": "cooked offal" },
     "description": "This is freshly cooked organ meat and entrails.  It's filled with essential vitamins, but most people consider it a bit gross unless very carefully prepared.",
     "parasites": 0,
     "healthy": 1,
@@ -426,8 +422,7 @@
     "type": "COMESTIBLE",
     "copy-from": "lung",
     "looks_like": "offal_cooked",
-    "name": "cooked piece of lung",
-    "name_plural": "cooked pieces of lung",
+    "name": { "str": "cooked piece of lung", "str_pl": "cooked pieces of lung" },
     "description": " Prepared in this way, it's a chewy grayish lump of flavorless connective tissue.  It doesn't look any tastier than it did raw, but the parasites are all cooked out.",
     "parasites": 0,
     "delete": { "flags": [ "RAW" ] }
@@ -476,8 +471,7 @@
     "type": "COMESTIBLE",
     "copy-from": "brain",
     "looks_like": "offal_cooked",
-    "name": "cooked brains",
-    "name_plural": "cooked brains",
+    "name": { "str": "cooked brains", "str_pl": "cooked brains" },
     "description": "Now you can emulate those zombies you love so much!  Preparing brain for eating is challenging, and this doesn't seem to be the best way to do it.",
     "parasites": 0,
     "healthy": -2,

data/json/items/comestibles/drink.json

@@ -179,8 +179,7 @@
   {
     "type": "COMESTIBLE",
     "id": "coffee",
-    "name": "coffee",
-    "name_plural": "coffee",
+    "name": { "str": "coffee", "str_pl": "coffee" },
     "weight": "250 g",
     "color": "brown",
     "addiction_type": "caffeine",
@@ -203,8 +202,7 @@
   {
     "type": "COMESTIBLE",
     "id": "coffee_substitute",
-    "name": "coffee substitute",
-    "name_plural": "coffee substitute",
+    "name": { "str": "coffee substitute", "str_pl": "coffee substitute" },
     "weight": "250 g",
     "color": "brown",
     "container": "bottle_plastic",
@@ -944,8 +942,7 @@
     "id": "water_clean",
     "copy-from": "water",
     "type": "COMESTIBLE",
-    "name": "clean water",
-    "name_plural": "clean water",
+    "name": { "str": "clean water", "str_pl": "clean water" },
     "description": "Fresh, clean water.  Truly the best thing to quench your thirst.",
     "color": "light_cyan",
     "use_action": [  ]

data/json/items/comestibles/fruit_dishes.json

@@ -2,8 +2,7 @@
   {
     "type": "COMESTIBLE",
     "id": "strawberries_cooked",
-    "name": "cooked strawberry",
-    "name_plural": "cooked strawberries",
+    "name": { "str": "cooked strawberry", "str_pl": "cooked strawberries" },
     "copy-from": "strawberries",
     "color": "red",
     "spoils_in": "3 days 18 hours",
@@ -42,8 +41,7 @@
   {
     "type": "COMESTIBLE",
     "id": "blueberries_cooked",
-    "name": "cooked blueberry",
-    "name_plural": "cooked blueberries",
+    "name": { "str": "cooked blueberry", "str_pl": "cooked blueberries" },
     "copy-from": "blueberries",
     "color": "blue",
     "spoils_in": "3 days 18 hours",

data/json/items/comestibles/junkfood.json

@@ -1070,8 +1070,7 @@
   {
     "type": "COMESTIBLE",
     "id": "hotdogs_cooked",
-    "name": "cooked hot dog",
-    "name_plural": "cooked hot dogs",
+    "name": { "str": "cooked hot dog" },
     "weight": "383 g",
     "color": "red",
     "spoils_in": "1 day",

data/json/items/comestibles/med.json

@@ -365,8 +365,7 @@
     "id": "coke",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "cocaine",
-    "name_plural": "cocaine",
+    "name": { "str": "cocaine", "str_pl": "cocaine" },
     "description": "Crystalline extract of the coca leaf, or at least, a white powder with some of that in it.  A topical analgesic, it is more commonly used for its stimulatory properties.  Highly addictive.",
     "weight": "1 g",
     "volume": "250 ml",

data/json/items/comestibles/other.json

@@ -301,8 +301,7 @@
   {
     "type": "COMESTIBLE",
     "id": "beans_cooked",
-    "name": "cooked beans",
-    "name_plural": "cooked beans",
+    "name": { "str": "cooked beans", "str_pl": "cooked beans" },
     "weight": "270 g",
     "color": "light_gray",
     "spoils_in": "10 days",
@@ -438,8 +437,7 @@
   {
     "type": "COMESTIBLE",
     "id": "lentils_cooked",
-    "name": "cooked lentils",
-    "name_plural": "cooked lentils",
+    "name": { "str": "cooked lentils", "str_pl": "cooked lentils" },
     "weight": "198 g",
     "copy-from": "dry_lentils",
     "color": "light_gray",
@@ -456,8 +454,7 @@
   {
     "type": "COMESTIBLE",
     "id": "coffee_raw",
-    "name": "coffee powder",
-    "name_plural": "coffee powder",
+    "name": { "str": "coffee powder", "str_pl": "coffee powder" },
     "weight": "14 g",
     "color": "brown",
     "addiction_type": "caffeine",

data/json/items/comestibles/seed.json

@@ -744,8 +744,7 @@
     "price": 50,
     "material": "veggy",
     "primary_material": "dried_vegetable",
-    "name": "coffee beans",
-    "name_plural": "coffee beans",
+    "name": { "str": "coffee beans", "str_pl": "coffee beans" },
     "symbol": ".",
     "color": "brown",
     "description": "Some coffee beans, can be roasted.",

data/json/items/comestibles/veggy_dishes.json

@@ -2,8 +2,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cooked_cattail_stalk",
-    "name": "cooked cattail stalk",
-    "name_plural": "cooked cattail stalks",
+    "name": { "str": "cooked cattail stalk" },
     "copy-from": "cattail_stalk",
     "color": "white",
     "spoils_in": "2 days 12 hours",
@@ -35,8 +34,7 @@
   {
     "type": "COMESTIBLE",
     "id": "dandelion_cooked",
-    "name": "cooked dandelion greens",
-    "name_plural": "cooked dandelion greens",
+    "name": { "str": "cooked dandelion greens", "str_pl": "cooked dandelion greens" },
     "copy-from": "raw_dandelion",
     "spoils_in": "2 days",
     "healthy": 2,
@@ -71,8 +69,7 @@
   {
     "type": "COMESTIBLE",
     "id": "veggy_wild_cooked",
-    "name": "cooked wild vegetables",
-    "name_plural": "cooked wild vegetables",
+    "name": { "str": "cooked wild vegetables", "str_pl": "cooked wild vegetables" },
     "copy-from": "veggy",
     "spoils_in": "2 days 2 hours",
     "description": "Cooked wild edible plants.  An interesting mix of flavors.",
@@ -100,8 +97,7 @@
   {
     "type": "COMESTIBLE",
     "id": "buckwheat_cooked",
-    "name": "cooked buckwheat",
-    "name_plural": "cooked buckwheat",
+    "name": { "str": "cooked buckwheat", "str_pl": "cooked buckwheat" },
     "copy-from": "buckwheat",
     "spoils_in": "20 days",
     "healthy": 2,
@@ -200,8 +196,7 @@
   {
     "type": "COMESTIBLE",
     "id": "rice_cooked",
-    "name": "cooked rice",
-    "name_plural": "cooked rice",
+    "name": { "str": "cooked rice", "str_pl": "cooked rice" },
     "copy-from": "dry_rice",
     "weight": "62 g",
     "color": "light_gray",