Merge pull request #37793 from snipercup/Comestible-modern-json

Comestible modern json

data/json/items/chemicals_and_resources.json

@@ -380,8 +380,7 @@
   {
     "type": "COMESTIBLE",
     "id": "water_acid",
-    "name": "acid water",
-    "name_plural": "acid water",
+    "name": { "str": "acid water", "str_pl": "acid water" },
     "weight": "260 g",
     "color": "light_green",
     "flags": [ "ACID" ],
@@ -1319,8 +1318,7 @@
     "id": "chem_acrylamide",
     "category": "chems",
     "price": 10,
-    "name": "acrylamide",
-    "name_plural": "acrylamide",
+    "name": { "str": "acrylamide", "str_pl": "acrylamide" },
     "symbol": ";",
     "quench": -15,
     "healthy": -20,

data/json/items/comestibles/alcohol.json

@@ -501,8 +501,7 @@
   {
     "type": "COMESTIBLE",
     "id": "irish_coffee",
-    "name": "Irish coffee",
-    "name_plural": "Irish coffee",
+    "name": { "str": "Irish coffee", "str_pl": "Irish coffee" },
     "weight": "260 g",
     "color": "brown",
     "addiction_type": "alcohol",
@@ -527,8 +526,7 @@
   {
     "type": "COMESTIBLE",
     "id": "long_island",
-    "name": "Long Island iced tea",
-    "name_plural": "Long Island iced tea",
+    "name": { "str": "Long Island iced tea", "str_pl": "Long Island iced tea" },
     "weight": "232 g",
     "color": "brown",
     "addiction_type": "alcohol",
@@ -1059,8 +1057,7 @@
     "type": "COMESTIBLE",
     "id": "canadian_whiskey",
     "copy-from": "whiskey",
-    "name": "Canadian whiskey",
-    "name_plural": "Canadian whiskey",
+    "name": { "str": "Canadian whiskey", "str_pl": "Canadian whiskey" },
     "description": "A multi-grain liquor made from a mash of corn and rye.",
     "price": 2400,
     "fun": 17
@@ -1095,8 +1092,7 @@
     "type": "COMESTIBLE",
     "id": "bristol_sherry",
     "copy-from": "sherry",
-    "name": "Bristol Cream",
-    "name_plural": "Bristol Cream",
+    "name": { "str": "Bristol Cream", "str_pl": "Bristol Cream" },
     "description": "A fine sherry that was been aged in American oak casks and bottled in Bristol, England.",
     "price": 2800,
     "fun": 18
@@ -1105,8 +1101,7 @@
     "type": "COMESTIBLE",
     "id": "madeira",
     "copy-from": "sherry",
-    "name": "Madeira wine",
-    "name_plural": "Madeira wine",
+    "name": { "str": "Madeira wine", "str_pl": "Madeira wine" },
     "description": "Fortified wine from Madeira.  A true Royal Navy drink.",
     "price": 2400,
     "fun": 15

data/json/items/comestibles/drink.json

@@ -590,8 +590,7 @@
     "id": "mex_chocolate",
     "type": "COMESTIBLE",
     "category": "food",
-    "name": "Mexican hot chocolate",
-    "name_plural": "Mexican hot chocolate",
+    "name": { "str": "Mexican hot chocolate", "str_pl": "Mexican hot chocolate" },
     "description": "This semi-bitter chocolate drink made from cocoa, cinnamon, and chilies, traces its history to the Maya and Aztecs.  Perfect for a cold winter day.",
     "weight": "263 g",
     "volume": "250 ml",

data/json/items/comestibles/junkfood.json

@@ -528,8 +528,7 @@
   {
     "type": "COMESTIBLE",
     "id": "fresh_fries",
-    "name": "French fries",
-    "name_plural": "French fries",
+    "name": { "str": "French fries", "str_pl": "French fries" },
     "copy-from": "fries",
     "spoils_in": "3 days",
     "description": "Deep fried potatoes with a touch of salt.  Crunchy and delicious.",
@@ -559,8 +558,7 @@
   {
     "type": "COMESTIBLE",
     "id": "neccowafers",
-    "name": "Necco wafers",
-    "name_plural": "Necco wafers",
+    "name": { "str": "Necco wafers", "str_pl": "Necco wafers" },
     "weight": "60 g",
     "color": "magenta",
     "spoils_in": "180 days",

data/json/items/comestibles/med.json

@@ -1370,8 +1370,7 @@
     "id": "weak_antibiotic",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "Atreyupan",
-    "name_plural": "Atreyupan",
+    "name": { "str": "Atreyupan", "str_pl": "Atreyupan" },
     "description": "A broad-spectrum antibiotic used to suppress infections and prevent them from setting in.  It isn't strong enough to purge infections outright, but it boosts the body's resistance against them.  One dose lasts twelve hours.",
     "weight": "15 g",
     "volume": "250 ml",
@@ -1383,7 +1382,7 @@
     "color": "white",
     "healthy": -2,
     "use_action": "WEAK_ANTIBIOTIC",
-    "flags": "NPC_SAFE"
+    "flags": [ "NPC_SAFE" ]
   },
   {
     "id": "pepto",
@@ -1410,8 +1409,7 @@
     "id": "panacea",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "Panaceus",
-    "name_plural": "Panaceii",
+    "name": { "str": "Panaceus", "str_pl": "Panaceii" },
     "description": "An apple-red gel capsule the size of your thumbnail, filled with a thick oily liquid that shifts from black to purple at unpredictable intervals, flecked with tiny gray dots.  Given the place you got it from, it's either very potent, or highly experimental.  Holding it, all the little aches and pains seem to fade, just for a moment…",
     "weight": "15 g",
     "volume": "5 ml",
@@ -1422,7 +1420,7 @@
     "color": "red",
     "healthy": 25,
     "use_action": "PANACEA",
-    "flags": "NPC_SAFE"
+    "flags": [ "NPC_SAFE" ]
   },
   {
     "id": "cattail_jelly",

data/json/items/comestibles/other.json

@@ -482,8 +482,7 @@
     "type": "COMESTIBLE",
     "id": "coffee_raw_kentucky",
     "copy-from": "coffee_raw",
-    "name": "Kentucky coffee grounds",
-    "name_plural": "Kentucky coffee grounds",
+    "name": { "str": "Kentucky coffee grounds", "str_pl": "Kentucky coffee grounds" },
     "container": "bag_plastic",
     "description": "Coffee grounds created through washing, cleaning, and roasting the pods from a Kentucky coffeetree.  They can be used to create coffee.",
     "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],

data/json/items/comestibles/seed.json

@@ -732,13 +732,12 @@
   {
     "type": "COMESTIBLE",
     "id": "coffee_pod",
-    "name": "Kentucky coffee pod",
-    "name_plural": "Kentucky coffee pods",
+    "name": { "str": "Kentucky coffee pod", "str_pl": "Kentucky coffee pods" },
     "category": "other",
     "weight": "26 g",
     "color": "light_green",
     "comestible_type": "FOOD",
-    "looks_like": "hickory_nuts",
+    "looks_like": "hickory_nut",
     "symbol": "%",
     "quench": -6,
     "healthy": -2,

data/json/items/comestibles/wheat.json

@@ -284,8 +284,7 @@
   {
     "type": "COMESTIBLE",
     "id": "frenchtoast",
-    "name": "French toast",
-    "name_plural": "French toasts",
+    "name": { "str": "French toast", "str_pl": "French toasts" },
     "weight": "42 g",
     "color": "brown",
     "spoils_in": "10 days",