Bit more cleanup

2025-05-06 16:21:22 -05:00
parent 85a7ed99bf
commit 0dfb9743f6
51 changed files with 15 additions and 41 deletions
--- a/scripts/Event/EventPause.gd
+++ b/scripts/Event/EventPause.gd
@@ -1,6 +1,6 @@
 class_name EventPause extends "res://scripts/Event/Event.gd"

-const PauseSystem = preload("res://scripts/Singletons/Pause.gd")
+const PauseSystem = preload("res://scripts/Singleton/Pause.gd")

@export var pauseType:PauseSystem.PauseType = PauseSystem.PauseType.ENTITY_PAUSED
@export var entities:Array[OverworldEntity] = []
@@ -13,4 +13,4 @@ func start() -> void:
 		ents.append(interactor)
 	if interactee != null and includeInteractee:
 		ents.append(interactee)
-	PAUSE.pause(pauseType, ents)
+	PAUSE.pause(pauseType, ents)
--- a/scripts/Scenes/CookingScene.gd.uid
+++ b/scripts/Scenes/CookingScene.gd.uid
--- a/scripts/Scenes/CuttingScene.gd.uid
+++ b/scripts/Scenes/CuttingScene.gd.uid
--- a/scripts/Scenes/MainMenuScene.gd.uid
+++ b/scripts/Scenes/MainMenuScene.gd.uid
--- a/scripts/Scenes/OverworldScene.gd
+++ b/scripts/Scenes/OverworldScene.gd
--- a/scripts/Scenes/OverworldScene.gd.uid
+++ b/scripts/Scenes/OverworldScene.gd.uid
--- a/scripts/Scenes/RootScene.gd.uid
+++ b/scripts/Scenes/RootScene.gd.uid
--- a/scripts/Scenes/UIScene.gd.uid
+++ b/scripts/Scenes/UIScene.gd.uid
--- a/scripts/Scenes/CookingScene.gd
+++ b/scripts/Scenes/CookingScene.gd
@@ -1 +0,0 @@
-class_name CookingScene extends Node3D
--- a/scripts/Scenes/CuttingScene.gd
+++ b/scripts/Scenes/CuttingScene.gd
@@ -1 +0,0 @@
-class_name CuttingScene extends Node3D
--- a/scripts/Singletons/Battle.gd
+++ b/scripts/Singletons/Battle.gd
--- a/scripts/Singletons/Battle.gd.uid
+++ b/scripts/Singletons/Battle.gd.uid
--- a/scripts/Singletons/BattleSystem.gd.uid
+++ b/scripts/Singletons/BattleSystem.gd.uid
--- a/scripts/Singletons/Cooking.gd
+++ b/scripts/Singletons/Cooking.gd
--- a/scripts/Singletons/Cooking.gd.uid
+++ b/scripts/Singletons/Cooking.gd.uid
--- a/scripts/Singletons/CookingSystem.gd.uid
+++ b/scripts/Singletons/CookingSystem.gd.uid
--- a/scripts/Singletons/Cutscene.gd
+++ b/scripts/Singletons/Cutscene.gd
--- a/scripts/Singletons/Cutscene.gd.uid
+++ b/scripts/Singletons/Cutscene.gd.uid
--- a/scripts/Singletons/CutsceneSystem.gd.uid
+++ b/scripts/Singletons/CutsceneSystem.gd.uid
--- a/scripts/Singletons/Debug.gd
+++ b/scripts/Singletons/Debug.gd
--- a/scripts/Singletons/Debug.gd.uid
+++ b/scripts/Singletons/Debug.gd.uid
--- a/scripts/Singletons/Item.gd
+++ b/scripts/Singletons/Item.gd
--- a/scripts/Singletons/Item.gd.uid
+++ b/scripts/Singletons/Item.gd.uid
--- a/scripts/Singletons/ItemSystem.gd.uid
+++ b/scripts/Singletons/ItemSystem.gd.uid
--- a/scripts/Singletons/Overworld.gd
+++ b/scripts/Singletons/Overworld.gd
--- a/scripts/Singletons/Overworld.gd.uid
+++ b/scripts/Singletons/Overworld.gd.uid
--- a/scripts/Singletons/OverworldSystem.gd.uid
+++ b/scripts/Singletons/OverworldSystem.gd.uid
--- a/scripts/Singletons/Pause.gd
+++ b/scripts/Singletons/Pause.gd
--- a/scripts/Singletons/Pause.gd.uid
+++ b/scripts/Singletons/Pause.gd.uid
--- a/scripts/Singletons/PauseSystem.gd.uid
+++ b/scripts/Singletons/PauseSystem.gd.uid
--- a/scripts/Singletons/Quest.gd
+++ b/scripts/Singletons/Quest.gd
--- a/scripts/Singletons/Quest.gd.uid
+++ b/scripts/Singletons/Quest.gd.uid
--- a/scripts/Singletons/QuestSystem.gd.uid
+++ b/scripts/Singletons/QuestSystem.gd.uid
--- a/scripts/Singletons/SceneManager.gd
+++ b/scripts/Singletons/SceneManager.gd
--- a/scripts/Singletons/SceneManager.gd.uid
+++ b/scripts/Singletons/SceneManager.gd.uid
--- a/scripts/Singletons/SceneSystem.gd.uid
+++ b/scripts/Singletons/SceneSystem.gd.uid
--- a/scripts/Singletons/Systems.gd.uid
+++ b/scripts/Singletons/Systems.gd.uid
--- a/scripts/Singletons/UI.gd
+++ b/scripts/Singletons/UI.gd
--- a/scripts/Singletons/UI.gd.uid
+++ b/scripts/Singletons/UI.gd.uid
--- a/scripts/Singletons/VN.gd
+++ b/scripts/Singletons/VN.gd
--- a/scripts/Singletons/VN.gd.uid
+++ b/scripts/Singletons/VN.gd.uid
--- a/scripts/Singletons/VNSystem.gd.uid
+++ b/scripts/Singletons/VNSystem.gd.uid