chore: better server preview

Author: kravallee

components/managers/lobby_manager.gd

@@ -26,9 +26,16 @@ func _ready():
 	map_spawner.spawn_function = map_manager.spawn_map
 	Steam.join_requested.connect(_on_lobby_join_requested)
 	Steam.lobby_joined.connect(_on_lobby_joined)
+	Steam.lobby_kicked.connect(_on_lobby_kicked)
 
 	check_command_line()
 
+func _on_lobby_kicked(lobby_id: int, _admin_id: int, _due_to_disconnect: int) -> void:
+	Steam.leaveLobby(lobby_id)
+	menu_manager.show_main_canvas()
+	menu_manager.hide_all_menus()
+	menu_manager._on_public_multiplayer_button_pressed()
+
 func _on_lobby_joined(_lobby: int, _permissions: int, _locked: bool, response: int):
 	if response == Steam.CHAT_ROOM_ENTER_RESPONSE_SUCCESS:
 		menu_manager.hide_main_canvas()
@@ -130,16 +137,15 @@ func refresh_steam_lobby_list():
 func _on_steam_lobby_match_list(lobbies):
 	for lobby in lobbies:
 		var lobby_name: String = Steam.getLobbyData(lobby, "name")
-		var lobby_mode: String = Steam.getLobbyData(lobby, "mode")
+		var _lobby_mode: String = Steam.getLobbyData(lobby, "mode")
 		if lobby_name.is_empty():
 			continue
 
 		var lobby_num_members: int = Steam.getNumLobbyMembers(lobby)
 
-		var lobby_btn = Button.new()
-		lobby_btn.set_text("Lobby %s: %s [%s] - %s Player(s)" % [lobby, lobby_name, lobby_mode, lobby_num_members])
-		lobby_btn.set_size(Vector2(800, 50))
-		lobby_btn.set_name("lobby_%s" % lobby)
-		lobby_btn.connect("pressed", Callable(self, "join_steam_lobby").bind(lobby))
-
+		var lobby_btn: ServerPanel = menu_manager.server_panel.instantiate()
 		lobby_v_box_container.add_child(lobby_btn)
+		lobby_btn.server_name.text = lobby_name
+		lobby_btn.player_count.text = "%s Player(s)" % lobby_num_members
+		lobby_btn.name = "lobby_%s" % lobby
+		lobby_btn.join_button.connect("pressed", Callable(self, "join_steam_lobby").bind(lobby))

components/managers/menu_manager.gd

@@ -1,5 +1,6 @@
 class_name MenuManager extends Node
 
+@export var server_panel: PackedScene
 @export var main_canvas: CanvasLayer
 @export var main_menu: Control
 @export var multiplayer_select_menu: Control

components/ui/server_panel.gd

@@ -0,0 +1,5 @@
+class_name ServerPanel extends Panel
+
+@onready var server_name: Label = %ServerName
+@onready var player_count: Label = %PlayerCount
+@onready var join_button: Button = %JoinButton

components/ui/server_panel.gd.uid

@@ -0,0 +1 @@
+uid://bktvkdny3qe33

scenes/game_controller.tscn

@@ -1,11 +1,12 @@
-[gd_scene load_steps=8 format=3 uid="uid://dctiktpqyar4l"]
+[gd_scene load_steps=9 format=3 uid="uid://dctiktpqyar4l"]
 
 [ext_resource type="Script" uid="uid://bqrnoubyb5xyt" path="res://components/managers/lobby_manager.gd" id="1_rc0pn"]
 [ext_resource type="Script" uid="uid://djqwyk1iv2mw3" path="res://components/managers/network_manager.gd" id="2_h843c"]
 [ext_resource type="Script" uid="uid://dnirqbsrgss6i" path="res://components/managers/menu_manager.gd" id="3_e85df"]
 [ext_resource type="Script" uid="uid://busevdy2omq1l" path="res://components/managers/map_manager.gd" id="4_burlk"]
 [ext_resource type="PackedScene" uid="uid://cl3jbmjvdq0xr" path="res://scenes/levels/lobby.tscn" id="5_e85df"]
 [ext_resource type="PackedScene" uid="uid://c0hrn5pe2ti1e" path="res://scenes/levels/main_menu.tscn" id="5_h843c"]
