Add ding sound to all tiles

6 files changed, 34 insertions, 34 deletions

diff --git a/client/audio/beep.ogg.import b/client/audio/beep.ogg.import
deleted file mode 100644
index afbaabb1..00000000
--- a/client/audio/beep.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://e4vsty7bkg8s"
-path="res://.godot/imported/beep.ogg-a7963d16930d94926b42639249fc8aad.oggvorbisstr"
-
-[deps]
-
-source_file="res://audio/beep.ogg"
-dest_files=["res://.godot/imported/beep.ogg-a7963d16930d94926b42639249fc8aad.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/map/progress.gd b/client/map/progress.gd
index c9b432fb..1a8bb3c0 100644
--- a/client/map/progress.gd
+++ b/client/map/progress.gd
@@ -18,16 +18,26 @@
 class_name ProgressBar3D
 extends MeshInstance3D
 
-var beep_node: PlayRandom = load("res://audio/play_random.tscn").instantiate()
+const PLAY_RANDOM_SCENE = preload("res://audio/play_random.tscn")
+
+var beep_node: PlayRandom = PLAY_RANDOM_SCENE.instantiate()
+var ding_node: PlayRandom = PLAY_RANDOM_SCENE.instantiate()
+
 var speed := 0.
 var position_ := 0.
 var warn := false
 
 func _ready():
 	add_child(beep_node)
+	add_child(ding_node)
+	
 	beep_node.randomize_pitch = false
 	beep_node.volume_db = -12
-	beep_node.setup([load("res://audio/beep.ogg")])
+	beep_node.setup([load("res://map/tiles/sounds/beep.ogg")])
+	
+	ding_node.randomize_pitch = false
+	ding_node.volume_db = -12
+	ding_node.setup([load("res://map/tiles/sounds/ding.ogg")])
 
 func update(new_position: float, new_speed: float, new_warn: bool):
 	speed = new_speed
@@ -37,6 +47,8 @@ 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)
+	
+	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 053d02de..d6c2785c 100644
--- a/client/map/tiles/oven.tscn
+++ b/client/map/tiles/oven.tscn
@@ -1,11 +1,9 @@
-[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="Script" path="res://audio/play_random.gd" id="4_3hvts"]
 [ext_resource type="Script" path="res://map/auto_setup/light_setup.gd" id="4_hjc80"]
-[ext_resource type="AudioStream" uid="uid://dkwpv708ihh4c" path="res://map/tiles/sounds/ding.ogg" id="5_d43p4"]
 
 [sub_resource type="Animation" id="Animation_yo2v1"]
 length = 0.001
@@ -66,9 +64,3 @@ light_energy = 2.0
 shadow_enabled = true
 script = ExtResource("4_hjc80")
 completely_disable_light_if_shadows_disabled = true
-
-[node name="Ding" type="Node3D" parent="."]
-script = ExtResource("4_3hvts")
-
-[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Ding"]
-stream = ExtResource("5_d43p4")
diff --git a/client/audio/beep.ogg b/client/map/tiles/sounds/beep.ogg
index c4491fa3..c4491fa3 100644
--- a/client/audio/beep.ogg
+++ b/client/map/tiles/sounds/beep.ogg
diff --git a/client/map/tiles/sounds/beep.ogg.import b/client/map/tiles/sounds/beep.ogg.import
new file mode 100644
index 00000000..85526c5e
--- /dev/null
+++ b/client/map/tiles/sounds/beep.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://e4vsty7bkg8s"
+path="res://.godot/imported/beep.ogg-fd24b57085580112faf45d17e578f198.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/tiles/sounds/beep.ogg"
+dest_files=["res://.godot/imported/beep.ogg-fd24b57085580112faf45d17e578f198.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4