Merge pull request #37313 from snipercup/Comestible-modern-json2

Comestible-modern-json 2
CleverRaven · Jan 23, 2020 · 7476d27 · 7476d27
2 parents aeb3a51 + 1c38996
commit 7476d27
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
   {
     "type": "COMESTIBLE",
     "id": "apple",
-    "name": "apple",
+    "name": { "str": "apple" },
     "weight": "182 g",
     "color": "red",
     "spoils_in": "6 days 16 hours",