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

Bit more cleanup

Browse Source
This commit is contained in:
Dominic Masters
2025-05-06 18:11:37 -05:00
parent 0dfb9743f6
commit 12746a520e
61 changed files with 148 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/Cutscene/Battle/BattleStartEvent.gd
View File

@@ -1,11 +0,0 @@
class_name BattleStartEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
var battle:Battle;
func _init(battle:Battle):
super._init();
self.battle = battle;
func start() -> void:
super.start();
getSystems().BATTLE.startBattle(self.battle);

1
scripts/Cutscene/Battle/BattleStartEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://e3ybjhvx0u1j

11
scripts/Cutscene/Cooking/CookingStartEvent.gd
View File

@@ -1,11 +0,0 @@
class_name CookingStartEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
const CookingGame = preload("res://scripts/Cooking/CookingGame.gd");
var cook:CookingGame;
func _init(cook:CookingGame) -> void:
self.cook = cook;
func start() -> void:
getSystems().COOKING.setCookingGame(self.cook);
getSystems().SCENE.setScene(SceneSystem.DawnScene.COOKING);

1
scripts/Cutscene/Cooking/CookingStartEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://cvgjwamgxd47o

42
scripts/Cutscene/Cutscene.gd
View File

@@ -1,42 +0,0 @@
class_name Cutscene
const CutsceneEvent = preload("res://scripts/Cutscene/CutsceneEvent.gd");
var queue:Array[CutsceneEvent] = [];
var cutsceneSystem = null;
func setupCutscene() -> void:
print_debug("Cutscene setup has not been overriden");
pass
func update(delta:float) -> void:
if queue.size() == 0:
return
var item = queue[0]
if !item.started:
item.start()
item.started = true
item.update(delta)
if item.isDone():
item.end()
queue.erase(item)
pass
func add(items:Array[CutsceneEvent]) -> void:
for item in items:
item.cutscene = self
queue.append(item)
func clear() -> void:
if queue.size() == 0:
return
var item = queue[0]
if item.started:
item.end()
item.started = false
queue.clear()

1
scripts/Cutscene/Cutscene.gd.uid
View File

@@ -1 +0,0 @@
uid://dyjbgcpycptxj

25
scripts/Cutscene/CutsceneEvent.gd
View File

@@ -1,25 +0,0 @@
class_name CutsceneEvent
var started:bool = false;
var cutscene = null;
func _init() -> void:
pass
func start() -> void:
started = true
func update(delta:float) -> void:
pass
func isDone() -> bool:
return true
func end() -> void:
pass
func reset() -> void:
started = false
func getCutscene():
return cutscene

1
scripts/Cutscene/CutsceneEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://chb6031ke0xeg

17
scripts/Cutscene/Event/CutsceneChangeEvent.gd
View File

@@ -1,17 +0,0 @@
class_name CutsceneChangeEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
var getCutscene:Callable
var cutsceneNext:Cutscene
func _init(getCutscene:Callable) -> void:
super._init();
self.getCutscene = getCutscene;
func start() -> void:
super.start();
self.cutsceneNext = self.getCutscene.call(self);
func end() -> void:
self.cutsceneNext.setupCutscene();
self.cutsceneNext.start();
getSystems().CUTSCENE.setCurrentCutscene(self.cutsceneNext);

1
scripts/Cutscene/Event/CutsceneChangeEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://crnwlun27bocw

73
scripts/Cutscene/Event/CutsceneConcurrentEvent.gd
View File

