Merge branch 'master' of https://codeberg.org/metamuffin/undercooked

4 files changed, 32 insertions, 5 deletions

diff --git a/client/map/items/item.gd b/client/map/items/item.gd
index d3acf200..7ab80fab 100644
--- a/client/map/items/item.gd
+++ b/client/map/items/item.gd
@@ -20,14 +20,17 @@ var owned_by: Node3D
 var base: Node3D = Node3D.new()
 
 var progress_instance: ProgressBar3D = preload("res://map/progress.tscn").instantiate()
-var sound_instance: PlayRandom = preload("res://audio/play_random.tscn").instantiate()
+var take_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate()
+var put_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate()
 
 func _init(owned_by_: Node3D):
 	progress_instance.position.y = 1
 	progress_instance.visible = false
 	add_child(progress_instance)
-	add_child(sound_instance)
-	sound_instance.volume_db = -16
+	take_sound.volume_db = -16
+	put_sound.volume_db = -16
+	add_child(take_sound)
+	add_child(put_sound)
 	base.position = base_position()
 	add_child(base)
 	owned_by = owned_by_
diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd
index 88403b55..9b462e5c 100644
--- a/client/map/items/plate.gd
+++ b/client/map/items/plate.gd
@@ -19,10 +19,15 @@ extends Item
 func _init(owned_by_: Node3D):
 	super(owned_by_)
 	add_child(load("res://map/items/plate.tscn").instantiate())
-	sound_instance.setup([preload("res://map/sounds/plate_up.ogg")])
+	take_sound.setup([preload("res://map/sounds/plate_up.ogg")])
+	put_sound.setup([preload("res://map/sounds/plate_down.ogg")])
 
 func take():
-	sound_instance.play_random()
+	take_sound.play_random()
+	super()
+
+func put():
+	put_sound.play_random()
 	super()
 
 static func base_position() -> Vector3:
diff --git a/client/map/sounds/plate_down.ogg b/client/map/sounds/plate_down.ogg
new file mode 100644
index 00000000..0827d902
--- /dev/null
+++ b/client/map/sounds/plate_down.ogg
diff --git a/client/map/sounds/plate_down.ogg.import b/client/map/sounds/plate_down.ogg.import
new file mode 100644
index 00000000..86e34bbf
--- /dev/null
+++ b/client/map/sounds/plate_down.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dy4bab6rn1cyu"
+path="res://.godot/imported/plate_down.ogg-97c6d5277190ef2a4619a7c4fee5a3bb.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/sounds/plate_down.ogg"
+dest_files=["res://.godot/imported/plate_down.ogg-97c6d5277190ef2a4619a7c4fee5a3bb.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4