[MIRROR] Major egg rework. Pavlova edition (#6825)

* Major egg rework. Pavlova edition (#59933)

* I'm getting closer

* ree

* Update food_mixtures.dm

* FOrgot this

* almost there

* yeeeeeeeeees

* oops

* Update food_mixtures.dm

* Update cake.dm

* Update cake.dm

* Ath fixes

* Why did I type 8

* yolk nutriment + whipped cream nutriment

* Oranges found where I live, there is a gun against my head.

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@ users.noreply.github.com>

* Update code/game/objects/items/food/cake.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@ users.noreply.github.com>

* I'll just warn you now. I don't know how to use a computer

* Local Australian has a very small brain.

Co-authored-by: necromanceranne <40847847+necromanceranne@ users.noreply.github.com>

* Major egg rework. Pavlova edition

Co-authored-by: carshalash <carshalash@gmail.com>
Co-authored-by: necromanceranne <40847847+necromanceranne@ users.noreply.github.com>

code/game/objects/items/food/cake.dm

@@ -467,3 +467,39 @@
 	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("cake" = 4, "butter" = 2, "cream" = 1)
 	foodtypes = GRAIN | DAIRY | SUGAR
+
+/obj/item/food/cake/pavlovacream
+	name = "pavlova"
+	desc = "A sweet berry pavlova. Invented in New Zealand, has become popular with Vox for some reason."
+	icon_state = "pavlova"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
+	tastes = list("meringue" = 5, "creaminess" = 1, "berries" = 1)
+	foodtypes = DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/pavlovacream/MakeProcessable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pavlovacream, 5, 30)
+
+/obj/item/food/cakeslice/pavlovacream
+	name = "Pavlova slice"
+	desc = "A cracked slice of pavlova stacked with berries"
+	icon_state = "pavlova_slice"
+	tastes = list("meringue" = 5, "creaminess" = 1, "berries" = 1)
+	foodtypes = DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/pavlovakorta
+	name = "pavlova"
+	desc = "A sweet berry pavlova. Invented in New Zealand, has become popular with Vox for some reason."
+	icon_state = "pavlova"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
+	tastes = list("meringue" = 5, "creaminess" = 1, "berries" = 1)
+	foodtypes = NUTS | FRUIT | SUGAR
+
+/obj/item/food/cake/pavlovakorta/MakeProcessable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pavlovakorta, 5, 30)
+
+/obj/item/food/cakeslice/pavlovakorta
+	name = "pavlova slice"
+	desc = "A cracked slice of pavlova stacked with berries"
+	icon_state = "pavlova_slice"
+	tastes = list("meringue" = 5, "creaminess" = 1, "berries" = 1)
+	foodtypes = NUTS | FRUIT | SUGAR

code/game/objects/items/food/egg.dm

@@ -15,7 +15,7 @@
 	name = "egg"
 	desc = "An egg!"
 	icon_state = "egg"
-	food_reagents = list(/datum/reagent/consumable/eggyolk = 5)
+	food_reagents = list(/datum/reagent/consumable/eggyolk = 2, /datum/reagent/consumable/eggwhite = 4)
 	microwaved_type = /obj/item/food/boiledegg
 	foodtypes = MEAT
 	w_class = WEIGHT_CLASS_TINY

code/game/objects/items/manuals.dm

@@ -136,7 +136,7 @@
 				<h2>Basic ingredients preparation:</h2>
 
 				<b>Dough:</b> 10u water + 15u flour for simple dough.<br>
-				15u egg yolk + 15u flour + 5u sugar for cake batter.<br>
+				6u egg yolk + 12 egg white + 15u flour + 5u sugar for cake batter.<br>
 				Doughs can be transformed by using a knife and rolling pin.<br>
 				All doughs can be microwaved.<br>
 				<b>Bowl:</b> Add water to it for soup preparation.<br>

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -126,7 +126,7 @@
 				to_chat(user, span_notice("[src] is full."))
 			else
 				to_chat(user, span_notice("You break [E] in [src]."))
-				reagents.add_reagent(/datum/reagent/consumable/eggyolk, 5)
+				reagents.add_reagent_list(/datum/reagent/consumable/eggyolk = 2, /datum/reagent/consumable/eggyolk = 4)
 				qdel(E)
 			return
 	else

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -458,7 +458,7 @@
 
 /datum/chemical_reaction/drink/eggnog
 	results = list(/datum/reagent/consumable/ethanol/eggnog = 15)
-	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/eggyolk = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/eggyolk = 2)
 
 /datum/chemical_reaction/drink/narsour
 	results = list(/datum/reagent/consumable/ethanol/narsour = 1)
@@ -626,8 +626,8 @@
 	reaction_tags = REACTION_TAG_DRINK | REACTION_TAG_EASY | REACTION_TAG_OTHER
 
 /datum/chemical_reaction/drink/planet_cracker
-	results = list(/datum/reagent/consumable/ethanol/planet_cracker = 4)
-	required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 2, /datum/reagent/consumable/ethanol/lizardwine = 2, /datum/reagent/consumable/eggyolk = 1, /datum/reagent/gold = 1)
+	results = list(/datum/reagent/consumable/ethanol/planet_cracker = 20)
+	required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 10, /datum/reagent/consumable/ethanol/lizardwine = 10, /datum/reagent/consumable/eggyolk = 2, /datum/reagent/gold = 5)
 	mix_message = "The liquid's color starts shifting as the nanogold is alternately corroded and redeposited."
 
 /datum/chemical_reaction/drink/red_queen

code/modules/food_and_drinks/recipes/food_mixtures.dm

@@ -32,11 +32,11 @@
 
 /datum/chemical_reaction/food/chocolatepudding
 	results = list(/datum/reagent/consumable/chocolatepudding = 20)
