project.godot

@@ -41,7 +41,7 @@ version_control/autoload_on_startup=true
 
 [editor_plugins]
 
-enabled=PackedStringArray("res://addons/AsepriteWizard/plugin.cfg", "res://addons/Tile_Set_Helper/plugin.cfg", "res://addons/ridiculous_coding/plugin.cfg")
+enabled=PackedStringArray("res://addons/AsepriteWizard/plugin.cfg", "res://addons/ridiculous_coding/plugin.cfg")
 
 [input]
 

scenes/room/room.gd

@@ -1,18 +1,14 @@
 class_name Room extends Node2D
 
 
-@export var config: RoomConfig
+@export var room_config: RoomConfig
 
 @onready var camera: RoomCamera = $RoomCamera
 @onready var director: StateMachine = $RoomDirector
 
-# TODO: better alternative to preloading as i add functionality?
+# 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 initial_spawn: Vector2i = Vector2i(16,16)
 
 var player: Player
-
+var initial_spawn: Vector2i = Vector2i(16,16)
-
-func _ready() -> void:
-	assert(config != null, "room config is null")

scenes/room/room.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=8 format=3 uid="uid://bxhyxox662buj"]
+[gd_scene load_steps=7 format=3 uid="uid://bxhyxox662buj"]
 
 [ext_resource type="Script" uid="uid://pcl0om2k32g6" path="res://scenes/room/room.gd" id="1_8xru0"]
 [ext_resource type="Script" uid="uid://diou146pyb0br" path="res://scenes/room/room_camera.gd" id="3_y1kpu"]
 [ext_resource type="Script" uid="uid://b7715auuhy7vu" path="res://scenes/room/states/room_entering.gd" id="4_1w8vm"]
 [ext_resource type="Script" uid="uid://diths5s8vd7lr" path="res://classes/state_machine/state_machine.gd" id="4_vaubn"]
 [ext_resource type="Script" uid="uid://d2xitfobwbk20" path="res://scenes/room/states/room_playing.gd" id="5_w7vtx"]
-[ext_resource type="Script" uid="uid://drnrd5xlt8imm" path="res://scenes/room/states/room_exiting.gd" id="6_7jj40"]
 [ext_resource type="Script" uid="uid://ceevyto3vbq7c" path="res://scenes/room/states/room_paused.gd" id="6_gui0a"]
 
 [node name="Room" type="Node2D"]
@@ -30,9 +29,5 @@ metadata/_custom_type_script = "uid://hjm43hb4os07"
 script = ExtResource("6_gui0a")
 metadata/_custom_type_script = "uid://hjm43hb4os07"
 
-[node name="Exiting" type="Node" parent="RoomDirector"]
-script = ExtResource("6_7jj40")
-metadata/_custom_type_script = "uid://hjm43hb4os07"
-
 [node name="RoomCamera" type="Camera2D" parent="."]
 script = ExtResource("3_y1kpu")

scenes/room/room_config.gd

@@ -3,6 +3,5 @@
 
 #@export var size: Vector2i = Vector2i.ZERO
 @export var follow_player: bool = true
-@export var loopable: bool = false
 
 @export var camera_position: Vector2i = Vector2i.ZERO

scenes/room/states/room_entering.gd

@@ -6,7 +6,6 @@ func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void:
 	room.player = room.player_scene.instantiate()
 	room.add_child(room.player)
 	room.player.global_position = room.initial_spawn
-	room.camera.global_position = room.config.camera_position
 	
 	finished.emit(PLAYING)
 	return

scenes/room/states/room_exiting.gd

@@ -1,5 +0,0 @@
-extends RoomState
-
-
-func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void:
-	room.queue_free()

scenes/room/states/room_exiting.gd.uid

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

scenes/room/states/room_playing.gd

@@ -1,13 +1,9 @@
 extends RoomState
 
 
-var follow: bool
-
-
 func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void:
 	print("entering room gameplay")
 	get_tree().paused = false
-	follow = room.config.follow_player
 
 
 func _handle_input(event: InputEvent) -> void:
@@ -16,4 +12,4 @@ func _handle_input(event: InputEvent) -> void:
 
 
 func _state_physics_update(delta: float) -> void:
-	if follow: room.camera.follow_player(delta)
+	room.camera.follow_player(delta)