diff options
Diffstat (limited to 'client/map/tiles')
| -rw-r--r-- | client/map/tiles/cutting_board.gd | 13 | ||||
| -rw-r--r-- | client/map/tiles/sink.gd | 4 | ||||
| -rw-r--r-- | client/map/tiles/tile.gd | 2 |
3 files changed, 11 insertions, 8 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/sink.gd b/client/map/tiles/sink.gd index e2524041..b12f175c 100644 --- a/client/map/tiles/sink.gd +++ b/client/map/tiles/sink.gd @@ -35,8 +35,8 @@ 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) +func progress(position_: float, speed: float, warn: bool, _acting_player): + super(position_, speed, warn, _acting_player) if item is Plate: particles.start(true) elif item is Glass: 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) |