RELEASING.md

@@ -5,7 +5,7 @@ Releases are made from the version in `project.godot`
 same version in the About window.
 
 1. Bump the version, e.g. from `1.9.0` to `1.10.0`, and add a `WHATS_NEW` entry in
-   `about_popup.gd`.
+   `popups/about_popup.gd`.
 2. Merge to `main` and push.
 
 The `Build` workflow (`.gitea/workflows/gitea-build.yaml`) then:

main/MainWindow.tscn

@@ -1,15 +1,15 @@
 [gd_scene format=3 uid="uid://xwq863o6uvsu"]
 
-[ext_resource type="PackedScene" path="res://TopBar.tscn" id="top_bar_scene"]
-[ext_resource type="PackedScene" path="res://Quiz.tscn" id="quiz_scene"]
-[ext_resource type="Script" uid="uid://b8f4g15cas2j2" path="res://main_window.gd" id="1_eu0t5"]
-[ext_resource type="PackedScene" uid="uid://bxydgil1yifps" path="res://SearchPopup.tscn" id="9_5ijvr"]
-[ext_resource type="PackedScene" uid="uid://dpdem7pdxweb5" path="res://SyncPopup.tscn" id="10_yxw0b"]
-[ext_resource type="PackedScene" uid="uid://bd1by80q1v27e" path="res://ShortcutsPopup.tscn" id="13_8eebo"]
-[ext_resource type="PackedScene" uid="uid://btupbowehiyyu" path="res://QRPopup.tscn" id="15_qr_window"]
-[ext_resource type="PackedScene" uid="uid://cp54idaudb8dp" path="res://AboutPopup.tscn" id="16_about_window"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
-[ext_resource type="PackedScene" uid="uid://bijh5h5yrivm3" path="res://LogPopup.tscn" id="14_26rwn"]
+[ext_resource type="PackedScene" path="res://main/TopBar.tscn" id="top_bar_scene"]
+[ext_resource type="PackedScene" path="res://quiz/Quiz.tscn" id="quiz_scene"]
+[ext_resource type="Script" uid="uid://b8f4g15cas2j2" path="res://main/main_window.gd" id="1_eu0t5"]
+[ext_resource type="PackedScene" uid="uid://bxydgil1yifps" path="res://popups/SearchPopup.tscn" id="9_5ijvr"]
+[ext_resource type="PackedScene" uid="uid://dpdem7pdxweb5" path="res://popups/SyncPopup.tscn" id="10_yxw0b"]
+[ext_resource type="PackedScene" uid="uid://bd1by80q1v27e" path="res://popups/ShortcutsPopup.tscn" id="13_8eebo"]
+[ext_resource type="PackedScene" uid="uid://btupbowehiyyu" path="res://popups/QRPopup.tscn" id="15_qr_window"]
+[ext_resource type="PackedScene" uid="uid://cp54idaudb8dp" path="res://popups/AboutPopup.tscn" id="16_about_window"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
+[ext_resource type="PackedScene" uid="uid://bijh5h5yrivm3" path="res://popups/LogPopup.tscn" id="14_26rwn"]
 
 [node name="MainWindow" type="Control" unique_id=407149696]
 layout_mode = 3

main/TopBar.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3]
 
-[ext_resource type="Script" path="res://top_bar.gd" id="top_bar_script"]
+[ext_resource type="Script" path="res://main/top_bar.gd" id="top_bar_script"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_ychxr"]
 font_size = 25

player/MusicPlayer.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=10 format=3 uid="uid://ds15cgsf8vpvc"]
 
-[ext_resource type="Script" uid="uid://d1v0rquma6nt8" path="res://music_player.gd" id="1_t24ra"]
+[ext_resource type="Script" uid="uid://d1v0rquma6nt8" path="res://player/music_player.gd" id="1_t24ra"]
 [ext_resource type="AudioStream" uid="uid://n2g8jddr85h2" path="res://sounds/01. Opening.mp3" id="2_xti80"]
 [ext_resource type="Texture2D" uid="uid://comxqfiykp54f" path="res://icons/play_icon_light.svg" id="3_6g308"]
 [ext_resource type="Texture2D" uid="uid://ccb6rvbldlgdg" path="res://icons/reload_light_icon.svg" id="4_jleuo"]
-[ext_resource type="PackedScene" uid="uid://w400rnew7453" path="res://VolumeSlider.tscn" id="5_iifuj"]
+[ext_resource type="PackedScene" uid="uid://w400rnew7453" path="res://player/VolumeSlider.tscn" id="5_iifuj"]
 
 [sub_resource type="InputEventKey" id="InputEventKey_r4qo3"]
 device = -1

player/VolumeSlider.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://w400rnew7453"]
 
-[ext_resource type="Script" uid="uid://bgviu7smansj1" path="res://volume_slider.gd" id="1_1aufb"]
+[ext_resource type="Script" uid="uid://bgviu7smansj1" path="res://player/volume_slider.gd" id="1_1aufb"]
 
 [node name="VolumeSlider" type="HSlider"]
 offset_right = 8.0

popups/AboutPopup.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://cp54idaudb8dp"]
 
-[ext_resource type="Script" uid="uid://b7bh0of7olbcb" path="res://about_popup.gd" id="1_about_script"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Script" uid="uid://b7bh0of7olbcb" path="res://popups/about_popup.gd" id="1_about_script"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [node name="AboutPopup" type="Control" unique_id=1626010355 node_paths=PackedStringArray("panel")]
 theme = ExtResource("popup_theme")

popups/CharacterCard.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://c7ecjj2af6usf"]
 
-[ext_resource type="Script" uid="uid://i35b3scbpwpu" path="res://character_card.gd" id="1_pjt0s"]
+[ext_resource type="Script" uid="uid://i35b3scbpwpu" path="res://popups/character_card.gd" id="1_pjt0s"]
 [ext_resource type="Texture2D" uid="uid://cv3hdd6bsruau" path="res://icon.svg" id="2_pjt0s"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pjt0s"]

popups/CharacterSelectPopup.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://cdy4kvemwaiom"]
 
-[ext_resource type="Script" uid="uid://cvffg87wr6r3y" path="res://character_select_popup.gd" id="1_h4tdp"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Script" uid="uid://cvffg87wr6r3y" path="res://popups/character_select_popup.gd" id="1_h4tdp"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_p4iny"]
 font_size = 25

popups/LogPopup.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=2 format=3 uid="uid://bijh5h5yrivm3"]
 
-[ext_resource type="Script" uid="uid://cw41y87l64qo7" path="res://log_popup.gd" id="1_q72ua"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Script" uid="uid://cw41y87l64qo7" path="res://popups/log_popup.gd" id="1_q72ua"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [node name="LogPopup" type="Control" node_paths=PackedStringArray("panel")]
 theme = ExtResource("popup_theme")

popups/QRPopup.tscn

@@ -1,8 +1,8 @@
 [gd_scene format=3 uid="uid://btupbowehiyyu"]
 
-[ext_resource type="Script" uid="uid://bsa6xg5xos6h7" path="res://qr_popup.gd" id="1_qr_script"]
+[ext_resource type="Script" uid="uid://bsa6xg5xos6h7" path="res://popups/qr_popup.gd" id="1_qr_script"]
 [ext_resource type="Script" uid="uid://dynulhnyq5hpq" path="res://addons/kenyoni/qr_code/qr_code_rect.gd" id="2_jpsxt"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [node name="QRPopup" type="Control" unique_id=1996957585 node_paths=PackedStringArray("panel")]
 theme = ExtResource("popup_theme")

popups/SearchPopup.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://bxydgil1yifps"]
 
-[ext_resource type="Script" uid="uid://bg5yo08638600" path="res://search_popup.gd" id="1_m7bij"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Script" uid="uid://bg5yo08638600" path="res://popups/search_popup.gd" id="1_m7bij"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [node name="SearchPopup" type="Control" unique_id=616238617 node_paths=PackedStringArray("panel")]
 theme = ExtResource("popup_theme")

popups/SettingsPopup.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://dldpeo5y3l5hq"]
 
-[ext_resource type="Script" uid="uid://dukqyjoduf1af" path="res://settings_popup.gd" id="1_bt55j"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Script" uid="uid://dukqyjoduf1af" path="res://popups/settings_popup.gd" id="1_bt55j"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_3xrlm"]
 font_size = 25

popups/ShortcutsPopup.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=2 format=3 uid="uid://bd1by80q1v27e"]
 
-[ext_resource type="Script" uid="uid://rolypd0cqd6h" path="res://shortcuts_popup.gd" id="1_12pxi"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Script" uid="uid://rolypd0cqd6h" path="res://popups/shortcuts_popup.gd" id="1_12pxi"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [node name="ShortcutsPopup" type="Control" node_paths=PackedStringArray("panel")]
 theme = ExtResource("popup_theme")

popups/SyncPopup.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://dpdem7pdxweb5"]
 
-[ext_resource type="Script" uid="uid://c3ejukwth512a" path="res://sync_popup.gd" id="1_8ba47"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Script" uid="uid://c3ejukwth512a" path="res://popups/sync_popup.gd" id="1_8ba47"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_anbfi"]
 font_size = 25

popups/WinnerPopup.tscn

@@ -1,8 +1,8 @@
 [gd_scene format=3 uid="uid://cxlsmxnrp0agh"]
 
-[ext_resource type="Script" uid="uid://dxpb22xbwf3t1" path="res://winner_popup.gd" id="1_winner_script"]
+[ext_resource type="Script" uid="uid://dxpb22xbwf3t1" path="res://popups/winner_popup.gd" id="1_winner_script"]
 [ext_resource type="Texture2D" uid="uid://r4as0nmtoa7p" path="res://noCharacter.png" id="2_no_character"]
-[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"]
+[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_hr75l"]
 font_size = 35

popups/character_select_popup.gd

@@ -5,7 +5,7 @@ extends BasePopup
 signal character_selected(texture: ImageTexture)
 
 var can_select_character: bool = false
-var character: PackedScene = preload("res://CharacterCard.tscn")
+var character: PackedScene = preload("res://popups/CharacterCard.tscn")
 
 @onready var character_panel: Panel = %CharacterPanel
 @onready var title_label: Label = %TitleLabel

project.godot

@@ -16,16 +16,16 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
 
 config/name="MusicPlayer"
 config/version="1.9.0"
-run/main_scene="res://MainWindow.tscn"
+run/main_scene="res://main/MainWindow.tscn"
 config/features=PackedStringArray("4.7", "GL Compatibility")
 config/icon="res://icon.svg"
 
 [autoload]
 
-GameLog="*res://game_log.gd"
-Settings="*res://settings.gd"
-Playlist="*res://playlist.gd"
-MusicServerClient="*res://music_server_client.gd"
+GameLog="*res://common/game_log.gd"
+Settings="*res://data/settings.gd"
+Playlist="*res://data/playlist.gd"
+MusicServerClient="*res://server/music_server_client.gd"
 
 [debug]
 

quiz/InspirationList.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3]
 
-[ext_resource type="Script" uid="uid://elgn7gkxgagq" path="res://inspiration_list.gd" id="2_gxtxm"]
+[ext_resource type="Script" uid="uid://elgn7gkxgagq" path="res://quiz/inspiration_list.gd" id="2_gxtxm"]
 
 [node name="InspirationList" type="ScrollContainer" unique_id=498283761]
 layout_mode = 3

quiz/MusicListPanel.tscn

@@ -1,8 +1,8 @@
 [gd_scene format=3]
 
-[ext_resource type="Script" path="res://music_list_panel.gd" id="part_script"]
-[ext_resource type="Script" uid="uid://gf1bk6xbe3j" path="res://scroll_to_end_container.gd" id="7_dj026"]
-[ext_resource type="Theme" uid="uid://rxexo3ur85as" path="res://light_gray_theme.tres" id="7_wxbv6"]
+[ext_resource type="Script" path="res://quiz/music_list_panel.gd" id="part_script"]
+[ext_resource type="Script" uid="uid://gf1bk6xbe3j" path="res://quiz/scroll_to_end_container.gd" id="7_dj026"]
+[ext_resource type="Theme" uid="uid://rxexo3ur85as" path="res://themes/light_gray_theme.tres" id="7_wxbv6"]
 
 [node name="MusicListPanel" type="PanelContainer" unique_id=2011292375]
 layout_mode = 3

quiz/NowPlaying.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3]
 
-[ext_resource type="Script" path="res://now_playing.gd" id="part_script"]
+[ext_resource type="Script" path="res://quiz/now_playing.gd" id="part_script"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_qspbu"]
 font_size = 50

quiz/PlayerRow.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=9 format=3 uid="uid://cslogy2csnd7a"]
 
-[ext_resource type="Script" uid="uid://dl6no2wr2c86y" path="res://player_row.gd" id="1_if4kc"]
+[ext_resource type="Script" uid="uid://dl6no2wr2c86y" path="res://quiz/player_row.gd" id="1_if4kc"]
 [ext_resource type="Texture2D" uid="uid://r4as0nmtoa7p" path="res://noCharacter.png" id="2_hpj3s"]
 [ext_resource type="Texture2D" uid="uid://b2kj6m8qpsgb1" path="res://icons/person_remove_light.svg" id="3_j3uxe"]
 

quiz/PlayersPanel.tscn

@@ -1,8 +1,8 @@
 [gd_scene format=3]
 
-[ext_resource type="Script" path="res://players_panel.gd" id="part_script"]
+[ext_resource type="Script" path="res://quiz/players_panel.gd" id="part_script"]
 [ext_resource type="Texture2D" uid="uid://bcfmpd7h512ef" path="res://icons/person_add_light.svg" id="5_31tjv"]
-[ext_resource type="Script" uid="uid://cgakje8gb37tf" path="res://player_name_field.gd" id="7_qsdfy"]
+[ext_resource type="Script" uid="uid://cgakje8gb37tf" path="res://quiz/player_name_field.gd" id="7_qsdfy"]
 
 [sub_resource type="InputEventKey" id="InputEventKey_03bm3"]
 device = -1

quiz/Quiz.tscn

@@ -1,17 +1,17 @@
 [gd_scene format=3]
 
-[ext_resource type="Script" path="res://quiz.gd" id="quiz_script"]
-[ext_resource type="PackedScene" uid="uid://ds15cgsf8vpvc" path="res://MusicPlayer.tscn" id="5_emn36"]
-[ext_resource type="PackedScene" uid="uid://cdy4kvemwaiom" path="res://CharacterSelectPopup.tscn" id="6_dhrvg"]
-[ext_resource type="PackedScene" uid="uid://dldpeo5y3l5hq" path="res://SettingsPopup.tscn" id="11_k62u5"]
-[ext_resource type="PackedScene" uid="uid://cxlsmxnrp0agh" path="res://WinnerPopup.tscn" id="17_winner_window"]
-[ext_resource type="PackedScene" path="res://MusicListPanel.tscn" id="scene_MusicListPanel"]
-[ext_resource type="PackedScene" path="res://PlayersPanel.tscn" id="scene_PlayersPanel"]
-[ext_resource type="PackedScene" path="res://InspirationList.tscn" id="scene_InspirationList"]
-[ext_resource type="PackedScene" path="res://QuizToolbar.tscn" id="scene_QuizToolbar"]
-[ext_resource type="PackedScene" path="res://SongControls.tscn" id="scene_SongControls"]
-[ext_resource type="PackedScene" path="res://NowPlaying.tscn" id="scene_NowPlaying"]
-[ext_resource type="Script" path="res://song_loader.gd" id="song_loader_script"]
+[ext_resource type="Script" path="res://quiz/quiz.gd" id="quiz_script"]
+[ext_resource type="PackedScene" uid="uid://ds15cgsf8vpvc" path="res://player/MusicPlayer.tscn" id="5_emn36"]
+[ext_resource type="PackedScene" uid="uid://cdy4kvemwaiom" path="res://popups/CharacterSelectPopup.tscn" id="6_dhrvg"]
+[ext_resource type="PackedScene" uid="uid://dldpeo5y3l5hq" path="res://popups/SettingsPopup.tscn" id="11_k62u5"]
+[ext_resource type="PackedScene" uid="uid://cxlsmxnrp0agh" path="res://popups/WinnerPopup.tscn" id="17_winner_window"]
+[ext_resource type="PackedScene" path="res://quiz/MusicListPanel.tscn" id="scene_MusicListPanel"]
+[ext_resource type="PackedScene" path="res://quiz/PlayersPanel.tscn" id="scene_PlayersPanel"]
+[ext_resource type="PackedScene" path="res://quiz/InspirationList.tscn" id="scene_InspirationList"]
+[ext_resource type="PackedScene" path="res://quiz/QuizToolbar.tscn" id="scene_QuizToolbar"]
+[ext_resource type="PackedScene" path="res://quiz/SongControls.tscn" id="scene_SongControls"]
+[ext_resource type="PackedScene" path="res://quiz/NowPlaying.tscn" id="scene_NowPlaying"]
+[ext_resource type="Script" path="res://quiz/song_loader.gd" id="song_loader_script"]
 
 [node name="Quiz" type="Control" unique_id=1146705218]
 layout_mode = 3

quiz/QuizToolbar.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3]
 
-[ext_resource type="Script" path="res://quiz_toolbar.gd" id="part_script"]
+[ext_resource type="Script" path="res://quiz/quiz_toolbar.gd" id="part_script"]
 
 [node name="QuizToolbar" type="Control" unique_id=1873301941]
 layout_mode = 3

quiz/SongControls.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3]
 
-[ext_resource type="Script" path="res://song_controls.gd" id="part_script"]
+[ext_resource type="Script" path="res://quiz/song_controls.gd" id="part_script"]
 
 [sub_resource type="InputEventKey" id="InputEventKey_06rl4"]
 device = -1

quiz/SongRow.tscn

@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=3 uid="uid://1jbtmhbqolqe"]
 
 [ext_resource type="Texture2D" uid="uid://c8r7ykphss4c2" path="res://characters/Link.png" id="1_ll28s"]
-[ext_resource type="Script" uid="uid://cjo13wixip8mq" path="res://song_row.gd" id="1_lspki"]
-[ext_resource type="Theme" uid="uid://8bllart6xn1f" path="res://default_theme.tres" id="1_x7fq8"]
-[ext_resource type="StyleBox" uid="uid://bsv6yb0yir04l" path="res://style_box_flat.tres" id="3_5h84f"]
+[ext_resource type="Script" uid="uid://cjo13wixip8mq" path="res://quiz/song_row.gd" id="1_lspki"]
+[ext_resource type="Theme" uid="uid://8bllart6xn1f" path="res://themes/default_theme.tres" id="1_x7fq8"]
+[ext_resource type="StyleBox" uid="uid://bsv6yb0yir04l" path="res://themes/style_box_flat.tres" id="3_5h84f"]
 
 [node name="SongRow" type="PanelContainer"]
 custom_minimum_size = Vector2(1000, 0)

quiz/music_list_panel.gd

@@ -6,7 +6,7 @@ extends PanelContainer
 
 signal song_clicked(song_no: int)
 
-var _song_list_object: PackedScene = preload("res://SongRow.tscn")
+var _song_list_object: PackedScene = preload("res://quiz/SongRow.tscn")
 
 @onready var _rows: VBoxContainer = %MusicList
 

quiz/players_panel.gd

@@ -16,7 +16,7 @@ signal player_removed(player_object: PlayerObject)
 ## Emitted when the character button in [param row] is pressed.
 signal change_character_requested(row: PlayerRow, player_name: String)
 
-var _player_row: PackedScene = preload("res://PlayerRow.tscn")
+var _player_row: PackedScene = preload("res://quiz/PlayerRow.tscn")
 
 @onready var add_players_button: TextureButton = %AddPlayersButton
 @onready var add_player_container: HBoxContainer = %AddPlayerContainer

tests/fakes/main_window_test_suite.gd

@@ -38,7 +38,7 @@ func before_test() -> void:
 	_server.respond_bytes("/music/played?song=0", PackedByteArray())
 
 	_before_window_starts()
-	_runner = scene_runner("res://MainWindow.tscn")
+	_runner = scene_runner("res://main/MainWindow.tscn")
 	_window = _runner.scene()
 	_quiz = _window.get_node("Quiz")
 	# The debug build lowers the winning score on startup; keep it out of reach

tests/integration/test_inspiration_list.gd

@@ -15,7 +15,7 @@ func before_test() -> void:
 	Settings.inspiration_list_speed = 0
 	_server = FakeHttpTransport.new().install()
 	_server.respond_json("/music/all", SOUNDTRACKS)
-	_runner = scene_runner("res://InspirationList.tscn")
+	_runner = scene_runner("res://quiz/InspirationList.tscn")
 	_list = _runner.scene()
 
 

tests/integration/test_layout_unchanged.gd

@@ -86,7 +86,7 @@ func before() -> void:
 	viewport.size = Vector2i(1920, 1080)
 	viewport.gui_embed_subwindows = true
 	Engine.get_main_loop().root.add_child(viewport)
-	_main = load("res://MainWindow.tscn").instantiate()
+	_main = load("res://main/MainWindow.tscn").instantiate()
 	viewport.add_child(_main)
 	await UiTour.new(_main).run(func(state: String, popup: Node) -> void:
 		_layout[state] = UiTour.dump_layout(_main, _main if popup == null else popup))