add room paused state

scenes/room/room.gd

@@ -4,7 +4,7 @@ class_name Room extends Node2D
 @export var room_config: RoomConfig
 
 @onready var camera: RoomCamera = $RoomCamera
-@onready var state_machine: StateMachine = $RoomStateMachine
+@onready var director: StateMachine = $RoomDirector
 
 var player_scene: PackedScene = preload("res://scenes/player/player.tscn")
 

scenes/room/room.tscn

@@ -1,32 +1,32 @@
-[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://bamoq5wi0lkdy" path="res://resources/room_config.gd" id="2_kxljb"]
 [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_starting.gd" id="4_1w8vm"]
+[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"]
-
-[sub_resource type="Resource" id="Resource_y1kpu"]
-script = ExtResource("2_kxljb")
-metadata/_custom_type_script = "uid://bamoq5wi0lkdy"
+[ext_resource type="Script" uid="uid://ceevyto3vbq7c" path="res://scenes/room/states/room_paused.gd" id="6_gui0a"]
 
 [node name="Room" type="Node2D"]
 script = ExtResource("1_8xru0")
-room_config = SubResource("Resource_y1kpu")
 
-[node name="RoomStateMachine" type="Node" parent="." node_paths=PackedStringArray("initial_state")]
+[node name="RoomDirector" type="Node" parent="." node_paths=PackedStringArray("initial_state")]
+process_mode = 3
 script = ExtResource("4_vaubn")
-initial_state = NodePath("Starting")
+initial_state = NodePath("Entering")
 metadata/_custom_type_script = "uid://diths5s8vd7lr"
 
-[node name="Starting" type="Node" parent="RoomStateMachine"]
+[node name="Entering" type="Node" parent="RoomDirector"]
 script = ExtResource("4_1w8vm")
 metadata/_custom_type_script = "uid://hjm43hb4os07"
 
-[node name="Playing" type="Node" parent="RoomStateMachine"]
+[node name="Playing" type="Node" parent="RoomDirector"]
 script = ExtResource("5_w7vtx")
 metadata/_custom_type_script = "uid://hjm43hb4os07"
 
+[node name="Paused" type="Node" parent="RoomDirector"]
+script = ExtResource("6_gui0a")
+metadata/_custom_type_script = "uid://hjm43hb4os07"
+
 [node name="RoomCamera" type="Camera2D" parent="."]
 script = ExtResource("3_y1kpu")

scenes/room/room_state.gd

@@ -32,20 +32,3 @@ func _state_update(_delta: float) -> void:
 
 func _state_physics_update(_delta: float) -> void:
 	pass
-
-
-func match_state(exclude: Array[StringName] = []) -> StringName:
-	if Input.is_action_just_pressed("pause"):
-		if PAUSED in exclude: return ""
-		return PAUSED
-	
-	return ""
-
-
-func watch_state(exclude: Array[StringName] = [], data: Dictionary[StringName, Variant] = {}) -> bool:
-	var next_state: StringName = match_state(exclude)
-	if next_state != "":
-		finished.emit(next_state, data)
-		return true
-	
-	return false

scenes/room/states/room_entering.gd

@@ -2,6 +2,7 @@ extends RoomState
 
 
 func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void:
+	print("entering room")
 	room.player = room.player_scene.instantiate()
 	room.add_child(room.player)
 	room.player.global_position = room.initial_spawn

scenes/room/states/room_paused.gd

@@ -0,0 +1,17 @@
+extends RoomState
+
+
+var _prev_state: String
+
+
+func _enter(previous_state_path: String, _data: Dictionary = {}) -> void:
+	print("entering room pause")
+	_prev_state = previous_state_path
+	get_tree().paused = true
+	print("room paused")
+
+
+func _handle_input(event: InputEvent) -> void:
+	if event.is_action_pressed("pause"):
+		finished.emit(_prev_state)
+		return

scenes/room/states/room_paused.gd.uid

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

scenes/room/states/room_playing.gd

@@ -1,6 +1,15 @@
 extends RoomState
 
 
+func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void:
+	print("entering room gameplay")
+	get_tree().paused = false
+
+
+func _handle_input(event: InputEvent) -> void:
+	if event.is_action_pressed("pause"):
+		finished.emit(PAUSED)
+
+
 func _state_physics_update(delta: float) -> void:
 	room.camera.follow_player(delta)
-	if match_state([PLAYING]): return