Merge pull request #38068 from snipercup/Comestible-name-to-object2

Comestible name to object, flags to array

data/json/items/comestibles/bread.json

@@ -2,8 +2,7 @@
   {
     "id": "donut_holes",
     "type": "COMESTIBLE",
-    "name": "donut holes",
-    "name_plural": "donut holes",
+    "name": { "str": "donut holes", "str_pl": "donut holes" },
     "weight": "226 g",
     "color": "yellow",
     "spoils_in": "10 days",

data/json/items/comestibles/brewing.json

@@ -67,8 +67,7 @@
   {
     "type": "COMESTIBLE",
     "id": "brew_gin",
-    "name": "fermenting gin mash",
-    "name_plural": "fermenting gin mashes",
+    "name": { "str": "fermenting gin mash", "str_pl": "fermenting gin mashes" },
     "description": "Undistilled gin mash.  Distilling it will produce gin.",
     "weight": "33 g",
     "color": "brown",

data/json/items/comestibles/carnivore.json

@@ -15,8 +15,7 @@
     "id": "fish",
     "copy-from": "flesh",
     "type": "COMESTIBLE",
-    "name": "fillet of fish",
-    "name_plural": "fillets of fish",
+    "name": { "str": "fillet of fish", "str_pl": "fillets of fish" },
     "description": "Freshly caught fish.  Makes a passable meal raw.",
     "//": "Nutrition information based on whitefish",
     "weight": "148 g",

data/json/items/comestibles/dairy.json

@@ -23,8 +23,7 @@
   {
     "type": "COMESTIBLE",
     "id": "milk_evap",
-    "name": "evaporated milk",
-    "name_plural": "evaporated milk",
+    "name": { "str": "evaporated milk", "str_pl": "evaporated milk" },
     "weight": "266 g",
     "color": "white",
     "spoils_in": "1 day",

data/json/items/comestibles/drink_other.json

@@ -111,8 +111,7 @@
     "type": "COMESTIBLE",
     "symbol": "~",
     "color": "yellow",
-    "name": "forest honey",
-    "name_plural": "forest honey",
+    "name": { "str": "forest honey", "str_pl": "forest honey" },
     "description": "Honey, that stuff bees make.  This one is \"forest honey\", a liquid form of honey.  This honey won't spoil and is good for your digestion.",
     "price": 250,
     "material": "honey",

data/json/items/comestibles/frozen.json

@@ -28,8 +28,7 @@
     "type": "COMESTIBLE",
     "copy-from": "milkshake",
     "id": "milkshake_fastfood",
-    "name": "fast food milkshake",
-    "name_plural": "fast food milkshakes",
+    "name": { "str": "fast food milkshake", "str_pl": "fast food milkshakes" },
     "description": "A milkshake made by freezing a premade mix.  Tastes better due to how much sugar is in it, but is bad for your health.",
     "calories": 175,
     "fun": 23,
@@ -106,8 +105,7 @@
     "type": "COMESTIBLE",
     "copy-from": "icecream",
     "id": "icecream_fruit",
-    "name": "fruity ice cream",
-    "name_plural": "fruity ice cream scoops",
+    "name": { "str": "fruity ice cream", "str_pl": "fruity ice cream scoops" },
     "description": "Small bits of sweet fruit have been tossed into this ice cream, making it slightly less terrible for you.",
     "healthy": 0,
     "calories": 224,
@@ -121,8 +119,7 @@
     "type": "COMESTIBLE",
     "copy-from": "icecream",
     "id": "icecream_custard",
-    "name": "frozen custard",
-    "name_plural": "frozen custard scoops",
+    "name": { "str": "frozen custard", "str_pl": "frozen custard scoops" },
     "description": "Similar to ice cream, this treat made famous in Coney Island is made like ice cream, but with egg yolk added in.  Its storing temperature is warmer, and it lasts a little longer than regular ice cream.",
     "spoils_in": "2 days",
     "calories": 328,
@@ -135,8 +132,7 @@
     "type": "COMESTIBLE",
     "copy-from": "icecream",
     "id": "icecream_yogurt",
-    "name": "frozen yogurt",
-    "name_plural": "frozen yogurt",
+    "name": { "str": "frozen yogurt", "str_pl": "frozen yogurt" },
     "description": "Tarter than ice cream, this is made with yogurt and other dairy products, and is generally low-fat compared to ice cream itself.",
     "calories": 127,
     "price": 275,

data/json/items/comestibles/junkfood.json

@@ -504,8 +504,7 @@
   {
     "type": "COMESTIBLE",
     "id": "fries",
-    "name": "fast-food French fries",
-    "name_plural": "fast-food French fries",
+    "name": { "str": "fast-food French fries", "str_pl": "fast-food French fries" },
     "weight": "71 g",
     "color": "yellow",
     "container": "box_small",

data/json/items/comestibles/meat_dishes.json

@@ -1148,8 +1148,7 @@
   {
     "type": "COMESTIBLE",
     "id": "sushi_fishroll",
-    "name": "fish makizushi",
-    "name_plural": "fish makizushi",
+    "name": { "str": "fish makizushi", "str_pl": "fish makizushi" },
     "weight": "159 g",
     "color": "green",
     "spoils_in": "12 hours",

data/json/items/comestibles/offal_dishes.json

@@ -3,8 +3,7 @@
     "id": "foie_gras",
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
-    "name": "foie gras",
-    "name_plural": "foie gras",
+    "name": { "str": "foie gras", "str_pl": "foie gras" },
     "symbol": "%",
     "looks_like": "meat_cooked",
     "description": "Thought it's not technically foie gras, you don't have to think about that.",

data/json/items/comestibles/other.json

@@ -277,8 +277,7 @@
   {
     "type": "COMESTIBLE",
     "id": "dry_beans",
-    "name": "dried beans",
-    "name_plural": "dried beans",
+    "name": { "str": "dried beans", "str_pl": "dried beans" },
     "weight": "56 g",
     "color": "light_gray",
     "spoils_in": "360 days",
@@ -342,8 +341,7 @@
   {
     "type": "COMESTIBLE",
     "id": "tofu_fried",
-    "name": "fried tofu",
-    "name_plural": "fried tofu",
+    "name": { "str": "fried tofu", "str_pl": "fried tofu" },
     "weight": "85 g",
     "color": "white",
     "spoils_in": "4 days",
@@ -416,8 +414,7 @@
   {
     "type": "COMESTIBLE",
     "id": "dry_lentils",
-    "name": "dried lentils",
-    "name_plural": "dried lentils",
+    "name": { "str": "dried lentils", "str_pl": "dried lentils" },
     "weight": "132 g",
     "color": "light_gray",
     "comestible_type": "FOOD",
@@ -527,8 +524,7 @@
   {
     "type": "COMESTIBLE",
     "id": "human_brain_embalmed",
-    "name": "embalmed human brain",
-    "name_plural": "embalmed human brains",
+    "name": { "str": "embalmed human brain", "str_pl": "embalmed human brains" },
     "weight": "56 g",
     "color": "pink",
     "looks_like": "offal",
@@ -542,7 +538,7 @@
     "description": "This is a human brain soaked in a solution of highly toxic formaldehyde.  Eating this would be a terrible idea.",
     "price": 80,
     "material": "hflesh",
-    "flags": "TRADER_AVOID",
+    "flags": [ "TRADER_AVOID" ],
     "volume": "250 ml",
     "fun": -30
   },
@@ -591,8 +587,7 @@
     "id": "dogfood",
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
-    "name": "dog food",
-    "name_plural": "dog food",
+    "name": { "str": "dog food", "str_pl": "dog food" },
     "description": "This is food for dogs.  It smells strange, but dogs seem to love it.",
     "weight": "554 g",
     "spoils_in": "1 day",

data/json/items/comestibles/seed.json

@@ -93,8 +93,7 @@
     "id": "seed_elderberries",
     "copy-from": "seed_fruit",
     "type": "COMESTIBLE",
-    "name": "elderberry seeds",
-    "name_plural": "elderberry seeds",
+    "name": { "str": "elderberry seeds", "str_pl": "elderberry seeds" },
     "description": "Some elderberry seeds.",
     "seed_data": { "plant_name": "elderberry", "fruit": "elderberries", "byproducts": [ "withered" ], "grow": "91 days" }
   },
@@ -533,8 +532,7 @@
     "type": "COMESTIBLE",
     "id": "seed_dogbane",
     "copy-from": "seed",
-    "name": "dogbane seeds",
-    "name_plural": "dogbane seeds",
+    "name": { "str": "dogbane seeds", "str_pl": "dogbane seeds" },
     "color": "green",
     "description": "Some dogbane seeds.",
     "charges": 2,
@@ -686,8 +684,7 @@
   {
     "type": "COMESTIBLE",
     "id": "fried_seeds",
-    "name": "fried seeds",
-    "name_plural": "fried seeds",
+    "name": { "str": "fried seeds", "str_pl": "fried seeds" },
     "weight": "32 g",
     "color": "yellow",
     "container": "bag_plastic",

data/json/items/comestibles/veggy_dishes.json

@@ -46,8 +46,7 @@
   {
     "type": "COMESTIBLE",
     "id": "dandelion_fried",
-    "name": "fried dandelions",
-    "name_plural": "fried dandelions",
+    "name": { "str": "fried dandelions", "str_pl": "fried dandelions" },
     "copy-from": "raw_dandelion",
     "color": "yellow",
     "spoils_in": "3 days",
@@ -171,8 +170,7 @@
   {
     "type": "COMESTIBLE",
     "id": "dry_rice",
-    "name": "dried rice",
-    "name_plural": "dried rice",
+    "name": { "str": "dried rice", "str_pl": "dried rice" },
     "weight": "40 g",
     "color": "white",
     "spoils_in": "360 days",
@@ -213,8 +211,7 @@
   {
     "type": "COMESTIBLE",
     "id": "deluxe_veggy_rice",
-    "name": "fried rice",
-    "name_plural": "fried rice",
+    "name": { "str": "fried rice", "str_pl": "fried rice" },
     "weight": "135 g",
     "color": "yellow",
     "spoils_in": "15 days",

data/json/items/comestibles/wheat.json

@@ -144,8 +144,7 @@
   {
     "type": "COMESTIBLE",
     "id": "flour",
-    "name": "flour",
-    "name_plural": "flour",
+    "name": { "str": "flour", "str_pl": "flour" },
     "weight": "13 g",
     "color": "white",
     "spoils_in": "360 days",
@@ -269,8 +268,7 @@
     "type": "COMESTIBLE",
     "id": "fruit_pancakes",
     "copy-from": "pancakes",
-    "name": "fruit pancake",
-    "name_plural": "fruit pancakes",
+    "name": { "str": "fruit pancake" },
     "weight": "80 g",
     "color": "brown",
     "calories": 113,
@@ -453,8 +451,7 @@
   {
     "type": "COMESTIBLE",
     "id": "noodles_fast",
-    "name": "fast noodles",
-    "name_plural": "fast noodles",
+    "name": { "str": "fast noodles", "str_pl": "fast noodles" },
     "weight": "81 g",
     "color": "yellow",
     "spoils_in": "360 days",