@@ -1,73 +0,0 @@
class_name CutsceneConcurrentEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
enum ConcurrentType {
SEQUENTIAL,
PARALLEL,
FIRST_DONE
}
var events:Array[CutsceneEvent] = []
var type:ConcurrentType = ConcurrentType.SEQUENTIAL
var current:int = 0
func _init(t:ConcurrentType, evts:Array[CutsceneEvent]) -> void:
super._init();
self.events = evts;
self.type = t;
func update(delta:float) -> void:
if self.type == ConcurrentType.PARALLEL:
for event in self.events:
if !event.started:
event.start()
event.started = true
if !event.isDone():
event.update(delta)
if event.isDone():
event.end()
elif self.type == ConcurrentType.FIRST_DONE:
for event in self.events:
if !event.started:
event.start()
event.started = true
event.update(delta)
if event.isDone():
event.end()
break
elif self.type == ConcurrentType.SEQUENTIAL:
if self.current >= self.events.size():
return;
var evt = self.events[self.current]
if !evt.started:
evt.start()
evt.started = true
evt.update(delta)
if evt.isDone():
evt.end()
self.current += 1
func isDone() -> bool:
if self.type == ConcurrentType.SEQUENTIAL:
return self.current >= self.events.size();
elif self.type == ConcurrentType.PARALLEL:
for evt in self.events:
if !evt.isDone():
return false;
return true;
elif self.type == ConcurrentType.FIRST_DONE:
for evt in self.events:
if evt.isDone():
return true;
return false;
printerr("Invalid ConcurrentType")
return false;

1
scripts/Cutscene/Event/CutsceneConcurrentEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://bwait88cm8pvd

32
scripts/Cutscene/Event/CutsceneIfEvent.gd
View File

@@ -1,32 +0,0 @@
class_name CutsceneIfEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
var eventTrue:CutsceneEvent
var eventFalse:CutsceneEvent
var condition:Callable
var result:bool = false
func _init(cond:Callable, evtTrue:CutsceneEvent, evtFalse:CutsceneEvent) -> void:
super._init();
condition = cond;
eventTrue = evtTrue;
eventFalse = evtFalse;
func start() -> void:
super.start();
result = self.condition.call(self);
if result:
eventTrue.start();
else:
eventFalse.start();
func getEvent() -> CutsceneEvent:
if result:
return eventTrue;
return eventFalse;
func update(delta:float) -> void:
getEvent().update(delta);
func isDone() -> bool:
return getEvent().isDone();

1
scripts/Cutscene/Event/CutsceneIfEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://2txg4eswrh0q

15
scripts/Cutscene/Event/CutscenePauseEvent.gd
View File

@@ -1,15 +0,0 @@
class_name CutscenePauseEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
var pauseType:PauseSystem.PauseType;
var pauseEntities:Array = [];
func _init(
type:PauseSystem.PauseType,
entities:Array = [],
) -> void:
super._init();
self.pauseType = type;
self.pauseEntities = entities;
func start() -> void:
PAUSE.pause(self.pauseType, self.pauseEntities);

1
scripts/Cutscene/Event/CutscenePauseEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://dj1kkm2vvvr2d

10
scripts/Cutscene/Event/CutscenePrintEvent.gd
View File

@@ -1,10 +0,0 @@
class_name CutscenePrintEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
var text:String = ""
func _init(text:String) -> void:
super._init()
self.text = text
func start() -> void:
print(self.text)

1
scripts/Cutscene/Event/CutscenePrintEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://cknkpwqllg7nc

13
scripts/Cutscene/Event/CutsceneWaitEvent.gd
View File

@@ -1,13 +0,0 @@
class_name CutsceneWaitEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
var wait:float = 0.0
func _init(time:float) -> void:
super._init()
self.wait = time
func update(delta:float) -> void:
self.wait -= delta
func isDone() -> bool:
return self.wait <= 0.0

1
scripts/Cutscene/Event/CutsceneWaitEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://cskwko5oqqq4m

43
scripts/Cutscene/Event/CutsceneWhileEvent.gd
View File

