Merge pull request #37570 from snipercup/Comestible-modern-json-3

Comestible-modern-json-3

data/json/items/comestibles/alcohol.json

@@ -85,8 +85,7 @@
   {
     "type": "COMESTIBLE",
     "id": "wine_cabernet",
-    "name": "Cabernet Sauvignon",
-    "name_plural": "Cabernet Sauvignon",
+    "name": { "str": "Cabernet Sauvignon", "str_pl": "Cabernet Sauvignon" },
     "weight": "50 g",
     "color": "red",
     "addiction_type": "alcohol",

data/json/items/comestibles/dairy.json

@@ -205,8 +205,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cheese",
-    "name": "cheese",
-    "name_plural": "cheese",
+    "name": { "str": "cheese", "str_pl": "cheese" },
     "weight": "30 g",
     "color": "yellow",
     "spoils_in": "28 days",
@@ -270,8 +269,7 @@
   {
     "type": "COMESTIBLE",
     "id": "con_milk",
-    "name": "condensed milk",
-    "name_plural": "condensed milk",
+    "name": { "str": "condensed milk", "str_pl": "condensed milk" },
     "weight": "32 g",
     "color": "white",
     "spoils_in": "1 day",

data/json/items/comestibles/drink_other.json

@@ -260,8 +260,7 @@
   {
     "type": "COMESTIBLE",
     "id": "coffee_syrup",
-    "name": "coffee syrup",
-    "name_plural": "coffee syrup",
+    "name": { "str": "coffee syrup", "str_pl": "coffee syrup" },
     "weight": "32 g",
     "color": "brown",
     "addiction_type": "caffeine",

data/json/items/comestibles/med.json

@@ -343,8 +343,7 @@
     "id": "codeine",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "codeine",
-    "name_plural": "codeine",
+    "name": { "str": "codeine", "str_pl": "codeine" },
     "description": "A mild opiate used in the suppression of pain, cough, and other ailments.  While relatively weak for a narcotic, it is still addictive, with a potential for overdose.",
     "weight": "1 g",
     "volume": "250 ml",
@@ -531,8 +530,7 @@
     "id": "diazepam",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "diazepam",
-    "name_plural": "diazepam",
+    "name": { "str": "diazepam", "str_pl": "diazepam" },
     "description": "A strong benzodiazepine drug used to treat muscle spasms, anxiety, seizures, and panic attacks.",
     "weight": "1 g",
     "volume": "250 ml",
@@ -843,8 +841,7 @@
     "id": "nyquil",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "cough syrup",
-    "name_plural": "cough syrup",
+    "name": { "str": "cough syrup", "str_pl": "cough syrup" },
     "description": "Nighttime cold and flu medication.  Useful when trying to sleep with a head full of virions.  Will cause drowsiness.",
     "weight": "48 g",
     "volume": "250 ml",
@@ -949,8 +946,7 @@
     "id": "poppysyrup",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "poppy cough syrup",
-    "name_plural": "poppy cough syrup",
+    "name": { "str": "poppy cough syrup", "str_pl": "poppy cough syrup" },
     "description": "Cough syrup made from mutated poppy.  Will make you sleepy.",
     "weight": "48 g",
     "volume": "250 ml",
@@ -1306,8 +1302,7 @@
     "id": "xanax",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "Xanax",
-    "name_plural": "Xanax",
+    "name": { "str": "Xanax", "str_pl": "Xanax" },
     "description": "Anti-anxiety agent with a powerful sedative effect.  May cause dissociation and loss of memory.  It is dangerously addictive, and withdrawal from regular use should be gradual.  Its generic name is alprazolam.",
     "weight": "1 g",
     "volume": "250 ml",

data/json/items/comestibles/other.json

@@ -110,8 +110,7 @@
   {
     "type": "COMESTIBLE",
     "id": "marloss_gel",
-    "name": "marloss gelatin",
-    "name_plural": "marloss gelatin",
+    "name": { "str": "marloss gelatin", "str_pl": "marloss gelatin" },
     "weight": "177 g",
     "color": "yellow",
     "addiction_type": "marloss_y",
@@ -125,7 +124,7 @@
     "description": "This looks like a handful of lemon-colored liquid which has taken a set, much like pre-Cataclysm Jello.  It has a strong but delicious aroma, but is clearly either mutated or of alien origin.",
     "price": 0,
     "material": "fruit",
-    "volume": 0,
+    "volume": "100 ml",
     "stack_size": 10,
     "fun": 30
   },