feat(content): dog and cat food can be made out of a lot more ingredi…

…ents (#4646) * feat(content): dog and catfood can be made out of a lot more ingredients * Update other.json * Update other.json * testy * Update other.json
cataclysmbnteam · May 13, 2024 · 20361f5 · 20361f5
1 parent d7f62f8
commit 20361f5
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 15 deletions.
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -631,7 +631,7 @@
     "symbol": ";",
     "healthy": 2,
     "quench": 2,
-    "calories": 450,
+    "calories": 350,
     "vitamins": [ [ "vitC", 4 ], [ "iron", 17 ], [ "vitB", 187 ], [ "calcium", 0 ] ],
     "fun": -15,
     "color": "brown",
@@ -655,7 +655,7 @@
     "symbol": ";",
     "healthy": 2,
     "quench": 2,
-    "calories": 800,
+    "calories": 600,
     "vitamins": [ [ "vitC", 4 ], [ "iron", 17 ], [ "vitB", 187 ], [ "calcium", 0 ] ],
     "fun": -15,
     "color": "brown",

diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json
@@ -244,8 +244,13 @@
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ],
     "components": [
-      [ [ "meat_red", 1, "LIST" ], [ "fish", 1 ] ],
-      [ [ "veggy", 1 ], [ "veggy_wild", 1 ] ],
+      [
+        [ "meat_sausage_cooked", 1, "LIST" ],
+        [ "meat_sausage_raw", 1, "LIST" ],
+        [ "fish", 1 ],
+        [ "fishs_cooked", 1, "LIST" ]
+      ],
+      [ [ "veggy_any", 1, "LIST" ] ],
       [ [ "water", 1 ], [ "water_clean", 1 ] ]
     ]
   },
@@ -261,7 +266,15 @@
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ],
-    "components": [ [ [ "meat_red", 2, "LIST" ], [ "fish", 2 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+    "components": [
+      [
+        [ "meat_sausage_cooked", 1, "LIST" ],
+        [ "meat_sausage_raw", 1, "LIST" ],
+        [ "fish", 1 ],
+        [ "fishs_cooked", 1, "LIST" ]
+      ],
+      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -1732,8 +1745,13 @@
     "components": [
       [ [ "water", 11 ], [ "water_clean", 11 ] ],
       [ [ "jar_glass", 1 ] ],
-      [ [ "meat", 1 ], [ "fish", 1 ] ],
-      [ [ "veggy", 1 ], [ "veggy_wild", 1 ] ]
+      [
+        [ "meat_sausage_cooked", 1, "LIST" ],
+        [ "meat_sausage_raw", 1, "LIST" ],
+        [ "fish", 1 ],
+        [ "fishs_cooked", 1, "LIST" ]
+      ],
+      [ [ "veggy_any", 1, "LIST" ] ]
     ]
   },
   {
@@ -1758,9 +1776,14 @@
     "components": [
       [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ] ],
-      [ [ "meat", 1 ], [ "fish", 1 ] ],
-      [ [ "veggy", 1 ], [ "veggy_wild", 1 ] ]
+      [
+        [ "meat_sausage_cooked", 1, "LIST" ],
+        [ "meat_sausage_raw", 1, "LIST" ],
+        [ "fish", 1 ],
+        [ "fishs_cooked", 1, "LIST" ]
+      ],
+      [ [ "veggy_any", 1, "LIST" ] ],
+      [ [ "water", 1 ], [ "water_clean", 1 ] ]
     ]
   },
   {
@@ -1782,8 +1805,13 @@
     "components": [
       [ [ "water", 16 ], [ "water_clean", 16 ] ],
       [ [ "jar_3l_glass", 1 ] ],
-      [ [ "meat", 6 ], [ "fish", 6 ] ],
-      [ [ "veggy", 6 ], [ "veggy_wild", 6 ] ]
+      [
+        [ "meat_sausage_cooked", 6, "LIST" ],
+        [ "meat_sausage_raw", 6, "LIST" ],
+        [ "fish", 6 ],
+        [ "fishs_cooked", 6, "LIST" ]
+      ],
+      [ [ "veggy_any", 6, "LIST" ] ]
     ]
   },
   {
@@ -1802,7 +1830,16 @@
     "result_mult": 2,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [ [ [ "water", 11 ], [ "water_clean", 11 ] ], [ [ "jar_glass", 1 ] ], [ [ "meat", 4 ], [ "fish", 4 ] ] ]
+    "components": [
+      [ [ "water", 11 ], [ "water_clean", 11 ] ],
+      [ [ "jar_glass", 1 ] ],
+      [
+        [ "meat_sausage_cooked", 4, "LIST" ],
+        [ "meat_sausage_raw", 4, "LIST" ],
+        [ "fish", 4 ],
+        [ "fishs_cooked", 4, "LIST" ]
+      ]
+    ]
   },
   {
     "type": "recipe",
@@ -1827,7 +1864,12 @@
       [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
       [ [ "water", 1 ], [ "water_clean", 1 ] ],
-      [ [ "meat", 2 ], [ "fish", 2 ] ]
+      [
+        [ "meat_sausage_cooked", 1, "LIST" ],
+        [ "meat_sausage_raw", 1, "LIST" ],
+        [ "fish", 1 ],
+        [ "fishs_cooked", 1, "LIST" ]
+      ]
     ]
   },
   {
@@ -1846,7 +1888,16 @@
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "meat", 24 ], [ "fish", 24 ] ] ]
+    "components": [
+      [ [ "water", 16 ], [ "water_clean", 16 ] ],
+      [ [ "jar_3l_glass", 1 ] ],
+      [
+        [ "meat_sausage_cooked", 24, "LIST" ],
+        [ "meat_sausage_raw", 24, "LIST" ],
+        [ "fish", 24 ],
+        [ "fishs_cooked", 24, "LIST" ]
+      ]
+    ]
   },
   {
     "type": "recipe",