Bit more cleanup

project.godot

@@ -18,14 +18,14 @@ config/icon="res://icon.svg"
 [autoload]
 
 DEBUG="*res://scenes/Singletons/Debug.tscn"
-BATTLE="*res://scripts/Singletons/Battle.gd"
-CUTSCENE="*res://scripts/Singletons/Cutscene.gd"
-COOKING="*res://scripts/Singletons/Cooking.gd"
-ITEM="*res://scripts/Singletons/Item.gd"
-OVERWORLD="*res://scripts/Singletons/Overworld.gd"
-PAUSE="*res://scripts/Singletons/Pause.gd"
+BATTLE="*res://scripts/Singleton/Battle.gd"
+CUTSCENE="*res://scripts/Singleton/Cutscene.gd"
+COOKING="*res://scripts/Singleton/Cooking.gd"
+ITEM="*res://scripts/Singleton/Item.gd"
+OVERWORLD="*res://scripts/Singleton/Overworld.gd"
+PAUSE="*res://scripts/Singleton/Pause.gd"
 QUEST="*res://scenes/Singletons/Quest.tscn"
-SCENE_MANAGER="*res://scripts/Singletons/SceneManager.gd"
+SCENE_MANAGER="*res://scripts/Singleton/SceneManager.gd"
 VN="*res://scenes/Singletons/VN.tscn"
 UI="*res://scenes/Singletons/UI.tscn"
 

scenes/Cooking.tscn

@@ -1,9 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://b4ffu88bmt4sa"]
-
-[ext_resource type="Script" uid="uid://ckxjs4wty6sju" path="res://scripts/Scenes/CookingScene.gd" id="1_27bmi"]
-[ext_resource type="PackedScene" uid="uid://bix00kr2hkaxn" path="res://scenes/Cooking/CuttingScene.tscn" id="1_bokpl"]
-
-[node name="Cooking" type="Node3D"]
-script = ExtResource("1_27bmi")
-
-[node name="CuttingScene" parent="." instance=ExtResource("1_bokpl")]

scenes/Cooking/CuttingScene.tscn

@@ -1,15 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://bix00kr2hkaxn"]
-
-[ext_resource type="Script" uid="uid://kwnx0enmgk54" path="res://scripts/Scenes/CuttingScene.gd" id="1_2ls7x"]
-
-[sub_resource type="CapsuleMesh" id="CapsuleMesh_hck4v"]
-
-[node name="CuttingScene" type="Node3D"]
-script = ExtResource("1_2ls7x")
-
-[node name="Camera3D" type="Camera3D" parent="."]
-transform = Transform3D(0.504528, 0.295299, -0.811326, 0, 0.939693, 0.34202, 0.863396, -0.172559, 0.474101, -1.50615, 0.608966, 0.933182)
-fov = 35.4
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-mesh = SubResource("CapsuleMesh_hck4v")

scenes/Overworld.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://tmbx2kit0jyq"]
 
-[ext_resource type="Script" uid="uid://pcncoc6wum4q" path="res://scripts/Scenes/OverworldScene.gd" id="1_rfscu"]
+[ext_resource type="Script" uid="uid://pcncoc6wum4q" path="res://scripts/Scene/OverworldScene.gd" id="1_rfscu"]
 [ext_resource type="PackedScene" uid="uid://dx6fv8n4jl5ku" path="res://scenes/Maps/TestMap/TestMap.tscn" id="2_puia7"]
 
 [node name="Overworld" type="Node3D"]

scenes/Singletons/Debug.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://klfo3l0dxlht"]
 
-[ext_resource type="Script" uid="uid://d36d3fnpi8y30" path="res://scripts/Singletons/Debug.gd" id="1_5spvt"]
+[ext_resource type="Script" uid="uid://d36d3fnpi8y30" path="res://scripts/Singleton/Debug.gd" id="1_5spvt"]
 [ext_resource type="PackedScene" uid="uid://bimrljk1rn7af" path="res://scenes/UI/SubsceneUI.tscn" id="2_5o7yr"]
 [ext_resource type="PackedScene" uid="uid://verg13jtqwvh" path="res://scenes/UI/DebugMenu.tscn" id="2_c2xgb"]
 

scenes/Singletons/Quest.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cs3kmmd0rfm8w"]
 
-[ext_resource type="Script" uid="uid://d0060jeyftia7" path="res://scripts/Singletons/Quest.gd" id="1_v2h4q"]
+[ext_resource type="Script" uid="uid://d0060jeyftia7" path="res://scripts/Singleton/Quest.gd" id="1_v2h4q"]
 
 [node name="Quest" type="Node"]
 script = ExtResource("1_v2h4q")

scenes/Singletons/UI.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://b5bwpsh0gcicf"]
 
-[ext_resource type="Script" uid="uid://dahhuhiu8u88b" path="res://scripts/Singletons/UI.gd" id="1_g3au4"]
+[ext_resource type="Script" uid="uid://dahhuhiu8u88b" path="res://scripts/Singleton/UI.gd" id="1_g3au4"]
 
 [node name="UI" type="Control"]
 layout_mode = 3

scenes/Singletons/VN.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://b6pl1cq5y05ad"]
 
-[ext_resource type="Script" uid="uid://benvf7v4p4i2l" path="res://scripts/Singletons/VN.gd" id="1_01fad"]
+[ext_resource type="Script" uid="uid://benvf7v4p4i2l" path="res://scripts/Singleton/VN.gd" id="1_01fad"]
 [ext_resource type="PackedScene" uid="uid://bkx3l0kckf4a8" path="res://scenes/UI/VNTextbox.tscn" id="2_adm0d"]
 [ext_resource type="PackedScene" uid="uid://bimrljk1rn7af" path="res://scenes/UI/SubsceneUI.tscn" id="2_hxsm8"]
 

scenes/UI/PauseMenu.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://cqr1fgxwv0bjg"]
+[gd_scene load_steps=2 format=3 uid="uid://dqf0j61ukvqco"]
 
 [ext_resource type="Theme" uid="uid://dm7ee4aqjr2dl" path="res://ui/UI Theme.tres" id="1_jnmec"]
 

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)

scripts/Scenes/CookingScene.gd

@@ -1 +0,0 @@
-class_name CookingScene extends Node3D

scripts/Scenes/CuttingScene.gd

@@ -1 +0,0 @@
-class_name CuttingScene extends Node3D