From 0463707616fdb9133a2162cf4ba683b024c82432 Mon Sep 17 00:00:00 2001 From: yuki Date: Mon, 24 Nov 2025 20:10:10 -0300 Subject: [PATCH] call point light method instead of manually enabling it --- scenes/player/player.gd | 6 +++--- scenes/player/player.tscn | 8 ++++++-- scenes/room/states/room_entering.gd | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scenes/player/player.gd b/scenes/player/player.gd index be8a9cc..c2eba6c 100644 --- a/scenes/player/player.gd +++ b/scenes/player/player.gd @@ -10,7 +10,7 @@ const DEADZONE = 0.1 @onready var sprite: AnimatedSprite2D = $AnimatedSprite2D @onready var state_machine: StateMachine = $PlayerStateMachine @onready var point_light: PointLight2D = $PointLight2D -@onready var animation_player: AnimationPlayer = $AnimationPlayer +@onready var point_light_animation: AnimationPlayer = $PointLight2D/AnimationPlayer var h_press_tick: int = 0 ## last time horizontal axis was pressed var v_press_tick: int = 0 ## last time vertical axis was pressed @@ -84,7 +84,7 @@ func _on_loop_toggled(enabled: bool, loop_size: Rect2i) -> void: func enable_point_light(enabled: bool, energy: float = 0) -> void: point_light.enabled = enabled point_light.energy = energy - if enabled: animation_player.play("default") - else: animation_player.pause() + if enabled: point_light_animation.play("default") + else: point_light_animation.play("RESET") point_light_toggled.emit(enabled, energy) diff --git a/scenes/player/player.tscn b/scenes/player/player.tscn index 27a88b4..fd2f9d8 100644 --- a/scenes/player/player.tscn +++ b/scenes/player/player.tscn @@ -35,7 +35,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [0.0] +"values": [-15.0] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_qek5x"] @@ -72,8 +72,10 @@ metadata/_custom_type_script = "uid://bebe1y51hwns8" enabled = false energy = 0.0 texture = ExtResource("5_75vfm") +offset = Vector2(0, -15) -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +[node name="AnimationPlayer" type="AnimationPlayer" parent="PointLight2D"] +root_node = NodePath("../..") libraries = { &"": SubResource("AnimationLibrary_qek5x") } @@ -87,3 +89,5 @@ animation = &"idle" position = Vector2(0, -7) shape = SubResource("CapsuleShape2D_gmlin") debug_color = Color(0.28459275, 0.61933166, 0.3529686, 0.41960785) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] diff --git a/scenes/room/states/room_entering.gd b/scenes/room/states/room_entering.gd index 0119179..04cf884 100644 --- a/scenes/room/states/room_entering.gd +++ b/scenes/room/states/room_entering.gd @@ -47,7 +47,7 @@ func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void: else: player_light_tween.tween_property(room.player.point_light, "energy", 0, room.config.transition_in_duration).set_trans(room.config.transition_in_type).set_ease(Tween.EASE_OUT) player_light_tween.tween_callback(func() -> void: - room.player.point_light.enabled = false + room.player.enable_point_light(false) player_light_tween = null )