diff --git a/Scenes/Selector.tscn b/Scenes/Selector.tscn index 0647ccde..9a1315c7 100644 --- a/Scenes/Selector.tscn +++ b/Scenes/Selector.tscn @@ -25,9 +25,10 @@ animations = [{ }] [node name="Selector" type="Node2D"] +top_level = true [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +top_level = true z_index = -5 sprite_frames = SubResource("SpriteFrames_kehny") -frame = 1 -frame_progress = 0.18995 +frame_progress = 0.78335 diff --git a/Scripts/PlayerMovement.cs b/Scripts/PlayerMovement.cs index 34bb992e..d09c4617 100644 --- a/Scripts/PlayerMovement.cs +++ b/Scripts/PlayerMovement.cs @@ -270,7 +270,17 @@ public partial class PlayerMovement : CharacterBody2D, IDestructible private void _on_interaction_controller_area_exited(Area2D area) { - + if (area.IsInGroup("Interactable") && area is Interactable interactable) + { + Debug.WriteLine($"Interactable {area.Name} Exited"); + + if (_selector != null) + { + _selector.Position = interactable.Position; + _selector.Visible = true; + _lastInteractable = interactable; + } + } } private void Explode() diff --git a/project.godot b/project.godot index 03fae4e3..7218f27e 100644 --- a/project.godot +++ b/project.godot @@ -122,6 +122,11 @@ strafe={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":false,"script":null) ] } +scan={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) +] +} [layer_names]