From 8ec34e12851f3ca2f6d7ef4f95ea5b5225f35e20 Mon Sep 17 00:00:00 2001
From: Ruslan Ignatov <ruslanlena30@gmail.com>
Date: Tue, 17 Mar 2026 21:56:31 +0300
Subject: [PATCH] Added lever animation

---
 game/characters/player/player.gd              |  2 +-
 .../abstract_activatable_object.gd            | 13 ++--
 game/objects/interactive/lever.gd             | 68 ++++++++++++++++++-
 game/objects/interactive/lever.tscn           | 17 +++--
 4 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/game/characters/player/player.gd b/game/characters/player/player.gd
index bd0a82c..c753fd0 100644
--- a/game/characters/player/player.gd
+++ b/game/characters/player/player.gd
@@ -56,7 +56,7 @@ func _physics_process(delta: float) -> void:
 	if is_dead:
 		_slow_down(delta*3)
 	else:
-		if Input.is_action_just_pressed("interact"):
+		if Input.is_action_pressed("interact"):
 			interacted.emit()
 		
 		if Input.is_action_just_pressed("jump"):
diff --git a/game/objects/interactive/abstract_activatable_object.gd b/game/objects/interactive/abstract_activatable_object.gd
index 890d9e1..dbac4db 100644
--- a/game/objects/interactive/abstract_activatable_object.gd
+++ b/game/objects/interactive/abstract_activatable_object.gd
@@ -5,8 +5,7 @@ extends Node2D
 @onready var hint_sprite : Sprite2D = $HintSprite
 
 
-func activate() -> void:
-	pass
+var _player_in_range := false
 
 
 func _ready() -> void:
@@ -16,10 +15,16 @@ func _ready() -> void:
 func _on_body_entered(body: Node2D) -> void:
 	if body is Player:
 		hint_sprite.show()
-		body.interacted.connect(activate)
+		_player_in_range = true
+		body.interacted.connect(_activate)
 
 
 func _on_body_exited(body: Node2D) -> void:
 	if body is Player:
 		hint_sprite.hide()
-		body.interacted.disconnect(activate)
+		_player_in_range = false
+		body.interacted.disconnect(_activate)
+
+
+func _activate() -> void:
+	pass
diff --git a/game/objects/interactive/lever.gd b/game/objects/interactive/lever.gd
index 1f7dbbd..4fc7225 100644
--- a/game/objects/interactive/lever.gd
+++ b/game/objects/interactive/lever.gd
@@ -1,5 +1,69 @@
 extends AbstractActivatableObject
 
 
-func activate() -> void:
-	pass
+signal switching
+signal switched
+
+
+enum State {
+	TurnedLeft,
+	TurnedRight,
+	TurningLeft,
+	TurningRight,
+}
+
+const ANIMATION_BY_STATE : Dictionary[State, String] = {
+	State.TurnedLeft: "turned_left",
+	State.TurnedRight: "turned_right",
+	State.TurningLeft: "turning_left",
+	State.TurningRight: "turning_right",
+}
+
+
+@export var initial_state: State = State.TurnedLeft
+
+
+var _current_state : State
+
+
+@onready var animated_sprite : AnimatedSprite2D = $AnimatedSprite2D
+
+
+func _ready() -> void:
+	super._ready()
+	_current_state = initial_state
+	_update_animation()
+
+
+func _activate() -> void:
+	var set_state := func(state: State) -> void:
+		_current_state = state
+		_update_animation()
+		hint_sprite.hide()
+		switching.emit()
+	
+	match _current_state:
+		State.TurnedLeft:
+			set_state.call(State.TurningRight)
+		State.TurnedRight:
+			set_state.call(State.TurningLeft)
+
+
+func _update_animation() -> void:
+	var animation := ANIMATION_BY_STATE[_current_state]
+	animated_sprite.play(animation)
+
+
+func _on_animation_finished() -> void:
+	var set_state := func(state: State) -> void:
+		_current_state = state
+		_update_animation()
+		switched.emit()
+		if _player_in_range:
+			hint_sprite.show()
+	
+	match _current_state:
+		State.TurningLeft:
+			set_state.call(State.TurnedLeft)
+		State.TurningRight:
+			set_state.call(State.TurnedRight)
diff --git a/game/objects/interactive/lever.tscn b/game/objects/interactive/lever.tscn
index dba8e68..0738766 100644
--- a/game/objects/interactive/lever.tscn
+++ b/game/objects/interactive/lever.tscn
@@ -66,7 +66,7 @@ animations = [{
 "speed": 5.0
 }, {
 "frames": [{
-"duration": 1.0,
+"duration": 2.0,
 "texture": SubResource("AtlasTexture_fmhac")
 }, {
 "duration": 1.0,
@@ -75,15 +75,15 @@ animations = [{
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_m2d68")
 }, {
-"duration": 1.0,
+"duration": 2.0,
 "texture": SubResource("AtlasTexture_eom63")
 }],
 "loop": false,
 "name": &"turning_left",
-"speed": 10.0
+"speed": 20.0
 }, {
 "frames": [{
-"duration": 1.0,
+"duration": 2.0,
 "texture": SubResource("AtlasTexture_0m1ch")
 }, {
 "duration": 1.0,
@@ -92,12 +92,12 @@ animations = [{
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_b2o5l")
 }, {
-"duration": 1.0,
+"duration": 2.0,
 "texture": SubResource("AtlasTexture_5h41l")
 }],
 "loop": false,
 "name": &"turning_right",
-"speed": 10.0
+"speed": 20.0
 }]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_5upgc"]
@@ -106,6 +106,7 @@ region = Rect2(96, 0, 16, 16)
 
 [node name="Lever" unique_id=1479061220 instance=ExtResource("1_rl4ey")]
 script = ExtResource("2_5hu3b")
+initial_state = 0
 
 [node name="CollisionShape2D" parent="." index="0" unique_id=2065213362]
 position = Vector2(0, -4)
@@ -116,7 +117,9 @@ position = Vector2(0, -11)
 
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." index="2" unique_id=2086579452]
 sprite_frames = SubResource("SpriteFrames_kky3u")
-animation = &"turned_left"
+animation = &"turning_left"
 
 [node name="BaseSprite" type="Sprite2D" parent="." index="3" unique_id=256419860]
 texture = SubResource("AtlasTexture_5upgc")
+
+[connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_animation_finished"]