diff options
| -rw-r--r-- | client/menu/lobby.gd | 28 | ||||
| -rw-r--r-- | client/menu/lobby.tscn | 94 |
2 files changed, 61 insertions, 61 deletions
diff --git a/client/menu/lobby.gd b/client/menu/lobby.gd index 3405cebb..d43bbf38 100644 --- a/client/menu/lobby.gd +++ b/client/menu/lobby.gd @@ -29,24 +29,24 @@ var bot_counts := {} var bot_reset_buttons := {} @onready var game: Game = $"../Game" -@onready var player_container = $MarginContainer/VBoxContainer/Players +@onready var player_container = $PlayerList/VBoxContainer/Players -@onready var map_name_label = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Name -@onready var map_player_label = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Players -@onready var map_difficulty_label = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Difficulty -@onready var map_list_container = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/MapList/VBoxContainer -@onready var map_list = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/MapList +@onready var map_name_label = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Name +@onready var map_player_label = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Players +@onready var map_difficulty_label = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Difficulty +@onready var map_list_container = $Sidebar/Bottom/MarginContainer/VBoxContainer/MapList/VBoxContainer +@onready var map_list = $Sidebar/Bottom/MarginContainer/VBoxContainer/MapList -@onready var map_selector = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer -@onready var prev_map = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Left -@onready var next_map = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/Right +@onready var map_selector = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer +@onready var prev_map = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Left +@onready var next_map = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/Right -@onready var bots_container = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/Bots -@onready var bot_settings = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/Bots/ScrollContainerCustom/BotSettings -@onready var bot_settings_conainer = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/Bots/ScrollContainerCustom +@onready var bots_container = $Sidebar/Bottom/MarginContainer/VBoxContainer/Bots +@onready var bot_settings = $Sidebar/Bottom/MarginContainer/VBoxContainer/Bots/ScrollContainerCustom/BotSettings +@onready var bot_settings_conainer = $Sidebar/Bottom/MarginContainer/VBoxContainer/Bots/ScrollContainerCustom -@onready var join_spectate = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer/JoinSpectate -@onready var start_button = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer/Start +@onready var join_spectate = $Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer/JoinSpectate +@onready var start_button = $Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer/Start func _ready(): game.update_players.connect(update_players) diff --git a/client/menu/lobby.tscn b/client/menu/lobby.tscn index b26b2190..a1381209 100644 --- a/client/menu/lobby.tscn +++ b/client/menu/lobby.tscn @@ -29,7 +29,27 @@ grow_vertical = 2 theme = ExtResource("1_u18ke") script = ExtResource("2_7657i") -[node name="HBoxContainer" type="HBoxContainer" parent="."] +[node name="PlayerList" type="MarginContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +theme_override_constants/margin_left = 342 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 342 +theme_override_constants/margin_bottom = 32 + +[node name="VBoxContainer" type="VBoxContainer" parent="PlayerList"] +layout_mode = 2 + +[node name="Players" type="HBoxContainer" parent="PlayerList/VBoxContainer"] +layout_mode = 2 +alignment = 1 + +[node name="Sidebar" type="HBoxContainer" parent="."] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -38,29 +58,29 @@ grow_horizontal = 2 grow_vertical = 2 alignment = 2 -[node name="Bottom" type="PanelContainer" parent="HBoxContainer"] +[node name="Bottom" type="PanelContainer" parent="Sidebar"] material = ExtResource("3_esmbx") layout_mode = 2 theme_override_styles/panel = ExtResource("3_6iqoe") script = ExtResource("5_am8pt") -[node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/Bottom"] +[node name="MarginContainer" type="MarginContainer" parent="Sidebar/Bottom"] layout_mode = 2 -[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/Bottom/MarginContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Sidebar/Bottom/MarginContainer"] layout_mode = 2 theme_override_constants/separation = 24 -[node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer"] layout_direction = 2 layout_mode = 2 alignment = 1 -[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 alignment = 1 -[node name="Left" type="TextureButton" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"] +[node name="Left" type="TextureButton" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"] custom_minimum_size = Vector2(19, 28) layout_mode = 2 focus_mode = 0 @@ -72,10 +92,10 @@ ignore_texture_size = true stretch_mode = 4 flip_h = true -[node name="Map" type="VBoxContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer"] +[node name="Map" type="VBoxContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 -[node name="Name" type="Label" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map"] +[node name="Name" type="Label" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map"] custom_minimum_size = Vector2(200, 0) layout_mode = 2 theme_override_fonts/font = SubResource("FontVariation_5xxr2") @@ -84,23 +104,23 @@ text = "Map name" horizontal_alignment = 1 vertical_alignment = 1 -[node name="Players" type="Label" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map"] +[node name="Players" type="Label" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map"] layout_mode = 2 text = "Players" horizontal_alignment = 1 vertical_alignment = 1 -[node name="Difficulty" type="Label" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map"] +[node name="Difficulty" type="Label" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map"] layout_mode = 2 text = "Difficulty" horizontal_alignment = 1 vertical_alignment = 1 -[node name="VBoxContainer2" type="VBoxContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer"] +[node name="VBoxContainer2" type="VBoxContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 alignment = 1 -[node name="Right" type="TextureButton" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2"] +[node name="Right" type="TextureButton" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2"] custom_minimum_size = Vector2(19, 28) layout_mode = 2 focus_mode = 0 @@ -111,39 +131,39 @@ texture_focused = ExtResource("6_tulu3") ignore_texture_size = true stretch_mode = 4 -[node name="MapList" type="ScrollContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer"] +[node name="MapList" type="ScrollContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 script = ExtResource("10_bgene") -[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/MapList"] +[node name="VBoxContainer" type="VBoxContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/MapList"] layout_mode = 2 size_flags_horizontal = 3 -[node name="Bots" type="VBoxContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer"] +[node name="Bots" type="VBoxContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer"] layout_mode = 2 -[node name="EnableBots" type="CheckButton" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/Bots"] +[node name="EnableBots" type="CheckButton" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/Bots"] layout_mode = 2 text = "c.menu.lobby.enable_bots" -[node name="ScrollContainerCustom" type="ScrollContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/Bots"] +[node name="ScrollContainerCustom" type="ScrollContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/Bots"] visible = false layout_mode = 2 size_flags_vertical = 3 script = ExtResource("10_bgene") -[node name="BotSettings" type="VBoxContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/Bots/ScrollContainerCustom"] +[node name="BotSettings" type="VBoxContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/Bots/ScrollContainerCustom"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Sidebar/Bottom/MarginContainer/VBoxContainer"] layout_mode = 2 theme_override_constants/separation = 15 alignment = 1 -[node name="JoinSpectate" type="Button" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer"] +[node name="JoinSpectate" type="Button" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer"] layout_mode = 2 text = "c.menu.ingame.spectate" expand_icon = true @@ -152,7 +172,7 @@ controller_texture = ExtResource("11_5uugf") press_action = "join_spectate" metadata/_custom_type_script = "uid://b1eomxildrq30" -[node name="Start" type="Button" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer"] +[node name="Start" type="Button" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer"] layout_mode = 2 text = "c.menu.lobby.start" expand_icon = true @@ -161,29 +181,9 @@ controller_texture = ExtResource("9_q14bw") press_action = "start_game" metadata/_custom_type_script = "uid://b1eomxildrq30" -[node name="MarginContainer" type="MarginContainer" parent="."] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_constants/margin_left = 342 -theme_override_constants/margin_top = 32 -theme_override_constants/margin_right = 342 -theme_override_constants/margin_bottom = 32 - -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] -layout_mode = 2 - -[node name="Players" type="HBoxContainer" parent="MarginContainer/VBoxContainer"] -layout_mode = 2 -alignment = 1 - [connection signal="visibility_changed" from="." to="." method="check_for_music"] -[connection signal="pressed" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Left" to="." method="_on_left_pressed"] -[connection signal="pressed" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/Right" to="." method="_on_right_pressed"] -[connection signal="toggled" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/Bots/EnableBots" to="." method="_on_enable_bots_toggled"] -[connection signal="pressed" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer/JoinSpectate" to="." method="_on_join_spectate_pressed"] -[connection signal="pressed" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer/Start" to="." method="_on_start_pressed"] +[connection signal="pressed" from="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Left" to="." method="_on_left_pressed"] +[connection signal="pressed" from="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/Right" to="." method="_on_right_pressed"] +[connection signal="toggled" from="Sidebar/Bottom/MarginContainer/VBoxContainer/Bots/EnableBots" to="." method="_on_enable_bots_toggled"] +[connection signal="pressed" from="Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer/JoinSpectate" to="." method="_on_join_spectate_pressed"] +[connection signal="pressed" from="Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer/Start" to="." method="_on_start_pressed"] |