From cb1655c3e3958845ec6b2b6ab634149cede152a8 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Wed, 19 Nov 2025 20:06:53 +0200 Subject: Improve room change --- top.gd | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'top.gd') diff --git a/top.gd b/top.gd index f7e98fe..63335c4 100644 --- a/top.gd +++ b/top.gd @@ -5,6 +5,11 @@ extends Node2D var save_state_path = "user://save_state.cfg" var save_state = ConfigFile.new() +## Should objects like the Player react to input, and enemies move +var objects_active = true + +var _transition_room: Node + # Called when the node enters the scene tree for the first time. func _ready() -> void: var room = initial_room.instantiate() @@ -19,33 +24,43 @@ func _ready() -> void: save_state.save(save_state_path) print(OS.get_data_dir()) -var _transition_room: Node - func transition_to_room(room_name: String): + # Do not transition if there is already a transition in process + if _transition_room != null: + print_debug("Tried to transition to ", room_name, " but a transition was already in process") + return + # Start animation # The animation calls _change_room at a specific time - $TransitionCanvas/AnimationPlayer.play("room_transition") + $TransitionCanvas/AnimationPlayer.play("room_trans_start") + objects_active = false var room = ResourceLoader.load("res://room_" + room_name + ".tscn") _transition_room = room.instantiate() -func _change_room(): +func _transition_start(): + print_debug("_transition_start") var current_room = get_node("active_room") remove_child(current_room) + current_room.queue_free() - # If the room hasn't loaded yet, busy loop until it is + # If the room hasn't loaded yet, loop until it is while _transition_room == null: await get_tree().create_timer(0.1).timeout var next_room: Node = _transition_room next_room.name = "active_room" - next_room.process_mode = Node.PROCESS_MODE_PAUSABLE + next_room.connect("ready", _on_room_changed) add_child(next_room) - _transition_room = null +func _on_room_changed(): + print_debug("_on_room_changed") + $TransitionCanvas/AnimationPlayer.play("room_trans_end") -func set_paused(paused: bool): - get_tree().paused = paused +func _transition_end(): + print_debug("_transition_end") + objects_active = true + _transition_room = null func save(): save_state.save("user://save_state.cfg") -- cgit v1.3