From ef5057cf1f366633ff4b9c3fc129548257f8de51 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Wed, 3 Mar 2021 17:02:28 -0600
Subject: [PATCH] Homemade toastems, buttercream frosting and recipes (#47696)

---
 data/json/items/comestibles/junkfood.json | 45 +++++++++++++++++++
 data/json/recipes/recipe_food.json        | 53 +++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
index f3288ba8378ac..1e6b73eaa5ebd 100644
--- a/data/json/items/comestibles/junkfood.json
+++ b/data/json/items/comestibles/junkfood.json
@@ -37,6 +37,14 @@
     "description": "Dry toaster pastries, usually coated with solid frosting.  Sadly, these are not.",
     "fun": 10
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "toastem4",
+    "name": { "str": "homemade toast-em" },
+    "copy-from": "toastem",
+    "description": "Homemade toaster pastries, lacking icing but at least fruit filled.",
+    "fun": 10
+  },
   {
     "type": "COMESTIBLE",
     "id": "toasterpastryfrozen",
@@ -68,6 +76,43 @@
     "description": "A delicious fruit-filled pastry that you've cooked.  It even comes with frosting!",
     "fun": 20
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "homemade_toasterpastry",
+    "name": { "str": "toaster pastry", "str_pl": "toaster pastries" },
+    "copy-from": "toasterpastryfrozen",
+    "quench": 4,
+    "description": "A delicious homemade fruit-filled pastry that you've cooked.",
+    "fun": 20
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "homemade_toasterpastry2",
+    "name": { "str": "toaster pastry with buttercream", "str_pl": "toaster pastries with buttercream" },
+    "copy-from": "toasterpastryfrozen",
+    "quench": 4,
+    "description": "A delicious homemade fruit-filled pastry that you've cooked.  It even comes with buttercream!",
+    "fun": 30
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "buttercream",
+    "name": { "str": "buttercream icing", "str_pl": "cups of buttercream icing" },
+    "weight": "32 g",
+    "color": "brown",
+    "container": "bag_plastic",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 288,
+    "description": "Smooth sugary buttercream icing.  Almost good enough to forget the end of everything.",
+    "price": 100,
+    "price_postapoc": 400,
+    "material": [ "junk" ],
+    "volume": "1 L",
+    "charges": 8,
+    "flags": [ "EDIBLE_FROZEN" ],
+    "fun": 6
+  },
   {
     "type": "COMESTIBLE",
     "id": "chips2",
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index 232006ce062d8..b4eeb9f13dd79 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -5382,6 +5382,20 @@
     "book_learn": [ [ "mag_glam", 1 ] ],
     "components": [ [ [ "bread_sandwich", 1, "LIST" ] ], [ [ "any_butter", 1, "LIST" ] ], [ [ "sprinkles", 3 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "toastem4",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_SNACK",
+    "skill_used": "cooking",
+    "time": "40 m",
+    "charges": 6,
+    "book_learn": [ [ "baking_book", 1 ] ],
+    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
+    "components": [ [ [ "flour", 12 ] ], [ [ "eggs_bird", 1, "LIST" ] ], [ [ "jam_fruit", 9 ] ], [ [ "cornmeal", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
@@ -5395,6 +5409,45 @@
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [ [ [ "toasterpastryfrozen", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "homemade_toasterpastry",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_SNACK",
+    "skill_used": "cooking",
+    "time": "2 m 30 s",
+    "charges": 1,
+    "autolearn": true,
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
+    "components": [ [ [ "toastem4", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "homemade_toasterpastry2",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_SNACK",
+    "skill_used": "cooking",
+    "time": "2 m 30 s",
+    "charges": 1,
+    "autolearn": true,
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
+    "components": [ [ [ "toastem4", 1 ] ], [ [ "buttercream", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "buttercream",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_SNACK",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "6 m 30 s",
+    "autolearn": true,
+    "qualities": [ { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "milk_cream", 1 ] ], [ [ "butter", 16 ] ], [ [ "sugar_standard", 1, "LIST" ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",