Add LobbyChat to LobbyScene

Add MapChoose.
add events on WebSockets

Author: SlejmUr

csharp/Client/ChatWebSocket.cs

@@ -1,5 +1,4 @@
 #if CLIENT || GAME
-
 using EIV_Common.Coroutines;
 using EIV_JsonLib.Lobby;
 using System.Buffers;
@@ -15,6 +14,7 @@ namespace ExtractIntoVoid.Client;
 public class ChatWebSocket
 {
     public Queue<ChatMessage> MessageQueue = new();
+    public Action<ChatMessage> NewMessage;
     ClientWebSocket webSocket = new();
     private static ChatWebSocket instance;
     public static ChatWebSocket Instance
@@ -56,7 +56,9 @@ public void Receive()
         var res = webSocket.ReceiveAsync(bytes, CancellationToken.None).Result;
         if (res.MessageType == WebSocketMessageType.Close)
             return;
-        MessageQueue.Enqueue(JsonSerializer.Deserialize<ChatMessage>(Encoding.UTF8.GetString(bytes, 0, res.Count)));
+        ChatMessage chat = JsonSerializer.Deserialize<ChatMessage>(Encoding.UTF8.GetString(bytes, 0, res.Count));
+        MessageQueue.Enqueue(chat);
+        NewMessage?.Invoke(chat);
         ArrayPool<byte>.Shared.Return(bytes);
     }
 

csharp/Client/UserWebSocket.cs

@@ -14,6 +14,7 @@ namespace ExtractIntoVoid.Client;
 public class UserWebSocket
 {
     public Queue<ClientSocketMessage> MessageQueue = new();
+    public Action<ClientSocketMessage> NewMessage;
     ClientWebSocket webSocket = new();
     private static UserWebSocket instance;
     public static UserWebSocket Instance
@@ -55,7 +56,9 @@ public void Receive()
         var res = webSocket.ReceiveAsync(bytes, CancellationToken.None).Result;
         if (res.MessageType == WebSocketMessageType.Close)
             return;
-        MessageQueue.Enqueue(JsonSerializer.Deserialize<ClientSocketMessage>(Encoding.UTF8.GetString(bytes, 0, res.Count)));
+        ClientSocketMessage message = JsonSerializer.Deserialize<ClientSocketMessage>(Encoding.UTF8.GetString(bytes, 0, res.Count));
+        MessageQueue.Enqueue(message);
+        NewMessage?.Invoke(message);
         ArrayPool<byte>.Shared.Return(bytes);
     }
 

csharp/Managers/GameManager.cs

@@ -66,8 +66,9 @@ private void ModManagerInstance_AllModsLoaded()
 #endif
     }
 
-    public void Quit()
+    public void Quit(string reason = "")
     {
+        Log.Information("Quiting! Reason: {Reason}", reason);
         MainLog.Close();
         GetTree().Quit();
     }

csharp/Managers/SceneManager.cs

@@ -23,6 +23,7 @@ static SceneManager()
             { "InputScene", "res://scenes/Menu/InputScene.tscn" },
             { "LobbyScene", "res://scenes/Menu/LobbyScene.tscn" },
             { "Inventory", "res://scenes/Menu/Inventory.tscn" },
+            { "MapChoose", "res://scenes/Menu/MapChoose.tscn" },
 //            { "Escape", "res://scenes/Menu/EscapeScene.tscn" },
 #endif
             //others

csharp/Menus/LobbyScene.cs

@@ -8,6 +8,7 @@
 using Godot;
 using Serilog;
 using System;
+using System.Collections.Generic;
 using System.Text.Json;
 
 namespace ExtractIntoVoid.Menus;
@@ -18,11 +19,14 @@ public partial class LobbyScene : Control
     public Label ServerText;
     [Export]
     public Label ServerLongDescription;
+    [Export]
+    public RichTextLabel LobbyChat;
     public string LobbyAddress;
     public string SelectedMap;
     private ConnectResponse ConnectResponse;
     private ServerInfoJson ServerInfo;