@@ -1,43 +0,0 @@
class_name CutsceneWhileEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
var events:Array[CutsceneEvent] = []
var callback:Callable
var current:int = 0
func _init(callback:Callable, evt:Array[CutsceneEvent]) -> void:
super._init();
self.events = evt;
self.callback = callback;
func shouldLoop() -> bool:
return self.callback.call(self)
func update(delta:float) -> void:
if self.current >= self.events.size():
return;
var evt = self.events[self.current]
if !evt.started:
evt.start()
evt.started = true
evt.update(delta)
if evt.isDone():
evt.end()
self.current += 1
if self.current < self.events.size():
return
if !self.shouldLoop():
return
self.current = 0
for event in self.events:
event.reset()
func isDone() -> bool:
if self.shouldLoop():
return false;
return self.current >= self.events.size();

1
scripts/Cutscene/Event/CutsceneWhileEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://cx4uqll85m28i

13
scripts/Cutscene/Event/Entity/OverworldChangeDirectionEvent.gd
View File

@@ -1,13 +0,0 @@
class_name OverworldChangeDirectionEvent extends "res://scripts/Cutscene/Event/Entity/OverworldEntityEvent.gd"
var direction:OverworldEntity.Direction;
func _init(
entity:OverworldEntity,
direction:OverworldEntity.Direction,
) -> void:
super._init(entity);
self.direction = direction;
func start() -> void:
entity.direction = direction;

1
scripts/Cutscene/Event/Entity/OverworldChangeDirectionEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://cu82did0twmkm

10
scripts/Cutscene/Event/Entity/OverworldEntityEvent.gd
View File

@@ -1,10 +0,0 @@
class_name OverworldEntityEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
const OverworldEntity = preload("res://scripts/Entity/OverworldEntity.gd");
var entity:OverworldEntity;
func _init(
entity:OverworldEntity,
) -> void:
super._init();
self.entity = entity;

1
scripts/Cutscene/Event/Entity/OverworldEntityEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://dmmguqphbe34j

15
scripts/Cutscene/Event/VisualNovel/TextboxEvent.gd
View File

@@ -1,15 +0,0 @@
class_name TextboxEvent extends "res://scripts/Cutscene/CutsceneEvent.gd"
var text:String;
func _init(
text:String
) -> void:
super._init();
self.text = text;
func start() -> void:
VN.getTextbox().setText(self.text);
func isDone() -> bool:
return VN.getTextbox().isClosed;

1
scripts/Cutscene/Event/VisualNovel/TextboxEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://dypv7erj66kbs

29
scripts/Cutscene/Scene/OverworldConversationEvent.gd
View File

@@ -1,29 +0,0 @@
class_name OverworldConversationEvent extends "res://scripts/Cutscene/Cutscene.gd"
const OverworldEntity = preload("res://scripts/Entity/OverworldEntity.gd");
const TextboxEvent = preload("res://scripts/Cutscene/Event/VisualNovel/TextboxEvent.gd");
const PauseEvent = preload("res://scripts/Cutscene/Event/CutscenePauseEvent.gd");
const OverworldChangeDirectionEvent = preload("res://scripts/Cutscene/Event/Entity/OverworldChangeDirectionEvent.gd");
var speaker:OverworldEntity;
var interacted:OverworldEntity;
var texts:Array[String];
func _init(speaker:OverworldEntity, interacted:OverworldEntity, texts:Array[String]) -> void:
self.speaker = speaker;
self.interacted = interacted;
self.texts = texts;
func setupCutscene() -> void:
var dirSpeaker = speaker.getDirectionToFace(interacted.position);
var dirInteracted = interacted.getDirectionToFace(speaker.position);
add([
OverworldChangeDirectionEvent.new(speaker, dirSpeaker),
OverworldChangeDirectionEvent.new(interacted, dirInteracted),
PauseEvent.new(PauseSystem.PauseType.ENTITY_PAUSED, [ speaker, interacted ]),
]);
for text in texts:
add([ TextboxEvent.new(text) ]);
add([ PauseEvent.new(PauseSystem.PauseType.NOT_PAUSED) ]);

