feat(UI): item category audit for comestibles (#6046)

feat(UI): more implementation of `cooking_ingredients` item category
cataclysmbnteam · Feb 3, 2025 · c7ddf60 · c7ddf60
1 parent e1b11b1
commit c7ddf60
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 1 deletion.
diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json
@@ -2,6 +2,7 @@
   {
     "type": "COMESTIBLE",
     "abstract": "brew_base",
+    "category": "cooking_ingredients",
     "name": "base brew",
     "price": "0 cent",
     "price_postapoc": "10 cent",

diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -560,6 +560,7 @@
   {
     "type": "COMESTIBLE",
     "id": "blood",
+    "category": "other",
     "name": { "str_sp": "blood" },
     "weight": "265 g",
     "color": "red",
@@ -667,6 +668,7 @@
   {
     "type": "COMESTIBLE",
     "id": "fat",
+    "category": "cooking_ingredients",
     "name": { "str": "chunk of fat", "str_pl": "chunks of fat" },
     "weight": "220 g",
     "color": "pink",
@@ -690,6 +692,7 @@
   {
     "type": "COMESTIBLE",
     "id": "tallow",
+    "category": "cooking_ingredients",
     "name": "tallow",
     "weight": "110 g",
     "color": "white",
@@ -1046,6 +1049,7 @@
   {
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
+    "category": "other",
     "id": "flesh_golem_heart",
     "name": "seeping heart",
     "weight": "2035 g",
@@ -1066,6 +1070,7 @@
   {
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
+    "category": "other",
     "id": "jabberwock_heart",
     "name": "putrid heart",
     "weight": "4535 g",
@@ -1086,6 +1091,7 @@
   {
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
+    "category": "other",
     "id": "jabberwock_heart_desiccated",
     "name": "desiccated putrid heart",
     "weight": "1360 g",
@@ -1115,6 +1121,7 @@
   {
     "id": "leech_flower",
     "type": "COMESTIBLE",
+    "category": "drugs",
     "comestible_type": "FOOD",
     "name": "leech flower",
     "color": "blue",

diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
@@ -2,6 +2,7 @@
   {
     "type": "COMESTIBLE",
     "id": "sauce_red",
+    "category": "cooking_ingredients",
     "name": "red sauce",
     "weight": "64 g",
     "color": "red",
@@ -49,6 +50,7 @@
   },
   {
     "id": "mayonnaise",
+    "category": "cooking_ingredients",
     "type": "COMESTIBLE",
     "symbol": "~",
     "color": "white",
@@ -70,6 +72,7 @@
   },
   {
     "id": "ketchup",
+    "category": "cooking_ingredients",
     "type": "COMESTIBLE",
     "symbol": "~",
     "color": "red",
@@ -91,6 +94,7 @@
   },
   {
     "id": "mustard",
+    "category": "cooking_ingredients",
     "type": "COMESTIBLE",
     "symbol": "~",
     "color": "yellow",
@@ -112,6 +116,7 @@
   },
   {
     "id": "honey_bottled",
+    "category": "cooking_ingredients",
     "type": "COMESTIBLE",
     "symbol": "~",
     "color": "yellow",
@@ -134,6 +139,7 @@
   },
   {
     "id": "peanutbutter",
+    "category": "cooking_ingredients",
     "type": "COMESTIBLE",
     "symbol": "~",
     "color": "brown",
@@ -165,6 +171,7 @@
   {
     "type": "COMESTIBLE",
     "id": "vinegar",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "vinegar" },
     "weight": "15 g",
     "color": "white",
@@ -184,6 +191,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cooking_oil",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "vegetable cooking oil" },
     "weight": "15 g",
     "color": "yellow",
@@ -207,6 +215,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cooking_oil2",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "animal cooking oil" },
     "//": "Can't copy-from the vegetable oil because it extends vitamins instead of overwriting them",
     "weight": "15 g",
@@ -230,6 +239,7 @@
   },
   {
     "type": "COMESTIBLE",
+    "category": "cooking_ingredients",
     "id": "molasses",
     "name": { "str_sp": "molasses" },
     "weight": "89 g",
@@ -253,6 +263,7 @@
   },
   {
     "id": "horseradish",
+    "category": "cooking_ingredients",
     "type": "COMESTIBLE",
     "symbol": "~",
     "color": "white",
@@ -275,6 +286,7 @@
   },
   {
     "type": "COMESTIBLE",
+    "category": "cooking_ingredients",
     "id": "coffee_syrup",
     "name": { "str_sp": "coffee syrup" },
     "weight": "32 g",

diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
@@ -202,6 +202,7 @@
   {
     "type": "COMESTIBLE",
     "id": "jam_fruit",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "jam" },
     "conditional_names": [
       { "type": "COMPONENT_ID", "condition": "apple", "name": { "str_sp": "apple %s" } },

diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
@@ -87,6 +87,7 @@
   {
     "type": "COMESTIBLE",
     "id": "kernels",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "popcorn kernels" },
     "weight": "32 g",
     "color": "brown",
@@ -418,6 +419,7 @@
   {
     "type": "COMESTIBLE",
     "id": "syrup",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "maple syrup" },
     "weight": "21 g",
     "color": "brown",
@@ -438,6 +440,7 @@
   },
   {
     "type": "COMESTIBLE",
+    "category": "cooking_ingredients",
     "id": "beet_syrup",
     "name": { "str_sp": "sugar beet syrup" },
     "weight": "15 g",

diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json
@@ -385,6 +385,7 @@
   {
     "type": "COMESTIBLE",
     "id": "acorns",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "acorns" },
     "weight": "30 g",
     "color": "brown",
@@ -407,6 +408,7 @@
   {
     "type": "COMESTIBLE",
     "id": "acorn_roasted",
+    "category": "food",
     "name": { "str_sp": "roasted acorns" },
     "copy-from": "acorns",
     "healthy": 1,

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -35,6 +35,7 @@
   {
     "type": "COMESTIBLE",
     "id": "honeycomb",
+    "category": "cooking_ingredients",
     "name": "honey comb",
     "weight": "150 g",
     "color": "yellow",
@@ -53,6 +54,7 @@
   {
     "type": "COMESTIBLE",
     "id": "wax",
+    "category": "other",
     "name": { "str_pl": "waxes", "str": "wax" },
     "weight": "97 g",
     "color": "white",
@@ -71,7 +73,7 @@
     "type": "COMESTIBLE",
     "id": "royal_jelly",
     "name": { "str": "royal jelly", "str_pl": "royal jellies" },
-    "category": "food",
+    "category": "drugs",
     "weight": "150 g",
     "color": "white",
     "comestible_type": "FOOD",
@@ -182,6 +184,7 @@
   {
     "type": "COMESTIBLE",
     "id": "meal_bone",
+    "category": "other",
     "name": { "str_sp": "bone meal" },
     "weight": "112 g",
     "color": "white",
@@ -199,6 +202,7 @@
   {
     "type": "COMESTIBLE",
     "id": "meal_bone_tainted",
+    "category": "other",
     "name": { "str_sp": "tainted bone meal" },
     "weight": "112 g",
     "color": "white",
@@ -218,6 +222,7 @@
   {
     "type": "COMESTIBLE",
     "id": "meal_chitin_piece",
+    "category": "other",
     "name": { "str_sp": "chitin powder" },
     "weight": "112 g",
     "color": "brown",
@@ -276,6 +281,7 @@
   {
     "type": "COMESTIBLE",
     "id": "dry_beans",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "dried beans" },
     "weight": "56 g",
     "color": "light_gray",
@@ -422,6 +428,7 @@
   {
     "type": "COMESTIBLE",
     "id": "dry_lentils",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "dried lentils" },
     "weight": "132 g",
     "color": "light_gray",
@@ -462,6 +469,7 @@
   {
     "type": "COMESTIBLE",
     "id": "lentils_cooked",
+    "category": "food",
     "name": { "str_sp": "cooked lentils" },
     "weight": "198 g",
     "copy-from": "dry_lentils",
@@ -478,6 +486,7 @@
   {
     "type": "COMESTIBLE",
     "id": "coffee_raw",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "coffee powder" },
     "weight": "14 g",
     "color": "brown",
@@ -512,6 +521,7 @@
   {
     "id": "honey_glassed",
     "type": "COMESTIBLE",
+    "category": "cooking_ingredients",
     "symbol": "~",
     "color": "yellow",
     "name": { "str_sp": "candied honey" },
@@ -554,6 +564,7 @@
   {
     "type": "COMESTIBLE",
     "id": "human_brain_embalmed",
+    "category": "other",
     "name": { "str": "embalmed human brain" },
     "weight": "56 g",
     "color": "pink",
@@ -584,6 +595,7 @@
   {
     "id": "cattlefodder",
     "type": "COMESTIBLE",
+    "category": "tools_farming",
     "comestible_type": "FOOD",
     "name": { "str_sp": "cattle fodder" },
     "description": "What cattle eat.  Mainly made of grass, silage or legumes.  It's perfect for ruminants.",
@@ -607,6 +619,7 @@
   {
     "id": "birdfood",
     "type": "COMESTIBLE",
+    "category": "tools_farming",
     "comestible_type": "FOOD",
     "name": { "str_sp": "bird food" },
     "description": "What birds eat.  Mainly made of seeds, silage or legumes.  It's perfect for small birds.",
@@ -629,6 +642,7 @@
   {
     "id": "dogfood",
     "type": "COMESTIBLE",
+    "category": "tools_farming",
     "comestible_type": "FOOD",
     "name": { "str_sp": "dog food" },
     "description": "This is food for dogs.  It smells strange, but dogs seem to love it.",
@@ -654,6 +668,7 @@
   {
     "id": "catfood",
     "type": "COMESTIBLE",
+    "category": "tools_farming",
     "comestible_type": "FOOD",
     "name": { "str_sp": "cat food" },
     "description": "This is food for cats.  It smells strange, but cats seem to love it.",

diff --git a/data/json/items/comestibles/protein.json b/data/json/items/comestibles/protein.json
@@ -30,6 +30,7 @@
     "id": "protein_powder",
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
+    "category": "cooking_ingredients",
     "name": { "str_sp": "protein powder" },
     "conditional_names": [
       { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "soylent green powder" } },