Comestible name to object

data/json/items/comestibles/carnivore.json

@@ -297,8 +297,7 @@
     "id": "offal_canned",
     "copy-from": "offal",
     "type": "COMESTIBLE",
-    "name": "canned offal",
-    "name_plural": "canned offal",
+    "name": { "str": "canned offal", "str_pl": "canned offal" },
     "description": "Freshly cooked organ meat and entrails, preserved by canning.  Unappetizing, but filled with essential vitamins.",
     "volume": "500 ml",
     "stack_size": 2,

data/json/items/comestibles/drink.json

@@ -122,8 +122,7 @@
   {
     "type": "COMESTIBLE",
     "id": "chai_tea",
-    "name": "chai tea",
-    "name_plural": "chai tea",
+    "name": { "str": "chai tea", "str_pl": "chai tea" },
     "weight": "259 g",
     "color": "brown",
     "spoils_in": "12 hours",

data/json/items/comestibles/frozen.json

@@ -93,8 +93,7 @@
     "type": "COMESTIBLE",
     "copy-from": "icecream",
     "id": "icecream_candy",
-    "name": "candy ice cream",
-    "name_plural": "candy ice cream scoops",
+    "name": { "str": "candy ice cream", "str_pl": "candy ice cream scoops" },
     "description": "Ice cream with bits of chocolate, caramel, or other flavoring mixed in.",
     "fun": 20,
     "healthy": -3,

data/json/items/comestibles/junkfood.json

@@ -1066,8 +1066,7 @@
   {
     "id": "hotdogs_campfire",
     "type": "COMESTIBLE",
-    "name": "campfire hot dog",
-    "name_plural": "campfire hot dogs",
+    "name": { "str": "campfire hot dog" },
     "copy-from": "hotdogs_frozen",
     "description": "The simple hot dog, cooked over an open fire.  Would be better on a bun, but it's quite an improvement over eating it uncooked",
     "stack_size": 4,

data/json/items/comestibles/meat_dishes.json

@@ -307,8 +307,7 @@
   {
     "type": "COMESTIBLE",
     "id": "fish_canned",
-    "name": "canned fish",
-    "name_plural": "canned fish",
+    "name": { "str": "canned fish", "str_pl": "canned fish" },
     "copy-from": "fish_cooked",
     "color": "light_gray",
     "spoils_in": "1 day 16 hours",
@@ -601,8 +600,7 @@
   {
     "type": "COMESTIBLE",
     "id": "can_tuna",
-    "name": "canned tuna fish",
-    "name_plural": "canned tuna fish",
+    "name": { "str": "canned tuna fish", "str_pl": "canned tuna fish" },
     "weight": "154 g",
     "color": "light_gray",
     "spoils_in": "1 day",
@@ -676,8 +674,7 @@
   {
     "type": "COMESTIBLE",
     "id": "can_clams",
-    "name": "canned clam",
-    "name_plural": "canned clams",
+    "name": { "str": "canned clam" },
     "weight": "169 g",
     "color": "light_gray",
     "spoils_in": "1 day",

data/json/items/comestibles/med.json

@@ -1423,8 +1423,7 @@
     "id": "cattail_jelly",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "cattail jelly",
-    "name_plural": "cattail jellies",
+    "name": { "str": "cattail jelly", "str_pl": "cattail jellies" },
     "description": "Clear jelly harvested from cattail, has antiseptic properties and works as a painkiller.",
     "container": "bottle_plastic_small",
     "weight": "50 g",

data/json/items/comestibles/other.json

@@ -258,8 +258,7 @@
   {
     "type": "COMESTIBLE",
     "id": "can_beans",
-    "name": "canned beans",
-    "name_plural": "beans",
+    "name": { "str": "canned beans", "str_pl": "beans" },
     "weight": "256 g",
     "color": "brown",
     "spoils_in": "2 days",
@@ -511,8 +510,7 @@
   {
     "type": "COMESTIBLE",
     "id": "can_tomato",
-    "name": "canned tomato",
-    "name_plural": "canned tomatoes",
+    "name": { "str": "canned tomato", "str_pl": "canned tomatoes" },
     "weight": "128 g",
     "color": "red",
     "spoils_in": "3 days 18 hours",
@@ -556,8 +554,7 @@
     "id": "cattlefodder",
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
-    "name": "cattle fodder",
-    "name_plural": "cattle fodder",
+    "name": { "str": "cattle fodder", "str_pl": "cattle fodder" },
     "description": "What cattle eat.  Mainly made of grass, silage or legumes.  It's perfect for ruminants.",
     "weight": "300 g",
     "volume": "250 ml",
@@ -622,8 +619,7 @@
     "id": "catfood",
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
-    "name": "cat food",
-    "name_plural": "cat food",
+    "name": { "str": "cat food", "str_pl": "cat food" },
     "description": "This is food for cats.  It smells strange, but cats seem to love it.",
     "weight": "223 g",
     "spoils_in": "1 day",

data/json/items/comestibles/raw_veggy.json

@@ -121,8 +121,7 @@
   {
     "type": "COMESTIBLE",
     "id": "carrot",
-    "name": "carrot",
-    "name_plural": "carrots",
+    "name": { "str": "carrot" },
     "weight": "68 g",
     "color": "light_red",
     "spoils_in": "5 days",
@@ -143,8 +142,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cattail_rhizome",
-    "name": "cattail rhizome",
-    "name_plural": "cattail rhizomes",
+    "name": { "str": "cattail rhizome" },
     "weight": "209 g",
     "color": "brown",
     "spoils_in": "3 days 8 hours",
@@ -162,8 +160,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cattail_stalk",
-    "name": "cattail stalk",
-    "name_plural": "cattail stalks",
+    "name": { "str": "cattail stalk" },
     "weight": "100 g",
     "color": "green",
     "spoils_in": "3 days 8 hours",

data/json/items/comestibles/seed.json

@@ -184,8 +184,7 @@
     "id": "seed_cabbage",
     "copy-from": "seed",
     "price": 50,
-    "name": "cabbage seeds",
-    "name_plural": "cabbage seeds",
+    "name": { "str": "cabbage seeds", "str_pl": "cabbage seeds" },
     "color": "light_gray",
     "description": "Some white cabbage seeds.",
     "seed_data": { "plant_name": "cabbage", "fruit": "cabbage", "byproducts": [ "withered" ], "grow": "85 days" }
@@ -256,8 +255,7 @@
     "type": "COMESTIBLE",
     "id": "seed_cattail",
     "copy-from": "seed",
-    "name": "cattail seeds",
-    "name_plural": "cattail seeds",
+    "name": { "str": "cattail seeds", "str_pl": "cattail seeds" },
     "color": "green",
     "description": "Some cattail seeds.",
     "seed_data": { "plant_name": "cattail", "fruit": "cattail_stalk", "byproducts": [ "cattail_rhizome" ], "grow": "91 days" }
@@ -318,8 +316,7 @@
     "type": "COMESTIBLE",
     "id": "seed_cactus",
     "copy-from": "seed",
-    "name": "cactus seeds",
-    "name_plural": "cactus seeds",
+    "name": { "str": "cactus seeds", "str_pl": "cactus seeds" },
     "color": "green",
     "description": "Some cactus seeds.",
     "seed_data": { "plant_name": "cactus", "fruit": "cactus_pad", "grow": "91 days" }
@@ -350,8 +347,7 @@
     "id": "seed_carrot",
     "copy-from": "seed",
     "price": 50,
-    "name": "carrot seeds",
-    "name_plural": "carrot seeds",
+    "name": { "str": "carrot seeds", "str_pl": "carrot seeds" },
     "description": "Some carrot seeds.",
     "seed_data": { "plant_name": "carrot", "fruit": "carrot", "byproducts": [ "withered" ], "grow": "65 days" }
   },
@@ -402,8 +398,7 @@
     "type": "COMESTIBLE",
     "id": "seed_weed",
     "copy-from": "seed",
-    "name": "cannabis seeds",
-    "name_plural": "cannabis seeds",
+    "name": { "str": "cannabis seeds", "str_pl": "cannabis seeds" },
     "color": "green",
     "use_action": "SEED",
     "quench": -1,
@@ -507,8 +502,7 @@
     "type": "COMESTIBLE",
     "id": "seed_canola",
     "copy-from": "seed",
-    "name": "canola seeds",
-    "name_plural": "canola seeds",
+    "name": { "str": "canola seeds", "str_pl": "canola seeds" },
     "color": "green",
     "description": "Some canola seeds.  You could press them into oil.",
     "charges": 2,
@@ -668,8 +662,7 @@
     "id": "seed_celery",
     "copy-from": "seed",
     "price": 50,
-    "name": "celery seeds",
-    "name_plural": "celery seeds",
+    "name": { "str": "celery seeds", "str_pl": "celery seeds" },
     "description": "Some celery seeds.",
     "seed_data": { "plant_name": "celery", "fruit": "celery", "byproducts": [ "withered" ], "grow": "130 days" }
   },