project.godot

@@ -14,11 +14,6 @@ config/name="girl will never sing again"
 config/features=PackedStringArray("4.5", "GL Compatibility")
 config/icon="uid://4aq8ekc6sruc"
 
-[autoload]
-
-GameDirector="*res://scenes/autoload/game_director.gd"
-EventBus="*res://scenes/autoload/event_bus.gd"
-
 [debug]
 
 gdscript/warnings/untyped_declaration=2

resources/room_config.gd

@@ -1,7 +1,7 @@
 @tool class_name RoomConfig extends Resource
 
 
-#@export var size: Vector2i = Vector2i.ZERO
+@export var size: Vector2i = Vector2i.ZERO
 @export var follow_player: bool = true
 
 @export var camera_position: Vector2i = Vector2i.ZERO

resources/waypoint.gd

@@ -1,8 +0,0 @@
-# TODO: better name
-class_name Waypoint 
-extends Resource
-
-
-#@export var from_scene: PackedScene
-@export var to_scene: PackedScene
-@export var spawn_coordinates: Vector2i

resources/waypoint.gd.uid

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

scenes/autoload/event_bus.gd

@@ -1,5 +0,0 @@
-extends Node
-
-
-@warning_ignore("unused_signal")
-signal room_changed(previous_room: StringName, next_room: StringName, waypoint: Waypoint)

scenes/autoload/event_bus.gd.uid

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

scenes/autoload/game_director.gd

@@ -1,23 +0,0 @@
-extends Node
-
-
-func goto_room(previous_room: Room, waypoint: Waypoint) -> void:
-	print("changing rooms")
-	
-	# for signal
-	var prev_name: StringName
-	var next_name: StringName
-	
-	prev_name = previous_room.name
-	
-	# wait until previous room is freed
-	await previous_room.tree_exited
-	
-	# instantiate next room and set room variables
-	var next_room: Room = waypoint.to_scene.instantiate()
-	next_name = next_room.name
-	next_room.initial_spawn = waypoint.spawn_coordinates
-	get_tree().root.add_child(next_room)
-	
-	# notify event bus
-	EventBus.room_changed.emit(prev_name, next_name, waypoint)

scenes/autoload/game_director.gd.uid

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

scenes/player/states/player_walking.gd

@@ -9,7 +9,7 @@ func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void:
 func _state_physics_update(_delta: float) -> void:
 #region player physics
 	var direction: Vector2 = player.get_movement_vector()
-	#direction = direction.normalized() # unneeded with 4 way movement
+	direction = direction.normalized()
 	player.velocity = direction * player.max_speed * player.speed_mult
 	
 	player.move_and_slide()

scenes/room/room.gd

@@ -6,9 +6,7 @@ class_name Room extends Node2D
 @onready var camera: RoomCamera = $RoomCamera
 @onready var director: StateMachine = $RoomDirector
 
-# TODO: better alternatice to preloading as i add functionality?
-# https://theduriel.github.io/Godot/Do-not-use---Preload
-var player_scene: PackedScene = preload("uid://cqm5besqgsb7x")
+var player_scene: PackedScene = preload("res://scenes/player/player.tscn")
 
 var player: Player
 var initial_spawn: Vector2i = Vector2i(16,16)

scenes/room/room.tscn

@@ -8,7 +8,6 @@
 [ext_resource type="Script" uid="uid://ceevyto3vbq7c" path="res://scenes/room/states/room_paused.gd" id="6_gui0a"]
 
 [node name="Room" type="Node2D"]
-y_sort_enabled = true
 script = ExtResource("1_8xru0")
 
 [node name="RoomDirector" type="Node" parent="." node_paths=PackedStringArray("initial_state")]