feature: voting system (#61)

scripts/setup.sh

@@ -71,7 +71,10 @@ if $INSTALL_5STACK_PLUGIN = true ; then
   fi
 fi
 
-cp "/opt/server-cfg/core.json" "$INSTANCE_SERVER_DIR/game/csgo/addons/counterstrikesharp/configs"
+if [ ! -e "$INSTANCE_SERVER_DIR/game/csgo/addons/counterstrikesharp/configs/core.json" ]; then
+    cp "/opt/server-cfg/core.json" "$INSTANCE_SERVER_DIR/game/csgo/addons/counterstrikesharp/configs"
+fi
+
 
 echo "---Check Metamod Install---"
 gameinfo_path="${INSTANCE_SERVER_DIR}/game/csgo/gameinfo.gi"

src/FiveStack.Commands/BackupRounds.cs

@@ -32,8 +32,9 @@ public void OnResetRound(CCSPlayerController? player, CommandInfo command)
         "Should only be called by the API, this is so we know the api regonized the restore"
     )]
     [CommandHelper(whoCanExecute: CommandUsage.SERVER_ONLY)]
-    public void OnApiResetRound(CCSPlayerController? player, CommandInfo command)
+    public async void OnApiResetRound(CCSPlayerController? player, CommandInfo command)
     {
+        _logger.LogInformation("API Restoring Round");
         string _round = command.ArgByIndex(1);
 
         if (_round == null)
@@ -62,12 +63,18 @@ public void OnApiResetRound(CCSPlayerController? player, CommandInfo command)
 
         _gameServer.SendCommands(new[] { $"mp_backup_restore_load_file {backupRoundFile}" });
 
-        _gameBackupRounds.ResetRestoreBackupRound();
+        _logger.LogInformation($"LETS GO Round {round}");
 
-        _gameServer.Message(
-            HudDestination.Alert,
-            $" {ChatColors.Red}Round {round} has been restored ({CommandUtility.PublicChatTrigger}resume to continue)"
-        );
+        await Task.Delay(10 * 1000);
+
+        Server.NextFrame(() =>
+        {
+            _logger.LogInformation($"Sending Message for Round {round}");
+            _gameServer.Message(
+                HudDestination.Alert,
+                $" {ChatColors.Red}Round {round} has been restored ({CommandUtility.PublicChatTrigger}resume to continue)"
+            );
+        });
     }
 
     [ConsoleCommand("css_reset", "Restores to a previous round")]
@@ -77,6 +84,7 @@ public void OnRestoreRound(CCSPlayerController? player, CommandInfo command)
 
         if (_round == null || _gameBackupRounds.IsResettingRound())
         {
+            _logger.LogWarning("Already restoring round, skipping");
             return;
         }
 

src/FiveStack.Commands/Help.cs

@@ -46,6 +46,9 @@ public void OnHelp(CCSPlayerController? player, CommandInfo command)
         command.ReplyToCommand(
             $" {ChatColors.BlueGrey}Rules: {ChatColors.Default}{CommandUtility.PublicChatTrigger}rules"
         );
+        command.ReplyToCommand(
+            $" {ChatColors.BlueGrey}Restore Round: {ChatColors.Default}{CommandUtility.PublicChatTrigger}reset <round>"
+        );
     }
 
     [ConsoleCommand("css_rules", "Shows Rules for Match")]

src/FiveStack.Commands/Surrender.cs

@@ -1,8 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Commands;
-using CounterStrikeSharp.API.Modules.Utils;
-using FiveStack.Utilities;
 
 namespace FiveStack;
 
@@ -16,11 +14,6 @@ public void Surrender(CCSPlayerController? player, CommandInfo? command)
             return;
         }
 
-        _gameServer.Message(
-            HudDestination.Notify,
-            $"{player.PlayerName} has asked to surrender the match, type in {CommandUtility.PublicChatTrigger}y or {CommandUtility.PublicChatTrigger}n to vote"
-        );
-
-        _surrender.SetupSurrender(player.Team);
+        _surrenderSystem.SetupSurrender(player.Team, player);
     }
 }

src/FiveStack.Commands/Timeout.cs

@@ -9,18 +9,18 @@ public partial class FiveStackPlugin
     [ConsoleCommand("css_pause", "Pauses the match")]
     public void OnPause(CCSPlayerController? player, CommandInfo? command)
     {
-        _matchTimeouts.Pause(player);
+        _timeoutSystem.RequestPause(player);
     }
 
     [ConsoleCommand("css_resume", "Resumes the match")]
     public void OnResume(CCSPlayerController? player, CommandInfo? command)
     {
-        _matchTimeouts.Resume(player);
+        _timeoutSystem.RequestResume(player);
     }
 
     [ConsoleCommand("css_tac", "Tactical Timeout")]
     public void OnTimeout(CCSPlayerController? player, CommandInfo? command)
     {
-        _matchTimeouts.CallTacTimeout(player);
+        _timeoutSystem.CallTacTimeout(player);
     }
 }

