Comestible name to object leave the s

data/json/items/comestibles/carnivore.json

@@ -273,8 +273,7 @@
     "id": "offal_pickled",
     "copy-from": "offal",
     "type": "COMESTIBLE",
-    "name": "pickled offal",
-    "name_plural": "pickled offal",
+    "name": { "str": "pickled offal", "str_pl": "pickled offal" },
     "description": "This is a mass of entrails and organ meat, preserved in brine.  Packed with essential vitamins, and although it looks like a lab specimen, it actually tastes pretty palatable.",
     "volume": "500 ml",
     "stack_size": 2,
@@ -401,8 +400,7 @@
     "type": "COMESTIBLE",
     "copy-from": "flesh",
     "looks_like": "offal",
-    "name": "piece of raw lung",
-    "name_plural": "pieces of raw lung",
+    "name": { "str": "piece of raw lung", "str_pl": "pieces of raw lung" },
     "description": "A portion of lung from an animal.  It's spongy and pink, and spoils very quickly.  It can be a delicacy if properly prepared - but if improperly prepared, it's a chewy lump of flavorless connective tissue.",
     "weight": "56 g",
     "volume": "250 ml",
@@ -453,8 +451,7 @@
     "type": "COMESTIBLE",
     "copy-from": "lung",
     "looks_like": "offal",
-    "name": "raw brains",
-    "name_plural": "raw brains",
+    "name": { "str": "raw brains", "str_pl": "raw brains" },
     "description": "The brain from an animal.  You wouldn't want to eat this raw…",
     "color": "light_gray",
     "healthy": -15,

data/json/items/comestibles/dairy.json

