From 1c38996617a2d547a48daf74e00e766ba0c1f59b Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Thu, 23 Jan 2020 01:54:51 +0100
Subject: [PATCH] Comestible-modern-json 2

---
 data/json/items/comestibles/drink.json        | 3 +--
 data/json/items/comestibles/egg.json          | 2 +-
 data/json/items/comestibles/fruit_dishes.json | 5 ++---
 data/json/items/comestibles/med.json          | 9 ++++-----
 data/json/items/comestibles/mutagen.json      | 2 +-
 data/json/items/comestibles/raw_fruit.json    | 2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
index 9a5bff1ffbbab..883067dc81793 100644
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -2,8 +2,7 @@
   {
     "type": "COMESTIBLE",
     "id": "apple_cider",
-    "name": "apple cider",
-    "name_plural": "apple cider",
+    "name": { "str": "apple cider", "str_pl": "apple cider" },
     "weight": "263 g",
     "color": "brown",
     "spoils_in": "6 days",
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
index f107b6685a2b5..17323078eb506 100644
--- a/data/json/items/comestibles/egg.json
+++ b/data/json/items/comestibles/egg.json
@@ -116,7 +116,7 @@
   {
     "type": "COMESTIBLE",
     "id": "ant_egg",
-    "name": "ant egg",
+    "name": { "str": "ant egg" },
     "copy-from": "egg_chicken",
     "color": "white",
     "symbol": "%",
diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
index 17006885feefc..ba46843e2c540 100644
--- a/data/json/items/comestibles/fruit_dishes.json
+++ b/data/json/items/comestibles/fruit_dishes.json
@@ -204,7 +204,7 @@
   {
     "type": "COMESTIBLE",
     "id": "apple_sugar",
-    "name": "fruit slice",
+    "name": { "str": "fruit slice" },
     "weight": "42 g",
     "color": "red",
     "spoils_in": "7 days 12 hours",
@@ -225,8 +225,7 @@
   {
     "type": "COMESTIBLE",
     "id": "apple_canned",
-    "name": "canned fruit",
-    "name_plural": "canned fruit",
+    "name": { "str": "canned fruit", "str_pl": "canned fruit" },
     "weight": "170 g",
     "color": "red",
     "spoils_in": "7 days 12 hours",
diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
index 55a6593610172..f8d3249b2ff1c 100644
--- a/data/json/items/comestibles/med.json
+++ b/data/json/items/comestibles/med.json
@@ -52,8 +52,7 @@
     "id": "antibiotics",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "antibiotics",
-    "name_plural": "antibiotics",
+    "name": { "str": "antibiotics", "str_pl": "antibiotics" },
     "description": "A strong antibacterial medication designed to prevent or stop the spread of infection.  It's the safest way to cure any infections you might have.  One dose lasts twelve hours.",
     "weight": "1 g",
     "volume": "250 ml",
@@ -63,13 +62,13 @@
     "symbol": "!",
     "color": "white",
     "use_action": "ANTIBIOTIC",
-    "flags": "NPC_SAFE"
+    "flags": [ "NPC_SAFE" ]
   },
   {
     "id": "antifungal",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "antifungal drug",
+    "name": { "str": "antifungal drug" },
     "description": "Powerful chemical tablets designed to eliminate fungal infections in living creatures.",
     "weight": "1 g",
     "volume": "250 ml",
@@ -80,7 +79,7 @@
     "symbol": "!",
     "color": "white",
     "use_action": "ANTIFUNGAL",
-    "flags": "NPC_SAFE"
+    "flags": [ "NPC_SAFE" ]
   },
   {
     "id": "antiparasitic",
diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json
index d5d73d6249337..078c1bb8a6ac2 100644
--- a/data/json/items/comestibles/mutagen.json
+++ b/data/json/items/comestibles/mutagen.json
@@ -496,7 +496,7 @@
     "type": "COMESTIBLE",
     "id": "arm",
     "category": "other",
-    "name": "mutated arm",
+    "name": { "str": "mutated arm" },
     "weight": "3767 g",
     "color": "brown",
     "spoils_in": "2 days",
diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json
index 85403756aa7a9..609d51af2bb6e 100644
--- a/data/json/items/comestibles/raw_fruit.json
+++ b/data/json/items/comestibles/raw_fruit.json
@@ -2,7 +2,7 @@
   {
     "type": "COMESTIBLE",
     "id": "apple",
-    "name": "apple",
+    "name": { "str": "apple" },
     "weight": "182 g",
     "color": "red",
     "spoils_in": "6 days 16 hours",