Fixed pluralization of acorn meal/bologna/bone meal/cornmeal/detergen…

…t/herring/oatmeal/yeast (#37375) * Fixed pluralization of bone/acorn/corn/oatmeal and yeast. * used new plural form, and added bologna and detergent plurals
CleverRaven · Jan 25, 2020 · 175cf62 · 175cf62
1 parent 075afa3
commit 175cf62
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -1128,7 +1128,7 @@
     "id": "detergent",
     "category": "chems",
     "price": 1000,
-    "name": "detergent",
+    "name": { "str": "detergent", "str_pl": "detergent" },
     "symbol": "=",
     "color": "white",
     "description": "A popular pre-Cataclysm washing powder.",

diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
@@ -363,7 +363,7 @@
   {
     "type": "COMESTIBLE",
     "id": "bologna",
-    "name": "bologna",
+    "name": { "str": "bologna", "str_pl": "bologna" },
     "conditional_names": [
       { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "brat %s", "str_pl": "brat %s" } },
       { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "bleak %s", "str_pl": "bleak %s" } }
@@ -660,7 +660,7 @@
   {
     "type": "COMESTIBLE",
     "id": "can_herring",
-    "name": "pickled herring",
+    "name": { "str": "pickled herring", "str_pl": "pickled herring" },
     "weight": "232 g",
     "color": "white",
     "spoils_in": "4 days",

diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json
@@ -447,7 +447,7 @@
   {
     "type": "COMESTIBLE",
     "id": "acorns_cooked",
-    "name": { "str": "cooked acorn meal" },
+    "name": { "str": "cooked acorn meal", "str_pl": "cooked acorn meal" },
     "weight": "22 g",
     "color": "brown",
     "spoils_in": "30 days",

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -153,7 +153,7 @@
   {
     "type": "COMESTIBLE",
     "id": "yeast",
-    "name": "yeast",
+    "name": { "str": "yeast", "str_pl": "yeast" },
     "weight": "11 g",
     "color": "white",
     "container": "bag_plastic",
@@ -172,7 +172,7 @@
   {
     "type": "COMESTIBLE",
     "id": "meal_bone",
-    "name": "bone meal",
+    "name": { "str": "bone meal", "str_pl": "bone meal" },
     "weight": "112 g",
     "color": "white",
     "comestible_type": "FOOD",
@@ -188,7 +188,7 @@
   {
     "type": "COMESTIBLE",
     "id": "meal_bone_tainted",
-    "name": "tainted bone meal",
+    "name": { "str": "tainted bone meal", "str_pl": "tainted bone meal" },
     "weight": "112 g",
     "color": "white",
     "use_action": "POISON",

diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
@@ -134,7 +134,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cornmeal",
-    "name": "cornmeal",
+    "name": { "str": "cornmeal", "str_pl": "cornmeal" },
     "weight": "19 g",
     "color": "yellow",
     "spoils_in": "360 days",

diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json
@@ -167,7 +167,7 @@
   {
     "type": "COMESTIBLE",
     "id": "oatmeal",
-    "name": "oatmeal",
+    "name": { "str": "oatmeal", "str_pl": "oatmeal" },
     "weight": "25 g",
     "color": "light_gray",
     "spoils_in": "360 days",
@@ -208,7 +208,7 @@
   {
     "type": "COMESTIBLE",
     "id": "oatmeal_cooked",
-    "name": "cooked oatmeal",
+    "name": { "str": "cooked oatmeal", "str_pl": "cooked oatmeal" },
     "weight": "247 g",
     "color": "light_gray",
     "spoils_in": "10 days",
@@ -228,6 +228,7 @@
     "type": "COMESTIBLE",
     "id": "oatmeal_deluxe",
     "name": "deluxe cooked oatmeal",
+    "name_plural": "deluxe cooked oatmeal",
     "weight": "164 g",
     "color": "light_gray",
     "spoils_in": "10 days",