4 files changed, 4 insertions, 16 deletions
diff --git a/client/map/progress.gd b/client/map/progress.gd
index d78c9e66..96edb574 100644
--- a/client/map/progress.gd
+++ b/client/map/progress.gd
@@ -47,6 +47,9 @@ func update(new_position: float, new_speed: float, new_warn: bool):
 	var mat: ShaderMaterial = get_active_material(0)
 	mat.set_shader_parameter("progress", position_)
 	mat.set_shader_parameter("bad", warn)
+	
+	# Always play ding sound if item is making progress while warn
+	if warn and speed > 0.: ding_node.play_random()
 
 func _process(delta: float):
 	position_ += delta * speed
diff --git a/client/map/tiles/oven.gd b/client/map/tiles/oven.gd
index 9ab7fd75..c5df63f8 100644
--- a/client/map/tiles/oven.gd
+++ b/client/map/tiles/oven.gd
@@ -29,7 +29,3 @@ func put_item(i: Item):
 func take_item() -> Item:
 	oven.open()
 	return super()
-
-func finish():
-	super()
-	oven.ding()
diff --git a/client/map/tiles/oven.tscn b/client/map/tiles/oven.tscn
index 7db9b3c4..d6c2785c 100644
--- a/client/map/tiles/oven.tscn
+++ b/client/map/tiles/oven.tscn
@@ -1,10 +1,8 @@
-[gd_scene load_steps=10 format=3 uid="uid://bil6eip7uwqvs"]
+[gd_scene load_steps=8 format=3 uid="uid://bil6eip7uwqvs"]
 
 [ext_resource type="Script" path="res://map/tiles/oven_model.gd" id="1_3v43w"]
 [ext_resource type="ArrayMesh" uid="uid://blc1q50d5ky86" path="res://map/tiles/oven_base.res" id="1_d1hwl"]
 [ext_resource type="ArrayMesh" uid="uid://blb5oew3sh7ek" path="res://map/tiles/oven_door.res" id="2_i5vso"]
-[ext_resource type="PackedScene" uid="uid://bncx0wul2ikrg" path="res://audio/play_random.tscn" id="2_jw4df"]
-[ext_resource type="AudioStream" uid="uid://dkwpv708ihh4c" path="res://map/tiles/sounds/ding.ogg" id="3_arthu"]
 [ext_resource type="Script" path="res://map/auto_setup/light_setup.gd" id="4_hjc80"]
 
 [sub_resource type="Animation" id="Animation_yo2v1"]
@@ -44,12 +42,6 @@ _data = {
 [node name="Oven" type="Node3D"]
 script = ExtResource("1_3v43w")
 
-[node name="Ding" parent="." instance=ExtResource("2_jw4df")]
-
-[node name="Ding" type="AudioStreamPlayer3D" parent="Ding"]
-stream = ExtResource("3_arthu")
-volume_db = -3.0
-
 [node name="Base" type="MeshInstance3D" parent="."]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
 mesh = ExtResource("1_d1hwl")
diff --git a/client/map/tiles/oven_model.gd b/client/map/tiles/oven_model.gd
index 6bcd69c5..0b1796c4 100644
--- a/client/map/tiles/oven_model.gd
+++ b/client/map/tiles/oven_model.gd
@@ -18,6 +18,3 @@ extends Node3D
 
 func open():
 	$AnimationPlayer.play("open")
-
-func ding():
-	$Ding.play_random()