aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-08-19 17:50:46 +0200
committermetamuffin <metamuffin@disroot.org>2024-08-19 17:50:58 +0200
commit947ea54a0dfe0093f658c371dc1a8aef3df61b61 (patch)
tree257c5a12318017303cecad467f99daead732fc00
parente2d6cd6f86370aa6dfb55dea73e34c09db634c51 (diff)
downloadhurrycurry-947ea54a0dfe0093f658c371dc1a8aef3df61b61.tar
hurrycurry-947ea54a0dfe0093f658c371dc1a8aef3df61b61.tar.bz2
hurrycurry-947ea54a0dfe0093f658c371dc1a8aef3df61b61.tar.zst
add strawberry shake items
-rw-r--r--client/map/item_factory.gd4
-rw-r--r--client/map/items/food_processor_items.gd20
-rw-r--r--data/recipes/default.ts4
3 files changed, 26 insertions, 2 deletions
diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd
index e92886a1..7c92e2b8 100644
--- a/client/map/item_factory.gd
+++ b/client/map/item_factory.gd
@@ -59,13 +59,17 @@ static func produce(name: String, owned_by: Node3D) -> Item:
"foodprocessor": return FoodProcessor.new(owned_by)
"coconut-foodprocessor": return FoodProcessorItems.CoconutF.new(owned_by)
+ "coconut-strawberry-puree-foodprocessor": return FoodProcessorItems.CoconutStrawberryPureeF.new(owned_by)
"dough-foodprocessor": return FoodProcessorItems.DoughF.new(owned_by)
"flour-foodprocessor": return FoodProcessorItems.FlourF.new(owned_by)
"milk-foodprocessor": return FoodProcessorItems.MilkF.new(owned_by)
+ "milk-strawberry-foodprocessor": return FoodProcessorItems.MilkStrawberryF.new(owned_by)
"rice-flour-foodprocessor": return FoodProcessorItems.RiceFlourF.new(owned_by)
"rice-foodprocessor": return FoodProcessorItems.RiceF.new(owned_by)
"strawberry-foodprocessor": return FoodProcessorItems.StrawberryF.new(owned_by)
+ "strawberry-icecream-foodprocessor": return FoodProcessorItems.StrawberryIcecreamF.new(owned_by)
"strawberry-puree-foodprocessor": return FoodProcessorItems.StrawberryPureeF.new(owned_by)
+ "strawberry-shake-foodprocessor": return FoodProcessorItems.StrawberryShakeF.new(owned_by)
"tomato-foodprocessor": return FoodProcessorItems.TomatoF.new(owned_by)
"tomato-juice-foodprocessor": return FoodProcessorItems.TomatoJuiceF.new(owned_by)
diff --git a/client/map/items/food_processor_items.gd b/client/map/items/food_processor_items.gd
index 615ea9e4..0b5be011 100644
--- a/client/map/items/food_processor_items.gd
+++ b/client/map/items/food_processor_items.gd
@@ -55,6 +55,26 @@ class StrawberryF extends FoodProcessor:
processing.color = Color(.9, .0, .0)
base.add_child(load("res://map/items/strawberry.tscn").instantiate())
+class CoconutStrawberryPureeF extends StrawberryPureeF:
+ func _init(owned_by_: Node3D):
+ super(owned_by_)
+ base.add_child(load("res://map/items/coconut.tscn").instantiate())
+
+class MilkStrawberryF extends MilkF:
+ func _init(owned_by_: Node3D):
+ super(owned_by_)
+ base.add_child(load("res://map/items/strawberry.tscn").instantiate())
+
+class StrawberryShakeF extends FoodProcessorContent:
+ func _init(owned_by_: Node3D):
+ super(owned_by_)
+ set_color(Color8(250, 140, 180))
+
+class StrawberryIcecreamF extends FoodProcessorContent:
+ func _init(owned_by_: Node3D):
+ super(owned_by_)
+ set_color(Color8(250, 180, 210))
+
class StrawberryPureeF extends FoodProcessorContent:
func _init(owned_by_: Node3D):
super(owned_by_)
diff --git a/data/recipes/default.ts b/data/recipes/default.ts
index 5899a80d..91afffe9 100644
--- a/data/recipes/default.ts
+++ b/data/recipes/default.ts
@@ -217,8 +217,8 @@ edible(nigiri)
const strawberry_puree = process(strawberry.tr(FP)).as("strawberry-puree")
const milk = process(coconut.tr(FP)).as("milk")
const strawberry_shake = either(
- process(container_add(milk, strawberry).as("coconut-strawberry-puree")).as("strawberry-shake"),
- process(container_add(strawberry_puree, coconut).as("milk-strawberry")).as("strawberry-shake")
+ process(container_add(milk, strawberry).as("milk-strawberry")).as("strawberry-shake"),
+ process(container_add(strawberry_puree, coconut).as("coconut-strawberry-puree")).as("strawberry-shake")
)
// Icecream