@@ -239,8 +239,7 @@
   {
     "type": "COMESTIBLE",
     "id": "milk_powder",
-    "name": "powdered milk",
-    "name_plural": "powdered milk",
+    "name": { "str": "powdered milk", "str_pl": "powdered milk" },
     "weight": "30 g",
     "color": "white",
     "container": "bag_plastic",

data/json/items/comestibles/drink.json

@@ -725,8 +725,7 @@
   {
     "type": "COMESTIBLE",
     "id": "pine_tea",
-    "name": "pine needle tea",
-    "name_plural": "pine needle tea",
+    "name": { "str": "pine needle tea", "str_pl": "pine needle tea" },
     "weight": "268 g",
     "color": "light_green",
     "comestible_type": "DRINK",

data/json/items/comestibles/egg.json

@@ -227,8 +227,7 @@
   {
     "type": "COMESTIBLE",
     "id": "powder_eggs",
-    "name": "powdered egg",
-    "name_plural": "powdered eggs",
+    "name": { "str": "powdered egg" },
     "weight": "7 g",
     "color": "yellow",
     "container": "bottle_plastic_small",

data/json/items/comestibles/junkfood.json

@@ -71,17 +71,15 @@
   {
     "type": "COMESTIBLE",
     "id": "chips2",
-    "name": "potato chips",
-    "name_plural": "potato chips",
+    "name": { "str": "potato chips", "str_pl": "potato chips" },
     "copy-from": "chips",
     "description": "Some plain, salted potato chips.",
     "fun": 3
   },
   {
     "type": "COMESTIBLE",
     "id": "chips3",
-    "name": "potato chips",
-    "name_plural": "potato chips",
+    "name": { "str": "potato chips", "str_pl": "potato chips" },
     "copy-from": "chips",
     "description": "Oh man, you love these chips!  Score!",
     "//": "Favorite flavor varies.",
@@ -90,8 +88,7 @@
   {
     "type": "COMESTIBLE",
     "id": "kernels",
-    "name": "popcorn kernels",
-    "name_plural": "popcorn kernels",
+    "name": { "str": "popcorn kernels", "str_pl": "popcorn kernels" },
     "weight": "32 g",
     "color": "brown",
     "container": "bag_plastic",
@@ -109,8 +106,7 @@
   {
     "type": "COMESTIBLE",
     "id": "popcorn",
-    "name": "popcorn",
-    "name_plural": "popcorn",
+    "name": { "str": "popcorn", "str_pl": "popcorn" },
     "weight": "8 g",
     "color": "white",
     "spoils_in": "360 days",
@@ -154,8 +150,7 @@
   {
     "type": "COMESTIBLE",
     "id": "pretzels",
-    "name": "pretzels",
-    "name_plural": "pretzels",
+    "name": { "str": "pretzels", "str_pl": "pretzels" },
     "weight": "62 g",
     "color": "brown",
     "spoils_in": "90 days",
@@ -315,8 +310,7 @@
   {
     "type": "COMESTIBLE",
     "id": "powder_candy",
-    "name": "powder candy sticks",
-    "name_plural": "powder candy sticks",
+    "name": { "str": "powder candy sticks", "str_pl": "powder candy sticks" },
     "weight": "46 g",
     "color": "red",
     "spoils_in": "360 days",
@@ -611,8 +605,7 @@
   {
     "type": "COMESTIBLE",
     "id": "chips",
-    "name": "potato chips",
-    "name_plural": "potato chips",
+    "name": { "str": "potato chips", "str_pl": "potato chips" },
     "weight": "28 g",
     "color": "yellow",
     "spoils_in": "30 days",

data/json/items/comestibles/meat_dishes.json

@@ -290,8 +290,7 @@
   {
     "type": "COMESTIBLE",
     "id": "fish_pickled",
-    "name": "pickled fish",
-    "name_plural": "pickled fish",
+    "name": { "str": "pickled fish", "str_pl": "pickled fish" },
     "copy-from": "fish_cooked",
     "color": "white",
     "spoils_in": "4 days",
@@ -575,8 +574,7 @@
   {
     "type": "COMESTIBLE",
     "id": "pork_beans",
-    "name": "pork and beans",
-    "name_plural": "pork and beans",
+    "name": { "str": "pork and beans", "str_pl": "pork and beans" },
     "weight": "267 g",
     "color": "brown",
     "spoils_in": "1 day 12 hours",

data/json/items/comestibles/raw_veggy.json

@@ -714,8 +714,7 @@
   {
     "type": "COMESTIBLE",
     "id": "raw_beans",
-    "name": "raw beans",
-    "name_plural": "raw beans",
+    "name": { "str": "raw beans", "str_pl": "raw beans" },
     "color": "brown",
     "spoils_in": "2 days",
     "comestible_type": "FOOD",

data/json/items/comestibles/seed.json

@@ -98,8 +98,7 @@
     "id": "seed_raspberries",
     "copy-from": "seed_fruit",
     "type": "COMESTIBLE",
-    "name": "raspberry seeds",
-    "name_plural": "raspberry seeds",
+    "name": { "str": "raspberry seeds", "str_pl": "raspberry seeds" },
     "description": "Some raspberry seeds.",
     "seed_data": { "plant_name": "raspberry", "fruit": "raspberries", "byproducts": [ "withered" ], "grow": "91 days" }
   },
@@ -495,8 +494,7 @@
     "type": "COMESTIBLE",
     "id": "seed_pumpkin",
     "copy-from": "seed",
-    "name": "pumpkin seeds",
-    "name_plural": "pumpkin seeds",
+    "name": { "str": "pumpkin seeds", "str_pl": "pumpkin seeds" },
     "weight": "2 g",
     "color": "green",
     "use_action": "SEED",

data/json/items/comestibles/veggy_dishes.json

@@ -502,8 +502,7 @@
   {
     "type": "COMESTIBLE",
     "id": "veggy_pickled",
-    "name": "pickled veggy",
-    "name_plural": "pickled veggies",
+    "name": { "str": "pickled veggy", "str_pl": "pickled veggies" },
     "copy-from": "veggy",
     "color": "light_green",
     "spoils_in": "30 days",

data/json/items/comestibles/wheat.json

@@ -64,8 +64,7 @@
   {
     "type": "COMESTIBLE",
     "id": "lasagne_raw",
-    "name": "raw lasagne pasta",
-    "name_plural": "raw lasagne pasta",
+    "name": { "str": "raw lasagne pasta", "str_pl": "raw lasagne pasta" },
     "spoils_in": "360 days",
     "weight": "60 g",
     "color": "yellow",