-
+    private MapChoose ChooseMapScene;
+    private List<string> PlayableMaps = [];
     public System.Net.Http.HttpClient Client;
 
     public override void _Ready()
@@ -57,17 +61,38 @@ public void Connect()
         foreach (var map in ServerInfo.Game.AvailableMaps)
         {
             Log.Information("Map {MAP} is available to play!", map);
+            if (SceneManager.Scenes.ContainsKey(map))
+                PlayableMaps.Add(map);
         }
         UserWebSocket.Instance.Connect(LobbyAddress, ConnectResponse.Id.ToString(), ConnectResponse.Ticket);
         ChatWebSocket.Instance.Connect(LobbyAddress, ConnectResponse.Ticket);
+        ChatWebSocket.Instance.NewMessage += ChatNewMessage;
     }
 
+    private void ChatNewMessage(ChatMessage message)
+    {
+        LobbyChat.Text += $"{message.SendTime:HH:mm:ss} {message.SenderId} {message.Message}";
+    }
 
     public void StartPlay()
     {
-        // Show maps that can be played.
-        // If selected set SelectedMap. And run SendMapToQueue.
+        GameManager.Instance.UIManager.LoadScreenStart();
+        if (!SceneManager.TryGetPackedScene("MapChoose", out PackedScene scene))
+            GameManager.Instance.Quit("MapChoose screen not found!");
+        ChooseMapScene = scene.Instantiate<MapChoose>();
+        ChooseMapScene.Maps = PlayableMaps;
+        this.Hide();
+        AddChild(ChooseMapScene);
+        ChooseMapScene.ChoosenMap += ChoosenMap;
+    }
 
+    private void ChoosenMap(string map)
+    {
+        ChooseMapScene.QueueFree();
+        ChooseMapScene = null;
+        this.Show();
+        SelectedMap = map;
+        SendMapToQueue();
     }
 
     public void SendMapToQueue()
@@ -77,17 +102,20 @@ public void SendMapToQueue()
             Enum = ClientSocketEnum.MatchmakeCheck,
             JsonMessage = JsonSerializer.Serialize(new MatchmakeCheck() { Map  = SelectedMap })
         });