+[ext_resource type="PackedScene" uid="uid://besrfb02v4ttt" path="res://scenes/ui/server.tscn" id="6_burlk"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_e85df"]
 font_color = Color(1, 0.172498, 0.208016, 1)
@@ -18,7 +19,7 @@ network_manager = NodePath("../NetworkManager")
 map_spawner = NodePath("../MapSpawner")
 map_manager = NodePath("../MapManager")
 menu_manager = NodePath("../MenuManager")
-lobby_v_box_container = NodePath("../CanvasLayer/Control/PublicMultiplayerMenu/Panel/ScrollContainer/VBoxContainer")
+lobby_v_box_container = NodePath("../CanvasLayer/Control/PublicMultiplayerMenu/Panel/ScrollContainer/MarginContainer/VBoxContainer")
 metadata/_custom_type_script = "uid://bqrnoubyb5xyt"
 
 [node name="NetworkManager" type="Node" parent="."]
@@ -27,6 +28,7 @@ metadata/_custom_type_script = "uid://djqwyk1iv2mw3"
 
 [node name="MenuManager" type="Node" parent="." node_paths=PackedStringArray("main_canvas", "main_menu", "multiplayer_select_menu", "local_multiplayer_menu", "public_multiplayer_menu", "mic_select", "restart_prompt", "lobby_manager", "network_manager")]
 script = ExtResource("3_e85df")
+server_panel = ExtResource("6_burlk")
 main_canvas = NodePath("../CanvasLayer")
 main_menu = NodePath("../CanvasLayer/Control/MainMenu")
 multiplayer_select_menu = NodePath("../CanvasLayer/Control/MultiplayerSelectMenu")
@@ -59,6 +61,7 @@ grow_horizontal = 2
 grow_vertical = 2
 
 [node name="MainMenu" type="Control" parent="CanvasLayer/Control"]
+visible = false
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -181,7 +184,6 @@ layout_mode = 2
 text = "Back"
 
 [node name="PublicMultiplayerMenu" type="Control" parent="CanvasLayer/Control"]
-visible = false
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -237,7 +239,16 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/Control/PublicMultiplayerMenu/Panel/ScrollContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="CanvasLayer/Control/PublicMultiplayerMenu/Panel/ScrollContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/Control/PublicMultiplayerMenu/Panel/ScrollContainer/MarginContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3

scenes/ui/server.tscn

@@ -0,0 +1,51 @@
+[gd_scene load_steps=3 format=3 uid="uid://besrfb02v4ttt"]
+
+[ext_resource type="Script" uid="uid://bktvkdny3qe33" path="res://components/ui/server_panel.gd" id="1_pbaku"]
+
+[sub_resource type="LabelSettings" id="LabelSettings_burlk"]
+font_size = 12
+
+[node name="Server" type="Panel"]
+clip_contents = true
+custom_minimum_size = Vector2(0, 50)
+script = ExtResource("1_pbaku")
+
+[node name="HBoxContainer" type="HBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+theme_override_constants/margin_left = 5
+theme_override_constants/margin_top = 5
+theme_override_constants/margin_right = 5
+theme_override_constants/margin_bottom = 5
+
+[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/MarginContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="ServerName" type="Label" parent="HBoxContainer/MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Server Name"
+vertical_alignment = 1
+
+[node name="PlayerCount" type="Label" parent="HBoxContainer/MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "0/4"
+label_settings = SubResource("LabelSettings_burlk")
+vertical_alignment = 1
+
+[node name="JoinButton" type="Button" parent="HBoxContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(50, 50)
+layout_mode = 2
+text = "Join"
+flat = true