diff --git a/src/base-environments/youth_room/youth_room_scene_player.gd b/src/base-environments/youth_room/youth_room_scene_player.gd index 4c8c05e..f5e0c91 100644 --- a/src/base-environments/youth_room/youth_room_scene_player.gd +++ b/src/base-environments/youth_room/youth_room_scene_player.gd @@ -24,7 +24,7 @@ func _on_scene_starting(scene_id: Scenes.id, _repeat: bool) -> void: Scenes.id.YOUTH_JUI_JUTSU: play("jui_jutsu_music") Scenes.id.YOUTH_DRAVEN: - play("draven") + play("draeven") func _on_scene_finished(scene_id: Scenes.id, _repeat: bool) -> void: print_debug("YouthRoomScenePlayer._on_scene_finished(%s)" % Scenes.id.keys()[scene_id]) diff --git a/src/project.godot b/src/project.godot index 51902bd..c3f39d4 100644 --- a/src/project.godot +++ b/src/project.godot @@ -16,7 +16,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true [application] config/name="Frame of Mind" -run/main_scene="uid://fgp3tbah7msy" +run/main_scene="uid://ccdfkvtu6sb36" config/use_custom_user_dir=true config/features=PackedStringArray("4.5", "Forward Plus") boot_splash/bg_color=Color(0.0313726, 0.0117647, 0.129412, 1) diff --git a/src/singletons/main/main.gd b/src/singletons/main/main.gd index 242f003..15c8a68 100644 --- a/src/singletons/main/main.gd +++ b/src/singletons/main/main.gd @@ -70,11 +70,11 @@ func _ready() -> void: func start_game(save: SaveGame) -> void: print_debug("main.gd: play_game()") var room_path := room_paths.get(save.current_room, youth_room_path) as String - + while room_path: await _load_room(room_path) room_path = await State.room.play() - + # Ending? Roll credits? diff --git a/src/ui/loading/loading.gd b/src/ui/loading/loading.gd index 5096649..2d20afc 100644 --- a/src/ui/loading/loading.gd +++ b/src/ui/loading/loading.gd @@ -14,3 +14,4 @@ func stop() -> void: if animation.is_playing(): animation.stop() animation.play("LoadingSpinner/anim_loading_done") + await animation.animation_finished