+        GetNode<Button>("Play").Hide();
+        // unhide "Cancel"
         // Lock button, etc.
         CoroutineWorkerNode.CallPeriodically(TimeSpan.FromSeconds(1), CheckMap, CoroutineType.Process, "CheckMap");
     }
 
 
     public void CheckMap()
     {
-        if (!UserWebSocket.Instance.MessageQueue.TryPeek(out var msg))
+        if (!UserWebSocket.Instance.MessageQueue.TryPeek(out ClientSocketMessage msg))
             return;
         if (msg.Enum != ClientSocketEnum.GameStart)
             return;
+        msg = UserWebSocket.Instance.MessageQueue.Dequeue();
         GameStart gamestart = JsonSerializer.Deserialize<GameStart>(msg.JsonMessage);
         var mainWorld = SceneManager.GetPackedScene("MainWorld").Instantiate<MainWorld>();
         this.CallDeferred("add_sibling", mainWorld);
@@ -97,6 +125,7 @@ public void CheckMap()
 
     public void Quit()
     {
+        ChatWebSocket.Instance.NewMessage -= ChatNewMessage;
         ChatWebSocket.Instance.Quit();
         UserWebSocket.Instance.Quit();
         CoroutineWorkerNode.KillCoroutineTagInstance("CheckMap");

csharp/Menus/MapChoose.cs

@@ -0,0 +1,39 @@
+#if CLIENT || GAME
+using ExtractIntoVoid.Managers;
+using Godot;
+using System;
+using System.Collections.Generic;
+
+namespace ExtractIntoVoid.Menus;
+
+public partial class MapChoose : Control
+{
+    [Export]
+    public GridContainer Container;
+    public Action<string> ChoosenMap;
+
+    public List<string> Maps = [];
+
+    public override void _Ready()
+    {
+        foreach (var map in Maps)
+        {
+            Control control = new()
+            {
+                Name = $"Control_{map}",
+                CustomMinimumSize = new(180 ,90),
+            };
+            Button button = new()
+            { 
+                Name = $"Button_{map}",
+                Flat = true,
+            };
+            button.SetAnchorsPreset(LayoutPreset.FullRect);
+            button.Pressed += () => { ChoosenMap.Invoke(map); };
+            control.AddChild(button);
+            Container.AddChild(control);
+        }
+        GameManager.Instance.UIManager.LoadScreenStop();
+    }
+}
+#endif

csharp/Properties/BuildDate.txt

@@ -1,4 +1,4 @@
 update-deps
-9f9f50f
-2025. 01. 03. 
-18:32
+bceb060
+2025. 01. 05. 
+21:44

default_bus_layout.tres

@@ -4,7 +4,6 @@
 resource_name = "Record"
 
 [resource]
-bus/0/volume_db = 0.0
 bus/1/name = &"SFX"
 bus/1/solo = false
 bus/1/mute = false

scenes/Menu/LobbyScene.tscn

@@ -2,41 +2,96 @@
 
 [ext_resource type="Script" path="res://csharp/Menus/LobbyScene.cs" id="1_xqe1h"]
 
-[node name="LobbyScene" type="Control" node_paths=PackedStringArray("ServerText")]
+[node name="LobbyScene" type="Control" node_paths=PackedStringArray("ServerText", "ServerLongDescription")]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_xqe1h")
-ServerText = NodePath("ServerText")
+ServerText = NodePath("Texts/ServerText")
+ServerLongDescription = NodePath("Texts/ServerDescription")
 
-[node name="ServerText" type="Label" parent="."]
+[node name="Texts" type="Control" parent="."]
 layout_mode = 1
 anchors_preset = 5
 anchor_left = 0.5
 anchor_right = 0.5
 offset_left = -20.0
 offset_right = 20.0
+offset_bottom = 40.0
+grow_horizontal = 2
+
+[node name="ServerText" type="Label" parent="Texts"]
+layout_mode = 1
+anchors_preset = 5
+anchor_left = 0.5
+anchor_right = 0.5
+offset_left = -44.0
+offset_right = 44.0
 offset_bottom = 23.0
 grow_horizontal = 2
 text = "Server Text"
 
+[node name="ServerDescription" type="Label" parent="Texts"]
+layout_mode = 1
+anchors_preset = 5
+anchor_left = 0.5
+anchor_right = 0.5
+offset_left = -35.5
+offset_top = 30.0
+offset_right = 35.5
+offset_bottom = 53.0
+grow_horizontal = 2
+text = "Server Description"
+horizontal_alignment = 1
+
+[node name="Chat" type="Control" parent="."]
+layout_mode = 1
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+grow_vertical = 0
+
+[node name="LobbyChat" type="RichTextLabel" parent="Chat"]
+layout_mode = 1
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+offset_top = -275.0
+offset_right = 400.0
+offset_bottom = -35.0
+grow_vertical = 0
+text = "Lobby Chat"
+
+[node name="ChatInput" type="LineEdit" parent="Chat"]
+layout_mode = 1
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+offset_top = -30.0
+offset_right = 400.0
+offset_bottom = 1.0
+grow_vertical = 0
+placeholder_text = "Lobby Chat Input"
+clear_button_enabled = true
+flat = true
+
 [node name="Play" type="Button" parent="."]
 layout_mode = 0
-offset_left = 478.0
-offset_top = 238.0
-offset_right = 597.0
-offset_bottom = 269.0
+offset_left = 47.0
+offset_top = 67.0
+offset_right = 166.0
+offset_bottom = 98.0
 text = "Play on Server"
 
 [node name="Quit" type="Button" parent="."]
 layout_mode = 0
-offset_left = 747.0
-offset_top = 225.0
-offset_right = 789.0
-offset_bottom = 256.0
+offset_left = 53.0
+offset_top = 127.0
+offset_right = 95.0
+offset_bottom = 158.0
 text = "Quit"
 
 [connection signal="pressed" from="Play" to="." method="StartPlay"]