refactor: move speedrun rankings into tab

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 9dbb5603-34d4-46e7-91ce-d0a49488bf15

Author: matteopolak

src/menus/main/main_menu.gd

@@ -56,8 +56,11 @@ func _ready() -> void:
 func _instantiate_maps() -> void:
 	var mode_to_container: Dictionary[String, ModeContainer]
 
-	for child: ModeContainer in mode_switcher.get_children():
-		mode_to_container[child.mode] = child
+	for child in mode_switcher.get_children():
+		if child is not ModeContainer:
+			continue
+		var mode_container := child as ModeContainer
+		mode_to_container[mode_container.mode] = mode_container
 
 	mode_to_container[Global.game_manager.current_mode].visible = true
 

src/menus/main/main_menu.tscn

@@ -24,6 +24,9 @@
 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_yrkwj"]
 size = Vector2(64, 64)
 
+[sub_resource type="Theme" id="Theme_og6j4"]
+default_font_size = 20
+
 [sub_resource type="FastNoiseLite" id="FastNoiseLite_3dplo"]
 
 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_iyvra"]
@@ -156,8 +159,8 @@ grow_horizontal = 2
 grow_vertical = 2
 theme = ExtResource("1_wwn1r")
 script = ExtResource("1_cput1")
-target_practice_leaderboard = NodePath("MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice/Content/OverallLeaderboard/TargetPracticeLeaderboard")
-movement_only_leaderboard = NodePath("MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only/Content/OverallLeaderboard/MovementOnlyLeaderboard")
+target_practice_leaderboard = NodePath("MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall/H/VBoxContainer/TargetPracticeLeaderboard")
+movement_only_leaderboard = NodePath("MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall/H/VBoxContainer2/MovementOnlyLeaderboard")
 
 [node name="MarginContainer" type="MarginContainer" parent="." unique_id=1955005440]
 layout_mode = 1
@@ -272,49 +275,6 @@ mode = "target"
 metadata/_custom_type_script = "uid://be34vbfubnjti"
 metadata/_tab_index = 0
 
