rename consistency

entities/npc/NPC.gd

@@ -1 +0,0 @@
-class_name NPC extends CharacterBody3D

entity/npc/NPC.gd

@@ -0,0 +1,6 @@
+class_name NPC extends CharacterBody3D
+
+@export var interactEvent:EventResource
+
+func _onInteract(playerEntity: Player) -> void:
+	pass

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"]

entity/npc/NPCForwarder.gd.uid

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

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]
 

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

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

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

event/EventItem.gd.uid

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

event/EventResource.gd

@@ -0,0 +1,3 @@
+class_name EventResource extends Resource
+
+@export var eventName:String

event/EventResource.gd.uid

@@ -0,0 +1 @@
+uid://5nyb2g1kghpv

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"]
 

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]
 

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")

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")

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

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")]