-	required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 10, /datum/reagent/consumable/eggyolk = 5)
+	required_reagents = list(/datum/reagent/consumable/cream  = 5, /datum/reagent/consumable/coco = 5, /datum/reagent/consumable/eggyolk = 2)
 
 /datum/chemical_reaction/food/vanillapudding
 	results = list(/datum/reagent/consumable/vanillapudding = 20)
-	required_reagents = list(/datum/reagent/consumable/vanilla = 5, /datum/reagent/consumable/milk = 5, /datum/reagent/consumable/eggyolk = 5)
+	required_reagents = list(/datum/reagent/consumable/vanilla = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/eggyolk = 2)
 
 /datum/chemical_reaction/food/chocolate_bar
 	required_reagents = list(/datum/reagent/consumable/soymilk = 2, /datum/reagent/consumable/coco = 2, /datum/reagent/consumable/sugar = 2)
@@ -144,7 +144,7 @@
 		new /obj/item/food/dough(location)
 
 /datum/chemical_reaction/food/cakebatter
-	required_reagents = list(/datum/reagent/consumable/eggyolk = 15, /datum/reagent/consumable/flour = 15, /datum/reagent/consumable/sugar = 5)
+	required_reagents = list(/datum/reagent/consumable/eggyolk = 6, /datum/reagent/consumable/eggwhite = 12, /datum/reagent/consumable/flour = 15, /datum/reagent/consumable/sugar = 5)
 	mix_message = "The ingredients form a cake batter."
 	reaction_flags = REACTION_INSTANT
 
@@ -158,7 +158,7 @@
 
 /datum/chemical_reaction/food/pancakebatter
 	results = list(/datum/reagent/consumable/pancakebatter = 15)
-	required_reagents = list(/datum/reagent/consumable/eggyolk = 15, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/flour = 5)
+	required_reagents = list(/datum/reagent/consumable/eggyolk = 6, /datum/reagent/consumable/eggwhite = 12, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/flour = 5)
 
 /datum/chemical_reaction/food/ricebowl
 	required_reagents = list(/datum/reagent/consumable/rice = 10, /datum/reagent/water = 10)

code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm

@@ -151,6 +151,28 @@
 	result = /obj/item/food/cake/bscc
 	subcategory = CAT_CAKE
 
+/datum/crafting_recipe/food/pavlovacream
+	name = "Pavlova with cream"
+	reqs = list(
+		/datum/reagent/consumable/eggwhite = 12,
+		/datum/reagent/consumable/sugar = 15,
+		/datum/reagent/consumable/whipped_cream = 10,
+		/obj/item/food/grown/berries = 5
+	)
+	result = /obj/item/food/cake/pavlovacream
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/pavlovakorta
+	name = "Pavlova with korta cream"
+	reqs = list(
+		/datum/reagent/consumable/eggwhite = 12,
+		/datum/reagent/consumable/sugar = 15,
+		/datum/reagent/consumable/korta_milk = 10,
+		/obj/item/food/grown/berries = 5
+	)
+	result = /obj/item/food/cake/pavlovakorta
+	subcategory = CAT_CAKE
+
 /datum/crafting_recipe/food/bscvcake
 	name = "blackberry and strawberry vanilla cake"
 	reqs = list(

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

@@ -449,7 +449,8 @@
 /datum/crafting_recipe/food/khachapuri
 	name = "Khachapuri"
 	reqs = list(
-		/datum/reagent/consumable/eggyolk = 5,
+		/datum/reagent/consumable/eggyolk = 2,
+		/datum/reagent/consumable/eggwhite = 4,
 		/obj/item/food/cheese = 1,
 		/obj/item/food/bread/plain = 1
 	)

code/modules/reagents/chemistry/machinery/reagentgrinder.dm

@@ -334,3 +334,8 @@
 			var/amount = beaker.reagents.get_reagent_amount(/datum/reagent/consumable/eggyolk)
 			beaker.reagents.remove_reagent(/datum/reagent/consumable/eggyolk, amount)
 			beaker.reagents.add_reagent(/datum/reagent/consumable/mayonnaise, amount)
+		//Recipe to make whipped cream
+		if (beaker.reagents.has_reagent(/datum/reagent/consumable/cream))
+			var/amount = beaker.reagents.get_reagent_amount(/datum/reagent/consumable/cream)
+			beaker.reagents.remove_reagent(/datum/reagent/consumable/cream, amount)
+			beaker.reagents.add_reagent(/datum/reagent/consumable/whipped_cream, amount)

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -601,11 +601,19 @@
 /datum/reagent/consumable/eggyolk
 	name = "Egg Yolk"
 	description = "It's full of protein."
-	nutriment_factor = 3 * REAGENTS_METABOLISM
+	nutriment_factor = 4 * REAGENTS_METABOLISM
 	color = "#FFB500"
 	taste_description = "egg"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
+/datum/reagent/consumable/eggwhite
+	name = "Egg White"
+	description = "It's full of even more protein."
+	nutriment_factor = 1.5 * REAGENTS_METABOLISM
+	color = "#fffdf7"
+	taste_description = "bland egg"
+	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
 /datum/reagent/consumable/corn_starch
 	name = "Corn Starch"
 	description = "A slippery solution."
@@ -981,6 +989,14 @@
 	taste_description = "peppery sweetness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
+/datum/reagent/consumable/whipped_cream
+	name = "Whipped Cream"
+	description = "A white fluffy cream made from whipping cream at intense speed."
+	color = "#efeff0"
+	nutriment_factor = 4 * REAGENTS_METABOLISM
+	taste_description = "fluffy sweet cream"
+	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
 /datum/reagent/consumable/peanut_butter
 	name = "Peanut Butter"
 	description = "A rich, creamy spread produced by grinding peanuts."