Fix hide and seek, make sure commands hide other messages for 5s

BattleBit-Gamenight · Sep 13, 2024 · b3cab5c · b3cab5c
1 parent 9d80b79
commit b3cab5c
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 129 deletions.
diff --git a/Api/BattleBitPlayer.cs b/Api/BattleBitPlayer.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using BattleBitAPI;
 using BattleBitMinigames.Enums;
+using BattleBitMinigames.Interfaces;
 
 namespace BattleBitMinigames.Api;
 public class BattleBitPlayer : Player<BattleBitPlayer>
@@ -72,4 +73,18 @@ public void ClearAllPlayerProperties()
     {
         PlayerProperties.Clear();
     }
+
+    public bool CanReceiveMessage()
+    {
+        var now = DateTime.UtcNow;
+        var lastMessageSentTimeStr = GetPlayerProperty(IPlayerProperties.IGeneralPlayerProperties.LastMessageSentTime);
+
+        if (DateTime.TryParse(lastMessageSentTimeStr, out var lastMessageSentTime))
+        {
+            if ((now - lastMessageSentTime).TotalSeconds <= 5)
+                return false;
+        }
+
+        return true;
+    }
 }
diff --git a/ChatCommands/ChatCommand.cs b/ChatCommands/ChatCommand.cs
@@ -1,5 +1,6 @@
 using BattleBitMinigames.Api;
 using BattleBitMinigames.Enums;
+using BattleBitMinigames.Interfaces;
 using log4net;
 
 namespace BattleBitMinigames.ChatCommands;
@@ -31,6 +32,11 @@ public override string ToString()
 
     public bool CanExecute(BattleBitPlayer player)
     {
-        return player.PlayerRoles.Any(role => role >= MinimumRequiredRole);
+        var canExec = player.PlayerRoles.Any(role => role >= MinimumRequiredRole);
+
+        if (canExec)
+            player.SetPlayerProperty(IPlayerProperties.IGeneralPlayerProperties.LastMessageSentTime, DateTime.UtcNow.ToUniversalTime().ToString());
+
+        return canExec;
     }
 }
diff --git a/Events/HideAndSeekGamemode.cs b/Events/HideAndSeekGamemode.cs
diff --git a/Events/RegionManager.cs b/Events/RegionManager.cs
@@ -121,6 +121,8 @@ private void HandlePlayerInRegion(BattleBitPlayer player, RegionHelper.Region re
         var spawnedInSpawn = player.GetPlayerProperty(IPlayerProperties.IGeneralPlayerProperties.SpawnedInSpawn);
         var spawnedInSpawnTimeStr = player.GetPlayerProperty(IPlayerProperties.IGeneralPlayerProperties.SpawnedInSpawnTime);
         var enteredSpawnTimeStr = player.GetPlayerProperty(IPlayerProperties.IGeneralPlayerProperties.EnteredSpawnTime);
+
+        if (!player.CanReceiveMessage()) return;
 
         if (spawnedInSpawn == "true")
         {
@@ -135,6 +137,8 @@ private void HandlePlayerInRegion(BattleBitPlayer player, RegionHelper.Region re
                 {
                     player.Message($"You spawned in the {region.Name}, please leave within {(int)(90 - (now - spawnedInSpawnTime).TotalSeconds)} seconds!", 1f);
                 }
+
+                player.SetPlayerProperty(IPlayerProperties.IGeneralPlayerProperties.LastMessageSentTime, now.ToUniversalTime().ToString());
             }
         }
         else
@@ -154,6 +158,8 @@ private void HandlePlayerInRegion(BattleBitPlayer player, RegionHelper.Region re
                 {
                     player.Message($"You entered the {region.Name}, please leave within {(int)(20 - (now - enteredSpawnTime).TotalSeconds)} seconds!", 1f);
                 }
+
+                player.SetPlayerProperty(IPlayerProperties.IGeneralPlayerProperties.LastMessageSentTime, now.ToUniversalTime().ToString());
             }
         }
     }

diff --git a/Events/ServerSettings.cs b/Events/ServerSettings.cs
@@ -7,24 +7,24 @@ public class ServerSettings : Event
 {
     public override Task OnConnected()
     {
-        foreach (var Map in Server.MapRotation.GetMapRotation())
+        foreach (var map in Server.MapRotation.GetMapRotation())
         {
-            Server.MapRotation.RemoveFromRotation(Map);
+            Server.MapRotation.RemoveFromRotation(map);
         }
 
-        foreach (var Gamemode in Server.GamemodeRotation.GetGamemodeRotation())
+        foreach (var gamemode in Server.GamemodeRotation.GetGamemodeRotation())
         {
-            Server.GamemodeRotation.RemoveFromRotation(Gamemode);
+            Server.GamemodeRotation.RemoveFromRotation(gamemode);
         }
 
-        foreach (var Map in Program.ServerConfiguration.MapRotation)
+        foreach (var map in Program.ServerConfiguration.MapRotation)
         {
-            Server.MapRotation.AddToRotation(Map);
+            Server.MapRotation.AddToRotation(map);
         }
 
-        foreach (var Gamemode in Program.ServerConfiguration.GamemodeRotation)
+        foreach (var gamemode in Program.ServerConfiguration.GamemodeRotation)
         {
-            Server.GamemodeRotation.AddToRotation(Gamemode);
+            Server.GamemodeRotation.AddToRotation(gamemode);
         }
 
         if (!Server.MapRotation.GetMapRotation().Any())
@@ -36,6 +36,9 @@ public override Task OnConnected()
         {
             Program.ReloadConfiguration();
         }
+
+        Server.ExecuteCommand("setspeedhackdetection false");
+        Server.ExecuteCommand("setmaxping 999");
 
         var serverRotation = Server.MapRotation.GetMapRotation();
         Program.Logger.Info($"Loaded Map Rotation: {string.Join(", ", serverRotation)}");

diff --git a/Events/ZombiesGamemode.cs b/Events/ZombiesGamemode.cs
@@ -131,11 +131,6 @@ private void SetServerSettings()
         loadingScreen.AppendLine($"- Do not defend anywhere infected can't access");
         Server.SetLoadingScreenText(loadingScreen.ToString());
 
-        Server.GamemodeRotation.ClearRotation();
-        Server.GamemodeRotation.SetRotation("DOMI");
-        Server.ExecuteCommand("setsize ultra");
-        Server.ExecuteCommand("setspeedhackdetection false");
-        Server.ExecuteCommand("setmaxping 999");
         Server.ServerSettings.UnlockAllAttachments = true;
         Server.ServerSettings.PlayerCollision = true;
         Server.ServerSettings.HideMapVotes = false;

diff --git a/Helpers/CustomGamemodeHelper.cs b/Helpers/CustomGamemodeHelper.cs
@@ -39,6 +39,7 @@ public static void SetCustomGameMode(string gm, BattleBitServer server)
                     break;
                 case "hideandseek":
                     server.AddEvents(CustomGameModeEvents.HideAndSeekEvents);
+                    server.SetServerSizeForNextMatch(MapSize._127vs127);
                     server.ForceEndGame();
                     break;
                 case "gungame":

diff --git a/Interfaces/PlayerProperties.cs b/Interfaces/PlayerProperties.cs
@@ -10,6 +10,7 @@ public interface IGeneralPlayerProperties
         public const string SpawnedInSpawn = "spawned_in_spawn";
         public const string SpawnedInSpawnTime = "spawned_in_spawn_time";
         public const string EnteredSpawnTime = "entered_spawn_time";
+        public const string LastMessageSentTime = "last_message_sent_time";
     }
 
     /// <summary>