From 379c7007aad8949aa00ca549a9fed6c2c58d5793 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Tue, 19 Aug 2025 19:57:24 -0500 Subject: [PATCH] rename consistency --- entities/npc/NPC.gd | 1 - {entities => entity}/EntityMovement.gd | 0 {entities => entity}/EntityMovement.gd.uid | 0 {entities => entity}/MapCamera.gd.uid | 0 {entities => entity}/NPC.gd.uid | 0 {entities => entity}/Player.gd.uid | 0 entity/npc/NPC.gd | 6 ++++++ {entities => entity}/npc/NPC.gd.uid | 0 {entities => entity}/npc/NPC.tscn | 14 +++++--------- entity/npc/NPCForwarder.gd.uid | 1 + {entities => entity}/npc/NPCMovement.gd | 0 {entities => entity}/npc/NPCMovement.gd.uid | 0 {entities => entity}/npc/NPCTest.gd | 0 {entities => entity}/npc/NPCTest.gd.uid | 0 {entities => entity}/player/Player.gd | 0 {entities => entity}/player/Player.gd.uid | 0 {entities => entity}/player/Player.png | Bin {entities => entity}/player/Player.png.import | 6 +++--- {entities => entity}/player/Player.png.pxo | Bin {entities => entity}/player/Player.tscn | 12 ++++++------ {entities => entity}/player/PlayerCamera.gd | 4 ++-- {entities => entity}/player/PlayerCamera.gd.uid | 0 {entities => entity}/player/PlayerInput.gd | 0 {entities => entity}/player/PlayerInput.gd.uid | 0 {entities => entity}/player/PlayerInteraction.gd | 0 .../player/PlayerInteraction.gd.uid | 0 {entities => entity}/player/PlayerMaterial.tres | 4 ++-- {entities => entity}/player/PlayerMovement.gd | 0 {entities => entity}/player/PlayerMovement.gd.uid | 0 event/EventItem.gd | 0 event/EventItem.gd.uid | 1 + event/EventResource.gd | 3 +++ event/EventResource.gd.uid | 1 + maps/TestMap.tscn | 4 ++-- project.godot | 14 +++++++------- {singletons => singleton}/GamePhysics.gd | 0 {singletons => singleton}/GamePhysics.gd.uid | 0 {singletons => singleton}/Input.gd.uid | 0 {singletons => singleton}/Load.gd | 0 {singletons => singleton}/Load.gd.uid | 0 {singletons => singleton}/Load.tscn | 2 +- {singletons => singleton}/Overworld.gd | 0 {singletons => singleton}/Overworld.gd.uid | 0 {singletons => singleton}/Pause.gd | 0 {singletons => singleton}/Pause.gd.uid | 0 {singletons => singleton}/Quest.gd | 0 {singletons => singleton}/Quest.gd.uid | 0 {singletons => singleton}/Quest.tscn | 2 +- {singletons => singleton}/Scene.gd | 0 {singletons => singleton}/Scene.gd.uid | 0 {singletons => singleton}/Transition.gd | 0 {singletons => singleton}/Transition.gd.uid | 0 {singletons => singleton}/Transition.tscn | 2 +- {singletons => singleton}/UI.gd | 0 {singletons => singleton}/UI.gd.uid | 0 {singletons => singleton}/UI.tscn | 2 +- 56 files changed, 43 insertions(+), 36 deletions(-) delete mode 100644 entities/npc/NPC.gd rename {entities => entity}/EntityMovement.gd (100%) rename {entities => entity}/EntityMovement.gd.uid (100%) rename {entities => entity}/MapCamera.gd.uid (100%) rename {entities => entity}/NPC.gd.uid (100%) rename {entities => entity}/Player.gd.uid (100%) create mode 100644 entity/npc/NPC.gd rename {entities => entity}/npc/NPC.gd.uid (100%) rename {entities => entity}/npc/NPC.tscn (84%) create mode 100644 entity/npc/NPCForwarder.gd.uid rename {entities => entity}/npc/NPCMovement.gd (100%) rename {entities => entity}/npc/NPCMovement.gd.uid (100%) rename {entities => entity}/npc/NPCTest.gd (100%) rename {entities => entity}/npc/NPCTest.gd.uid (100%) rename {entities => entity}/player/Player.gd (100%) rename {entities => entity}/player/Player.gd.uid (100%) rename {entities => entity}/player/Player.png (100%) rename {entities => entity}/player/Player.png.import (72%) rename {entities => entity}/player/Player.png.pxo (100%) rename {entities => entity}/player/Player.tscn (92%) rename {entities => entity}/player/PlayerCamera.gd (89%) rename {entities => entity}/player/PlayerCamera.gd.uid (100%) rename {entities => entity}/player/PlayerInput.gd (100%) rename {entities => entity}/player/PlayerInput.gd.uid (100%) rename {entities => entity}/player/PlayerInteraction.gd (100%) rename {entities => entity}/player/PlayerInteraction.gd.uid (100%) rename {entities => entity}/player/PlayerMaterial.tres (70%) rename {entities => entity}/player/PlayerMovement.gd (100%) rename {entities => entity}/player/PlayerMovement.gd.uid (100%) create mode 100644 event/EventItem.gd create mode 100644 event/EventItem.gd.uid create mode 100644 event/EventResource.gd create mode 100644 event/EventResource.gd.uid rename {singletons => singleton}/GamePhysics.gd (100%) rename {singletons => singleton}/GamePhysics.gd.uid (100%) rename {singletons => singleton}/Input.gd.uid (100%) rename {singletons => singleton}/Load.gd (100%) rename {singletons => singleton}/Load.gd.uid (100%) rename {singletons => singleton}/Load.tscn (83%) rename {singletons => singleton}/Overworld.gd (100%) rename {singletons => singleton}/Overworld.gd.uid (100%) rename {singletons => singleton}/Pause.gd (100%) rename {singletons => singleton}/Pause.gd.uid (100%) rename {singletons => singleton}/Quest.gd (100%) rename {singletons => singleton}/Quest.gd.uid (100%) rename {singletons => singleton}/Quest.tscn (86%) rename {singletons => singleton}/Scene.gd (100%) rename {singletons => singleton}/Scene.gd.uid (100%) rename {singletons => singleton}/Transition.gd (100%) rename {singletons => singleton}/Transition.gd.uid (100%) rename {singletons => singleton}/Transition.tscn (92%) rename {singletons => singleton}/UI.gd (100%) rename {singletons => singleton}/UI.gd.uid (100%) rename {singletons => singleton}/UI.tscn (96%) diff --git a/entities/npc/NPC.gd b/entities/npc/NPC.gd deleted file mode 100644 index 9898402..0000000 --- a/entities/npc/NPC.gd +++ /dev/null @@ -1 +0,0 @@ -class_name NPC extends CharacterBody3D diff --git a/entities/EntityMovement.gd b/entity/EntityMovement.gd similarity index 100% rename from entities/EntityMovement.gd rename to entity/EntityMovement.gd diff --git a/entities/EntityMovement.gd.uid b/entity/EntityMovement.gd.uid similarity index 100% rename from entities/EntityMovement.gd.uid rename to entity/EntityMovement.gd.uid diff --git a/entities/MapCamera.gd.uid b/entity/MapCamera.gd.uid similarity index 100% rename from entities/MapCamera.gd.uid rename to entity/MapCamera.gd.uid diff --git a/entities/NPC.gd.uid b/entity/NPC.gd.uid similarity index 100% rename from entities/NPC.gd.uid rename to entity/NPC.gd.uid diff --git a/entities/Player.gd.uid b/entity/Player.gd.uid similarity index 100% rename from entities/Player.gd.uid rename to entity/Player.gd.uid diff --git a/entity/npc/NPC.gd b/entity/npc/NPC.gd new file mode 100644 index 0000000..5403daf --- /dev/null +++ b/entity/npc/NPC.gd @@ -0,0 +1,6 @@ +class_name NPC extends CharacterBody3D + +@export var interactEvent:EventResource + +func _onInteract(playerEntity: Player) -> void: + pass diff --git a/entities/npc/NPC.gd.uid b/entity/npc/NPC.gd.uid similarity index 100% rename from entities/npc/NPC.gd.uid rename to entity/npc/NPC.gd.uid diff --git a/entities/npc/NPC.tscn b/entity/npc/NPC.tscn similarity index 84% rename from entities/npc/NPC.tscn rename to entity/npc/NPC.tscn index 2de3044..472f8e9 100644 --- a/entities/npc/NPC.tscn +++ b/entity/npc/NPC.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=13 format=3 uid="uid://kabs7mopalmo"] +[gd_scene load_steps=12 format=3 uid="uid://kabs7mopalmo"] -[ext_resource type="Script" uid="uid://crw7ls7t8cwct" path="res://entities/npc/NPC.gd" id="1_00k55"] -[ext_resource type="Script" uid="uid://cmwovncvo1n5o" path="res://entities/npc/NPCTest.gd" id="2_1seh5"] +[ext_resource type="Script" uid="uid://crw7ls7t8cwct" path="res://entity/npc/NPC.gd" id="1_00k55"] [ext_resource type="Script" uid="uid://b00rxpveu3v4m" path="res://InteractableArea.gd" id="2_x8luf"] -[ext_resource type="Script" uid="uid://tlfthv88ki0y" path="res://entities/npc/NPCMovement.gd" id="3_1seh5"] -[ext_resource type="Texture2D" uid="uid://xx3qp5xh7tgu" path="res://entities/player/Player.png" id="4_x8luf"] +[ext_resource type="Script" uid="uid://tlfthv88ki0y" path="res://entity/npc/NPCMovement.gd" id="3_1seh5"] +[ext_resource type="Texture2D" uid="uid://xx3qp5xh7tgu" path="res://entity/player/Player.png" id="4_x8luf"] [sub_resource type="BoxShape3D" id="BoxShape3D_1seh5"] size = Vector3(16, 16, 16) @@ -68,9 +67,6 @@ script = ExtResource("1_00k55") [node name="Scripts" type="Node" parent="."] -[node name="NPCTest" type="Node" parent="Scripts"] -script = ExtResource("2_1seh5") - [node name="NPCMovement" type="Node" parent="Scripts" node_paths=PackedStringArray("body", "sprite")] script = ExtResource("3_1seh5") body = NodePath("../..") @@ -96,4 +92,4 @@ animation = &"walk_west" transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 8.5, 0) shape = SubResource("SphereShape3D_x8luf") -[connection signal="interactEvent" from="InteractableArea" to="Scripts/NPCTest" method="onInteract"] +[connection signal="interactEvent" from="InteractableArea" to="." method="_onInteract"] diff --git a/entity/npc/NPCForwarder.gd.uid b/entity/npc/NPCForwarder.gd.uid new file mode 100644 index 0000000..298b9da --- /dev/null +++ b/entity/npc/NPCForwarder.gd.uid @@ -0,0 +1 @@ +uid://dda6r22r8eow2 diff --git a/entities/npc/NPCMovement.gd b/entity/npc/NPCMovement.gd similarity index 100% rename from entities/npc/NPCMovement.gd rename to entity/npc/NPCMovement.gd diff --git a/entities/npc/NPCMovement.gd.uid b/entity/npc/NPCMovement.gd.uid similarity index 100% rename from entities/npc/NPCMovement.gd.uid rename to entity/npc/NPCMovement.gd.uid diff --git a/entities/npc/NPCTest.gd b/entity/npc/NPCTest.gd similarity index 100% rename from entities/npc/NPCTest.gd rename to entity/npc/NPCTest.gd diff --git a/entities/npc/NPCTest.gd.uid b/entity/npc/NPCTest.gd.uid similarity index 100% rename from entities/npc/NPCTest.gd.uid rename to entity/npc/NPCTest.gd.uid diff --git a/entities/player/Player.gd b/entity/player/Player.gd similarity index 100% rename from entities/player/Player.gd rename to entity/player/Player.gd diff --git a/entities/player/Player.gd.uid b/entity/player/Player.gd.uid similarity index 100% rename from entities/player/Player.gd.uid rename to entity/player/Player.gd.uid diff --git a/entities/player/Player.png b/entity/player/Player.png similarity index 100% rename from entities/player/Player.png rename to entity/player/Player.png diff --git a/entities/player/Player.png.import b/entity/player/Player.png.import similarity index 72% rename from entities/player/Player.png.import rename to entity/player/Player.png.import index 416b062..54ad579 100644 --- a/entities/player/Player.png.import +++ b/entity/player/Player.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://xx3qp5xh7tgu" -path.s3tc="res://.godot/imported/Player.png-e32651025a39607688584ad92d58078b.s3tc.ctex" +path.s3tc="res://.godot/imported/Player.png-44a553acafadade6fc26fd4f7692a8d9.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://entities/player/Player.png" -dest_files=["res://.godot/imported/Player.png-e32651025a39607688584ad92d58078b.s3tc.ctex"] +source_file="res://entity/player/Player.png" +dest_files=["res://.godot/imported/Player.png-44a553acafadade6fc26fd4f7692a8d9.s3tc.ctex"] [params] diff --git a/entities/player/Player.png.pxo b/entity/player/Player.png.pxo similarity index 100% rename from entities/player/Player.png.pxo rename to entity/player/Player.png.pxo diff --git a/entities/player/Player.tscn b/entity/player/Player.tscn similarity index 92% rename from entities/player/Player.tscn rename to entity/player/Player.tscn index 0f008b7..30cb4c6 100644 --- a/entities/player/Player.tscn +++ b/entity/player/Player.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=14 format=3 uid="uid://2ch34sio36nv"] -[ext_resource type="Script" uid="uid://ylmy3nvpirgr" path="res://entities/player/Player.gd" id="1_24gqh"] -[ext_resource type="Script" uid="uid://bwxdv3kxrs4oj" path="res://entities/player/PlayerMovement.gd" id="2_o7et6"] -[ext_resource type="Script" uid="uid://b3nty7pvbo58d" path="res://entities/player/PlayerInteraction.gd" id="3_24gqh"] -[ext_resource type="Script" uid="uid://bdv1fj1pwknrs" path="res://entities/player/PlayerInput.gd" id="4_yjynp"] -[ext_resource type="Script" uid="uid://bdjgvyiacbg28" path="res://entities/player/PlayerCamera.gd" id="5_g3lhm"] -[ext_resource type="Texture2D" uid="uid://xx3qp5xh7tgu" path="res://entities/player/Player.png" id="7_fmb3c"] +[ext_resource type="Script" uid="uid://ylmy3nvpirgr" path="res://entity/player/Player.gd" id="1_24gqh"] +[ext_resource type="Script" uid="uid://bwxdv3kxrs4oj" path="res://entity/player/PlayerMovement.gd" id="2_o7et6"] +[ext_resource type="Script" uid="uid://b3nty7pvbo58d" path="res://entity/player/PlayerInteraction.gd" id="3_24gqh"] +[ext_resource type="Script" uid="uid://bdv1fj1pwknrs" path="res://entity/player/PlayerInput.gd" id="4_yjynp"] +[ext_resource type="Script" uid="uid://bdjgvyiacbg28" path="res://entity/player/PlayerCamera.gd" id="5_g3lhm"] +[ext_resource type="Texture2D" uid="uid://xx3qp5xh7tgu" path="res://entity/player/Player.png" id="7_fmb3c"] [sub_resource type="SphereShape3D" id="SphereShape3D_4pwj0"] radius = 8.5 diff --git a/entities/player/PlayerCamera.gd b/entity/player/PlayerCamera.gd similarity index 89% rename from entities/player/PlayerCamera.gd rename to entity/player/PlayerCamera.gd index a0e2c60..1a2f83b 100644 --- a/entities/player/PlayerCamera.gd +++ b/entity/player/PlayerCamera.gd @@ -1,11 +1,11 @@ class_name PlayerCamera extends Node const CAMERA_PIXELS_PER_UNIT = 1.0 -const CAMERA_PIXEL_SCALE = 2.0 +const CAMERA_PIXEL_SCALE = 1.0 @export var camera:Camera3D = null @export var target:Node3D = null -@export var offset:Vector3 = Vector3(0, 0, 16) +@export var offset:Vector3 = Vector3(0, 0, 12) func _process(delta: float) -> void: # I tried a few things but this is most consistent for both backbuffer and diff --git a/entities/player/PlayerCamera.gd.uid b/entity/player/PlayerCamera.gd.uid similarity index 100% rename from entities/player/PlayerCamera.gd.uid rename to entity/player/PlayerCamera.gd.uid diff --git a/entities/player/PlayerInput.gd b/entity/player/PlayerInput.gd similarity index 100% rename from entities/player/PlayerInput.gd rename to entity/player/PlayerInput.gd diff --git a/entities/player/PlayerInput.gd.uid b/entity/player/PlayerInput.gd.uid similarity index 100% rename from entities/player/PlayerInput.gd.uid rename to entity/player/PlayerInput.gd.uid diff --git a/entities/player/PlayerInteraction.gd b/entity/player/PlayerInteraction.gd similarity index 100% rename from entities/player/PlayerInteraction.gd rename to entity/player/PlayerInteraction.gd diff --git a/entities/player/PlayerInteraction.gd.uid b/entity/player/PlayerInteraction.gd.uid similarity index 100% rename from entities/player/PlayerInteraction.gd.uid rename to entity/player/PlayerInteraction.gd.uid diff --git a/entities/player/PlayerMaterial.tres b/entity/player/PlayerMaterial.tres similarity index 70% rename from entities/player/PlayerMaterial.tres rename to entity/player/PlayerMaterial.tres index 9223528..39f2b40 100644 --- a/entities/player/PlayerMaterial.tres +++ b/entity/player/PlayerMaterial.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://cv8q4cbjyfauh"] -[ext_resource type="Shader" uid="uid://b3vi5kwotike5" path="res://materials/EntityMaterialShader.gdshader" id="1_gsq3s"] -[ext_resource type="Texture2D" uid="uid://xx3qp5xh7tgu" path="res://entities/player/Player.png" id="2_awgof"] +[ext_resource type="Shader" path="res://materials/EntityMaterialShader.gdshader" id="1_gsq3s"] +[ext_resource type="Texture2D" uid="uid://xx3qp5xh7tgu" path="res://entity/player/Player.png" id="2_awgof"] [resource] render_priority = 0 diff --git a/entities/player/PlayerMovement.gd b/entity/player/PlayerMovement.gd similarity index 100% rename from entities/player/PlayerMovement.gd rename to entity/player/PlayerMovement.gd diff --git a/entities/player/PlayerMovement.gd.uid b/entity/player/PlayerMovement.gd.uid similarity index 100% rename from entities/player/PlayerMovement.gd.uid rename to entity/player/PlayerMovement.gd.uid diff --git a/event/EventItem.gd b/event/EventItem.gd new file mode 100644 index 0000000..e69de29 diff --git a/event/EventItem.gd.uid b/event/EventItem.gd.uid new file mode 100644 index 0000000..22db99b --- /dev/null +++ b/event/EventItem.gd.uid @@ -0,0 +1 @@ +uid://c42rc36mudwgh diff --git a/event/EventResource.gd b/event/EventResource.gd new file mode 100644 index 0000000..75bb087 --- /dev/null +++ b/event/EventResource.gd @@ -0,0 +1,3 @@ +class_name EventResource extends Resource + +@export var eventName:String diff --git a/event/EventResource.gd.uid b/event/EventResource.gd.uid new file mode 100644 index 0000000..edcdcb6 --- /dev/null +++ b/event/EventResource.gd.uid @@ -0,0 +1 @@ +uid://5nyb2g1kghpv diff --git a/maps/TestMap.tscn b/maps/TestMap.tscn index c20d74c..ac3bd95 100644 --- a/maps/TestMap.tscn +++ b/maps/TestMap.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://d0ywgijpuqy0r"] [ext_resource type="PackedScene" uid="uid://cluuhtfjeodwb" path="res://maps/TestMapBase.tscn" id="1_ox0si"] -[ext_resource type="PackedScene" uid="uid://2ch34sio36nv" path="res://entities/player/Player.tscn" id="2_0d2qr"] -[ext_resource type="PackedScene" uid="uid://kabs7mopalmo" path="res://entities/npc/NPC.tscn" id="3_0vfw4"] +[ext_resource type="PackedScene" uid="uid://2ch34sio36nv" path="res://entity/player/Player.tscn" id="2_0d2qr"] +[ext_resource type="PackedScene" uid="uid://kabs7mopalmo" path="res://entity/npc/NPC.tscn" id="3_0vfw4"] [node name="TestMap" type="Node3D"] diff --git a/project.godot b/project.godot index 2be4e99..719feee 100644 --- a/project.godot +++ b/project.godot @@ -17,13 +17,13 @@ config/icon="res://icon.svg" [autoload] -PHYSICS="*res://singletons/GamePhysics.gd" -PAUSE="*res://singletons/Pause.gd" -TRANSITION="*res://singletons/Transition.tscn" -UI="*res://singletons/UI.tscn" -QUEST="*res://singletons/Quest.tscn" -OVERWORLD="*res://singletons/Overworld.gd" -SCENE="*res://singletons/Scene.gd" +PHYSICS="*res://singleton/GamePhysics.gd" +PAUSE="*res://singleton/Pause.gd" +TRANSITION="*res://singleton/Transition.tscn" +UI="*res://singleton/UI.tscn" +QUEST="*res://singleton/Quest.tscn" +OVERWORLD="*res://singleton/Overworld.gd" +SCENE="*res://singleton/Scene.gd" [debug] diff --git a/singletons/GamePhysics.gd b/singleton/GamePhysics.gd similarity index 100% rename from singletons/GamePhysics.gd rename to singleton/GamePhysics.gd diff --git a/singletons/GamePhysics.gd.uid b/singleton/GamePhysics.gd.uid similarity index 100% rename from singletons/GamePhysics.gd.uid rename to singleton/GamePhysics.gd.uid diff --git a/singletons/Input.gd.uid b/singleton/Input.gd.uid similarity index 100% rename from singletons/Input.gd.uid rename to singleton/Input.gd.uid diff --git a/singletons/Load.gd b/singleton/Load.gd similarity index 100% rename from singletons/Load.gd rename to singleton/Load.gd diff --git a/singletons/Load.gd.uid b/singleton/Load.gd.uid similarity index 100% rename from singletons/Load.gd.uid rename to singleton/Load.gd.uid diff --git a/singletons/Load.tscn b/singleton/Load.tscn similarity index 83% rename from singletons/Load.tscn rename to singleton/Load.tscn index d247d5e..3f197da 100644 --- a/singletons/Load.tscn +++ b/singleton/Load.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c8shl8u156rfi"] -[ext_resource type="Script" uid="uid://dfpml5awf5i35" path="res://singletons/Load.gd" id="1_a3iwn"] +[ext_resource type="Script" uid="uid://dfpml5awf5i35" path="res://singleton/Load.gd" id="1_a3iwn"] [node name="Load" type="Node"] script = ExtResource("1_a3iwn") diff --git a/singletons/Overworld.gd b/singleton/Overworld.gd similarity index 100% rename from singletons/Overworld.gd rename to singleton/Overworld.gd diff --git a/singletons/Overworld.gd.uid b/singleton/Overworld.gd.uid similarity index 100% rename from singletons/Overworld.gd.uid rename to singleton/Overworld.gd.uid diff --git a/singletons/Pause.gd b/singleton/Pause.gd similarity index 100% rename from singletons/Pause.gd rename to singleton/Pause.gd diff --git a/singletons/Pause.gd.uid b/singleton/Pause.gd.uid similarity index 100% rename from singletons/Pause.gd.uid rename to singleton/Pause.gd.uid diff --git a/singletons/Quest.gd b/singleton/Quest.gd similarity index 100% rename from singletons/Quest.gd rename to singleton/Quest.gd diff --git a/singletons/Quest.gd.uid b/singleton/Quest.gd.uid similarity index 100% rename from singletons/Quest.gd.uid rename to singleton/Quest.gd.uid diff --git a/singletons/Quest.tscn b/singleton/Quest.tscn similarity index 86% rename from singletons/Quest.tscn rename to singleton/Quest.tscn index 080e18d..5cc2117 100644 --- a/singletons/Quest.tscn +++ b/singleton/Quest.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dodd3jx81w40c"] -[ext_resource type="Script" uid="uid://cd4lf5sm2aquv" path="res://singletons/Quest.gd" id="1_u2r0s"] +[ext_resource type="Script" uid="uid://cd4lf5sm2aquv" path="res://singleton/Quest.gd" id="1_u2r0s"] [node name="Quest" type="Node"] script = ExtResource("1_u2r0s") diff --git a/singletons/Scene.gd b/singleton/Scene.gd similarity index 100% rename from singletons/Scene.gd rename to singleton/Scene.gd diff --git a/singletons/Scene.gd.uid b/singleton/Scene.gd.uid similarity index 100% rename from singletons/Scene.gd.uid rename to singleton/Scene.gd.uid diff --git a/singletons/Transition.gd b/singleton/Transition.gd similarity index 100% rename from singletons/Transition.gd rename to singleton/Transition.gd diff --git a/singletons/Transition.gd.uid b/singleton/Transition.gd.uid similarity index 100% rename from singletons/Transition.gd.uid rename to singleton/Transition.gd.uid diff --git a/singletons/Transition.tscn b/singleton/Transition.tscn similarity index 92% rename from singletons/Transition.tscn rename to singleton/Transition.tscn index 74dec9b..6e1a7e1 100644 --- a/singletons/Transition.tscn +++ b/singleton/Transition.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://i4ukelrrsujw"] -[ext_resource type="Script" uid="uid://iu3m73wtjlho" path="res://singletons/Transition.gd" id="1_isjic"] +[ext_resource type="Script" uid="uid://iu3m73wtjlho" path="res://singleton/Transition.gd" id="1_isjic"] [node name="Transition" type="Control"] layout_mode = 3 diff --git a/singletons/UI.gd b/singleton/UI.gd similarity index 100% rename from singletons/UI.gd rename to singleton/UI.gd diff --git a/singletons/UI.gd.uid b/singleton/UI.gd.uid similarity index 100% rename from singletons/UI.gd.uid rename to singleton/UI.gd.uid diff --git a/singletons/UI.tscn b/singleton/UI.tscn similarity index 96% rename from singletons/UI.tscn rename to singleton/UI.tscn index 7fcdd47..50d18a1 100644 --- a/singletons/UI.tscn +++ b/singleton/UI.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://baos0arpiskbp"] [ext_resource type="PackedScene" uid="uid://bkx3l0kckf4a8" path="res://ui/component/VNTextbox.tscn" id="1_1mtk3"] -[ext_resource type="Script" uid="uid://dq3qyyayugt5l" path="res://singletons/UI.gd" id="1_son71"] +[ext_resource type="Script" uid="uid://dq3qyyayugt5l" path="res://singleton/UI.gd" id="1_son71"] [ext_resource type="PackedScene" uid="uid://c0i5e2dj11d8c" path="res://ui/pause/PauseMenu.tscn" id="2_atyu8"] [node name="UI" type="Control" node_paths=PackedStringArray("TEXTBOX", "PAUSE")]