Name to object, flags to array

CleverRaven · Feb 7, 2020 · 6c48955 · 6c48955
1 parent f52c2de
commit 6c48955
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/data/json/items/chemicals_and_resources.json b/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,

diff --git a/data/json/items/comestibles/drink.json b/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",

diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
@@ -558,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",

diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
@@ -1409,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",
@@ -1421,7 +1420,7 @@
     "color": "red",
     "healthy": 25,
     "use_action": "PANACEA",
-    "flags": "NPC_SAFE"
+    "flags": [ "NPC_SAFE" ]
   },
   {
     "id": "cattail_jelly",