seperate reg and fatty smoked

CleverRaven · Mar 16, 2024 · d257656 · d257656
1 parent 279560b
commit d257656
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -2083,7 +2083,6 @@
     "calories": 240,
     "//": "Scaled from 100g boneless chicken thigh according to USDA database",
     "fun": -20,
-    "cooks_like": "meat_cooked",
     "vitamins": [ [ "calcium", "9 mg 6 mcg" ], [ "iron", "960 mcg" ] ],
     "smoking_result": "poultry_smoked"
   },
@@ -2097,9 +2096,8 @@
     "calories": 594,
     "//": "Scaled from 100g skin-on goose according to USDA database",
     "fun": -20,
-    "cooks_like": "meat_cooked",
     "vitamins": [ [ "calcium", "19 mg 200 mcg" ], [ "iron", "4 mg" ] ],
-    "smoking_result": "poultry_smoked"
+    "smoking_result": "poultry_fatty_smoked"
   },
   {
     "id": "poultry_scrap",
@@ -2141,8 +2139,6 @@
     "type": "COMESTIBLE",
     "name": { "str": "cooked scrap of chicken", "str_pl": "cooked scraps of chicken" },
     "description": "A tiny scrap of cooked bird.  It's not much, but it'll do in a pinch.",
-    "parasites": 0,
-    "fun": 0,
     "flags": [ ],
     "calories": 24
   },
@@ -2177,14 +2173,26 @@
     "id": "poultry_smoked",
     "copy-from": "meat_smoked",
     "type": "COMESTIBLE",
-    "name": { "str_sp": "smoked chicken" },
+    "name": { "str_sp": "smoked poultry" },
     "description": "Strip of bird meat that has been heavily smoked for preservation.  It could be further smoked to dehydrate it completely.",
     "color": "brown",
-    "spoils_in": "24 days",
+    "calories": 240,
     "price_postapoc": 200,
-    "quench": -1,
-    "fun": 5,
     "flags": [ "EATEN_HOT", "SMOKED", "SMOKABLE" ],
     "smoking_result": "dry_poultry"
+  },
+  {
+    "id": "poultry_fatty_smoked",
+    "copy-from": "meat_smoked",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "smoked fatty poultry" },
+    "description": "Strip of fatty waterfowl meat that has been heavily smoked for preservation.  While it certainly lasts longer, it is still full of fat which can easily go rancid.  It is also too fatty to dehydrate properly, it would be best to eat it while it lasts.",
+    "color": "brown",
+    "spoils_in": "17 days",
+    "calories": 594,
+    "price_postapoc": 200,
+    "quench": -1,
+    "fun": 5,
+    "flags": [ "EATEN_HOT", "SMOKED" ]
   }
-]
+]
diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
@@ -1342,13 +1342,19 @@
   {
     "id": "poultry_raw_any",
     "type": "requirement",
-    "//": "Any bird meat, chunks or scraps",
+    "//": "Any bird meat, 1 chunk or 10 scraps",
     "components": [ [ [ "poultry", 1 ], [ "poultry_fatty", 1 ], [ "poultry_scrap", 10 ], [ "poultry_fatty_scrap", 10 ] ] ]
   },
   {
     "id": "poultry_raw_steak",
     "type": "requirement",
     "//": "Any bird meat, chunks only",
     "components": [ [ [ "poultry", 1 ], [ "poultry_fatty", 1 ] ] ]
+  },
+  {
+    "id": "poultrys_smoked_any",
+    "type": "requirement",
+    "//": "Any smoked bird meat",
+    "components": [ [ [ "poultry_smoked", 1 ], [ "poultry_fatty_smoked", 1 ] ] ]
   }
 ]