Pet feeding tweaks (#75987)

* add raw pet food items * petfood recipe tweaks * skills used added back to pet food recipes * Apply suggestions from code review * Apply suggestions from code review --------- Co-authored-by: Maleclypse <[email protected]>
CleverRaven · Sep 30, 2024 · c6de402 · c6de402
1 parent 0f8d3f3
commit c6de402
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 20 deletions.
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -1098,6 +1098,28 @@
     "use_action": [ "PETFOOD" ],
     "petfood": [ "BIRDFOOD" ]
   },
+  {
+    "id": "dogfood_raw",
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "name": { "str_sp": "raw dog food" },
+    "description": "Minced meat mixed with some greens to be presented to a dog or something with a omnivorous diet.",
+    "weight": "430 g",
+    "spoils_in": "1 day",
+    "volume": "500 ml",
+    "price": "3 USD",
+    "price_postapoc": "2 USD 50 cent",
+    "material": [ "flesh", "veggy" ],
+    "symbol": "%",
+    "quench": 2,
+    "calories": 402,
+    "vitamins": [ [ "vitC", 4 ], [ "iron", 12 ], [ "calcium", 2 ], [ "meat_allergen", 1 ] ],
+    "fun": -15,
+    "color": "red",
+    "flags": [ "LUPINE" ],
+    "use_action": [ "PETFOOD" ],
+    "petfood": [ "DOGFOOD" ]
+  },
   {
     "id": "dogfood",
     "type": "COMESTIBLE",
@@ -1145,6 +1167,28 @@
     "use_action": [ "PETFOOD" ],
     "petfood": [ "DOGFOOD" ]
   },
+  {
+    "id": "catfood_raw",
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "name": { "str_sp": "raw cat food" },
+    "description": "Minced meat to be presented to a cat or something with a strict meat diet.",
+    "weight": "223 g",
+    "spoils_in": "1 day",
+    "volume": "250 ml",
+    "price": "3 USD",
+    "price_postapoc": "4 USD",
+    "material": [ "flesh" ],
+    "symbol": "%",
+    "quench": 2,
+    "calories": 402,
+    "vitamins": [ [ "vitC", 0 ], [ "iron", 12 ], [ "calcium", 2 ], [ "meat_allergen", 1 ] ],
+    "fun": -15,
+    "color": "red",
+    "flags": [ "FELINE" ],
+    "use_action": [ "PETFOOD" ],
+    "petfood": [ "CATFOOD" ]
+  },
   {
     "id": "catfood",
     "type": "COMESTIBLE",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -1894,16 +1894,52 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_knife_skills" } ],
     "components": [ [ [ "human_flesh", 1 ] ], [ [ "pepper", 1 ] ], [ [ "salt", 1 ], [ "seasoning_salt", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "dogfood_raw",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "time": "30 s",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "proficiencies": [ { "proficiency": "prof_knife_skills" } ],
+    "components": [
+      [ [ "meat_nofish", 1, "LIST" ], [ "fish", 1 ], [ "lobster", 1 ] ],
+      [ [ "veggy_green", 1, "LIST" ] ],
+      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "dogfood",
+    "id_suffix": "from_raw_dogfood",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 3,
+    "time": "9 m 30 s",
+    "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 12, "LIST" ] ] ],
+    "proficiencies": [ { "proficiency": "prof_food_prep" } ],
+    "components": [ [ [ "dogfood_raw", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "result": "dogfood",
+    "id_suffix": "from_ingredients",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
     "difficulty": 3,
     "time": "10 m",
     "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
     "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 12, "LIST" ] ] ],
     "//": "dogs can eat raw meat, but should cook this just to be safe. 2u for veggy, 10u for meat (red meat will be undercooked, not a big deal)",
@@ -1914,16 +1950,48 @@
       [ [ "water", 1 ], [ "water_clean", 1 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "catfood_raw",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "time": "30 s",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "proficiencies": [ { "proficiency": "prof_knife_skills" } ],
+    "components": [ [ [ "meat_nofish", 2, "LIST" ], [ "fish", 2 ], [ "lobster", 2 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "catfood",
+    "id_suffix": "from_raw_catfood",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 3,
+    "time": "9 m 30 s",
+    "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
+    "proficiencies": [ { "proficiency": "prof_food_prep" } ],
+    "components": [ [ [ "catfood_raw", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "result": "catfood",
+    "id_suffix": "from_ingredients",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
     "difficulty": 3,
     "time": "10 m",
     "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
     "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
     "//": "cats can eat raw meat, but should cook this just to be safe. 20u for meat (red meat will be undercooked, not a big deal)",
@@ -8525,13 +8593,11 @@
   {
     "result": "cattlefodder",
     "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
+    "activity_level": "NO_EXERCISE",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
-    "skill_used": "cooking",
-    "difficulty": 2,
-    "skills_required": [ "survival", 1 ],
-    "time": "10 m",
+    "skill_used": "survival",
+    "time": "1 s",
     "autolearn": true,
     "components": [
       [
@@ -8562,13 +8628,11 @@
   {
     "result": "cattlefodder_medium",
     "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
+    "activity_level": "NO_EXERCISE",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
-    "skill_used": "cooking",
-    "difficulty": 2,
-    "skills_required": [ "survival", 1 ],
-    "time": "10 m",
+    "skill_used": "survival",
+    "time": "1 s",
     "autolearn": true,
     "components": [
       [
@@ -8600,13 +8664,11 @@
   {
     "result": "cattlefodder_large",
     "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
+    "activity_level": "NO_EXERCISE",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
-    "skill_used": "cooking",
-    "difficulty": 2,
-    "skills_required": [ "survival", 1 ],
-    "time": "10 m",
+    "skill_used": "survival",
+    "time": "1 s",
     "autolearn": true,
     "components": [
       [
@@ -8638,13 +8700,11 @@
   {
     "result": "birdfood",
     "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
+    "activity_level": "NO_EXERCISE",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
-    "skill_used": "cooking",
-    "difficulty": 1,
-    "skills_required": [ "survival", 1 ],
-    "time": "2 m",
+    "skill_used": "survival",
+    "time": "1 s",
     "autolearn": true,
     "components": [
       [