list open matches

formatting

create and join matches

added refresh button

update players when players join - sort of.

Author: Byteron

src/nodes/hud/chat/MatchListing.cs

@@ -0,0 +1,20 @@
+using Godot;
+using System;
+
+public partial class MatchListing : Button
+{
+    private Label _nameLabel;
+    private Label _playersLabel;
+    
+    public override void _Ready()
+    {
+        _nameLabel = GetNode<Label>("MarginContainer/HBoxContainer/NameLabel");    
+        _playersLabel = GetNode<Label>("MarginContainer/HBoxContainer/PlayersLabel");
+    }
+
+    public void UpdateInfo(string name, int players)
+    {
+        _nameLabel.Text = name;
+        _playersLabel.Text = $"{players}";
+    }
+}

src/nodes/hud/chat/MatchListing.tscn

@@ -0,0 +1,56 @@
+[gd_scene load_steps=2 format=3 uid="uid://cmq71hr7i8yac"]
+
+[ext_resource type="Script" path="res://src/nodes/hud/chat/MatchListing.cs" id="1_kokcm"]
+
+[node name="MatchListing" type="Button"]
+offset_right = 1378.0
+offset_bottom = 60.0
+rect_min_size = Vector2(0, 60)
+script = ExtResource( "1_kokcm" )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+mouse_filter = 2
+theme_override_constants/margin_right = 4
+theme_override_constants/margin_top = 4
+theme_override_constants/margin_left = 4
+theme_override_constants/margin_bottom = 4
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"]
+offset_left = 4.0
+offset_top = 4.0
+offset_right = 1374.0
+offset_bottom = 56.0
+mouse_filter = 2
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="NameLabel" type="Label" parent="MarginContainer/HBoxContainer"]
+offset_top = 13.0
+offset_right = 58.0
+offset_bottom = 39.0
+text = "Game 1"
+
+[node name="Space" type="Control" parent="MarginContainer/HBoxContainer"]
+offset_left = 62.0
+offset_right = 1334.0
+offset_bottom = 52.0
+size_flags_horizontal = 3
+
+[node name="PlayersLabel" type="Label" parent="MarginContainer/HBoxContainer"]
+offset_left = 1338.0
+offset_top = 13.0
+offset_right = 1370.0
+offset_bottom = 39.0
+text = "1 / 2"
+__meta__ = {
+"_edit_use_anchors_": false
+}

src/nodes/menu/FactionSelectionView.cs

@@ -14,6 +14,7 @@ public partial class FactionSelectionView : PanelContainer
 
     public int LocalPlayerId { get; set; }
     public List<string> Players { get; set; }
+    public int PlayerCount { get; set; }
     public string MapName { get; set; }
 
     Dictionary<int, PlayerOption> _options = new Dictionary<int, PlayerOption>();
@@ -28,7 +29,7 @@ public override void _Ready()
         _continueButton = GetNode<Button>("CenterContainer/VBoxContainer/HBoxContainer/ContinueButton");
         _backButton = GetNode<Button>("CenterContainer/VBoxContainer/HBoxContainer/BackButton");
 
-        for (int side = 0; side < Players.Count; side++)
+        for (int side = 0; side < PlayerCount; side++)
         {
             var option = _playerOption.Instantiate<PlayerOption>();
             option.Connect(nameof(PlayerOption.FactionChanged), new Callable(this, nameof(OnFactionChanged)));
@@ -40,6 +41,16 @@ public override void _Ready()
         }
     }
 
