Almost fixed entities

scenes/Entities/Rosa.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=3 uid="uid://yhtpoum3eek7"]
+[gd_scene load_steps=12 format=3 uid="uid://yhtpoum3eek7"]
 
 [ext_resource type="Script" uid="uid://ixwikdguyhf0" path="res://scripts/Entity/Rosa.gd" id="1_r5ufg"]
 [ext_resource type="Script" uid="uid://dtjjqp2atjyhr" path="res://scripts/Entity/Entity.gd" id="1_rvn3n"]
@@ -7,6 +7,7 @@
 [ext_resource type="Shader" uid="uid://7h2axb2tsh17" path="res://shaders/NPC Shader.gdshader" id="3_j5vis"]
 [ext_resource type="Script" uid="uid://c5nfs0m6ua4eb" path="res://scripts/Entity/Component/EntityMovement.gd" id="4_7s3uq"]
 [ext_resource type="Texture2D" uid="uid://cofrgefp8e617" path="res://textures/human.png" id="4_rvn3n"]
+[ext_resource type="Script" uid="uid://dfh2rh8idx267" path="res://scripts/Entity/Component/EntityInteractor.gd" id="5_ug24t"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ls7r8"]
 radius = 0.437175
@@ -32,10 +33,11 @@ metadata/_custom_type_script = "uid://ixwikdguyhf0"
 script = ExtResource("1_rvn3n")
 metadata/_custom_type_script = "uid://dtjjqp2atjyhr"
 
-[node name="EntityDirection" type="Node" parent="Entity" node_paths=PackedStringArray("meshInstance")]
+[node name="EntityDirection" type="Node" parent="Entity" node_paths=PackedStringArray("meshInstance", "characterBody")]
 script = ExtResource("2_vcxxc")
 meshInstance = NodePath("../../MeshInstance3D")
 direction = 2
+characterBody = NodePath("../..")
 metadata/_custom_type_script = "uid://cjfcpi7sxentf"
 
 [node name="EntityMoving" type="Node" parent="Entity" node_paths=PackedStringArray("characterBody", "entity", "entityDirection")]
@@ -45,6 +47,14 @@ entity = NodePath("..")
 entityDirection = NodePath("../EntityDirection")
 movementType = 0
 
+[node name="EntityInteractor" type="Node" parent="Entity" node_paths=PackedStringArray("entityDirection", "characterBody", "entity")]
+script = ExtResource("5_ug24t")
+interactorType = 0
+entityDirection = NodePath("../EntityDirection")
+characterBody = NodePath("../..")
+entity = NodePath("..")
+metadata/_custom_type_script = "uid://dfh2rh8idx267"
+
 [node name="Rosa Camera" type="Camera3D" parent="." node_paths=PackedStringArray("follow")]
 transform = Transform3D(1, 0, 0, 0, 0.130388, 0.991463, 0, -0.991463, 0.130388, 0, 3.14994, 0.404846)
 current = true

scenes/Entities/TestNPC.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://dr4b2pmsknuhc"]
+[gd_scene load_steps=11 format=3 uid="uid://dr4b2pmsknuhc"]
 
 [ext_resource type="Script" uid="uid://d23qg1ovkbxst" path="res://scripts/Entity/BasicNPCEntity.gd" id="1_1muh7"]
 [ext_resource type="Shader" uid="uid://7h2axb2tsh17" path="res://shaders/NPC Shader.gdshader" id="1_xgcv1"]
@@ -6,6 +6,7 @@
 [ext_resource type="Script" uid="uid://cjfcpi7sxentf" path="res://scripts/Entity/Component/EntityDirection.gd" id="3_gyi1p"]
 [ext_resource type="Script" uid="uid://c5nfs0m6ua4eb" path="res://scripts/Entity/Component/EntityMovement.gd" id="4_3wesq"]
 [ext_resource type="Texture2D" uid="uid://cofrgefp8e617" path="res://textures/human.png" id="4_vo0ku"]
+[ext_resource type="Script" uid="uid://03dqknw7v4mr" path="res://scripts/Entity/Component/EntityInteractable.gd" id="5_gyi1p"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_dw1sy"]
 radius = 0.420979
@@ -31,9 +32,10 @@ metadata/_custom_type_script = "uid://d23qg1ovkbxst"
 script = ExtResource("2_ehu3x")
 metadata/_custom_type_script = "uid://dtjjqp2atjyhr"
 
-[node name="EntityDirection" type="Node" parent="Entity" node_paths=PackedStringArray("meshInstance")]
+[node name="EntityDirection" type="Node" parent="Entity" node_paths=PackedStringArray("meshInstance", "characterBody")]
 script = ExtResource("3_gyi1p")
 meshInstance = NodePath("../../MeshInstance3D")
+characterBody = NodePath("../..")
 metadata/_custom_type_script = "uid://cjfcpi7sxentf"
 
 [node name="EntityMoving" type="Node" parent="Entity" node_paths=PackedStringArray("characterBody", "entity", "entityDirection")]
@@ -43,6 +45,12 @@ entity = NodePath("..")
 entityDirection = NodePath("../EntityDirection")
 movementType = 2
 
+[node name="EntityInteractable" type="Node" parent="Entity" node_paths=PackedStringArray("entityDirection", "entity")]
+script = ExtResource("5_gyi1p")
+entityDirection = NodePath("../EntityDirection")
+entity = NodePath("..")
+metadata/_custom_type_script = "uid://03dqknw7v4mr"
+
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 shape = SubResource("CapsuleShape3D_dw1sy")
 

scenes/Maps/TestMap/TestMap.tscn

@@ -32,8 +32,9 @@ environment = SubResource("Environment_nyivo")
 [node name="Rosa" parent="." instance=ExtResource("1_7b7hx")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.19857, 0.684572, 0.968477)
 
-[node name="Green" parent="." instance=ExtResource("2_cg1ph")]
+[node name="Green" parent="." node_paths=PackedStringArray("interactEvent") instance=ExtResource("2_cg1ph")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.68747, 0.459578, -0.399262)
+interactEvent = NodePath("../Events/TestConversation")
 
 [node name="OmniLight3D" type="OmniLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7.20244, 3.80554)

scripts/Entity/BasicNPCEntity.gd

@@ -1 +1,16 @@
 class_name BasicNPCEntity extends CharacterBody3D
+
+@export var interactEvent:Event = null
+
+func _ready() -> void:
+	$Entity/EntityInteractable.onInteract.connect(
+		self.onEntityInteract
+	)
+
+func onEntityInteract(
+	interactor:EntityInteractor,
+	interactee:EntityInteractable
+) -> void:
+	if interactEvent == null || interactEvent.started:
+		return
+	interactEvent.onEntityInteract(interactor, $Entity/EntityInteractable)

scripts/Entity/Component/EntityDirection.gd

@@ -18,6 +18,8 @@ enum Direction {
 		direction = newDirection;
 		_updateMaterial();
 
+@export var characterBody:CharacterBody3D = null
+
 func _ready() -> void:
 	_updateMaterial();
 
@@ -63,16 +65,19 @@ func updateDirectionFromMovement(movement:Vector2) -> void:
 	elif (movement.y < 0):
 		direction = Direction.NORTH;
 
-# func getDirectionToFace(position:Vector3) -> Direction:
+func getDirectionToFace(position:Vector3) -> Direction:
-# 	var diff = position - self.position;
+	if !characterBody:
-# 	if abs(diff.x) > abs(diff.z):
+		return Direction.SOUTH;
-# 		if diff.x > 0:
+
-# 			return Direction.EAST;
+	var diff = position - characterBody.position;
-# 		else:
+	if abs(diff.x) > abs(diff.z):
-# 			return Direction.WEST;
+		if diff.x > 0:
-# 	else:
+			return Direction.EAST;
-# 		if diff.z > 0:
+		else:
-# 			return Direction.SOUTH;
+			return Direction.WEST;
-# 		else:
+	else:
-# 			return Direction.NORTH;
+		if diff.z > 0:
-# 	return Direction.SOUTH;
+			return Direction.SOUTH;
+		else:
+			return Direction.NORTH;
+	return Direction.SOUTH;

scripts/Entity/Component/EntityInteractable.gd

@@ -1,3 +1,10 @@
 class_name EntityInteractable extends Node
 
-signal entityOnInteract(entity:EntityInteractor);
+@export var entityDirection:EntityDirection = null
+@export var entity:Entity = null
+@export var characterBody:CharacterBody3D = null;
+
+signal onInteract(interactor:EntityInteractor, interactable:EntityInteractable)
+
+func interact(interactor:EntityInteractor) -> void:
+	onInteract.emit(interactor, self)

scripts/Entity/Component/EntityInteractor.gd

@@ -1,4 +1,59 @@
 class_name EntityInteractor extends Node
 
-func tryInteract() -> EntityInteractable:
+enum InteractorType {
-	return null
+	PLAYER_INPUT,
+	UNDECIDED
+}
+
+@export var interactorType:InteractorType = InteractorType.UNDECIDED;
+@export var entityDirection:EntityDirection = null;
+@export var characterBody:CharacterBody3D = null;
+@export var interactRange = 0.7;
+@export var entity:Entity = null
+@export_flags_3d_physics() var interactLayers = 2;
+
+func interactWith(interactable:EntityInteractable) -> void:
+	interactable.interact(self)
+	pass
+
+func getRaycastInteractable() -> EntityInteractable:
+	if !entityDirection or !characterBody:
+		return null
+	
+	var rayDirection = entityDirection.getDirectionVector()
+	var query = PhysicsRayQueryParameters3D.create(
+		characterBody.position,
+		characterBody.position + (rayDirection * interactRange)
+	)
+	query.collide_with_bodies = true;
+	query.collide_with_areas = true;
+	query.collision_mask = interactLayers;
+	query.exclude = [ characterBody ];
+
+	var result = characterBody.get_world_3d().direct_space_state.intersect_ray(query)
+	if !result or !result.collider:
+		return null
+
+	var coll:Node3D = result.collider;
+	var interactable:EntityInteractable = coll.find_child("EntityInteractable")
+	return interactable
+
+func _process(delta: float) -> void:
+	match interactorType:
+		InteractorType.PLAYER_INPUT:
+			_processPlayerInput()
+		InteractorType.UNDECIDED:
+			_processUndecided()
+		_:
+			assert(false, "Invalid interactor type")
+
+func _processPlayerInput() -> void:
+	if !Input.is_action_just_pressed("interact"):
+		return
+
+	var interactable:EntityInteractable = getRaycastInteractable()
+	if interactable:
+		self.interactWith(interactable)
+
+func _processUndecided() -> void:
+	pass

scripts/Entity/Rosa.gd

@@ -1,27 +1 @@
 class_name Rosa extends CharacterBody3D
-
-
-
-# var interactRange = 0.7;
-
-# func updateOverworldLogic(delta) -> void:
-# 	# Check if interact button is pressed
-# 	if(Input.is_action_just_pressed("interact")):
-# 		var rayDirection = getDirectionVector();
-# 		# cast ray
-		
-# 		var query = PhysicsRayQueryParameters3D.create(
-# 			position,
-# 			position + (rayDirection * interactRange)
-# 		)
-# 		query.collide_with_areas = true
-# 		query.exclude = [self]
-
-# 		var result = get_world_3d().direct_space_state.intersect_ray(query)
-# 		if result and result.collider:
-# 			var collider = result.collider
-# 			if(collider.has_method("interact")):
-# 				collider.interact(self)
-
-# 	if Input.is_action_just_pressed("pause"):
-# 		PAUSE.playerPauseToggle();

scripts/Event/Entity/EventEntityTurn.gd

@@ -1,6 +1,6 @@
 class_name EventEntityTurn extends "res://scripts/Event/Event.gd"
 
-@export var entity:Entity = null
+@export var entity:EntityDirection = null
 @export var direction:EntityDirection.Direction = EntityDirection.Direction.SOUTH
 
 func start():

scripts/Event/Event.gd

@@ -2,11 +2,10 @@ class_name Event extends Node
 
 const Entity = preload("res://scripts/Entity/Entity.gd");
 
-
 var started:bool = false;
 var ended:bool = false;
-var interactor:Entity = null
+var interactor:EntityInteractor = null
-var interactee:Entity = null
+var interactee:EntityInteractable = null
 
 # Godot Methods
 func _init() -> void:
@@ -43,8 +42,8 @@ func reset() -> void:
 	interactee = null
 
 func onEntityInteract(
-	interactor:Entity,
+	interactor:EntityInteractor,
-	interactee:Entity
+	interactee:EntityInteractable
 ) -> void:
 	self.reset()
 	self.interactor = interactor

scripts/Event/EventConversation.gd

@@ -12,34 +12,39 @@ class_name EventConversation extends "res://scripts/Event/Flow/EventGroup.gd"
 
 func start() -> void:
 	# Turn events
-	if interactee != null && interactor != null:
+	if interactee && interactor:
-		if pauseInteractee && turnInteractee:
+		if turnInteractee && interactee.entityDirection && interactor.characterBody:
 			var turn = EventEntityTurn.new()
-			turn.entity = interactee
+			turn.entity = interactee.entityDirection
-			turn.direction = interactee.getDirectionToFace(interactor.position)
+			turn.direction = turn.entity.getDirectionToFace(interactor.characterBody.position)
 			addExtraEvent(turn, 0)
 
-		if pauseInteractor && turnInteractor:
+		if turnInteractor && interactor.entityDirection && interactee.characterBody:
 			var turn = EventEntityTurn.new()
-			turn.entity = interactor
+			turn.entity = interactor.entityDirection
-			turn.direction = interactor.getDirectionToFace(interactee.position)
+			turn.direction = turn.entity.getDirectionToFace(interactee.characterBody.position)
 			addExtraEvent(turn, 0)
 
 	# Create start pause event
-	var startPause = EventPause.new()
+	if (pauseInteractee && interactee.entity) || (pauseInteractor && interactor.entity):
-	startPause.pauseType = startPauseType
+		var startPause = EventPause.new()
-	startPause.entities = entities
+		startPause.pauseType = startPauseType
-	startPause.includeInteractee = pauseInteractee
+		startPause.entities = entities
-	startPause.includeInteractor = pauseInteractor
+		if pauseInteractee && interactee.entity:
-	addExtraEvent(startPause, 0)
+			startPause.includeInteractee = pauseInteractee
+		if pauseInteractor && interactor.entity:
+			startPause.includeInteractor = pauseInteractor
+		addExtraEvent(startPause, 0)
 
-	# Create end pause event.
+		# Create end pause event.
-	var endPause = EventPause.new()
+		var endPause = EventPause.new()
-	endPause.pauseType = endPauseType
+		endPause.pauseType = endPauseType
-	endPause.entities = entities
+		endPause.entities = entities
-	endPause.includeInteractee = pauseInteractee
+		if pauseInteractee && interactee.entity:
-	endPause.includeInteractor = pauseInteractor
+			endPause.includeInteractee = pauseInteractee
-	addExtraEvent(endPause, -1)
+		if pauseInteractor && interactor.entity:
+			endPause.includeInteractor = pauseInteractor
+		addExtraEvent(endPause, -1)
 
 	# Pass off to event group
-	super.start()
+	super.start()

scripts/Event/EventPause.gd

@@ -9,8 +9,8 @@ const PauseSystem = preload("res://scripts/Singleton/Pause.gd")
 
 func start() -> void:
 	var ents:Array[Entity] = entities
-	if interactor != null and includeInteractor:
+	if interactor && includeInteractor && interactor.entity:
-		ents.append(interactor)
+		ents.append(interactor.entity)
-	if interactee != null and includeInteractee:
+	if interactee && includeInteractee && interactee.entity:
-		ents.append(interactee)
+		ents.append(interactee.entity)
 	PAUSE.pause(pauseType, ents)

scripts/Singleton/Pause.gd

@@ -12,7 +12,7 @@ enum PauseType {
 };
 
 var pauseType:PauseType = PauseType.NOT_PAUSED;
-var entities:Array = [];
+var entities:Array[Entity] = [];
 var playerPaused:bool = false;
 
 func getPauseState() -> PauseType: