7 files changed, 41 insertions, 27 deletions
diff --git a/client/map/tiles/cutting_board.gd b/client/map/tiles/cutting_board.gd
index c9291717..e8f8897b 100644
--- a/client/map/tiles/cutting_board.gd
+++ b/client/map/tiles/cutting_board.gd
@@ -22,11 +22,14 @@ func _init(rename: String, neighbors: Array):
 	super(rename, neighbors)
 	base.add_child(board)
 
-func progress(position_: float, speed: float, warn: bool):
-	super(position_, speed, warn)
-	var anim: AnimationPlayer = board.get_node("AnimationPlayer")
-	if not anim.is_playing():
-		anim.play("cut_loop")
+func progress(position_: float, speed: float, warn: bool, acting_player):
+	super(position_, speed, warn, acting_player)
+	var knife: Node3D = board.get_node("Knife")
+	knife.visible = speed == 0
+	
+	if acting_player != null:
+		var acting_character: Character = acting_player.character
+		acting_character.cutting = speed != 0
 
 static func interact_target() -> Vector3:
 	return Vector3(0., 0.575, 0.)
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/map/tiles/sink.gd b/client/map/tiles/sink.gd
index e2524041..efa85ed0 100644
--- a/client/map/tiles/sink.gd
+++ b/client/map/tiles/sink.gd
@@ -35,14 +35,18 @@ func _init(rename: String, neighbors: Array):
 	stopping.stream = preload("res://map/tiles/sounds/sink_stopping.ogg")
 	add_child(stopping)
 
-func progress(position_: float, speed: float, warn: bool):
-	super(position_, speed, warn)
-	if item is Plate:
-		particles.start(true)
-	elif item is Glass:
-		particles.start()
-	if not running.playing:
-		running.play()
+func progress(position_: float, speed: float, warn: bool, _acting_player):
+	super(position_, speed, warn, _acting_player)
+	if speed == 0:
+		particles.stop()
+		running.stop()
+	else:
+		if item is Plate:
+			particles.start(true)
+		elif item is Glass:
+			particles.start()
+		if not running.playing:
+			running.play()
 
 func finish():
 	super()
diff --git a/client/map/tiles/sounds/beep.ogg b/client/map/tiles/sounds/beep.ogg
new file mode 100644
index 00000000..c4491fa3
--- /dev/null
+++ 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
diff --git a/client/map/tiles/tile.gd b/client/map/tiles/tile.gd
index be78883e..4bee3ced 100644
--- a/client/map/tiles/tile.gd
+++ b/client/map/tiles/tile.gd
@@ -57,7 +57,7 @@ static func interact_target() -> Vector3:
 func interact():
 	pass
 
-func progress(position_: float, speed: float, warn: bool):
+func progress(position_: float, speed: float, warn: bool, _acting_player):
 	if item != null:
 		item.progress(position_, speed, warn)