Merge pull request #218 from shobhit-pathak/dev

0.8.4

Author: shobhit-pathak

BackupManagement.cs

@@ -200,34 +200,6 @@ private void RestoreRoundBackup(CCSPlayerController? player, string fileName) {
                     matchConfig = Newtonsoft.Json.JsonConvert.DeserializeObject<MatchConfig>(matchConfigValue)!;
                     SetupRoundBackupFile();
                 }
-                if (backupData.TryGetValue("map_name", out var map_name))
-                {
-                    if (map_name != Server.MapName)
-                    {
-                        ChangeMap(map_name, 0);
-                        isRoundRestorePending = true;
-                        pendingRestoreFileName = fileName;
-                        // Returning from here, backup will be restored again once the map is changed.
-                        return;
-                    }
-                }
-
-                // This is done after checking map_name so that we load the correct map first
-                if (gameRules.WarmupPeriod) 
-                {
-                    if (!isRoundRestorePending)
-                    {
-                        isRoundRestorePending = true;
-                        pendingRestoreFileName = fileName;
-                        PrintToAllChat(Localizer["matchzy.restore.loadedsuccessfully", fileName]);
-                        return;
-                    }
-                    else
-                    {
-                        liveSetupRequired = true;
-                    }
-                }
-
                 if (backupData.TryGetValue("team1", out var team1config))
                 {
                     matchzyTeam1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Team>(team1config)!;
@@ -236,7 +208,6 @@ private void RestoreRoundBackup(CCSPlayerController? player, string fileName) {
                 {
                     matchzyTeam2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Team>(team2config)!;
                 }
-
                 if (backupData.TryGetValue("team1_side", out var team1Side))
                 {
 
@@ -257,7 +228,33 @@ private void RestoreRoundBackup(CCSPlayerController? player, string fileName) {
                         // SwapSidesInTeamData(false);
                     }
                 }
+                if (backupData.TryGetValue("map_name", out var map_name))
+                {
+                    if (map_name != Server.MapName)
+                    {
+                        ChangeMap(map_name, 0);
+                        isRoundRestorePending = true;
+                        pendingRestoreFileName = fileName;
+                        // Returning from here, backup will be restored again once the map is changed.
+                        return;
+                    }
+                }
 
+                // This is done after checking map_name so that we load the correct map first
+                if (gameRules.WarmupPeriod) 
+                {
+                    if (!isRoundRestorePending)
+                    {
+                        isRoundRestorePending = true;
+                        pendingRestoreFileName = fileName;
+                        PrintToAllChat(Localizer["matchzy.restore.loadedsuccessfully", fileName]);
+                        return;
+                    }
+                    else
+                    {
+                        liveSetupRequired = true;
+                    }
+                }
                 if (backupData.TryGetValue("TerroristTimeOuts", out var terroristTimeouts))
                 {
                     gameRules.TerroristTimeOuts = int.Parse(terroristTimeouts);

CHANGELOG.md

@@ -1,5 +1,14 @@
 # MatchZy Changelog
 
+# 0.8.4
+
+#### August 27, 2024
+
+- Fixes in coach system, where players would spawn into each other.
+- Improved backup loading (teams will be locked automatically with the first restore if match setup was being used.)
+- Fixed veto bug where ready system would not work after the veto.
+- Updated Uzbek translations 
+
 # 0.8.3
 
 #### August 25, 2024

Coach.cs

@@ -73,10 +73,13 @@ public void HandleCoaches()
         coachKillTimer?.Kill();
         coachKillTimer = null;
         int freezeTime = ConVar.Find("mp_freezetime")!.GetPrimitiveValue<int>();
+        freezeTime = freezeTime > 2 ? freezeTime: 2;
         coachKillTimer ??= AddTimer(freezeTime - 1.5f, KillCoaches);
         HashSet<CCSPlayerController> coaches = GetAllCoaches();
+        HashSet<CCSPlayerController> competitiveSpawnCoaches = new();
+        if (spawnsData.Values.Any(list => list.Count == 0)) GetSpawns();
 
-        foreach (var coach in coaches)
+        foreach (CCSPlayerController coach in coaches)
         {
             if (!IsPlayerValid(coach)) continue;
             Team coachTeam = matchzyTeam1.coach.Contains(coach) ? matchzyTeam1 : matchzyTeam2;
@@ -90,53 +93,64 @@ public void HandleCoaches()
             coach.ActionTrackingServices!.MatchStats.Assists = 0;
             coach.ActionTrackingServices!.MatchStats.Damage = 0;
 
-            bool isCompetitiveSpawn = false;
-
+            List<Position> teamPositions = spawnsData[coach.TeamNum];
             Position coachPosition = new(coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsOrigin, coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsRotation);
-            List<Position> teamPositions = spawnsData[(byte)coachTeamNum];
-
-            // Elevating the coach so that they don't block the players.
-            coach!.PlayerPawn.Value!.Teleport(new Vector(coach.PlayerPawn.Value.CBodyComponent!.SceneNode!.AbsOrigin.X, coach.PlayerPawn.Value.CBodyComponent!.SceneNode!.AbsOrigin.Y, coach.PlayerPawn.Value.CBodyComponent!.SceneNode!.AbsOrigin.Z + 75.0f), coach.PlayerPawn.Value.EyeAngles, new Vector(0, 0, 0));
-            coach.PlayerPawn.Value!.MoveType = MoveType_t.MOVETYPE_NONE;
-            coach.PlayerPawn.Value!.ActualMoveType = MoveType_t.MOVETYPE_NONE;
-
-            SetPlayerInvisible(player: coach, setWeaponsInvisible: false);
 
             foreach (Position position in teamPositions)
             {
                 if (position.Equals(coachPosition))
                 {
-                    isCompetitiveSpawn = true;
+                    competitiveSpawnCoaches.Add(coach);
                     break;
                 }
             }
-            if (isCompetitiveSpawn)
+            SetPlayerInvisible(player: coach, setWeaponsInvisible: false);
+            // Elevating coach before dropping the C4 to prevent it going inside the ground.
+            AddTimer(0.05f, () =>
+            {
+                coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
+                HandleCoachWeapons(coach);
+                coach!.PlayerPawn.Value.Teleport(coachPosition.PlayerPosition, coachPosition.PlayerAngle, new Vector(0, 0, 0));
+            });
+            
+        }
+
+        var playerEntities = Utilities.FindAllEntitiesByDesignerName<CCSPlayerController>("cs_player_controller");
+
+        // foreach (var key in playerData.Keys)
+        // {
+        foreach (var player in playerEntities)
+        {
+            if (!IsPlayerValid(player)) continue;
+            // CCSPlayerController player = playerData[key];
+            List<Position> teamPositions = spawnsData[player.TeamNum];
+            Position playerPosition = new(player.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsOrigin, player.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsRotation);
+            bool isCompetitiveSpawn = false;
+            foreach (Position position in teamPositions)
             {
-                foreach (var key in playerData.Keys)
+                if (position.Equals(playerPosition))
                 {
-                    CCSPlayerController player = playerData[key];
-                    if (!IsPlayerValid(player) || coaches.Contains(player) || player.TeamNum != (byte)coachTeamNum) continue;
-                    bool playerOnCompetitiveSpawn = false;
-                    Position playerPosition = new(player.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsOrigin, player.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsRotation);
-                    foreach (Position position in teamPositions)
-                    {
-                        if (position.Equals(playerPosition))
-                        {
-                            playerOnCompetitiveSpawn = true;
-                            break;
-                        }
-                    }
-                    // No need to swap the player if they are already on a competitive spawn.
-                    if (playerOnCompetitiveSpawn) continue;
-                    // Swapping positions of the coach and the player so that the coach doesn't take any competitive spawn.
-                    AddTimer(0.1f, () =>
-                    {
-                        coach!.PlayerPawn.Value.Teleport(new Vector(playerPosition.PlayerPosition.X, playerPosition.PlayerPosition.Y, playerPosition.PlayerPosition.Z + 150.0f), playerPosition.PlayerAngle, new Vector(0, 0, 0));
-                        player!.PlayerPawn.Value.Teleport(coachPosition.PlayerPosition, coachPosition.PlayerAngle, new Vector(0, 0, 0));
-                    });
+                    isCompetitiveSpawn = true;
+                    break;
                 }
             }
-            HandleCoachWeapons(coach);
+            // Player is already on a competitive spawn, no need to swap.
+            if (isCompetitiveSpawn) continue;
+
+            CCSPlayerController? coach = competitiveSpawnCoaches.FirstOrDefault((CCSPlayerController coach) => coach.Team == player.Team);
+            if (coach is null) continue;
+            competitiveSpawnCoaches.Remove(coach);
+
+            Position coachPosition = new(coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsOrigin, coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsRotation);
+            AddTimer(0.1f, () =>
+            {
+                coach!.PlayerPawn.Value!.Teleport(new Vector(playerPosition.PlayerPosition.X, playerPosition.PlayerPosition.Y, playerPosition.PlayerPosition.Z), playerPosition.PlayerAngle, new Vector(0, 0, 0));
+                player!.PlayerPawn.Value.Teleport(coachPosition.PlayerPosition, coachPosition.PlayerAngle, new Vector(0, 0, 0));
+            });
+
+            // Stopping the coaches from moving, so that they don't block the players.
+            coach.PlayerPawn.Value!.MoveType = MoveType_t.MOVETYPE_NONE;
+            coach.PlayerPawn.Value!.ActualMoveType = MoveType_t.MOVETYPE_NONE;
         }
     }
 
@@ -187,6 +201,7 @@ private void HandleCoachTeam(CCSPlayerController playerController)
 
     private void KillCoaches()
     {
+        if (isPaused || IsTacticalTimeoutActive()) return;
         HashSet<CCSPlayerController> coaches = GetAllCoaches();
         string suicidePenalty = GetConvarStringValue(ConVar.Find("mp_suicide_penalty"));
         string deathDropGunEnabled = GetConvarStringValue(ConVar.Find("mp_death_drop_gun"));
@@ -201,6 +216,12 @@ private void KillCoaches()
             foreach (var coach in coaches)
             {
                 if (!IsPlayerValid(coach)) continue;
+                if (isPaused || IsTacticalTimeoutActive()) continue;
+
+                Position coachPosition = new(coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsOrigin, coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsRotation);
+                coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
+                // Dropping the C4 if it was picked up or passed to the coach.
+                DropWeaponByDesignerName(coach, "weapon_c4");
                 coach.PlayerPawn.Value!.CommitSuicide(explode: false, force: true);
             }
             Server.ExecuteCommand($"mp_suicide_penalty {suicidePenalty}; mp_death_drop_gun {deathDropGunEnabled}; spec_freeze_time {specFreezeTime}; spec_freeze_time_lock {specFreezeTimeLock}; spec_freeze_deathanim_time {specFreezeDeathanim};");

EventHandlers.cs

@@ -160,6 +160,41 @@ public HookResult EventRoundStartHandler(EventRoundStart @event, GameEventInfo i
         }
     }
 
+    public HookResult EventRoundFreezeEndHandler(EventRoundFreezeEnd @event, GameEventInfo info)
+    {
+        try
+        {
+            if (!matchStarted) return HookResult.Continue;
+            HashSet<CCSPlayerController> coaches = GetAllCoaches();
+
+            foreach (var coach in coaches)
+            {
+                if (!IsPlayerValid(coach)) continue;
+                // If coaches are still left alive after freezetime ends, this code will force them to spectate their team again.
+                if (coach.PlayerPawn.Value?.LifeState != (byte)LifeState_t.LIFE_ALIVE) continue;
+
+                Position coachPosition = new(coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsOrigin, coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsRotation);
+                coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
+                // Dropping the C4 if it was picked up or passed to the coach.
+                DropWeaponByDesignerName(coach, "weapon_c4");
+                AddTimer(1.5f, () =>
+                {
+                    coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
+                    DropWeaponByDesignerName(coach, "weapon_c4");
+                    CsTeam oldTeam = GetCoachTeam(coach);
+                    coach.ChangeTeam(CsTeam.Spectator);
+                    AddTimer(0.01f, () => coach.ChangeTeam(oldTeam));
+                });
+            }
+            return HookResult.Continue;
+        }
+        catch (Exception e)
+        {
+            Log($"[EventRoundFreezeEnd FATAL] An error occurred: {e.Message}");
+            return HookResult.Continue;
+        }
+    }
+
     public void OnEntitySpawnedHandler(CEntityInstance entity)
     {
         try

MatchZy.cs

@@ -13,7 +13,7 @@ public partial class MatchZy : BasePlugin
     {
 
         public override string ModuleName => "MatchZy";
-        public override string ModuleVersion => "0.8.3";
+        public override string ModuleVersion => "0.8.4";
 
         public override string ModuleAuthor => "WD- (https://github.com/shobhit-pathak/)";
 
@@ -204,6 +204,7 @@ public override void Load(bool hotReload) {
             RegisterEventHandler<EventCsWinPanelRound>(EventCsWinPanelRoundHandler, hookMode: HookMode.Pre);
             RegisterEventHandler<EventCsWinPanelMatch>(EventCsWinPanelMatchHandler);
             RegisterEventHandler<EventRoundStart>(EventRoundStartHandler);
+            RegisterEventHandler<EventRoundFreezeEnd>(EventRoundFreezeEndHandler);
             RegisterEventHandler<EventPlayerDeath>(EventPlayerDeathPreHandler, hookMode: HookMode.Pre);
             RegisterListener<Listeners.OnClientDisconnectPost>(playerSlot => { 
                // May not be required, but just to be on safe side so that player data is properly updated in dictionaries

Utility.cs

@@ -227,6 +227,7 @@ private void StartKnifeRound()
             }
 
             // Setting match phases bools
+            matchStarted = true;
             isKnifeRound = true;
             readyAvailable = false;
             isWarmup = false;
@@ -426,12 +427,15 @@ private void ResetMatch(bool warmupCfgRequired = true)
 
                 foreach (var coach in coaches)
                 {
+                    if (!IsPlayerValid(coach)) continue;
                     coach.Clan = "";
                     SetPlayerVisible(coach);
                 }
 
                 matchzyTeam1.coach = new();
                 matchzyTeam2.coach = new();
+                coachKillTimer?.Kill();
+                coachKillTimer = null;
 
                 matchzyTeam1.seriesScore = 0;
                 matchzyTeam2.seriesScore = 0;
@@ -693,7 +697,6 @@ private void HandleMatchStart()
         {
             isPractice = false;
             isDryRun = false;
-            matchStarted = true;
             if (isRoundRestorePending)
             {
                 RestoreRoundBackup(null, pendingRestoreFileName);
@@ -1013,6 +1016,8 @@ private void HandlePostRoundEndEvent(EventRoundEnd @event)
             {
                 if (isMatchLive)
                 {
+                    coachKillTimer?.Kill();
+                    coachKillTimer = null;
                     (int t1score, int t2score) = GetTeamsScore();
                     Server.PrintToChatAll($"{chatPrefix} {ChatColors.Green}{matchzyTeam1.teamName} [{t1score} - {t2score}] {matchzyTeam2.teamName}");
 
@@ -1260,6 +1265,9 @@ private void UnpauseMatch()
 
         private void SetMatchPausedFlags()
         {
+            coachKillTimer?.Kill();
+            coachKillTimer = null;
+
             Server.ExecuteCommand("mp_pause_match;");
             isPaused = true;