Merge pull request #257 from shobhit-pathak/dev

0.8.7

Author: shobhit-pathak

BackupManagement.cs

@@ -13,6 +13,7 @@ public partial class MatchZy
 
         public FakeConVar<bool> smokeColorEnabled = new("matchzy_smoke_color_enabled", "Whether player-specific smoke color is enabled or not. Default: false", false);
         public FakeConVar<bool> techPauseEnabled = new("matchzy_enable_tech_pause", "Whether .tech command is enabled or not. Default: true", true);
+        public FakeConVar<string> techPausePermission  = new("matchzy_tech_pause_flag", "Flag required to use tech pause", "");
         public FakeConVar<int> techPauseDuration  = new("matchzy_tech_pause_duration", "Tech pause duration in seconds. Default value: 300", 300);
 
         public FakeConVar<int> maxTechPausesAllowed  = new("matchzy_max_tech_pauses_allowed", " Max tech pauses allowed. Default value: 2", 2);

ConfigConvars.cs

@@ -13,7 +13,7 @@ public partial class MatchZy : BasePlugin
     {
 
         public override string ModuleName => "MatchZy";
-        public override string ModuleVersion => "0.8.6";
+        public override string ModuleVersion => "0.8.7";
 
         public override string ModuleAuthor => "WD- (https://github.com/shobhit-pathak/)";
 

MatchZy.cs

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.263">
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.291">
         <PrivateAssets>none</PrivateAssets>
         <ExcludeAssets>runtime</ExcludeAssets>
         <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

MatchZy.csproj

@@ -17,13 +17,26 @@ public class Position
 
         public Vector PlayerPosition { get; private set; }
         public QAngle PlayerAngle { get; private set; }
+
+        // Copy constructor
+        public Position(Position other)
+        {
+            PlayerPosition = other.PlayerPosition;
+            PlayerAngle = other.PlayerAngle;
+        }
+
         public Position(Vector playerPosition, QAngle playerAngle)
         {
             // Create deep copies of the Vector and QAngle objects
             PlayerPosition = new Vector(playerPosition.X, playerPosition.Y, playerPosition.Z);
             PlayerAngle = new QAngle(playerAngle.X, playerAngle.Y, playerAngle.Z);
         }
 
+        public void Teleport(CCSPlayerController player)
+        {
+            player!.PlayerPawn.Value!.Teleport(PlayerPosition, PlayerAngle, new Vector(0, 0, 0));
+        }
+
         public override bool Equals(object? obj)
         {
             if (obj == null || GetType() != obj.GetType())

PracticeMode.cs

@@ -1029,6 +1029,7 @@ private int GetRoundNumer()
 
         public void HandlePostRoundStartEvent(EventRoundStart @event)
         {
+            if (isDryRun) RandomizeSpawns();
             if (!matchStarted) return;
             playerHasTakenDamage = false;
             HandleCoaches();
@@ -1170,6 +1171,19 @@ private void PauseMatch(CCSPlayerController? player, CommandInfo? command)
                 ReplyToUserCommand(player, Localizer["matchzy.utility.tacticaltimeout"]);
                 return;
             }
+            if (!techPauseEnabled.Value && player != null)
+            {
+                PrintToPlayerChat(player, Localizer["matchzy.pause.techpausenotenabled"]);
+                return;
+            }
+            if(!string.IsNullOrEmpty(techPausePermission.Value))
+            {
+                if (!IsPlayerAdmin(player, "css_pause", techPausePermission.Value))
+                {
+                    SendPlayerNotAdminMessage(player);
+                    return;
+                }
+            }
             if (isMatchLive && !isPaused)
             {
 
@@ -2013,5 +2027,31 @@ public void DropWeaponByDesignerName(CCSPlayerController player, string weaponNa
                 player.DropActiveWeapon();
             }
         }
+
+        public void RandomizeSpawns()
+        {
+            List<CCSPlayerController> players = Utilities.GetPlayers();
+
+            Dictionary<byte, List<Position>> teamSpawns = new()
+            {
+                { (byte)CsTeam.CounterTerrorist, spawnsData[(byte)CsTeam.CounterTerrorist].Select(position => new Position(position)).ToList() },
+                { (byte)CsTeam.Terrorist, spawnsData[(byte)CsTeam.Terrorist].Select(position => new Position(position)).ToList() }
+            };
+
+            Random random = new();
+
+            foreach (var player in players)
+            {
+                if (!IsPlayerValid(player)) continue;
+                
+                if (teamSpawns[player.TeamNum].Count == 0) break;
+
+                int randomIndex = random.Next(teamSpawns[player.TeamNum].Count);
+                Position spawnPosition = teamSpawns[player.TeamNum][randomIndex];
+                teamSpawns[player.TeamNum].RemoveAt(randomIndex);
+
+                spawnPosition.Teleport(player);
+            }
+        }
     }
 }

Utility.cs

@@ -39,6 +39,10 @@ matchzy_use_pause_command_for_tactical_pause false
 // Default value: true
 matchzy_enable_tech_pause true
 
+// Flag required to use tech pause. Blank for anyone
+// Default value: ""
+matchzy_tech_pause_flag ""
+
 // Tech pause duration in seconds. Set -1 to keep it infinite.
 // Default value: 300
 matchzy_tech_pause_duration 300

cfg/MatchZy/config.cfg

@@ -0,0 +1 @@
+

cfg/MatchZy/ive_wingman_override.cfg

@@ -112,4 +112,4 @@ mp_disconnect_kills_players 0
 mp_warmup_end
 
 // execute override config
-exec live_override.cfg
+exec MatchZy/live_override.cfg

cfg/MatchZy/live.cfg

@@ -0,0 +1 @@
+