1
scripts/Cutscene/Scene/OverworldConversationEvent.gd.uid
View File

@@ -1 +0,0 @@
uid://cywuvoi5v4fe3

10
scripts/Cutscene/TestCutscene.gd
View File

@@ -1,10 +0,0 @@
class_name TestCutscene extends "res://scripts/Cutscene/Scene/OverworldConversationEvent.gd"
func _init(speaker:OverworldEntity, interacted:OverworldEntity ) -> void:
super(
speaker,
interacted,
[
"Hello, my name is GREEN and I am an NPC."
]
);

1
scripts/Cutscene/TestCutscene.gd.uid
View File

@@ -1 +0,0 @@
uid://btxgv85qst1jy

8
scripts/Quest/Objective/QuestObjective.gd
View File

@@ -1,8 +0,0 @@
class_name QuestObjective
var name:String
func _init(
name:String
):
self.name = name;

1
scripts/Quest/Objective/QuestObjective.gd.uid
View File

@@ -1 +0,0 @@
uid://bakmt6ufpq33o

37
scripts/Quest/Quest.gd
View File

@@ -1,36 +1,3 @@
class_name Quest
const QuestObjective = preload("res://scripts/Quest/Objective/QuestObjective.gd");
class_name Quest extends Node
enum QuestState {
NOT_STARTED,
ACTIVE,
INACTIVE,
FINISHED
};
var questName:String;
var questState:QuestState = QuestState.NOT_STARTED;
var objectives:Array[QuestObjective] = [];
var currentObjective = -1;
func _init(
questName:String,
objectives:Array[QuestObjective]
) -> void:
self.questName = questName;
self.objectives = objectives;
func getState() -> QuestState:
return questState;
func start():
print("Starting quest: " + questName);
questState = QuestState.ACTIVE;
currentObjective = 0;
func nextObjective():
currentObjective = currentObjective + 1;
if currentObjective >= objectives.size():
questState = QuestState.FINISHED;
return null;
return objectives[currentObjective];
@export var questName:String = "Some quest"

2
scripts/Quest/Quest.gd.uid
View File

@@ -1 +1 @@
uid://kuxak18kbjr5
uid://dn0kxbe85n40f

6
scripts/Quest/QuestExample.gd
View File

@@ -1,6 +0,0 @@
class_name QuestExample extends "res://scripts/Quest/Quest.gd"
func _init() -> void:
super("Example Quest", [
QuestObjective.new("Test")
]);

1
scripts/Quest/QuestExample.gd.uid
View File

@@ -1 +0,0 @@
uid://cg3piglr8rbfs

9
scripts/Quest/QuestObjective.gd Normal file
View File

@@ -0,0 +1,9 @@
class_name QuestObjective extends Node
enum Type {
Item,
}
@export var objectiveName:String = "Some objective"
@export var objectiveType:Type = Type.Item

1
scripts/Quest/QuestObjective.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://de1ao4huhy0hm

3
scripts/Quest/QuestStage.gd Normal file
View File

@@ -0,0 +1,3 @@
class_name QuestStage extends Node
@export var stageName:String = "Some stage"

1
scripts/Quest/QuestStage.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://db4yhcxyhiosq

22
scripts/Singleton/Cutscene.gd
View File

@@ -1,22 +0,0 @@
extends Node
var currentCutscene:Cutscene = null;
func _process(delta: float) -> void:
if PAUSE.getPauseState() == PAUSE.PauseType.FULLY_PAUSED:
return;
if currentCutscene != null:
currentCutscene.update(delta);
func _exit_tree() -> void:
if currentCutscene != null:
currentCutscene.clear();
func setCurrentCutscene(cutscene:Cutscene) -> void:
if currentCutscene != null:
currentCutscene.clear();
currentCutscene = cutscene;
cutscene.cutsceneSystem = self;
currentCutscene.setupCutscene();

14
scripts/Singleton/Quest.gd
View File

