Broth audit (#75351)

* broth audit * peptone broth audit * recipes * more peptone weirdness * make the broth usable in recipes
CleverRaven · Aug 1, 2024 · 2b476f9 · 2b476f9
1 parent 633a598
commit 2b476f9
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 21 deletions.
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -1616,20 +1616,16 @@
  "phase": "liquid"
  },
  {
- "type": "COMESTIBLE",
+ "type": "GENERIC",
  "id": "chem_peptone_broth",
  "category": "chems",
  "price": "1 cent",
  "price_postapoc": "1 cent",
- "name": { "str_sp": "peptone broth powder" },
+ "name": { "str_sp": "peptone water powder" },
  "symbol": ";",
- "quench": -15,
- "fun": -4,
  "color": "yellow",
  "container": "bottle_plastic_small",
- "flags": [ "EDIBLE_FROZEN" ],
- "description": "A pre-mixed salty solution of protein and sugar. It's meant for bacteria to eat, but if you were desperate, you could eat it too; it's not much different from cup noodle stock.",
- "comestible_type": "INVALID",
+ "description": "A pre-mixed salty solution of protein and sugar meant for bacteria to eat.",
  "material": [ "powder" ],
  "volume": "2 ml",
  "//": "Bulk density is around 0.5 g/mL",

diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
@@ -3,15 +3,15 @@
  "type": "COMESTIBLE",
  "id": "broth",
  "looks_like": "water",
- "name": { "str_sp": "broth" },
+ "name": { "str_sp": "vegetable broth" },
  "weight": "253 g",
  "color": "yellow",
  "spoils_in": "6 days 16 hours",
  "container": "can_medium",
  "comestible_type": "DRINK",
  "symbol": "~",
  "quench": 30,
- "calories": 13,
+ "calories": 16,
  "description": "Vegetable stock. Tasty and fairly nutritious.",
  "price": "3 USD 50 cent",
  "price_postapoc": "25 cent",
@@ -21,7 +21,35 @@
  "phase": "liquid",
  "flags": [ "EATEN_HOT" ],
  "fun": 1,
- "vitamins": [ [ "iron", 3 ], [ "veggy_allergen", 1 ] ]
+ "vitamins": [ [ "veggy_allergen", 1 ] ]
+ },
+ {
+ "type": "COMESTIBLE",
+ "id": "broth_meat",
+ "looks_like": "water",
+ "name": { "str_sp": "meat broth" },
+ "conditional_names": [
+ { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "human %s" } },
+ { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "demihuman %s" } }
+ ],
+ "weight": "253 g",
+ "color": "yellow",
+ "spoils_in": "6 days 16 hours",
+ "container": "can_medium",
+ "comestible_type": "DRINK",
+ "symbol": "~",
+ "quench": 30,
+ "calories": 17,
+ "description": "Meat stock. Tasty and fairly nutritious.",
+ "price": "3 USD 50 cent",
+ "price_postapoc": "25 cent",
+ "material": [ "flesh" ],
+ "volume": "500 ml",
+ "charges": 2,
+ "phase": "liquid",
+ "flags": [ "EATEN_HOT" ],
+ "fun": 1,
+ "vitamins": [ [ "vitC", "1 mg" ], [ "iron", "1 mg" ], [ "calcium", "19 mg" ], [ "meat_allergen", 1 ] ]
  },
  {
  "type": "COMESTIBLE",
@@ -32,14 +60,14 @@
  { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "human %s" } },
  { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "demihuman %s" } }
  ],
- "weight": "267 g",
+ "weight": "253 g",
  "color": "yellow",
  "spoils_in": "6 days 16 hours",
  "container": "can_medium",
  "comestible_type": "DRINK",
  "symbol": "~",
  "quench": 30,
- "calories": 43,
+ "calories": 41,
  "description": "A tasty and nutritious broth made from bones, with added vinegar to extract more calcium.",
  "price": "3 USD 50 cent",
  "price_postapoc": "25 cent",
@@ -50,7 +78,7 @@
  "phase": "liquid",
  "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ],
  "fun": 10,
- "vitamins": [ [ "calcium", 7 ], [ "iron", 1 ], [ "meat_allergen", 1 ] ]
+ "vitamins": [ [ "calcium", 7 ], [ "iron", "200 μg" ], [ "meat_allergen", 1 ] ]
  },
  {
  "type": "COMESTIBLE",

diff --git a/data/json/obsoletion_and_migration_0.I/blacklist_temperature_removal.json b/data/json/obsoletion_and_migration_0.I/blacklist_temperature_removal.json
@@ -22,7 +22,8 @@
  "bifocal_contacts_weekly",
  "bifocal_transition_contacts_weekly",
  "butternut",
- "large_bone"
+ "large_bone",
+ "chem_peptone_broth"
  ],
  "//1": "CAUTION: this list is for items that are safe for straightforward deactivation",
  "//2": "items that may be active for additional reasons other than temperature tracking should use separate special case handling"

diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json
@@ -358,6 +358,26 @@
  "//1": "pressure canning is measured in 0.5 liter quantities, so 1u of canning_high_heat.",
  "components": [ [ [ "jar_glass_sealed", 1 ] ] ]
  },
+ {
+ "type": "recipe",
+ "activity_level": "NO_EXERCISE",
+ "result": "broth_meat",
+ "id_suffix": "jarred",
+ "byproducts": [ [ "water_clean", 2 ] ],
+ "container": "jar_glass_sealed",
+ "category": "CC_FOOD",
+ "subcategory": "CSC_FOOD_OTHER",
+ "skill_used": "cooking",
+ "difficulty": 4,
+ "time": "30 m",
+ "charges": 2,
+ "book_learn": [ [ "cookbook", 4 ], [ "manual_canning", 3 ] ],
+ "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
+ "batch_time_factors": [ 80, 4 ],
+ "using": [ [ "broth_meat_ingredients", 2 ], [ "canning_high_heat", 1, "LIST" ] ],
+ "//1": "pressure canning is measured in 0.5 liter quantities, so 1u of canning_high_heat.",
+ "components": [ [ [ "jar_glass_sealed", 1 ] ] ]
+ },
  {
  "type": "recipe",
  "activity_level": "NO_EXERCISE",
@@ -650,6 +670,26 @@
  "//1": "pressure canning is measured in 0.5 liter quantities, so 6u of canning_high_heat.",
  "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "water_clean", 10 ] ] ]
  },
+ {
+ "type": "recipe",
+ "activity_level": "NO_EXERCISE",
+ "result": "broth_meat",
+ "id_suffix": "jarred_3l",
+ "byproducts": [ [ "water_clean", 12 ] ],
+ "container": "jar_3l_glass_sealed",
+ "category": "CC_FOOD",
+ "subcategory": "CSC_FOOD_OTHER",
+ "skill_used": "cooking",
+ "difficulty": 4,
+ "time": "40 m",
+ "charges": 12,
+ "book_learn": [ [ "cookbook", 4 ], [ "manual_canning", 3 ] ],
+ "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
+ "batch_time_factors": [ 80, 4 ],
+ "using": [ [ "broth_meat_ingredients", 12 ], [ "canning_high_heat", 6, "LIST" ] ],
+ "//1": "pressure canning is measured in 0.5 liter quantities, so 6u of canning_high_heat.",
+ "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "water_clean", 10 ] ] ]
+ },
  {
  "type": "recipe",
  "activity_level": "NO_EXERCISE",
@@ -2519,6 +2559,65 @@
  "components": [ [ [ "water_clean", 13 ] ] ],
  "byproducts": [ [ "water_clean", 6 ] ]
  },
+ {
+ "type": "recipe",
+ "activity_level": "NO_EXERCISE",
+ "result": "broth_meat",
+ "id_suffix": "canned",
+ "category": "CC_FOOD",
+ "subcategory": "CSC_FOOD_OTHER",
+ "skill_used": "cooking",
+ "difficulty": 4,
+ "time": "24 m",
+ "book_learn": [ [ "manual_sealing", 3 ] ],
+ "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
+ "contained": true,
+ "batch_time_factors": [ 83, 5 ],
+ "using": [ [ "broth_meat_ingredients", 2 ], [ "canning_metal", 2, "LIST" ], [ "tincan_medium", 1 ] ],
+ "//1": "tincan canning is measured in 0.25 liter quantities, so 2u of canning_metal.",
+ "components": [ [ [ "water_clean", 3 ] ] ],
+ "byproducts": [ [ "water_clean", 6 ] ]
+ },
+ {
+ "type": "recipe",
+ "activity_level": "NO_EXERCISE",
+ "result": "broth_meat",
+ "id_suffix": "canned_small",
+ "category": "CC_FOOD",
+ "subcategory": "CSC_FOOD_OTHER",
+ "skill_used": "cooking",
+ "difficulty": 4,
+ "time": "20 m",
+ "book_learn": [ [ "manual_sealing", 3 ] ],
+ "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
+ "container": "can_food",
+ "charges": 1,
+ "batch_time_factors": [ 83, 5 ],
+ "using": [ [ "broth_meat_ingredients", 1 ], [ "canning_metal", 1, "LIST" ], [ "tincan_small", 1 ] ],
+ "//1": "tincan canning is measured in 0.25 liter quantities, so 1u of canning_metal.",
+ "components": [ [ [ "water_clean", 2 ] ] ],
+ "byproducts": [ [ "water_clean", 1 ] ]
+ },
+ {
+ "type": "recipe",
+ "activity_level": "NO_EXERCISE",
+ "result": "broth_meat",
+ "id_suffix": "canned_big",
+ "category": "CC_FOOD",
+ "subcategory": "CSC_FOOD_OTHER",
+ "skill_used": "cooking",
+ "difficulty": 4,
+ "time": "48 m",
+ "book_learn": [ [ "manual_sealing", 3 ] ],
+ "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
+ "container": "can_food_big",
+ "charges": 12,
+ "batch_time_factors": [ 83, 5 ],
+ "using": [ [ "broth_meat_ingredients", 12 ], [ "canning_metal", 12, "LIST" ], [ "tincan_large", 1 ] ],
+ "//1": "tincan canning is measured in 0.25 liter quantities, so 12u of canning_metal.",
+ "components": [ [ [ "water_clean", 13 ] ] ],
+ "byproducts": [ [ "water_clean", 6 ] ]
+ },
  {
  "type": "recipe",
  "activity_level": "NO_EXERCISE",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -3730,6 +3730,24 @@
  "//": "power usage here is 1u for the base water boiling and 2u between the ingredients and the boil time",
  "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
  },
+ {
+ "type": "recipe",
+ "activity_level": "NO_EXERCISE",
+ "result": "broth_meat",
+ "category": "CC_FOOD",
+ "subcategory": "CSC_FOOD_OTHER",
+ "skill_used": "cooking",
+ "difficulty": 2,
+ "time": "20 m",
+ "charges": 1,
+ "autolearn": true,
+ "batch_time_factors": [ 80, 4 ],
+ "qualities": [ { "id": "COOK", "level": 3 } ],
+ "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ],
+ "using": [ [ "broth_meat_ingredients", 1 ] ],
+ "//": "power usage here is 1u for the base water boiling and 2u between the ingredients and the boil time",
+ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+ },
  {
  "type": "recipe",
  "activity_level": "NO_EXERCISE",

diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
@@ -656,7 +656,7 @@
  "id": "meat_soup_ingredients",
  "type": "requirement",
  "components": [
- [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
+ [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "broth_meat", 2 ] ],
  [
  [ "veggy_potatolike", 1, "LIST" ],
  [ "celery", 1 ],
@@ -699,7 +699,7 @@
  "id": "fish_soup_ingredients",
  "type": "requirement",
  "components": [
- [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
+ [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "broth_meat", 2 ] ],
  [
  [ "spaghetti_raw", 1 ],
  [ "macaroni_raw", 1 ],
@@ -819,7 +819,7 @@
  "id": "woods_soup_ingredients",
  "type": "requirement",
  "components": [
- [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "pine_tea", 2 ] ],
+ [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "broth_meat", 2 ], [ "pine_tea", 2 ] ],
  [
  [ "meat_nofish", 1, "LIST" ],
  [ "poultry_cooked_any", 1, "LIST" ],
@@ -882,7 +882,7 @@
  "id": "woods_soup_ingredients_veggy",
  "type": "requirement",
  "components": [
- [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "pine_tea", 1 ] ],
+ [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "broth_meat", 1 ], [ "pine_tea", 1 ] ],
  [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ],
  [
  [ "veggy_wild", 1 ],
@@ -1225,9 +1225,6 @@
  [ "veggy_any", 1, "LIST" ],
  [ "empty_corn_cob", 1 ],
  [ "corn", 1 ],
- [ "powder_eggs", 1 ],
- [ "eggs_bird", 1, "LIST" ],
- [ "egg_reptile", 1 ],
  [ "mushroom_cooked", 1 ],
  [ "morel_cooked", 1 ],
  [ "mushroom", 1 ],
@@ -1246,6 +1243,23 @@
  ]
  ]
  },
+ {
+ "id": "broth_meat_ingredients",
+ "type": "requirement",
+ "components": [
+ [ [ "meat_nofish", 1, "LIST" ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ],
+ [
+ [ "hot_sauce", 1 ],
+ [ "seasoning_italian", 4 ],
+ [ "wild_herbs", 8 ],
+ [ "seasoning_salt", 4 ],
+ [ "soysauce", 1 ],
+ [ "pepper", 4 ],
+ [ "garlic_clove", 2 ],
+ [ "salt", 4 ]
+ ]
+ ]
+ },
  {
  "id": "veggy_soup_ingredients",
  "type": "requirement",