+    public void UpdatePlayers(List<string> players)
+    {
+        Players = players;
+
+        foreach (PlayerOption option in _container.GetChildren())
+        {
+            option.UpdatePlayers(players);
+        }
+    }
+
     public void ChangeFaction(int side, int index)
     {
         _options[side].ChangeFaction(index);

src/nodes/menu/LobbyView.cs

@@ -4,29 +4,39 @@
 
 public partial class LobbyView : Control
 {
+    [Signal] public delegate void MatchSelected(string matchId);
     [Signal] public delegate void MessageSubmitted(string message);
     [Signal] public delegate void ScenarioSelected(string mapName);
+    [Signal] public delegate void RefreshButtonPressed();
     [Signal] public delegate void JoinButtonPressed();
+    [Signal] public delegate void CreateButtonPressed();
+    [Signal] public delegate void QueueButtonPressed();
     [Signal] public delegate void BackButtonPressed();
     [Signal] public delegate void CancelButtonPressed();
 
     [Export] private PackedScene ChatMessageView;
+    [Export] private PackedScene MatchListing;
 
     private VBoxContainer _userListContainer;
+    private VBoxContainer _matchListContainer;
     private VBoxContainer _messages;
     private LineEdit _input;
 
     private OptionButton _scenarioOptions;
+    private Button _queueButton;
     private Button _joinButton;
     private Label _infoLabel;
 
     public override void _Ready()
     {
         _userListContainer = GetNode<VBoxContainer>("PanelContainer/HBoxContainer/VBoxContainer2/Panel/VBoxContainer/UserList");
+        _matchListContainer = GetNode<VBoxContainer>("PanelContainer/HBoxContainer/VBoxContainer/Panel2/MarginContainer/MatchList");
+
         _messages = GetNode<VBoxContainer>("PanelContainer/HBoxContainer/VBoxContainer/Panel/MarginContainer/Messages");
         _input = GetNode<LineEdit>("PanelContainer/HBoxContainer/VBoxContainer/HBoxContainer/LineEdit");
 
-        _joinButton = GetNode<Button>("PanelContainer/HBoxContainer/VBoxContainer2/HBoxContainer/JoinButton");
+        _queueButton = GetNode<Button>("PanelContainer/HBoxContainer/VBoxContainer2/HBoxContainer/QueueButton");
+        _joinButton = GetNode<Button>("PanelContainer/HBoxContainer/VBoxContainer2/JoinButton");
         _infoLabel = GetNode<Label>("PanelContainer/HBoxContainer/VBoxContainer2/Label");
         _scenarioOptions = GetNode<OptionButton>("PanelContainer/HBoxContainer/VBoxContainer2/MapOptionButton");
 
@@ -39,19 +49,37 @@ public override void _Ready()
         OnMapOptionButtonItemSelected(0);
     }
 
-    public void UpdateInfo(string text)
+    public void UpdateInfoLabel(string text)
     {
         _infoLabel.Text = text;
     }
 
-    public void DisableJoinButton()
+    public void UpdateMatchList(IApiMatchList matchList)
+    {
+        foreach (Node child in _matchListContainer.GetChildren())
+        {
+            _matchListContainer.RemoveChild(child);
+            child.QueueFree();
+        }
+        
+        foreach (var match in matchList.Matches)
+        {
+            var listing = MatchListing.Instantiate<MatchListing>();
+            listing.Connect("pressed", new Callable(this, nameof(OnMatchSelected)), new Godot.Collections.Array() { match.MatchId });
+            _matchListContainer.AddChild(listing);
+
+            listing.UpdateInfo(match.MatchId, match.Size);
+        }
+    }
+
+    public void DisableQueueButton()
     {
-        _joinButton.Disabled = true;
+        _queueButton.Disabled = true;
     }
 
     public void EnableJoinButton()
     {
-        _joinButton.Disabled = false;
+        _queueButton.Disabled = false;
     }
 
     public void UpdateUsers(string username, List<IUserPresence> users)
@@ -93,10 +121,29 @@ public void NewMessage(string username, string message, string time)
         }
     }
 
+    private void OnMatchSelected(string matchId)
+    {
+        EmitSignal(nameof(MatchSelected), matchId);
+    }
+
+    private void OnRefreshButtonPressed()
+    {
+        EmitSignal(nameof(RefreshButtonPressed));
+    }
+    
     private void OnJoinButtonPressed()
     {
         EmitSignal(nameof(JoinButtonPressed));
     }
+    private void OnCreateButtonPressed()
+    {
+        EmitSignal(nameof(CreateButtonPressed));
+    }
+
+    private void OnQueueButtonPressed()
+    {
+        EmitSignal(nameof(QueueButtonPressed));
+    }
 
     private void OnCancelButtonPressed()
     {