Add poultry meat (CleverRaven#70934)

* I have no idea what I am doing * scraps, harvest * lots of bugs * seperate reg and fatty smoked * edit requirements and barebones new recipes * calorie fix * chicken dishes * recipes, 5 of 7 * reconfigure item id for easy searching and autofill * recipes, 8 of 7 * lint * lint * migrate sandwich to sandwich.json, and remove the possibility of egg * revert mystery reverts * calorie is a number not a string * fix load errors * attempt fix density and cal * attempt cal fix 2 * attempt cal fix 3 * just work already ya bastard * apply suggestions from review * lint Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * redo nutrition, remove fatty poultry, shuffle json * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/meat_dishes.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * lint * lint * fix typo * revert all changes to bird.json * add missing scrap cooking recipe, recalculate cooking heat * missing rename * add missing prices * cleanup remainder of waterfowl group * rectify mystery reverts --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
XygenSS · Apr 27, 2024 · 150fdfe · 150fdfe
1 parent 27b977e
commit 150fdfe
Show file tree

Hide file tree

Showing 8 changed files with 592 additions and 10 deletions.
diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -1107,7 +1107,7 @@
  "id": "bird_tiny",
  "type": "harvest",
  "entries": [
- { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.4 },
+ { "drop": "poultry_scrap", "type": "flesh", "mass_ratio": 0.4 },
  { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
  { "drop": "feather", "type": "skin", "mass_ratio": 0.01 },
  { "drop": "down_feather", "type": "skin", "mass_ratio": 0.005 }
@@ -1117,9 +1117,9 @@
  "id": "bird_small",
  "type": "harvest",
  "entries": [
- { "drop": "meat", "type": "flesh", "mass_ratio": 0.3 },
+ { "drop": "poultry", "type": "flesh", "mass_ratio": 0.3 },
  { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
- { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.05 },
+ { "drop": "poultry_scrap", "type": "flesh", "mass_ratio": 0.05 },
  { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
  { "drop": "feather", "type": "skin", "mass_ratio": 0.01 },
  { "drop": "down_feather", "type": "skin", "mass_ratio": 0.005 }
@@ -1129,9 +1129,9 @@
  "id": "bird_large",
  "type": "harvest",
  "entries": [
- { "drop": "meat", "type": "flesh", "mass_ratio": 0.3 },
+ { "drop": "poultry", "type": "flesh", "mass_ratio": 0.3 },
  { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
- { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.03 },
+ { "drop": "poultry_scrap", "type": "flesh", "mass_ratio": 0.03 },
  { "drop": "fat", "type": "flesh", "mass_ratio": 0.18 },
  { "drop": "feather", "type": "skin", "mass_ratio": 0.02 },
  { "drop": "down_feather", "type": "skin", "mass_ratio": 0.01 },

diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -2075,5 +2075,106 @@
  "volume": "250 ml",
  "fun": -10,
  "flags": [ "NO_SALVAGE" ]
+ },
+ {
+ "id": "poultry",
+ "copy-from": "flesh",
+ "type": "COMESTIBLE",
+ "name": { "str": "chunk of poultry meat", "str_pl": "chunks of poultry meat" },
+ "description": "A chunk of raw meat from a bird. Dangerous to eat as-is.",
+ "weight": "104 g",
+ "volume": "100 ml",
+ "price": "3 USD",
+ "price_postapoc": "25 cent",
+ "spoils_in": "1 day",
+ "calories": 220,
+ "//": "Scaled from 100g skin on, boneless, wild duck meat from USDA database",
+ "fun": -18,
+ "cooks_like": "meat_cooked",
+ "vitamins": [ [ "calcium", "5 mg" ], [ "iron", "5 mg" ] ],
+ "flags": [ "SMOKABLE", "RAW", "PREDATOR_FUN" ],
+ "smoking_result": "poultry_smoked"
+ },
+ {
+ "id": "poultry_scrap",
+ "copy-from": "poultry",
+ "type": "COMESTIBLE",
+ "name": { "str": "scrap of poultry meat", "str_pl": "scraps of poultry meat" },
+ "description": "A tiny scrap of raw meat from a bird. You figure that one of these should be about one fifth of a portion. Dangerous to eat as-is.",
+ "cooks_like": "meat_scrap_cooked",
+ "proportional": { "weight": 0.2, "volume": 0.2, "price_postapoc": 0.2, "calories": 0.2 },
+ "delete": { "flags": [ "SMOKABLE" ] },
+ "vitamins": [ [ "calcium", "1 mg" ], [ "iron", "1 mg" ] ]
+ },
+ {
+ "id": "poultry_cooked",
+ "copy-from": "flesh",
+ "weight": "94 g",
+ "volume": "90 ml",
+ "spoils_in": "2 days",
+ "type": "COMESTIBLE",
+ "name": { "str_sp": "cooked poultry" },
+ "description": "A chunk of bird meat that has been cooked. Nutritious and safe to eat, but a bit bland.",
+ "price": "4 USD",
+ "price_postapoc": "1 USD",
+ "parasites": 0,
+ "calories": 220,
+ "fun": 1,
+ "vitamins": [ [ "calcium", "5 mg" ], [ "iron", "5 mg" ] ],
+ "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
+ },
+ {
+ "id": "poultry_pepper",
+ "copy-from": "flesh",
+ "weight": "104 g",
+ "volume": "100 ml",
+ "spoils_in": "2 days",
+ "type": "COMESTIBLE",
+ "name": { "str_sp": "cooked pepper poultry" },
+ "description": "A cut of bird meat that has been cooked with salt and pepper. The simple addition of spices has made it much more palatable.",
+ "price": "5 USD",
+ "price_postapoc": "2 USD",
+ "fun": 3,
+ "parasites": 0,
+ "calories": 220,
+ "vitamins": [ [ "calcium", "5 mg" ], [ "iron", "5 mg" ] ],
+ "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
+ },
+ {
+ "id": "poultry_scrap_cooked",
+ "copy-from": "poultry_scrap",
+ "type": "COMESTIBLE",
+ "name": { "str": "cooked scrap of poultry", "str_pl": "cooked scraps of poultry" },
+ "description": "A tiny scrap of cooked meat from a bird. Not very filling, and a bit bland.",
+ "parasites": 0,
+ "fun": 1,
+ "flags": [ "NUTRIENT_OVERRIDE" ],
+ "calories": 55,
+ "vitamins": [ [ "calcium", "1 mg" ], [ "iron", "1 mg" ] ]
+ },
+ {
+ "id": "poultry_scrap_pepper",
+ "copy-from": "poultry_scrap",
+ "type": "COMESTIBLE",
+ "name": { "str": "cooked pepper scrap of poultry", "str_pl": "cooked pepper scraps of poultry" },
+ "description": "A tiny scrap of cooked bird meat, seasoned with simple spices. Makes for a nice high-protein snack.",
+ "parasites": 0,
+ "fun": 3,
+ "flags": [ "NUTRIENT_OVERRIDE" ],
+ "calories": 55,
+ "vitamins": [ [ "calcium", "1 mg" ], [ "iron", "1 mg" ] ]
+ },
+ {
+ "id": "poultry_smoked",
+ "copy-from": "meat_smoked",
+ "type": "COMESTIBLE",
+ "name": { "str_sp": "chicken jerky" },
+ "weight": "65 g",
+ "description": "Strip of bird meat that has been heavily smoked for preservation. It could be further smoked to dehydrate it completely.",
+ "color": "brown",
+ "calories": 220,
+ "price_postapoc": "4 USD",
+ "flags": [ "EATEN_HOT", "SMOKED", "SMOKABLE" ],
+ "smoking_result": "dry_poultry"
  }
 ]
diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
@@ -1554,6 +1554,15 @@
  "volume": "25 ml",
  "flags": [ "EDIBLE_FROZEN" ]
  },
+ {
+ "type": "COMESTIBLE",
+ "id": "dry_poultry",
+ "name": { "str_sp": "dehydrated chicken" },
+ "copy-from": "dry_meat",
+ "color": "white",
+ "description": "Dehydrated flakes of bird meat. With proper storage, this dried food will remain edible for an incredibly long time.",
+ "calories": 240
+ },
  {
  "type": "COMESTIBLE",
  "id": "rehydrated_froglegs",
@@ -1565,6 +1574,17 @@
  "price_postapoc": "3 USD",
  "fun": 2
  },
+ {
+ "type": "COMESTIBLE",
+ "id": "rehydrated_poultry",
+ "name": { "str_sp": "rehydrated chicken" },
+ "copy-from": "poultry_cooked",
+ "color": "light_red",
+ "description": "Reconstituted bird meat, which are much more enjoyable to eat now that they have been rehydrated.",
+ "price": 600,
+ "price_postapoc": 300,
+ "fun": 2
+ },
  {
  "type": "COMESTIBLE",
  "id": "rehydrated_meat",
@@ -1891,5 +1911,95 @@
  "volume": "240 ml",
  "flags": [ "EATEN_HOT", "FREEZERBURN" ],
  "fun": 4
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "chicken_fried",
+ "name": { "str_sp": "fried chicken" },
+ "weight": "181 g",
+ "volume": "250 ml",
+ "price": "3 USD",
+ "spoils_in": "4 days",
+ "container": "box_small",
+ "comestible_type": "FOOD",
+ "symbol": "%",
+ "calories": 440,
+ "description": "A delicious golden-brown serving of crispy fried chicken.",
+ "fun": 14,
+ "vitamins": [ [ "calcium", "24 mg" ], [ "iron", "2 mg" ] ]
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "chicken_fried_buttermilk",
+ "name": { "str_sp": "buttermilk fried chicken" },
+ "weight": "181 g",
+ "volume": "250 ml",
+ "price": "4 USD",
+ "spoils_in": "4 days",
+ "container": "box_small",
+ "comestible_type": "FOOD",
+ "symbol": "%",
+ "calories": 500,
+ "description": "Brined in buttermilk, seasoned and breaded to perfection, and fried until crispy and golden. This fried chicken is so good you can almost forget about the end of the world. Vinegar leg is on the right!",
+ "fun": 25,
+ "vitamins": [ [ "calcium", "24 mg" ], [ "iron", "2 mg" ] ]
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "chicken_tandoori",
+ "name": { "str": "tandoori chicken" },
+ "weight": "200 g",
+ "color": "brown",
+ "spoils_in": "4 days",
+ "comestible_type": "FOOD",
+ "symbol": "%",
+ "calories": 400,
+ "description": "Originating from Punjabi cuisine, this deep-red and spicy baked chicken is marinated with a yogurt-based sauce and is traditionally baked directly on the walls of a wood-fired clay oven.",
+ "price": 1000,
+ "price_postapoc": 340,
+ "material": [ "flesh", "milk" ],
+ "primary_material": "flesh",
+ "volume": "250 ml",
+ "flags": [ "EATEN_HOT", "ALLERGEN_MILK" ],
+ "fun": 18,
+ "vitamins": [ [ "calcium", "105 mg" ], [ "iron", "1 mg" ] ]
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "chicken_rice_hianese",
+ "name": { "str": "Hinanese chicken rice" },
+ "weight": "195 g",
+ "color": "brown",
+ "spoils_in": "2 days",
+ "comestible_type": "FOOD",
+ "symbol": "%",
+ "calories": 403,
+ "description": "This delicious serving of poached chicken with rice is one of the national dishes of Singapore.",
+ "price": 1000,
+ "price_postapoc": 250,
+ "material": [ "flesh", "veggy" ],
+ "volume": "250 ml",
+ "flags": [ "EATEN_HOT" ],
+ "fun": 18,
+ "vitamins": [ [ "calcium", "108 mg" ] ]
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "chicken_parm",
+ "name": { "str": "chicken parmesan" },
+ "weight": "250 g",
+ "color": "brown",
+ "spoils_in": "1 day",
+ "comestible_type": "FOOD",
+ "symbol": "%",
+ "calories": 620,
+ "description": "A classic Italian-American dish of breaded and fried chicken atop a bed of pasta, enrobed with tomato sauce and cheese.",
+ "price": 1000,
+ "price_postapoc": 250,
+ "material": [ "flesh", "wheat", "veggy" ],
+ "volume": "250 ml",
+ "flags": [ "EATEN_HOT" ],
+ "fun": 18,
+ "vitamins": [ [ "calcium", "423 mg" ], [ "iron", "8 mg" ] ]
  }
 ]
diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json
@@ -942,5 +942,45 @@
  "flags": [ "EATEN_HOT" ],
  "fun": 8,
  "vitamins": [ [ "vitC", 10 ], [ "calcium", 7 ], [ "iron", 18 ] ]
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "chicken_sandwich",
+ "name": { "str": "chicken sandwich", "str_pl": "chicken sandwiches" },
+ "weight": "187 g",
+ "color": "brown",
+ "spoils_in": "2 days",
+ "container": "wrapper",
+ "comestible_type": "FOOD",
+ "symbol": "%",
+ "calories": 468,
+ "description": "A sandwich of crispy fried chicken topped with condiments and veggies. Also called chicken burger, or chicken on a bun.",
+ "price": 1000,
+ "price_postapoc": 250,
+ "material": [ "flesh", "wheat", "veggy" ],
+ "volume": "250 ml",
+ "flags": [ "EATEN_HOT" ],
+ "fun": 17,
+ "vitamins": [ [ "calcium", "108 mg" ], [ "iron", "3 mg" ] ]
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "chicken_sandwich_wheat_free",
+ "name": { "str": "wheat-free chicken sandwich", "str_pl": "wheat-free chicken sandwiches" },
+ "weight": "187 g",
+ "color": "brown",
+ "spoils_in": "2 days",
+ "container": "wrapper",
+ "comestible_type": "FOOD",
+ "symbol": "%",
+ "calories": 468,
+ "description": "A wheat-free sandwich of crispy fried chicken topped with condiments and veggies.",
+ "price": 1000,
+ "price_postapoc": 250,
+ "material": [ "flesh", "veggy" ],
+ "volume": "250 ml",
+ "flags": [ "EATEN_HOT" ],
+ "fun": 17,
+ "vitamins": [ [ "calcium", "108 mg" ], [ "iron", "3 mg" ] ]
  }
 ]
diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
@@ -561,5 +561,29 @@
  "flags": [ "EDIBLE_FROZEN" ],
  "vitamins": [ [ "iron", 2 ] ],
  "fun": -10
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "coqauvin",
+ "looks_like": "soup_dumplings",
+ "name": { "str_sp": "coq au vin" },
+ "weight": "263 g",
+ "color": "light_gray",
+ "spoils_in": "3 days",
+ "comestible_type": "DRINK",
+ "symbol": "~",
+ "quench": 8,
+ "calories": 580,
+ "description": "Frenchy chicken stew braised with red wine.",
+ "price": 500,
+ "price_postapoc": 100,
+ "material": [ "flesh", "veggy" ],
+ "primary_material": "flesh",
+ "volume": "500 ml",
+ "charges": 2,
+ "phase": "liquid",
+ "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
+ "vitamins": [ [ "vitC", "7 mg" ], [ "iron", "23 mg" ] ],
+ "fun": 16
  }
 ]