Add default put and take sounds

8 files changed, 49 insertions, 11 deletions

diff --git a/client/audio/play_random.gd b/client/audio/play_random.gd
index efaad7d8..df77de2f 100644
--- a/client/audio/play_random.gd
+++ b/client/audio/play_random.gd
@@ -48,6 +48,8 @@ func configure_player(player):
 		player.attenuation_filter_cutoff_hz = 20500
 
 func play_random():
+	if sounds.size() == 0: return
+	
 	var s = sounds[randi_range(0, sounds.size() - 1)]
 	s.pitch_scale = randf_range(0.9, 1.1)
 	s.play()
diff --git a/client/audio/play_random.tscn b/client/audio/play_random.tscn
index 44f3a10b..f9b20842 100644
--- a/client/audio/play_random.tscn
+++ b/client/audio/play_random.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://bbyb6s110my8c"]
+[gd_scene load_steps=2 format=3 uid="uid://bncx0wul2ikrg"]
 
 [ext_resource type="Script" path="res://audio/play_random.gd" id="1_c8pxf"]
 
diff --git a/client/map/items/item.gd b/client/map/items/item.gd
index 7ab80fab..d1bb71f7 100644
--- a/client/map/items/item.gd
+++ b/client/map/items/item.gd
@@ -48,11 +48,15 @@ func progress(p: float, warn: bool):
 func finish(_warn: bool):
 	progress_instance.visible = false
 
+func setup_sounds():
+	take_sound.setup([preload("res://map/sounds/generic_up.ogg")])
+	put_sound.setup([preload("res://map/sounds/plate_down.ogg")])
+
 func take():
-	pass
+	take_sound.play_random()
 
 func put():
-	pass
+	put_sound.play_random()
 
 static func base_position() -> Vector3:
 	return Vector3(0., 0., 0.)
diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd
index 9b462e5c..9d2fe538 100644
--- a/client/map/items/plate.gd
+++ b/client/map/items/plate.gd
@@ -19,16 +19,10 @@ extends Item
 func _init(owned_by_: Node3D):
 	super(owned_by_)
 	add_child(load("res://map/items/plate.tscn").instantiate())
+
+func setup_sounds():
 	take_sound.setup([preload("res://map/sounds/plate_up.ogg")])
 	put_sound.setup([preload("res://map/sounds/plate_down.ogg")])
 
-func take():
-	take_sound.play_random()
-	super()
-
-func put():
-	put_sound.play_random()
-	super()
-
 static func base_position() -> Vector3:
 	return Vector3(0., 0.05, 0.)
diff --git a/client/map/sounds/generic_down.ogg b/client/map/sounds/generic_down.ogg
new file mode 100644
index 00000000..2646fc02
--- /dev/null
+++ b/client/map/sounds/generic_down.ogg
diff --git a/client/map/sounds/generic_down.ogg.import b/client/map/sounds/generic_down.ogg.import
new file mode 100644
index 00000000..8bdaf0da
--- /dev/null
+++ b/client/map/sounds/generic_down.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://74413o382cgr"
+path="res://.godot/imported/generic_down.ogg-f6d254ca3073bfe53a9d25f0138ad218.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/sounds/generic_down.ogg"
+dest_files=["res://.godot/imported/generic_down.ogg-f6d254ca3073bfe53a9d25f0138ad218.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/map/sounds/generic_up.ogg b/client/map/sounds/generic_up.ogg
new file mode 100644
index 00000000..89577f19
--- /dev/null
+++ b/client/map/sounds/generic_up.ogg
diff --git a/client/map/sounds/generic_up.ogg.import b/client/map/sounds/generic_up.ogg.import
new file mode 100644
index 00000000..96dab74e
--- /dev/null
+++ b/client/map/sounds/generic_up.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dimmyptj1wxlm"
+path="res://.godot/imported/generic_up.ogg-fe69b207b9c1d21d7754ffe5f7b09f51.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/sounds/generic_up.ogg"
+dest_files=["res://.godot/imported/generic_up.ogg-fe69b207b9c1d21d7754ffe5f7b09f51.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4