YourWishes/Dawn-Godot
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Rewrote entity system

Browse Source
This commit is contained in:
Dominic Masters
2025-05-09 22:33:51 -05:00
parent a69ec56a2d
commit f465880044
29 changed files with 372 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/Event/Entity/EventEntityTurn.gd
View File

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

10
scripts/Event/Event.gd
View File

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

2
scripts/Event/EventConversation.gd
View File

@@ -3,7 +3,7 @@ class_name EventConversation extends "res://scripts/Event/Flow/EventGroup.gd"
@export var startPauseType:PauseSystem.PauseType = PauseSystem.PauseType.ENTITY_PAUSED
@export var endPauseType:PauseSystem.PauseType = PauseSystem.PauseType.NOT_PAUSED
@export var entities:Array[OverworldEntity] = []
@export var entities:Array[Entity] = []
@export var pauseInteractee:bool = true
@export var pauseInteractor:bool = true

4
scripts/Event/EventPause.gd
View File

@@ -3,12 +3,12 @@ class_name EventPause extends "res://scripts/Event/Event.gd"
const PauseSystem = preload("res://scripts/Singleton/Pause.gd")
@export var pauseType:PauseSystem.PauseType = PauseSystem.PauseType.ENTITY_PAUSED
@export var entities:Array[OverworldEntity] = []
@export var entities:Array[Entity] = []
@export var includeInteractee:bool = true
@export var includeInteractor:bool = true
func start() -> void:
var ents:Array[OverworldEntity] = entities
var ents:Array[Entity] = entities
if interactor != null and includeInteractor:
ents.append(interactor)
if interactee != null and includeInteractee: