From c86931a2cf4167738fb6856a7b6ba3d86c3a8f92 Mon Sep 17 00:00:00 2001 From: cmod31 Date: Tue, 31 Jan 2023 15:12:40 +0100 Subject: [PATCH] dialogue stuff didnt commit --- scenes/player.tscn | 2 ++ src/scene-scripts/player.cs | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scenes/player.tscn b/scenes/player.tscn index 7a8f158..46dc01b 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -99,7 +99,9 @@ script = ExtResource("1_qehox") rotation = 3.14159 target_position = Vector2(-64, 0) collision_mask = 2 +hit_from_inside = true collide_with_areas = true +collide_with_bodies = false [node name="animated_sprite_2d" type="AnimatedSprite2D" parent="."] texture_filter = 1 diff --git a/src/scene-scripts/player.cs b/src/scene-scripts/player.cs index 361d2c7..a517981 100644 --- a/src/scene-scripts/player.cs +++ b/src/scene-scripts/player.cs @@ -3,18 +3,19 @@ using System; public partial class player : CharacterBody2D { + [Export] public string playerName; [Export] public int speed = 200; public Vector2 movement; public AnimatedSprite2D animatedSprite; public Marker2D rotCenter; - public RayCast2D rayCast; + public RayCast2D dialogRayCast; public override void _Ready() { animatedSprite = GetNode("animated_sprite_2d"); rotCenter = GetNode("rotation_center"); - rayCast = GetNode("rotation_center/ray_cast_2d"); + dialogRayCast = GetNode("rotation_center/ray_cast_2d"); } public void ChangeProcess(bool process) { @@ -29,9 +30,8 @@ public partial class player : CharacterBody2D } public override void _Process(double delta) { - //call event in raycasted object - if (Input.IsActionJustPressed("ui_accept") && rayCast.IsColliding()) - rayCast.GetCollider().Call("OnInteraction", playerName); + if (Input.IsActionJustPressed("ui_accept") && dialogRayCast.IsColliding()) + dialog_bubble.SetDialog(dialogRayCast.GetCollider().Get("dialogFile").AsString()); //animation system (with controller support wich cant get normalized vector) if (movement.Length() != 0)