Merge pull request #37712 from snipercup/comestible-modern-json

Comestible Names to objects

data/json/items/comestibles/carnivore.json

@@ -60,8 +60,7 @@
     "id": "human_fat",
     "copy-from": "fat",
     "type": "COMESTIBLE",
-    "name": "chunk of human fat",
-    "name_plural": "chunks of human fat",
+    "name": { "str": "chunk of human fat", "str_pl": "chunks of human fat" },
     "description": "Freshly harvested from a human body.",
     "material": "hflesh"
   },
@@ -87,8 +86,7 @@
     "copy-from": "meat",
     "type": "COMESTIBLE",
     "cooks_like": "human_cooked",
-    "name": "human flesh",
-    "name_plural": "human fleshes",
+    "name": { "str": "human flesh", "str_pl": "human fleshes" },
     "description": "Freshly butchered from a human body.",
     "material": "hflesh"
   },
@@ -654,8 +652,7 @@
     "id": "mutant_human_fat",
     "type": "COMESTIBLE",
     "copy-from": "mutant_fat",
-    "name": "chunk of mutant humanoid fat",
-    "name_plural": "chunks of mutant humanoid fat",
+    "name": { "str": "chunk of mutant humanoid fat", "str_pl": "chunks of mutant humanoid fat" },
     "description": "Freshly butchered fat from a heavily mutated humanoid.",
     "material": "hflesh"
   },

data/json/items/comestibles/dairy.json

@@ -2,8 +2,7 @@
   {
     "type": "COMESTIBLE",
     "id": "milk_raw",
-    "name": "raw milk",
-    "name_plural": "raw milk",
+    "name": { "str": "raw milk", "str_pl": "raw milk" },
     "copy-from": "milk",
     "spoils_in": "12 hours",
     "price": 19,

data/json/items/comestibles/drink.json

@@ -636,8 +636,7 @@
   {
     "type": "COMESTIBLE",
     "id": "milk_reconstituted",
-    "name": "reconstituted milk",
-    "name_plural": "reconstituted milk",
+    "name": { "str": "reconstituted milk", "str_pl": "reconstituted milk" },
     "copy-from": "milk",
     "description": "Baby cow food, appropriated for adult humans.  This milk has been reconstituted from a processed milk.  Spoils rapidly."
   },

data/json/items/comestibles/frozen.json

@@ -82,8 +82,7 @@
     "type": "COMESTIBLE",
     "copy-from": "icecream",
     "id": "icecream_artificial",
-    "name": "dairy dessert",
-    "name_plural": "dairy dessert scoops",
+    "name": { "str": "dairy dessert", "str_pl": "dairy dessert scoops" },
     "description": "Government regulations dictate that since this isn't *technically* ice cream, it be called a dairy dessert instead.  It still tastes good, but your body won't like you.",
     "healthy": -2,
     "price": 200,

data/json/items/comestibles/seed.json

@@ -29,8 +29,7 @@
     "abstract": "seed_mushroom_base",
     "type": "COMESTIBLE",
     "copy-from": "seed",
-    "name": "mushroom spores",
-    "name_plural": "mushroom spores",
+    "name": { "str": "mushroom spores", "str_pl": "mushroom spores" },
     "description": "Some mushroom spores.",
     "charges": 2,
     "color": "green"

data/json/items/comestibles/spice.json

@@ -3,62 +3,55 @@
     "id": "chilly-p",
     "copy-from": "spice",
     "type": "COMESTIBLE",
-    "name": "chili powder",
-    "name_plural": "chili powder",
+    "name": { "str": "chili powder", "str_pl": "chili powder" },
     "description": "Chilly P, Yo!  Not edible on its own, but it could be used to make seasoning.",
     "color": "red"
   },
   {
     "id": "cinnamon",
     "copy-from": "spice",
     "type": "COMESTIBLE",
-    "name": "cinnamon",
-    "name_plural": "cinnamon",
+    "name": { "str": "cinnamon", "str_pl": "cinnamon" },
     "description": "Ground cinnamon bark with a sweet but slightly spicy aroma.",
     "color": "brown"
   },
   {
     "id": "curry_powder",
     "copy-from": "spice",
     "type": "COMESTIBLE",
-    "name": "curry powder",
-    "name_plural": "curry powder",
+    "name": { "str": "curry powder", "str_pl": "curry powder" },
     "description": "A blend of spices meant to be used in some South Asian dishes.  Can't be eaten raw, why would you even try that?",
     "color": "red"
   },
   {
     "id": "pepper",
     "copy-from": "spice",
     "type": "COMESTIBLE",
-    "name": "black pepper",
-    "name_plural": "black pepper",
+    "name": { "str": "black pepper", "str_pl": "black pepper" },
     "description": "Ground black spice berries with a pungent aroma.",
     "color": "dark_gray"
   },
   {
     "id": "salt",
     "copy-from": "spice",
     "type": "COMESTIBLE",
-    "name": "salt",
-    "name_plural": "salt",
+    "name": { "str": "salt", "str_pl": "salt" },
     "description": "Yuck!  You surely wouldn't want to eat this.  It's good for preserving meat and cooking, though.",
     "color": "white"
   },
   {
     "id": "seasoning_italian",
     "copy-from": "spice",
     "type": "COMESTIBLE",
-    "name": "Italian seasoning",
-    "name_plural": "Italian seasoning",
+    "name": { "str": "Italian seasoning", "str_pl": "Italian seasoning" },
     "description": "A fragrant mix of dried oregano, basil, thyme and other spices.",
     "color": "green"
   },
   {
     "id": "seasoning_salt",
     "copy-from": "salt",
     "type": "COMESTIBLE",
-    "name": "seasoned salt",
-    "name_plural": "seasoned salt",
+    "name": { "str": "seasoned salt", "str_pl": "seasoned salt" },
     "description": "Salt mixed with a fragrant blend of secret herbs and spices.",
     "color": "brown"
   },