src/FiveStack.Commands/Vote.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Commands;
+using Microsoft.Extensions.Logging;
 
 namespace FiveStack;
 
@@ -17,12 +18,23 @@ public void OnResetAnswer(CCSPlayerController? player, CommandInfo command)
 
         if (_gameBackupRounds.IsResettingRound())
         {
-            _gameBackupRounds.CastVote(player, command.GetCommandString == "css_y");
+            _gameBackupRounds.restoreRoundVote?.CastVote(
+                player,
+                command.GetCommandString == "css_y"
+            );
         }
 
-        if (_surrender.IsSurrendering())
+        if (_surrenderSystem.IsSurrendering())
         {
-            _surrender.CastVote(player, command.GetCommandString == "css_y");
+            _surrenderSystem.surrenderingVote?.CastVote(
+                player,
+                command.GetCommandString == "css_y"
+            );
+        }
+
+        if (_timeoutSystem.resumeVote != null)
+        {
+            _timeoutSystem.resumeVote?.CastVote(player, command.GetCommandString == "css_y");
         }
     }
 }

src/FiveStack.Events/GameEnd.cs

@@ -8,6 +8,7 @@ public partial class FiveStackPlugin
     [GameEventHandler]
     public HookResult OnGameEnd(EventCsWinPanelMatch @event, GameEventInfo info)
     {
+        _surrenderSystem.ResetDisconnectTimers();
         _gameDemos.Stop();
 
         MatchManager? match = _matchService.GetCurrentMatch();

src/FiveStack.Events/PlayerConnected.cs

@@ -27,7 +27,7 @@ public HookResult OnPlayerConnect(EventPlayerConnectFull @event, GameEventInfo i
             return HookResult.Continue;
         }
 
-        _surrender.CancelDisconnectTimer(@event.Userid.SteamID);
+        _surrenderSystem.CancelDisconnectTimer(@event.Userid.SteamID);
 
         CCSPlayerController player = @event.Userid;
 

src/FiveStack.Events/PlayerDisconnected.cs

@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
-using CounterStrikeSharp.API.Modules.Utils;
 using FiveStack.Entities;
 
 namespace FiveStack;
@@ -38,9 +37,7 @@ public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo
 
         if (match.IsLive())
         {
-            _gameServer.Message(HudDestination.Center, $" {ChatColors.Red}Match Paused");
-            match.PauseMatch();
-            _surrender.SetupDisconnectTimer(@event.Userid.Team, @event.Userid.SteamID);
+            _surrenderSystem.SetupDisconnectTimer(@event.Userid.Team, @event.Userid.SteamID);
         }
 
         return HookResult.Continue;

src/FiveStack.Events/RoundEnd.cs

@@ -97,13 +97,13 @@ public HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
         MatchMap? currentMap = match?.GetCurrentMap();
         MatchData? matchData = match?.GetMatchData();
 
+        this.roundWinner = TeamUtility.TeamNumToCSTeam(@event.Winner);
+
         if (match == null || matchData == null || currentMap == null)
         {
             return HookResult.Continue;
         }
 
-        this.roundWinner = TeamUtility.TeamNumToCSTeam(@event.Winner);
-
         if (match.IsKnife())
         {
             match.knifeSystem.SetWinningTeam(TeamUtility.TeamNumToCSTeam(@event.Winner));

src/FiveStack.Events/RoundStart.cs

@@ -0,0 +1,40 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using FiveStack.Utilities;
+using Microsoft.Extensions.Logging;
+
+namespace FiveStack;
+
+public partial class FiveStackPlugin
+{
+    [GameEventHandler]
+    public HookResult OnRoundStart(EventRoundPrestart @event, GameEventInfo info)
+    {
+        MatchManager? matchManager = _matchService.GetCurrentMatch();
+        if (matchManager == null)
+        {
+            return HookResult.Continue;
+        }
+
+        if (!matchManager.IsLive())
+        {
+            return HookResult.Continue;
+        }
+
+        int currentPlayers = MatchUtility.Players().Count;
+
+        int expectedPlayers = _matchService.GetCurrentMatch()?.GetExpectedPlayerCount() ?? 10;
+
+        _logger.LogInformation(
+            "expectedPlayers: {expectedPlayers}, currentPlayers: {currentPlayers}",
+            expectedPlayers,
+            currentPlayers
+        );
+        if (currentPlayers < expectedPlayers)
+        {
+            matchManager.PauseMatch("Waiting for players to reconnect");
+        }
+
+        return HookResult.Continue;
+    }
+}