From bd3a8581c4e47258060051dcba506b7eb7a07b1c Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 3 May 2023 13:00:31 -0700
Subject: Sandwiches, fish soup, french toast now use bread_sandwich group.
 Peanut Butter now uses sugar_standard group. Wasteland Sausages, rennet, and
 sausage casing now use custom edible_stomach group. Upstream bone broth now
 allows human bones. Various updates to recipes in order to sync with upstream
 where my fixes had diverged.

---
 json/recipes/food/meat.json | 64 ++++++++++++---------------------------------
 1 file changed, 16 insertions(+), 48 deletions(-)

(limited to 'json/recipes/food/meat.json')

diff --git a/json/recipes/food/meat.json b/json/recipes/food/meat.json
index ef99936..000a8ee 100644
--- a/json/recipes/food/meat.json
+++ b/json/recipes/food/meat.json
@@ -236,14 +236,7 @@
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
       [ [ "meat_red", 1, "LIST" ] ],
-      [
-        [ "flatbread", 2 ],
-        [ "bread", 2 ],
-        [ "cornbread", 2 ],
-        [ "wastebread", 2 ],
-        [ "sourdough_bread", 2 ],
-        [ "brioche", 2 ]
-      ],
+      [ [ "bread_sandwich", 2, "LIST" ] ],
       [ [ "cheese_any", 1, "LIST" ] ],
       [
         [ "pickle", 1 ],
@@ -256,16 +249,7 @@
         [ "lettuce", 1 ],
         [ "irradiated_lettuce", 1 ]
       ],
-      [
-        [ "ketchup", 1 ],
-        [ "mustard", 1 ],
-        [ "horseradish", 1 ],
-        [ "mayonnaise", 1 ],
-        [ "bacon", 1 ],
-        [ "seasoning_salt", 1 ],
-        [ "soysauce", 1 ],
-        [ "sauerkraut", 1 ]
-      ]
+      [ [ "condiment", 1, "LIST" ], [ "bacon", 1 ], [ "seasoning_salt", 1 ] ]
     ]
   },
   {
@@ -286,14 +270,7 @@
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
       [ [ "meat_red", 1, "LIST" ] ],
-      [
-        [ "flatbread", 2 ],
-        [ "bread", 2 ],
-        [ "cornbread", 2 ],
-        [ "wastebread", 2 ],
-        [ "sourdough_bread", 2 ],
-        [ "brioche", 2 ]
-      ],
+      [ [ "bread_sandwich", 2, "LIST" ] ],
       [
         [ "pickle", 1 ],
         [ "veggy_pickled", 1 ],
@@ -305,16 +282,7 @@
         [ "lettuce", 1 ],
         [ "irradiated_lettuce", 1 ]
       ],
-      [
-        [ "ketchup", 1 ],
-        [ "mustard", 1 ],
-        [ "horseradish", 1 ],
-        [ "mayonnaise", 1 ],
-        [ "bacon", 1 ],
-        [ "seasoning_salt", 1 ],
-        [ "soysauce", 1 ],
-        [ "sauerkraut", 1 ]
-      ]
+      [ [ "condiment", 1, "LIST" ], [ "bacon", 1 ], [ "seasoning_salt", 1 ] ]
     ]
   },
   { 
@@ -412,7 +380,7 @@
     "tools": [ [ [ "char_smoker", 10 ] ] ],
     "components": [
       [ [ "offal_raw", 4, "LIST" ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ],
-      [ [ "sausage_casings", 2 ], [ "stomach", 2 ], [ "stomach_large", 1 ], [ "hstomach", 2 ], [ "hstomach_large", 1 ] ],
+      [ [ "sausage_casings", 2 ], [ "edible_stomach", 1, "LIST" ] ],
       [ [ "salt_preservation", 4, "LIST" ] ]
     ]
   },
@@ -433,7 +401,7 @@
     ],
     "components": [
       [ [ "offal_raw", 4, "LIST" ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ],
-      [ [ "sausage_casings", 2 ], [ "stomach", 2 ], [ "stomach_large", 1 ], [ "hstomach", 2 ], [ "hstomach_large", 1 ] ],
+      [ [ "sausage_casings", 2 ], [ "edible_stomach", 1, "LIST" ] ],
       [ [ "salt_preservation", 4, "LIST" ] ]
     ]
   },
@@ -453,14 +421,7 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
-      [
-        [ "flatbread", 2 ],
-        [ "bread", 2 ],
-        [ "cornbread", 2 ],
-        [ "wastebread", 2 ],
-        [ "sourdough_bread", 2 ],
-        [ "brioche", 2 ]
-      ],
+      [ [ "bread_sandwich", 2, "LIST" ] ],
       [ [ "bacon", 1 ] ],
       [ [ "lettuce", 1 ], [ "irradiated_lettuce", 1 ] ],
       [ [ "can_tomato", 1 ], [ "irradiated_tomato", 1 ], [ "tomato", 1 ] ]
@@ -499,7 +460,14 @@
         [ "cabbage", 2 ]
       ],
       [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ], [ "onion", 1 ], [ "irradiated_onion", 1 ] ],
-      [ [ "pepper", 20 ], [ "chilly-p", 20 ], [ "garlic_clove", 6 ], [ "chili_pepper", 2 ] ]
+      [
+        [ "pepper", 20 ],
+        [ "chilly-p", 20 ],
+        [ "garlic_clove", 6 ],
+        [ "garlic_roasted", 1 ],
+        [ "chili_pepper", 2 ],
+        [ "chili_pepper_roasted", 2 ]
+      ]
     ]
   },
   { 
@@ -593,7 +561,7 @@
     "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ],
     "tools": [ [ [ "funnel", -1 ] ] ],
     "components": [
-      [ [ "stomach", 2 ], [ "stomach_large", 1 ] ],
+      [ [ "edible_stomach", 1, "LIST" ] ],
       [ [ "salt", 20 ] ],
       [ [ "water", 2 ], [ "water_clean", 2 ] ],
       [ [ "bag_plastic", 1 ] ]
-- 
cgit v1.2.1