diff --git a/scenes/gui/dialog_trigger_area.tscn b/scenes/gui/dialog_trigger_area.tscn index 4655591..c07e84e 100644 --- a/scenes/gui/dialog_trigger_area.tscn +++ b/scenes/gui/dialog_trigger_area.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=2 format=3 uid="uid://hkcebwbua6wm"] +[gd_scene load_steps=2 format=3 uid="uid://hyhe4kitrbt6"] -[ext_resource type="Script" path="res://src/scene-scripts/gui/dialog_trigger_area.cs" id="1_wosjw"] +[ext_resource type="Script" path="res://src/scene-scripts/dialog_trigger_area.cs" id="1_ujbo8"] [node name="dialog_trigger_area" type="Area2D"] collision_layer = 2 collision_mask = 2 -script = ExtResource("1_wosjw") +script = ExtResource("1_ujbo8") [node name="collision_shape_2d" type="CollisionShape2D" parent="."] diff --git a/scenes/tiles/dialogdebug_cupcake.tscn b/scenes/tiles/dialogdebug_cupcake.tscn index 991219a..092a2c9 100644 --- a/scenes/tiles/dialogdebug_cupcake.tscn +++ b/scenes/tiles/dialogdebug_cupcake.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://h8na2j1qthm4"] [ext_resource type="Texture2D" uid="uid://p5ubildre2tg" path="res://assets/textures/debug/cupcake.png" id="1_imilm"] -[ext_resource type="PackedScene" uid="uid://hkcebwbua6wm" path="res://scenes/gui/dialog_trigger_area.tscn" id="2_blpmd"] +[ext_resource type="PackedScene" uid="uid://hyhe4kitrbt6" path="res://scenes/gui/dialog_trigger_area.tscn" id="2_blpmd"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_pchpi"] size = Vector2(64, 58.5) diff --git a/src/scene-scripts/gui/dialog_trigger_area.cs b/src/scene-scripts/dialog_trigger_area.cs similarity index 100% rename from src/scene-scripts/gui/dialog_trigger_area.cs rename to src/scene-scripts/dialog_trigger_area.cs diff --git a/src/scene-scripts/player.cs b/src/scene-scripts/player.cs index 70aad7f..cd7c1ad 100644 --- a/src/scene-scripts/player.cs +++ b/src/scene-scripts/player.cs @@ -26,7 +26,9 @@ public partial class player : CharacterBody2D if (Input.IsActionJustPressed("move_up")) GetNode("ray_cast_2d").TargetPosition = new Vector2(0, -64); //call event in raycasted object + if (Input.IsActionJustPressed("ui_accept") && GetNode("ray_cast_2d").IsColliding()) { var raycastedObject = GetNode("ray_cast_2d").GetCollider(); - if(Input.IsActionJustPressed("ui_accept") && raycastedObject!=null) raycastedObject.Call("OnInteraction"); + raycastedObject.Call("OnInteraction"); + } } }