Fix Commander Lottery Freecam Bug

- Fixes bug where commander applicants were in freecam for ~15 seconds, which could potentially be abused to scout locations before the round starts
- Now all applicants are spawned into a unit at their HQ/Nest
- Right before the round starts all applicants will be put in freecam for added suspense on who will get promoted
- As soon as the round starts, only the lottery winner is promoted and smoothly switches to RTS view while all other applicants are returned to their team's default spawn unit

Author: data-bomb

Si_CommManagement/CommanderApplications.cs

@@ -267,21 +267,11 @@ private static class CommanderManager_Patch_Strategy_TimerUpdate
         {
             private static void Postfix(MP_Strategy __instance)
             {
-                if (!CommanderManager._BlockRoundStartUntilEnoughApplicants.Value)
-                {
-                    return;
-                }
-
                 if (__instance.GameOver)
                 {
                     return;
                 }
 
-                if (AllTeamsHaveCommanderApplicants())
-                {
-                    return;
-                }
-
                 float timerValue;
 
                 #if NET6_0
@@ -292,14 +282,66 @@ private static void Postfix(MP_Strategy __instance)
                 timerValue = (float)timerField.GetValue(__instance);
                 #endif
 
+                // the last second before the round is about to start
+                if (timerValue <= 1f && timerValue > 0f)
+                {
+                    // switch all applicants to freecam
+                    for (int i = 0; i < SiConstants.MaxPlayableTeams; i++)
+                    {
+                        if (commanderApplicants[i].Count == 0)
+                        {
+                            continue;
+                        }
+
+                        foreach (Player applicantPlayer in commanderApplicants[i])
+                        {
+                            if (applicantPlayer == null)
+                            {
+                                continue;
+                            }
+
+                            // send to role NONE
+                            CommanderPrimitives.SendToRole(applicantPlayer, GameModeExt.ETeamRole.NONE);
+                            MelonLogger.Msg("Player " + applicantPlayer.PlayerName + " is being sent to role NONE.");
+
+                            // force switching to role NONE
+                            GameMode.CurrentGameMode.DestroyAllUnitsForPlayer(applicantPlayer);
+                            #if NET6_0
+                            if (__instance.PlayerRespawnTracker.ContainsKey(applicantPlayer))
+                            {
+                                __instance.PlayerRespawnTracker.Remove(applicantPlayer);
+                            }
+                            #else
+                            FieldInfo playerRespawnTrackerField = typeof(MP_Strategy).GetField("PlayerRespawnTracker", BindingFlags.NonPublic | BindingFlags.Instance);
+                            Dictionary<Player, float> localPlayerRespawnTracker = (Dictionary<Player, float>)playerRespawnTrackerField.GetValue(__instance);
+                            if (localPlayerRespawnTracker.ContainsKey(applicantPlayer))
+                            {
+                                localPlayerRespawnTracker.Remove(applicantPlayer);
+                                playerRespawnTrackerField.SetValue(__instance, localPlayerRespawnTracker);
+                            }
+                            #endif
+                        }
+                    }
+                }
+
+                if (!CommanderManager._BlockRoundStartUntilEnoughApplicants.Value)
+                {
+                    return;
+                }
+
+                if (AllTeamsHaveCommanderApplicants())
+                {
+                    return;
+                }
+
                 if (timerValue <= 5f && timerValue > 4f)
                 {
                     HelperMethods.ReplyToCommand("Round cannot start because all teams don't have a commander. Chat !commander to apply.");
 
                     #if NET6_0
-                    __instance.Timer = 21f;
+                    __instance.Timer = 26f;
                     #else
-                    timerField.SetValue(__instance, 21f);
+                    timerField.SetValue(__instance, 26f);
                     #endif
                 }
             }

Si_CommManagement/CommanderPrimitives.cs

@@ -59,23 +59,6 @@ public static void PromoteToCommander(Player CommanderPlayer)
         {
             MP_Strategy strategyInstance = GameObject.FindObjectOfType<MP_Strategy>();
 
-            // mimic switching to role NONE first
-            GameMode.CurrentGameMode.DestroyAllUnitsForPlayer(CommanderPlayer);
-            #if NET6_0
-            if (strategyInstance.PlayerRespawnTracker.ContainsKey(CommanderPlayer))
-            {
-                strategyInstance.PlayerRespawnTracker.Remove(CommanderPlayer);
-            }
-            #else
-            FieldInfo playerRespawnTrackerField = typeof(MP_Strategy).GetField("PlayerRespawnTracker", BindingFlags.NonPublic | BindingFlags.Instance);
-            Dictionary<Player, float> localPlayerRespawnTracker = (Dictionary<Player, float>)playerRespawnTrackerField.GetValue(strategyInstance);
-            if (localPlayerRespawnTracker.ContainsKey(CommanderPlayer))
-            {
-                localPlayerRespawnTracker.Remove(CommanderPlayer);
-                playerRespawnTrackerField.SetValue(strategyInstance, localPlayerRespawnTracker);
-            }
-            #endif
-
             // now mimic switching to COMMANDER role
             BaseTeamSetup strategyTeamInstance = strategyInstance.GetTeamSetup(CommanderPlayer.Team);
             MelonLogger.Msg("Trying to promote " + CommanderPlayer.PlayerName + " on team " + CommanderPlayer.Team.TeamShortName);

Si_CommManagement/Si_CommanderManager.cs

@@ -33,7 +33,7 @@ You should have received a copy of the GNU General Public License
 using SilicaAdminMod;
 using System.Linq;
 
-[assembly: MelonInfo(typeof(CommanderManager), "Commander Management", "1.6.12", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(CommanderManager), "Commander Management", "1.7.0", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
@@ -131,7 +131,7 @@ public void OnRequestCommander(object? sender, OnRequestCommanderArgs args)
 
                 MelonLogger.Msg("Denied early game commander join for " + args.Requester.PlayerName);
                 args.Block = true;
-                args.PreventSpawnWhenBlocked = true;
+                args.PreventSpawnWhenBlocked = false;
                 return;
             }
         }