@@ -1 +1,13 @@
class_name QuestSystem extends Node
class_name QuestSystem extends Node
var quests:Array[Quest]
func _ready() -> void:
_updateQuests()
pass
func _updateQuests() -> void:
quests = []
for quest in $Quests.get_children():
if quest is Quest:
quests.append(quest)

26
scripts/Singleton/UI.gd
View File

@@ -1,25 +1,5 @@
class_name UISystem extends Control
enum Layer {
Game,
VN,
Test,
Debug
}
func addSubscene(subscene:Control, layer:Layer) -> void:
subscene.originalParent.remove_child.call_deferred(subscene)
match layer:
Layer.Game:
$LayerGame.add_child.call_deferred(subscene)
Layer.Debug:
$LayerDebug.add_child.call_deferred(subscene)
Layer.VN:
$LayerVN.add_child.call_deferred(subscene)
_:
push_error("Invalid layer: " + str(layer))
return
func removeSubscene(subscene:Control) -> void:
subscene.get_parent().remove_child(subscene)
func _process(delta: float) -> void:
# This needs to always be at the end of the parent node's tree
get_parent().move_child(self, get_parent().get_child_count() - 1)

2
scripts/Singleton/VN.gd
View File

@@ -4,7 +4,7 @@ const VNTextbox = preload("res://scripts/UI/VNTextbox.gd")
var vnTextbox:VNTextbox = null
func _ready() -> void:
vnTextbox = $SubsceneUI/VNTextbox
vnTextbox = UI.get_node("VNTextbox")
func getTextbox() -> VNTextbox:
return vnTextbox

14
scripts/UI/DebugMenu.gd
View File

@@ -1,6 +1,8 @@
class_name DebugMenu extends VBoxContainer
func _ready() -> void:
hide()
$MainMenu.connect("pressed", _on_MainMenu_pressed);
$OverworldOption/Overworld.connect("pressed", _on_Overworld_pressed);
$Quests.connect("pressed", _on_Quests_pressed);
@@ -13,15 +15,23 @@ func _ready() -> void:
$OverworldOption/MapDropdown.add_item(map, i);
i = i + 1;
func _process(delta: float) -> void:
if Input.is_action_just_pressed("debug"):
print("Debug key pressed")
if is_visible():
hide()
else:
show()
func _on_MainMenu_pressed():
SCENE_MANAGER.setScene("MainMenu");
DEBUG.hideMenu()
hide()
func _on_Overworld_pressed():
var keys:Array[String] = OVERWORLD.MAPS.keys()
OVERWORLD.setMap(keys[$OverworldOption/MapDropdown.selected])
SCENE_MANAGER.setScene("Overworld");
DEBUG.hideMenu()
hide()
func _on_Quests_pressed():
print("Quests pressed")

6
scripts/UI/QuestMenu.gd Normal file
View File

@@ -0,0 +1,6 @@
class_name QuestMenu extends Control
func _ready() -> void:
$VBoxContainer/HBoxContainer/ItemList.clear()
for quest in QUEST.quests:
$VBoxContainer/HBoxContainer/ItemList.add_item(quest.questName)

1
scripts/UI/QuestMenu.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://cbsrw36kkucje

15
scripts/UI/SubsceneUI.gd
View File

@@ -1,15 +0,0 @@
class_name SubsceneUI extends Control
@export var layer:UISystem.Layer = UISystem.Layer.Game;
var originalParent:Node = null
func _ready() -> void:
originalParent = self.get_parent()
originalParent.tree_exiting.connect(onParentExiting)
UI.addSubscene(self, layer)
func onParentExiting() -> void:
if originalParent:
originalParent.tree_exiting.disconnect(onParentExiting)
UI.removeSubscene(self)
originalParent = null

1
scripts/UI/SubsceneUI.gd.uid
View File

@@ -1 +0,0 @@
uid://x3cc7wsnn0xd