pot and plate sounds

28 files changed, 162 insertions, 120 deletions

diff --git a/client/map/items/food_processor.gd b/client/map/items/food_processor.gd
index 006954ef..588777ff 100644
--- a/client/map/items/food_processor.gd
+++ b/client/map/items/food_processor.gd
@@ -31,8 +31,8 @@ func progress(p: float, warn: bool):
 	if sound_id == null:
 		sound_id = Sound.item_progress(
 			self,
-			preload("res://map/items/food_processor_running.ogg"),
-			preload("res://map/items/food_processor_stopping.ogg")
+			preload("res://map/items/sounds/food_processor_running.ogg"),
+			preload("res://map/items/sounds/food_processor_stopping.ogg")
 		)
 
 func finish(warn: bool):
diff --git a/client/map/items/food_processor_running.ogg.import b/client/map/items/food_processor_running.ogg.import
deleted file mode 100644
index 45f2249e..00000000
--- a/client/map/items/food_processor_running.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://rxjywx4vm0v8"
-path="res://.godot/imported/food_processor_running.ogg-41d9b8fef28296b1e1fe6d23f7a6b29a.oggvorbisstr"
-
-[deps]
-
-source_file="res://map/items/food_processor_running.ogg"
-dest_files=["res://.godot/imported/food_processor_running.ogg-41d9b8fef28296b1e1fe6d23f7a6b29a.oggvorbisstr"]
-
-[params]
-
-loop=true
-loop_offset=0.0
-bpm=0.0
-beat_count=0
-bar_beats=4
diff --git a/client/map/items/food_processor_stopping.ogg.import b/client/map/items/food_processor_stopping.ogg.import
deleted file mode 100644
index 7e0d8f6d..00000000
--- a/client/map/items/food_processor_stopping.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dghbc6sebonde"
-path="res://.godot/imported/food_processor_stopping.ogg-6f8738c65f08cc9554ad7bbd457e5ac0.oggvorbisstr"
-
-[deps]
-
-source_file="res://map/items/food_processor_stopping.ogg"
-dest_files=["res://.godot/imported/food_processor_stopping.ogg-6f8738c65f08cc9554ad7bbd457e5ac0.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/map/items/item.gd b/client/map/items/item.gd
index 868af444..6f2af3fb 100644
--- a/client/map/items/item.gd
+++ b/client/map/items/item.gd
@@ -51,8 +51,8 @@ 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")])
+	take_sound.setup([preload("res://map/items/sounds/generic_take.ogg")])
+	put_sound.setup([preload("res://map/items/sounds/plate_put.ogg")])
 
 func take():
 	take_sound.play_random()
diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd
index 9d2fe538..73ffc5d9 100644
--- a/client/map/items/plate.gd
+++ b/client/map/items/plate.gd
@@ -21,8 +21,8 @@ func _init(owned_by_: Node3D):
 	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")])
+	take_sound.setup([preload("res://map/items/sounds/plate_take.ogg")])
+	put_sound.setup([preload("res://map/items/sounds/plate_put.ogg")])
 
 static func base_position() -> Vector3:
 	return Vector3(0., 0.05, 0.)
diff --git a/client/map/items/pot.gd b/client/map/items/pot.gd
index 89cbf4c4..e802b7e9 100644
--- a/client/map/items/pot.gd
+++ b/client/map/items/pot.gd
@@ -35,5 +35,9 @@ func finish(warn: bool):
 	super(warn)
 	steam.emitting = false
 
+func setup_sounds():
+	take_sound.setup([preload("res://map/items/sounds/pot_take.ogg")])
+	put_sound.setup([preload("res://map/items/sounds/pot_put.ogg")])
+
 static func base_position() -> Vector3:
 	return Vector3(0., 0.015, 0.)
diff --git a/client/map/items/food_processor_running.ogg b/client/map/items/sounds/food_processor_running.ogg
index 10ebaf90..10ebaf90 100644
--- a/client/map/items/food_processor_running.ogg
+++ b/client/map/items/sounds/food_processor_running.ogg
diff --git a/client/map/items/sounds/food_processor_running.ogg.import b/client/map/items/sounds/food_processor_running.ogg.import
new file mode 100644
index 00000000..d16ab2a5
--- /dev/null
+++ b/client/map/items/sounds/food_processor_running.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://rxjywx4vm0v8"
+path="res://.godot/imported/food_processor_running.ogg-6506a6a5653ba2f2b6b730a02c0666b6.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/items/sounds/food_processor_running.ogg"
+dest_files=["res://.godot/imported/food_processor_running.ogg-6506a6a5653ba2f2b6b730a02c0666b6.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4
diff --git a/client/map/items/food_processor_stopping.ogg b/client/map/items/sounds/food_processor_stopping.ogg
index 471e264a..471e264a 100644
--- a/client/map/items/food_processor_stopping.ogg
+++ b/client/map/items/sounds/food_processor_stopping.ogg
diff --git a/client/map/items/sounds/food_processor_stopping.ogg.import b/client/map/items/sounds/food_processor_stopping.ogg.import
new file mode 100644
index 00000000..88ad40f0
--- /dev/null
+++ b/client/map/items/sounds/food_processor_stopping.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dghbc6sebonde"
+path="res://.godot/imported/food_processor_stopping.ogg-ff77c875a73e7d6e0dc852e7de936ae8.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/items/sounds/food_processor_stopping.ogg"
+dest_files=["res://.godot/imported/food_processor_stopping.ogg-ff77c875a73e7d6e0dc852e7de936ae8.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/map/sounds/generic_down.ogg b/client/map/items/sounds/generic_put.ogg
index 2646fc02..2646fc02 100644
--- a/client/map/sounds/generic_down.ogg
+++ b/client/map/items/sounds/generic_put.ogg
diff --git a/client/map/items/sounds/generic_put.ogg.import b/client/map/items/sounds/generic_put.ogg.import
new file mode 100644
index 00000000..c3c06725
--- /dev/null
+++ b/client/map/items/sounds/generic_put.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://74413o382cgr"
+path="res://.godot/imported/generic_put.ogg-71f756ad7da95a854dc079b882d88098.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/items/sounds/generic_put.ogg"
+dest_files=["res://.godot/imported/generic_put.ogg-71f756ad7da95a854dc079b882d88098.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/items/sounds/generic_take.ogg
index 89577f19..89577f19 100644
--- a/client/map/sounds/generic_up.ogg
+++ b/client/map/items/sounds/generic_take.ogg
diff --git a/client/map/items/sounds/generic_take.ogg.import b/client/map/items/sounds/generic_take.ogg.import
new file mode 100644
index 00000000..90ee9e85
--- /dev/null
+++ b/client/map/items/sounds/generic_take.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dimmyptj1wxlm"
+path="res://.godot/imported/generic_take.ogg-58b7a86e64dc39c372d275df9a89f825.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/items/sounds/generic_take.ogg"
+dest_files=["res://.godot/imported/generic_take.ogg-58b7a86e64dc39c372d275df9a89f825.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/map/items/sounds/plate_put.ogg b/client/map/items/sounds/plate_put.ogg
new file mode 100644
index 00000000..17059fa1
--- /dev/null
+++ b/client/map/items/sounds/plate_put.ogg
diff --git a/client/map/items/sounds/plate_put.ogg.import b/client/map/items/sounds/plate_put.ogg.import
new file mode 100644
index 00000000..e748930c
--- /dev/null
+++ b/client/map/items/sounds/plate_put.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://bmsdt2xav3dfi"
+path="res://.godot/imported/plate_put.ogg-4e332f97bec21a96276803836308400a.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/items/sounds/plate_put.ogg"
+dest_files=["res://.godot/imported/plate_put.ogg-4e332f97bec21a96276803836308400a.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/map/items/sounds/plate_take.ogg b/client/map/items/sounds/plate_take.ogg
new file mode 100644
index 00000000..4ee7fd37
--- /dev/null
+++ b/client/map/items/sounds/plate_take.ogg
diff --git a/client/map/items/sounds/plate_take.ogg.import b/client/map/items/sounds/plate_take.ogg.import
new file mode 100644
index 00000000..c8f13933
--- /dev/null
+++ b/client/map/items/sounds/plate_take.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dytee1arrjb2j"
+path="res://.godot/imported/plate_take.ogg-dd95f70134d26571c8fd012af38d2e8a.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/items/sounds/plate_take.ogg"
+dest_files=["res://.godot/imported/plate_take.ogg-dd95f70134d26571c8fd012af38d2e8a.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/map/items/sounds/pot_put.ogg b/client/map/items/sounds/pot_put.ogg
new file mode 100644
index 00000000..13e1abf9
--- /dev/null
+++ b/client/map/items/sounds/pot_put.ogg
diff --git a/client/map/items/sounds/pot_put.ogg.import b/client/map/items/sounds/pot_put.ogg.import
new file mode 100644
index 00000000..363d3784
--- /dev/null
+++ b/client/map/items/sounds/pot_put.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dfmty54bviifx"
+path="res://.godot/imported/pot_put.ogg-1c886ef2769ab239bdd47fb1253a9552.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/items/sounds/pot_put.ogg"
+dest_files=["res://.godot/imported/pot_put.ogg-1c886ef2769ab239bdd47fb1253a9552.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/map/items/sounds/pot_take.ogg b/client/map/items/sounds/pot_take.ogg
new file mode 100644
index 00000000..2736101b
--- /dev/null
+++ b/client/map/items/sounds/pot_take.ogg
diff --git a/client/map/items/sounds/pot_take.ogg.import b/client/map/items/sounds/pot_take.ogg.import
new file mode 100644
index 00000000..4e8e0f4f
--- /dev/null
+++ b/client/map/items/sounds/pot_take.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cpeig1y5bsar2"
+path="res://.godot/imported/pot_take.ogg-d1e77bdb4ef71d0a80a6b45ecef61ed6.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/items/sounds/pot_take.ogg"
+dest_files=["res://.godot/imported/pot_take.ogg-d1e77bdb4ef71d0a80a6b45ecef61ed6.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/map/sounds/generic_down.ogg.import b/client/map/sounds/generic_down.ogg.import
deleted file mode 100644
index 8bdaf0da..00000000
--- a/client/map/sounds/generic_down.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[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.import b/client/map/sounds/generic_up.ogg.import
deleted file mode 100644
index 96dab74e..00000000
--- a/client/map/sounds/generic_up.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[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
diff --git a/client/map/sounds/plate_down.ogg b/client/map/sounds/plate_down.ogg
deleted file mode 100644
index 0827d902..00000000
--- a/client/map/sounds/plate_down.ogg
+++ /dev/null
diff --git a/client/map/sounds/plate_down.ogg.import b/client/map/sounds/plate_down.ogg.import
deleted file mode 100644
index 86e34bbf..00000000
--- a/client/map/sounds/plate_down.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[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
diff --git a/client/map/sounds/plate_up.ogg b/client/map/sounds/plate_up.ogg
deleted file mode 100644
index 21a96811..00000000
--- a/client/map/sounds/plate_up.ogg
+++ /dev/null
diff --git a/client/map/sounds/plate_up.ogg.import b/client/map/sounds/plate_up.ogg.import
deleted file mode 100644
index 5f2128e4..00000000
--- a/client/map/sounds/plate_up.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dyt45wi23lmmh"
-path="res://.godot/imported/plate_up.ogg-321cdd38fc6e820b2112fd77d567bcc9.oggvorbisstr"
-
-[deps]
-
-source_file="res://map/sounds/plate_up.ogg"
-dest_files=["res://.godot/imported/plate_up.ogg-321cdd38fc6e820b2112fd77d567bcc9.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4