feature/TeamModePlayerSelect

PugSharp.Config/TeamMode.cs

@@ -7,4 +7,7 @@ public enum TeamMode
 
     // Scramble Teams after all players are joined
     Scramble,
+
+    // Player Selects which Team to join
+    PlayerSelect
 }

PugSharp.Match/Match.cs

@@ -124,6 +124,7 @@ private void InitializeStateMachine()
         _MatchStateMachine.Configure(MatchState.DefineTeams)
             .Permit(MatchCommand.TeamsDefined, MatchState.MapVote)
             .OnEntry(ContinueIfDefault)
+            .OnEntry(ContinueIfPlayerSelect)
             .OnEntry(ScrambleTeams);
 
         _MatchStateMachine.Configure(MatchState.MapVote)
@@ -215,6 +216,14 @@ private void ContinueIfDefault()
         }
     }
 
+    private void ContinueIfPlayerSelect()
+    {
+        if (MatchInfo.Config.TeamMode == Config.TeamMode.PlayerSelect)
+        {
+            TryFireState(MatchCommand.TeamsDefined);
+        }
+    }
+
     private void StartWarmup()
     {
         _CsServer.LoadAndExecuteConfig("warmup.cfg");
@@ -649,7 +658,7 @@ private void VoteTimer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
 
     private void ReadyReminderTimer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
     {
-        if (!_ReadyReminderTimer.Enabled)
+        if (MatchInfo.Config.TeamMode != Config.TeamMode.PlayerSelect && !_ReadyReminderTimer.Enabled)
         {
             return;
         }
@@ -658,6 +667,25 @@ private void ReadyReminderTimer_Elapsed(object? sender, System.Timers.ElapsedEve
         {
             try
             {
+                if (MatchInfo.Config.TeamMode == Config.TeamMode.PlayerSelect)
+                {
+                    _Logger.LogInformation("TeamReminder Elapsed");
+                    foreach (var player in AllMatchPlayers)
+                    {
+                        var matchTeam = GetMatchTeam(player.Player.Team);
+                        if (player.Player.Team == Team.Terrorist || player.Player.Team == Team.CounterTerrorist)
+                        {
+                            var teamMessage = _TextHelper.GetText(nameof(Resources.PugSharp_Match_TeamReminder), matchTeam?.TeamConfig.Name);
+                            player.Player.PrintToChat(teamMessage);
+                        }
+                    }
+                }
+
+                if (!_ReadyReminderTimer.Enabled)
+                {
+                    return;
+                }
+
                 _Logger.LogInformation("ReadyReminder Elapsed");
                 var readyPlayerIds = AllMatchPlayers.Where(p => p.IsReady).Select(x => x.Player.SteamID).ToList();
                 var notReadyPlayers = _CsServer.LoadAllPlayers().Where(p => !readyPlayerIds.Contains(p.SteamID));
@@ -937,8 +965,61 @@ private MatchPlayer GetMatchPlayer(ulong steamID)
         return AllMatchPlayers.First(x => x.Player.SteamID == steamID);
     }
 
+    public bool PlayerIsReady(ulong steamID)
+    {
+        var matchPlayer = AllMatchPlayers.FirstOrDefault(x => x.Player.SteamID == steamID);
+        return matchPlayer != null && matchPlayer.IsReady;
+    }
+
     #region Match Functions
 
+    private bool TryAddPlayerToCurrentTeam(IPlayer player)
+    {
+        var matchPlayer = MatchInfo.MatchTeam1.Players.Any(x => x.Player.SteamID == player.SteamID) || MatchInfo.MatchTeam2.Players.Any(x => x.Player.SteamID == player.SteamID) ? GetMatchPlayer(player.SteamID) : null;
+        if (matchPlayer == null) {
+            matchPlayer = new MatchPlayer(player);
+        }
+        else {
+            // Remove the player from the match
+            MatchInfo.MatchTeam1.Players.Remove(matchPlayer);
+            MatchInfo.MatchTeam2.Players.Remove(matchPlayer);
+        }
+
+        // Add them back to the match
+        bool? isTeam1 = null;
+        if (MatchInfo.MatchTeam1.CurrentTeamSite == Team.None && MatchInfo.MatchTeam2.CurrentTeamSite == Team.None)
+        {
+            isTeam1 = player.Team == Team.Terrorist;
+        }
+        else if (MatchInfo.MatchTeam1.CurrentTeamSite != Team.None)
+        {
+            isTeam1 = MatchInfo.MatchTeam1.CurrentTeamSite == player.Team;
+        }
+        else if (MatchInfo.MatchTeam2.CurrentTeamSite != Team.None)
+        {
+            isTeam1 = MatchInfo.MatchTeam2.CurrentTeamSite != player.Team;
+        }
+
+        if (isTeam1 == null)
+        {
+            _Logger.LogInformation("Could not add player to match", player.SteamID);
+            return false;
+        }
+        else if (isTeam1.HasValue && isTeam1.Value)
+        {
+            MatchInfo.MatchTeam1.Players.Add(matchPlayer);
+        }
+        else
+        {
+            MatchInfo.MatchTeam2.Players.Add(matchPlayer);
+        }
+
+        // Console.WriteLine("Team 1: " + string.Join(',', MatchInfo.MatchTeam1.Players.Select(p => $"{p.Player.PlayerName}").ToList()));
+        // Console.WriteLine("Team 2: " + string.Join(',', MatchInfo.MatchTeam2.Players.Select(p => $"{p.Player.PlayerName}").ToList()));
+
+        return true;
+    }
+
     public bool TryAddPlayer(IPlayer player)
     {
         if (!PlayerBelongsToMatch(player.SteamID))
@@ -947,6 +1028,12 @@ public bool TryAddPlayer(IPlayer player)
             return false;
         }
 
+        if (MatchInfo.Config.TeamMode == Config.TeamMode.PlayerSelect)
+        {
+            // Quicker to just remove them and add them back, rather than check whether they are already in the match
+            return TryAddPlayerToCurrentTeam(player);
+        }
+
         if (MatchInfo.MatchTeam1.Players.Any(x => x.Player.SteamID == player.SteamID)
             || MatchInfo.MatchTeam2.Players.Any(x => x.Player.SteamID == player.SteamID))
         {
@@ -1036,6 +1123,12 @@ public void TogglePlayerIsReady(IPlayer player)
         }
 
         var matchPlayer = GetMatchPlayer(player.SteamID);
+        if (matchPlayer.Player.Team != Team.Terrorist && matchPlayer.Player.Team != Team.CounterTerrorist)
+        {
+            player.PrintToChat(_TextHelper.GetText(nameof(Resources.PugSharp_Match_Error_NoReadyExpected)));
+            return;
+        }
+
         matchPlayer.IsReady = !matchPlayer.IsReady;
 
         var readyPlayers = MatchInfo.MatchTeam1.Players.Count(x => x.IsReady) + MatchInfo.MatchTeam2.Players.Count(x => x.IsReady);

PugSharp.Translation/Properties/Resources.br.resx

@@ -238,6 +238,9 @@
   <data name="PugSharp.Match.Info.WaitingForAllPlayers" xml:space="preserve">
     <value>Aguardando todos os jogadores estarem prontos.</value>
   </data>
+  <data name="PugSharp.Match.TeamReminder" xml:space="preserve">
+    <value>Você está atualmente na equipe: **{0:teamName}**.</value>
+  </data>
   <data name="PugSharp.Match.RemindReady" xml:space="preserve">
     <value>Você !!não!! está pronto!! Digite `!ready` se você está pronto.</value>
   </data>
@@ -256,6 +259,9 @@
   <data name="PugSharp.Match.VoteTeamMenuHeader" xml:space="preserve">
     <value>Escolha o lado inicial com (`!stay` ou `!switch`)</value>
   </data>
+  <data name="PugSharp_Match_VoteConfirmTeamHeader" xml:space="preserve">
+    <value>Escolha a equipe correta:</value>
+  </data>
   <data name="PugSharp.Match.WaitForOtherTeam" xml:space="preserve">
     <value>Aguardando o voto da outra equipe!</value>
   </data>

PugSharp.Translation/Properties/Resources.da.resx

@@ -70,6 +70,9 @@
   <data name="PugSharp.Command.ConfigLoaded" xml:space="preserve">
     <value>Kampconfig loadet!</value>
   </data>
+  <data name="PugSharp.Match.TeamReminder" xml:space="preserve">
+    <value>Je zit momenteel in Team: **{0:teamName}**.</value>
+  </data>
   <data name="PugSharp.Command.CreatingMatchPlayersPerTeam" xml:space="preserve">
     <value>`!spillereperteam &lt;players&gt;` for at sætte antal spillere per hold!</value>
   </data>

PugSharp.Translation/Properties/Resources.de.resx

@@ -168,6 +168,9 @@
   <data name="PugSharp.Match.Error.UnknownMapNumber" xml:space="preserve">
     <value>Die Karte mit der Kartennummer **{0:mapNumber}** ist nicht verfügbar!</value>
   </data>
+  <data name="PugSharp.Match.TeamReminder" xml:space="preserve">
+    <value>Sie sind derzeit im Team: **{0:teamName}**.</value>
+  </data>
   <data name="PugSharp.Match.RemindReady" xml:space="preserve">
     <value>Du bist !!nicht!! bereit! Schreibe `!ready` in den chat wenn du bereit bist.</value>
   </data>
@@ -177,6 +180,9 @@
   <data name="PugSharp.Match.VoteTeamMenuHeader" xml:space="preserve">
     <value>Wähle die Startseite (`!stay` oder`!switch`)</value>
   </data>
+  <data name="PugSharp_Match_VoteConfirmTeamHeader" xml:space="preserve">
+    <value>Wählen Sie das richtige Team:</value>
+  </data>
   <data name="PugSharp.Match.VoteMapMenuHeader" xml:space="preserve">
     <value>Stimme ab um eine Karte zu bannen: schreibe `!&lt;Kartennummer&gt;` in den Chat</value>
   </data>

PugSharp.Translation/Properties/Resources.es.resx

@@ -64,6 +64,9 @@
   <data name="PugSharp.Match.VoteTeamMenuHeader" xml:space="preserve">
     <value>Elige bando inicial:</value>
   </data>
+  <data name="PugSharp_Match_VoteConfirmTeamHeader" xml:space="preserve">
+    <value>Elige el equipo correcto:</value>
+  </data>
   <data name="PugSharp.Match.VoteMapMenuHeader" xml:space="preserve">
     <value>Votación para banear mapa: escribe `!&lt;mapnumber&gt;`</value>
   </data>
@@ -88,6 +91,9 @@
   <data name="PugSharp.Match.Info.WaitingForAllPlayers" xml:space="preserve">
     <value>Esperando a que todos los jugadores estén preparados.</value>
   </data>
+  <data name="PugSharp.Match.TeamReminder" xml:space="preserve">
+    <value>Actualmente estás en el equipo: **{0:teamName}**.</value>
+  </data>
   <data name="PugSharp.Match.Info.IsLive" xml:space="preserve">
     <value>La partida está **EN VIVO**</value>
   </data>

PugSharp.Translation/Properties/Resources.ja.resx

@@ -67,6 +67,9 @@
   <data name="PugSharp.Command.ChangedMaxRounds" xml:space="preserve">
     <value>最大ラウンド数を{0:oldMaxRounds}から{1:maxRounds}に変更</value>
   </data>
+  <data name="PugSharp.Match.TeamReminder" xml:space="preserve">
+    <value>あなたは現在次のチームに所属しています: **{0:teamName}**.</value>
+  </data>
   <data name="PugSharp.Command.CreatingMatchStartMatch" xml:space="preserve">
     <value>`!startmatch`で試合を開始できます！</value>
   </data>

PugSharp.Translation/Properties/Resources.ko.resx

@@ -58,6 +58,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PugSharp.Match.TeamReminder" xml:space="preserve">
+    <value>귀하는 현재 다음 팀에 속해 있습니다: **{0:teamName}**.</value>
+  </data>
   <data name="PugSharp.Hello" xml:space="preserve">
     <value>**{0:playerName}** 안녕하세요,
 매치에 오신걸 환영합니다 {1:matchId}</value>

PugSharp.Translation/Properties/Resources.resx

@@ -297,6 +297,9 @@
   <data name="PugSharp.Match.Info.WaitingForAllPlayers" xml:space="preserve">
     <value>Waiting for all players to be ready.</value>
   </data>
+  <data name="PugSharp.Match.TeamReminder" xml:space="preserve">
+    <value>You are currently on Team: **{0:teamName}**.</value>
+  </data>
   <data name="PugSharp.Match.RemindReady" xml:space="preserve">
     <value>You are !!not!! ready! Type `!ready` if you are ready.</value>
   </data>
@@ -315,6 +318,9 @@
   <data name="PugSharp.Match.VoteTeamMenuHeader" xml:space="preserve">
     <value>Choose starting side (`!stay` or `!switch`)</value>
   </data>
+  <data name="PugSharp.Match.VoteConfirmTeamHeader" xml:space="preserve">
+    <value>Escolha a equipe correta:</value>
+  </data>
   <data name="PugSharp.Match.WaitForOtherTeam" xml:space="preserve">
     <value>Waiting for other Team to vote!</value>
   </data>

PugSharp/Application.cs

@@ -263,6 +263,18 @@ private async void CheckMatchPlayerTeam(CCSPlayerController playerController, in
 
         if (_Match.CurrentState == MatchState.WaitingForPlayersConnectedReady || _Match.CurrentState == MatchState.WaitingForPlayersReady)
         {
+            // Do not enforce locked teams during warmup for TeamMode: PlayerSelect
+            if (_Match.MatchInfo.Config.TeamMode == TeamMode.PlayerSelect)
+            {
+                // If player is already on team, make sure the match teams are updated
+                if (_Match.PlayerIsReady(playerController.SteamID) && (team == (int)Match.Contract.Team.Terrorist || team == (int)Match.Contract.Team.CounterTerrorist))
+                {
+                    _Match.TryAddPlayer(new Player(playerController.SteamID));
+                }
+
+                return;
+            }
+
             var configTeam = _Match.GetPlayerTeam(playerController.SteamID);
             var steamId = playerController.SteamID;
             var userName = playerController.PlayerName;
@@ -323,10 +335,15 @@ private void OnMapStartHandler(string mapName)
     {
         if (_Match != null)
         {
-            _Dispatcher.NextFrame(() =>
+            if (_Match.CurrentState is MatchState.WaitingForPlayersConnectedReady or MatchState.WaitingForPlayersReady)
             {
-                SetMatchVariable();
-            });
+                _CsServer.LoadAndExecuteConfig("warmup.cfg");
+
+                _Dispatcher.NextFrame(() =>
+                {
+                    SetMatchVariable();
+                });
+            }
         }
     }
 
@@ -1956,6 +1973,18 @@ private void SetMatchVariable()
         _CsServer.ExecuteCommand($"mp_teamname_2 {tTeam.TeamConfig.Name}");
         _CsServer.ExecuteCommand($"mp_teamflag_2 {tTeam.TeamConfig.Flag}");
 
+        // Allow players to select their team
+        if (_Match.MatchInfo.Config.TeamMode == TeamMode.PlayerSelect)
+        {
+            _CsServer.UpdateConvar("sv_disable_teamselect_menu", false);
+            _CsServer.UpdateConvar("sv_human_autojoin_team", (int)Match.Contract.Team.None);
+        }
+        else
+        {
+            _CsServer.UpdateConvar("sv_disable_teamselect_menu", true);
+            _CsServer.UpdateConvar("sv_human_autojoin_team", (int)Match.Contract.Team.Terrorist);
+        }
+
         _Logger.LogInformation("Set match variables done");
     }