Update queue (#1477)

Content.Server/Connection/ConnectionManager.cs

@@ -145,7 +145,7 @@ namespace Content.Server.Connection
             }
 
             // Corvax-Queue-Start
-            var isQueueEnabled = _cfg.GetCVar(CCCVars.QueueEnabled);
+            var isQueueEnabled = IoCManager.Instance!.TryResolveType<IServerJoinQueueManager>(out var mgr) && mgr.IsEnabled;
             if (_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !isPrivileged && !isQueueEnabled)
             // Corvax-Queue-End
             {

Content.Shared/Corvax/CCCVars/CCCVars.cs

@@ -9,16 +9,6 @@ namespace Content.Shared.Corvax.CCCVars;
 // ReSharper disable once InconsistentNaming
 public sealed class CCCVars
 {
-    /*
-     * Queue
-     */
-
-    /// <summary>
-    ///     Controls if the connections queue is enabled. If enabled stop kicking new players after `SoftMaxPlayers` cap and instead add them to queue.
-    /// </summary>
-    public static readonly CVarDef<bool>
-        QueueEnabled = CVarDef.Create("queue.enabled", false, CVar.SERVERONLY);
-
     /**
      * TTS (Text-To-Speech)
      */

Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs

@@ -2,7 +2,9 @@
 
 public interface IServerJoinQueueManager
 {
+    public bool IsEnabled { get; }
     public int PlayerInQueueCount { get; }
     public int ActualPlayersCount { get; }
     public void Initialize();
+    public void PostInitialize();
 }

Resources/ConfigPresets/Corvax/athara.toml

@@ -11,6 +11,7 @@ time = 180.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true

Resources/ConfigPresets/Corvax/echo.toml

@@ -17,6 +17,7 @@ time = 180.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true

Resources/ConfigPresets/Corvax/elysium.toml

@@ -11,6 +11,7 @@ time = 10.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true

Resources/ConfigPresets/Corvax/main.toml

@@ -11,6 +11,7 @@ time = 180.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true

Resources/ConfigPresets/Corvax/nova.toml

@@ -17,6 +17,7 @@ time = 10.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true

Resources/ConfigPresets/Corvax/solaris.toml

@@ -17,6 +17,7 @@ time = 180.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true

Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl

@@ -3,3 +3,7 @@ queue-quit = Выйти
 queue-position = Ваша позиция:
 queue-total = Всего в очереди:
 queue-priority-join = Приоритетный вход
+queue-server-title = Вы можете подключиться к:
+queue-server-not-available = Нет доступных серверов
+queue-server-online = Онлайн:
+queue-server-connect = Подключиться