From f52c2de2cd9461d5bceacc482df4fe35e74b644a Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Fri, 7 Feb 2020 08:35:23 +0100
Subject: [PATCH] Name to object, fix looks_like

---
 data/json/items/comestibles/alcohol.json | 9 +++------
 data/json/items/comestibles/other.json   | 3 +--
 data/json/items/comestibles/seed.json    | 5 ++---
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json
index 04bd7aed10790..bff17204bd439 100644
--- a/data/json/items/comestibles/alcohol.json
+++ b/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",
@@ -1103,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
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 17e46d5aa3466..177bf015b1f12 100644
--- a/data/json/items/comestibles/other.json
+++ b/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" ],
diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
index 46ec04ba666e2..8c466f89fe46e 100644
--- a/data/json/items/comestibles/seed.json
+++ b/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,