diff --git a/project.godot b/project.godot index b0740ac..631d1c3 100644 --- a/project.godot +++ b/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" diff --git a/scenes/Cooking.tscn b/scenes/Cooking.tscn deleted file mode 100644 index 2d2b99a..0000000 --- a/scenes/Cooking.tscn +++ /dev/null @@ -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")] diff --git a/scenes/Cooking/CuttingScene.tscn b/scenes/Cooking/CuttingScene.tscn deleted file mode 100644 index 5198e4a..0000000 --- a/scenes/Cooking/CuttingScene.tscn +++ /dev/null @@ -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") diff --git a/scenes/Overworld.tscn b/scenes/Overworld.tscn index b336089..ebfec14 100644 --- a/scenes/Overworld.tscn +++ b/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"] diff --git a/scenes/Singletons/Debug.tscn b/scenes/Singletons/Debug.tscn index 1f162d6..76cf4ba 100644 --- a/scenes/Singletons/Debug.tscn +++ b/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"] diff --git a/scenes/Singletons/Quest.tscn b/scenes/Singletons/Quest.tscn index d7366c5..777ad07 100644 --- a/scenes/Singletons/Quest.tscn +++ b/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") diff --git a/scenes/Singletons/UI.tscn b/scenes/Singletons/UI.tscn index 60b41fe..7399ef2 100644 --- a/scenes/Singletons/UI.tscn +++ b/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 diff --git a/scenes/Singletons/VN.tscn b/scenes/Singletons/VN.tscn index ee12e22..5c3a16d 100644 --- a/scenes/Singletons/VN.tscn +++ b/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"] diff --git a/scenes/UI/PauseMenu.tscn b/scenes/UI/PauseMenu.tscn index 7b2dfae..4ed8943 100644 --- a/scenes/UI/PauseMenu.tscn +++ b/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"] diff --git a/scripts/Event/EventPause.gd b/scripts/Event/EventPause.gd index c5f3698..168c25f 100644 --- 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) \ No newline at end of file + PAUSE.pause(pauseType, ents) diff --git a/scripts/Scenes/CookingScene.gd.uid b/scripts/Scene/CookingScene.gd.uid similarity index 100% rename from scripts/Scenes/CookingScene.gd.uid rename to scripts/Scene/CookingScene.gd.uid diff --git a/scripts/Scenes/CuttingScene.gd.uid b/scripts/Scene/CuttingScene.gd.uid similarity index 100% rename from scripts/Scenes/CuttingScene.gd.uid rename to scripts/Scene/CuttingScene.gd.uid diff --git a/scripts/Scenes/MainMenuScene.gd.uid b/scripts/Scene/MainMenuScene.gd.uid similarity index 100% rename from scripts/Scenes/MainMenuScene.gd.uid rename to scripts/Scene/MainMenuScene.gd.uid diff --git a/scripts/Scenes/OverworldScene.gd b/scripts/Scene/OverworldScene.gd similarity index 100% rename from scripts/Scenes/OverworldScene.gd rename to scripts/Scene/OverworldScene.gd diff --git a/scripts/Scenes/OverworldScene.gd.uid b/scripts/Scene/OverworldScene.gd.uid similarity index 100% rename from scripts/Scenes/OverworldScene.gd.uid rename to scripts/Scene/OverworldScene.gd.uid diff --git a/scripts/Scenes/RootScene.gd.uid b/scripts/Scene/RootScene.gd.uid similarity index 100% rename from scripts/Scenes/RootScene.gd.uid rename to scripts/Scene/RootScene.gd.uid diff --git a/scripts/Scenes/UIScene.gd.uid b/scripts/Scene/UIScene.gd.uid similarity index 100% rename from scripts/Scenes/UIScene.gd.uid rename to scripts/Scene/UIScene.gd.uid diff --git a/scripts/Scenes/CookingScene.gd b/scripts/Scenes/CookingScene.gd deleted file mode 100644 index fae8a7a..0000000 --- a/scripts/Scenes/CookingScene.gd +++ /dev/null @@ -1 +0,0 @@ -class_name CookingScene extends Node3D \ No newline at end of file diff --git a/scripts/Scenes/CuttingScene.gd b/scripts/Scenes/CuttingScene.gd deleted file mode 100644 index d76a01b..0000000 --- a/scripts/Scenes/CuttingScene.gd +++ /dev/null @@ -1 +0,0 @@ -class_name CuttingScene extends Node3D diff --git a/scripts/Singletons/Battle.gd b/scripts/Singleton/Battle.gd similarity index 100% rename from scripts/Singletons/Battle.gd rename to scripts/Singleton/Battle.gd diff --git a/scripts/Singletons/Battle.gd.uid b/scripts/Singleton/Battle.gd.uid similarity index 100% rename from scripts/Singletons/Battle.gd.uid rename to scripts/Singleton/Battle.gd.uid diff --git a/scripts/Singletons/BattleSystem.gd.uid b/scripts/Singleton/BattleSystem.gd.uid similarity index 100% rename from scripts/Singletons/BattleSystem.gd.uid rename to scripts/Singleton/BattleSystem.gd.uid diff --git a/scripts/Singletons/Cooking.gd b/scripts/Singleton/Cooking.gd similarity index 100% rename from scripts/Singletons/Cooking.gd rename to scripts/Singleton/Cooking.gd diff --git a/scripts/Singletons/Cooking.gd.uid b/scripts/Singleton/Cooking.gd.uid similarity index 100% rename from scripts/Singletons/Cooking.gd.uid rename to scripts/Singleton/Cooking.gd.uid diff --git a/scripts/Singletons/CookingSystem.gd.uid b/scripts/Singleton/CookingSystem.gd.uid similarity index 100% rename from scripts/Singletons/CookingSystem.gd.uid rename to scripts/Singleton/CookingSystem.gd.uid diff --git a/scripts/Singletons/Cutscene.gd b/scripts/Singleton/Cutscene.gd similarity index 100% rename from scripts/Singletons/Cutscene.gd rename to scripts/Singleton/Cutscene.gd diff --git a/scripts/Singletons/Cutscene.gd.uid b/scripts/Singleton/Cutscene.gd.uid similarity index 100% rename from scripts/Singletons/Cutscene.gd.uid rename to scripts/Singleton/Cutscene.gd.uid diff --git a/scripts/Singletons/CutsceneSystem.gd.uid b/scripts/Singleton/CutsceneSystem.gd.uid similarity index 100% rename from scripts/Singletons/CutsceneSystem.gd.uid rename to scripts/Singleton/CutsceneSystem.gd.uid diff --git a/scripts/Singletons/Debug.gd b/scripts/Singleton/Debug.gd similarity index 100% rename from scripts/Singletons/Debug.gd rename to scripts/Singleton/Debug.gd diff --git a/scripts/Singletons/Debug.gd.uid b/scripts/Singleton/Debug.gd.uid similarity index 100% rename from scripts/Singletons/Debug.gd.uid rename to scripts/Singleton/Debug.gd.uid diff --git a/scripts/Singletons/Item.gd b/scripts/Singleton/Item.gd similarity index 100% rename from scripts/Singletons/Item.gd rename to scripts/Singleton/Item.gd diff --git a/scripts/Singletons/Item.gd.uid b/scripts/Singleton/Item.gd.uid similarity index 100% rename from scripts/Singletons/Item.gd.uid rename to scripts/Singleton/Item.gd.uid diff --git a/scripts/Singletons/ItemSystem.gd.uid b/scripts/Singleton/ItemSystem.gd.uid similarity index 100% rename from scripts/Singletons/ItemSystem.gd.uid rename to scripts/Singleton/ItemSystem.gd.uid diff --git a/scripts/Singletons/Overworld.gd b/scripts/Singleton/Overworld.gd similarity index 100% rename from scripts/Singletons/Overworld.gd rename to scripts/Singleton/Overworld.gd diff --git a/scripts/Singletons/Overworld.gd.uid b/scripts/Singleton/Overworld.gd.uid similarity index 100% rename from scripts/Singletons/Overworld.gd.uid rename to scripts/Singleton/Overworld.gd.uid diff --git a/scripts/Singletons/OverworldSystem.gd.uid b/scripts/Singleton/OverworldSystem.gd.uid similarity index 100% rename from scripts/Singletons/OverworldSystem.gd.uid rename to scripts/Singleton/OverworldSystem.gd.uid diff --git a/scripts/Singletons/Pause.gd b/scripts/Singleton/Pause.gd similarity index 100% rename from scripts/Singletons/Pause.gd rename to scripts/Singleton/Pause.gd diff --git a/scripts/Singletons/Pause.gd.uid b/scripts/Singleton/Pause.gd.uid similarity index 100% rename from scripts/Singletons/Pause.gd.uid rename to scripts/Singleton/Pause.gd.uid diff --git a/scripts/Singletons/PauseSystem.gd.uid b/scripts/Singleton/PauseSystem.gd.uid similarity index 100% rename from scripts/Singletons/PauseSystem.gd.uid rename to scripts/Singleton/PauseSystem.gd.uid diff --git a/scripts/Singletons/Quest.gd b/scripts/Singleton/Quest.gd similarity index 100% rename from scripts/Singletons/Quest.gd rename to scripts/Singleton/Quest.gd diff --git a/scripts/Singletons/Quest.gd.uid b/scripts/Singleton/Quest.gd.uid similarity index 100% rename from scripts/Singletons/Quest.gd.uid rename to scripts/Singleton/Quest.gd.uid diff --git a/scripts/Singletons/QuestSystem.gd.uid b/scripts/Singleton/QuestSystem.gd.uid similarity index 100% rename from scripts/Singletons/QuestSystem.gd.uid rename to scripts/Singleton/QuestSystem.gd.uid diff --git a/scripts/Singletons/SceneManager.gd b/scripts/Singleton/SceneManager.gd similarity index 100% rename from scripts/Singletons/SceneManager.gd rename to scripts/Singleton/SceneManager.gd diff --git a/scripts/Singletons/SceneManager.gd.uid b/scripts/Singleton/SceneManager.gd.uid similarity index 100% rename from scripts/Singletons/SceneManager.gd.uid rename to scripts/Singleton/SceneManager.gd.uid diff --git a/scripts/Singletons/SceneSystem.gd.uid b/scripts/Singleton/SceneSystem.gd.uid similarity index 100% rename from scripts/Singletons/SceneSystem.gd.uid rename to scripts/Singleton/SceneSystem.gd.uid diff --git a/scripts/Singletons/Systems.gd.uid b/scripts/Singleton/Systems.gd.uid similarity index 100% rename from scripts/Singletons/Systems.gd.uid rename to scripts/Singleton/Systems.gd.uid diff --git a/scripts/Singletons/UI.gd b/scripts/Singleton/UI.gd similarity index 100% rename from scripts/Singletons/UI.gd rename to scripts/Singleton/UI.gd diff --git a/scripts/Singletons/UI.gd.uid b/scripts/Singleton/UI.gd.uid similarity index 100% rename from scripts/Singletons/UI.gd.uid rename to scripts/Singleton/UI.gd.uid diff --git a/scripts/Singletons/VN.gd b/scripts/Singleton/VN.gd similarity index 100% rename from scripts/Singletons/VN.gd rename to scripts/Singleton/VN.gd diff --git a/scripts/Singletons/VN.gd.uid b/scripts/Singleton/VN.gd.uid similarity index 100% rename from scripts/Singletons/VN.gd.uid rename to scripts/Singleton/VN.gd.uid diff --git a/scripts/Singletons/VNSystem.gd.uid b/scripts/Singleton/VNSystem.gd.uid similarity index 100% rename from scripts/Singletons/VNSystem.gd.uid rename to scripts/Singleton/VNSystem.gd.uid