RespawnTimer Support

- Added RespawnTimer Support
Marco15453-Archived · Jun 30, 2023 · 9519aad · 9519aad
1 parent af7da13
commit 9519aad
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/Configs/Config.cs b/Configs/Config.cs
@@ -12,6 +12,9 @@ public class Config : IConfig
         [Description("Should debug messages be shown in a server console.")]
         public bool Debug { get; set; } = false;
 
+        [Description("How many seconds before a spawnwave occurs should it calculate the spawn chance")]
+        public int SpawnWaveCalculation { get; set; } = 10;
+
         [Description("Options for UIU spawn:")]
         public SpawnManager SpawnManager { get; private set; } = new SpawnManager();
 

diff --git a/EventHandlers.cs b/EventHandlers.cs
@@ -5,6 +5,7 @@
 using MEC;
 using PlayerRoles;
 using Respawning;
+using System;
 using System.Collections.Generic;
 
 namespace UIURescueSquad
@@ -17,23 +18,43 @@ internal sealed class EventHandlers
 
         private int Respawns = 0;
         private int UIURespawns = 0;
-        public bool UIUSpawns = false;
+        private CoroutineHandle calcuationCoroutine;
 
         public void OnRoundStarted()
         {
+            plugin.IsSpawnable = false;
             Respawns = 0;
             UIURespawns = 0;
-            UIUSpawns = false;
+
+            if (calcuationCoroutine.IsRunning)
+                Timing.KillCoroutines(calcuationCoroutine);
+
+            calcuationCoroutine = Timing.RunCoroutine(spawnCalculation());
+        }
+
+        private IEnumerator<float> spawnCalculation()
+        {
+            while (true)
+            {
+                yield return Timing.WaitForSeconds(1f);
+
+                if (Round.IsEnded)
+                    break;
+
+                if (Math.Round(Respawn.TimeUntilSpawnWave.TotalSeconds, 0) != plugin.Config.SpawnWaveCalculation)
+                    continue;
+
+                if (Respawn.NextKnownTeam == SpawnableTeamType.NineTailedFox)
+                    plugin.IsSpawnable = Loader.Random.Next(100) <= plugin.Config.SpawnManager.Probability &&
+                        Respawns >= plugin.Config.SpawnManager.Respawns &&
+                        UIURespawns < plugin.Config.SpawnManager.MaxSpawns;
+            }
         }
 
         public void OnRespawningTeam(RespawningTeamEventArgs ev)
         {
-            if(Loader.Random.Next(100) <= plugin.Config.SpawnManager.Probability &&
-                Respawns >= plugin.Config.SpawnManager.Respawns &&
-                UIURespawns < plugin.Config.SpawnManager.MaxSpawns &&
-                ev.NextKnownTeam == SpawnableTeamType.NineTailedFox)
+            if(plugin.IsSpawnable)
             {
-                UIUSpawns = true;
                 List<Player> players = new List<Player>();
                 if (ev.Players.Count > plugin.Config.SpawnManager.MaxSquad)
                     players = ev.Players.GetRange(0, plugin.Config.SpawnManager.MaxSquad);
@@ -61,7 +82,6 @@ public void OnRespawningTeam(RespawningTeamEventArgs ev)
                     }
                 }
                 UIURespawns++;
-
                 ev.NextKnownTeam = SpawnableTeamType.None;
             }
             Respawns++;
@@ -70,7 +90,7 @@ public void OnRespawningTeam(RespawningTeamEventArgs ev)
         public void OnAnnouncingNtfEntrance(AnnouncingNtfEntranceEventArgs ev)
         {
             string cassieMessage = string.Empty;
-            if (!UIUSpawns)
+            if (!plugin.IsSpawnable)
             {
                 if (ev.ScpsLeft == 0 && !string.IsNullOrEmpty(plugin.Config.SpawnManager.NtfAnnouncmentCassieNoScp))
                 {
@@ -95,7 +115,7 @@ public void OnAnnouncingNtfEntrance(AnnouncingNtfEntranceEventArgs ev)
                     ev.IsAllowed = false;
                     cassieMessage = plugin.Config.SpawnManager.UiuAnnouncementCassie;
                 }
-                UIUSpawns = false;
+                plugin.IsSpawnable = false;
             }
 
             cassieMessage = cassieMessage.Replace("{scpnum}", $"{ev.ScpsLeft} scpsubject");

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión
 // utilizando el carácter "*", como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.2.0")]
-[assembly: AssemblyFileVersion("5.2.0")]
+[assembly: AssemblyVersion("5.3.0")]
+[assembly: AssemblyFileVersion("5.3.0")]
diff --git a/UIURescueSquad.cs b/UIURescueSquad.cs
@@ -14,9 +14,11 @@ public class UIURescueSquad : Plugin<Configs.Config>
         public override string Name { get; } = "UIURescueSquad";
         public override string Author { get; } = "JesusQC, Michal78900, maintained by Marco15453";
         public override string Prefix { get; } = "UIURescueSquad";
-        public override Version Version { get; } = new Version(5, 2, 0);
+        public override Version Version { get; } = new Version(5, 3, 0);
         public override Version RequiredExiledVersion => new Version(7, 1, 0);
 
+        public bool IsSpawnable = false;
+
         private EventHandlers eventHandlers;
 
         public override void OnEnabled()