aboutsummaryrefslogtreecommitdiff
path: root/client/map/items
diff options
context:
space:
mode:
authornokoe <nokoe@mailbox.org>2024-09-27 21:24:03 +0200
committernokoe <nokoe@mailbox.org>2024-09-27 21:25:01 +0200
commit6ffcb0e03a6c2af11547de900eed1f542bc0b40b (patch)
tree46601e6245269ad1ec4e7d4bd7724dd6f2e2881b /client/map/items
parentb68dc5d1d229e8bcdf655c99daf3a9e6ecac8aa7 (diff)
downloadhurrycurry-6ffcb0e03a6c2af11547de900eed1f542bc0b40b.tar
hurrycurry-6ffcb0e03a6c2af11547de900eed1f542bc0b40b.tar.bz2
hurrycurry-6ffcb0e03a6c2af11547de900eed1f542bc0b40b.tar.zst
add frying sound again
Diffstat (limited to 'client/map/items')
-rw-r--r--client/map/items/food_processor.gd4
-rw-r--r--client/map/items/item.gd2
-rw-r--r--client/map/items/pan.gd7
3 files changed, 10 insertions, 3 deletions
diff --git a/client/map/items/food_processor.gd b/client/map/items/food_processor.gd
index 05b783c1..38adf5aa 100644
--- a/client/map/items/food_processor.gd
+++ b/client/map/items/food_processor.gd
@@ -77,9 +77,7 @@ func progress(position_: float, speed: float, warn: bool):
func finish():
super()
- if sound_id != null:
- processing.emitting = false
- Sound.item_finished(sound_id)
+ processing.emitting = false
static func base_position() -> Vector3:
return Vector3(0., 0.4, 0.)
diff --git a/client/map/items/item.gd b/client/map/items/item.gd
index 2d801096..5c31d70f 100644
--- a/client/map/items/item.gd
+++ b/client/map/items/item.gd
@@ -79,6 +79,8 @@ func progress(position_: float, speed: float, warn: bool):
func finish():
progress_instance.visible = false
+ if sound_id != null:
+ Sound.item_finished(sound_id)
func setup_sounds():
take_sound.setup([preload("res://map/items/sounds/generic_take.ogg")])
diff --git a/client/map/items/pan.gd b/client/map/items/pan.gd
index 1aa80da0..bc858a6b 100644
--- a/client/map/items/pan.gd
+++ b/client/map/items/pan.gd
@@ -33,6 +33,13 @@ func progress(position_: float, speed: float, warn: bool):
steam.color = Color(.2, .2, .2)
else:
steam.color = Color(1.,1.,1.)
+ if sound_id == null:
+ sound_id = Sound.item_progress(
+ self,
+ preload("res://map/items/sounds/frying.ogg"),
+ null,
+ -5.
+ )
func finish():
super()