-[node name="Content" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice" unique_id=100000001]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-
-[node name="MapScroll" type="ScrollContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice/Content" unique_id=100000002]
-layout_mode = 2
-size_flags_vertical = 3
-
-[node name="MapMargin" type="MarginContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice/Content/MapScroll" unique_id=100000003]
-layout_mode = 2
-size_flags_horizontal = 3
-theme_override_constants/margin_left = 20
-theme_override_constants/margin_top = 20
-theme_override_constants/margin_right = 20
-theme_override_constants/margin_bottom = 20
-
-[node name="MapContainer" type="HFlowContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice/Content/MapScroll/MapMargin" unique_id=100000004]
-layout_mode = 2
-size_flags_horizontal = 3
-theme_override_constants/h_separation = 15
-theme_override_constants/v_separation = 15
-
-[node name="OverallLeaderboard" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice/Content" unique_id=100000005]
-layout_mode = 2
-
-[node name="Heading" type="Label" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice/Content/OverallLeaderboard" unique_id=100000006]
-layout_mode = 2
-text = "Overall Leaderboard"
-
-[node name="TargetPracticeLeaderboard" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice/Content/OverallLeaderboard" unique_id=100000015]
-layout_mode = 2
-
-[node name="ExplanationText" type="Label" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Target Practice/Content/OverallLeaderboard" unique_id=100000007]
-layout_mode = 2
-theme_override_font_sizes/font_size = 13
-text = "Points are given based on runs in the top 10.
-1st place is 10 points, 2nd place is 9 points, etc.."
-horizontal_alignment = 1
-
 [node name="Movement Only" type="Control" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher" unique_id=868796938]
 visible = false
 layout_mode = 2
@@ -323,43 +283,54 @@ mode = "bhop"
 metadata/_custom_type_script = "uid://be34vbfubnjti"
 metadata/_tab_index = 1
 
-[node name="Content" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only" unique_id=100000008]
+[node name="Leaderboard" type="Control" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher" unique_id=1078392968]
+visible = false
+layout_mode = 2
+metadata/_tab_index = 2
+
+[node name="Overall" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard" unique_id=1926363149]
 layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -110.0
+offset_top = -18.0
+offset_right = 110.0
+offset_bottom = 18.0
 grow_horizontal = 2
 grow_vertical = 2
+theme_override_constants/separation = 20
 
-[node name="MapScroll" type="ScrollContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only/Content" unique_id=100000009]
+[node name="H" type="HBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall" unique_id=257135821]
 layout_mode = 2
-size_flags_vertical = 3
+theme = SubResource("Theme_og6j4")
+theme_override_constants/separation = 50
 
-[node name="MapMargin" type="MarginContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only/Content/MapScroll" unique_id=100000010]
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall/H" unique_id=1128228830]
 layout_mode = 2
-size_flags_horizontal = 3
-theme_override_constants/margin_left = 20
-theme_override_constants/margin_top = 20
-theme_override_constants/margin_right = 20
-theme_override_constants/margin_bottom = 20
 
-[node name="MapContainer" type="HFlowContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only/Content/MapScroll/MapMargin" unique_id=100000011]
+[node name="Label" type="Label" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall/H/VBoxContainer" unique_id=637673176]
+layout_mode = 2
+theme_override_font_sizes/font_size = 25
+text = "Target Practice"
+
+[node name="TargetPracticeLeaderboard" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall/H/VBoxContainer" unique_id=1291506203]
 layout_mode = 2
-size_flags_horizontal = 3
-theme_override_constants/h_separation = 15
-theme_override_constants/v_separation = 15
 
-[node name="OverallLeaderboard" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only/Content" unique_id=100000012]
+[node name="VBoxContainer2" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall/H" unique_id=15554509]
 layout_mode = 2
 
-[node name="Heading" type="Label" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only/Content/OverallLeaderboard" unique_id=100000013]
+[node name="Label" type="Label" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall/H/VBoxContainer2" unique_id=2137644706]
 layout_mode = 2
-text = "Overall Leaderboard"
+theme_override_font_sizes/font_size = 25
+text = "Movement Only"
 
-[node name="MovementOnlyLeaderboard" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only/Content/OverallLeaderboard" unique_id=100000016]
+[node name="MovementOnlyLeaderboard" type="VBoxContainer" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall/H/VBoxContainer2" unique_id=257067248]
 layout_mode = 2
 
-[node name="ExplanationText" type="Label" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Movement Only/Content/OverallLeaderboard" unique_id=100000014]
+[node name="Label" type="Label" parent="MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher/Leaderboard/Overall" unique_id=1815162472]
 layout_mode = 2
 theme_override_font_sizes/font_size = 13
 text = "Points are given based on runs in the top 10.

src/menus/main/mode_container.gd

@@ -3,7 +3,26 @@ class_name ModeContainer extends Control
 const MapButtonScene = preload("res://src/menus/main/map_button/map_button.tscn")
 
 @export var mode: String
-@onready var map_container: HFlowContainer = $Content/MapScroll/MapMargin/MapContainer
+var map_container := HFlowContainer.new()
+
+func _ready() -> void:
+	var sc := ScrollContainer.new()
+	sc.size_flags_vertical = Control.SIZE_EXPAND
+	sc.set_anchors_preset(PRESET_FULL_RECT)
+	add_child(sc)
+	var margin_container := MarginContainer.new()
+	var margin := 20
+	margin_container.add_theme_constant_override("margin_left", margin)
+	margin_container.add_theme_constant_override("margin_top", margin)
+	margin_container.add_theme_constant_override("margin_right", margin)
+	margin_container.add_theme_constant_override("margin_bottom", margin)
+	sc.add_child(margin_container)
+	margin_container.add_child(map_container)
+	margin_container.size_flags_horizontal = Control.SIZE_EXPAND_FILL
+	map_container.size_flags_horizontal = Control.SIZE_EXPAND_FILL
+
+	map_container.add_theme_constant_override("h_separation", 15)
+	map_container.add_theme_constant_override("v_separation", 15)
 
 func add_map(map: MapData, mode: String, pb: float, position: int, total: int) -> void:
 	var btn: MapButton = MapButtonScene.instantiate()

tests/aim_menu_smoke.gd

@@ -57,15 +57,25 @@ func _run() -> void:
 				"Main menu should expose an Aim Trainer tab",
 		)
 		var speedrun_modes_path := "MarginContainer/Content/Body/Speedrun/M/V/ModeSwitcher"
-		var target_leaderboard_path := speedrun_modes_path + "/Target Practice/Content/OverallLeaderboard/TargetPracticeLeaderboard"
-		var movement_leaderboard_path := speedrun_modes_path + "/Movement Only/Content/OverallLeaderboard/MovementOnlyLeaderboard"
+		var speedrun_leaderboard_path := speedrun_modes_path + "/Leaderboard"
+		var target_leaderboard_path := speedrun_leaderboard_path + "/Overall/H/VBoxContainer/TargetPracticeLeaderboard"
+		var movement_leaderboard_path := speedrun_leaderboard_path + "/Overall/H/VBoxContainer2/MovementOnlyLeaderboard"
+		var speedrun_modes = main_menu.get_node(speedrun_modes_path)
+		_check(
+				speedrun_modes.get_tab_count() == 3,
+				"Speedrun should expose Target Practice, Movement Only, and Leaderboard tabs",
+		)
+		_check(
+				main_menu.has_node(speedrun_leaderboard_path),
+				"Speedrun should expose a dedicated leaderboard mode tab",
+		)
 		_check(
 				main_menu.has_node(target_leaderboard_path),
-				"Target Practice should expose its overall leaderboard below the map list",
+				"Speedrun leaderboard tab should expose Target Practice rankings",
 		)
 		_check(
 				main_menu.has_node(movement_leaderboard_path),
-				"Movement Only should expose its overall leaderboard below the map list",
+				"Speedrun leaderboard tab should expose Movement Only rankings",
 		)
 		_check(
 				not main_menu.has_node("MarginContainer/Content/Body/Leaderboard"),