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

Singelton patch

Browse Source
This commit is contained in:
Dominic Masters
2025-05-05 22:21:51 -05:00
parent 43487bb448
commit 631365aa38
46 changed files with 78 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/Entities/BasicNPCEntity.gd
View File

@@ -31,12 +31,12 @@ func interact(interactor:OverworldEntity) -> void:
# Cutscene in this manner must take two entities
# (self, speaker, and interactor, player)
var cs:Cutscene = interactCutscene.new(self, interactor);
getSystems().CUTSCENE.setCurrentCutscene(cs);
CUTSCENE.setCurrentCutscene(cs);
return
if interactType == BasicNPCInteractType.TEXTS:
var cs:Cutscene = OverworldConversationEvent.new(self, interactor, interactTexts);
getSystems().CUTSCENE.setCurrentCutscene(cs);
CUTSCENE.setCurrentCutscene(cs);
return
pass

12
scripts/Entities/OverworldEntity.gd
View File

@@ -1,7 +1,5 @@
class_name OverworldEntity extends CharacterBody3D
const PauseSystem = preload("res://scripts/System/PauseSystem.gd")
enum Direction {
NORTH,
EAST,
@@ -33,9 +31,6 @@ func _updateMaterial():
return
material.set_shader_parameter("direction", direction)
func getSystems() -> Systems:
return get_tree().current_scene.get_node("Systems") as Systems;
func getDirectionVector() -> Vector3:
match direction:
Direction.NORTH:
@@ -70,19 +65,18 @@ func updateOverworldLogic(delta) -> void:
pass
func isPaused() -> bool:
var pause = getSystems().PAUSE;
var ps = pause.getPauseState();
var ps = PAUSE.getPauseState();
if ps == PauseSystem.PauseType.NOT_PAUSED:
return false;
elif ps == PauseSystem.PauseType.FULLY_PAUSED:
return true;
elif ps == PauseSystem.PauseType.ENTITY_PAUSED:
if pause.entities.find(self) != -1:
if PAUSE.entities.find(self) != -1:
return true;
return false
elif ps == PauseSystem.PauseType.CUTSCENE_PAUSED:
if pause.entities.find(self) != -1:
if PAUSE.entities.find(self) != -1:
return false;
return true;
return false;

2
scripts/Entities/RosaController.gd
View File

@@ -22,7 +22,7 @@ func updateOverworldLogic(delta) -> void:
collider.interact(self)
if Input.is_action_just_pressed("pause"):
getSystems().PAUSE.playerPauseToggle();
PAUSE.playerPauseToggle();
func updateMovement(delta) -> void:
# User movement