diff --git a/.gitignore b/.gitignore index 557ab36..1817949 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ obj/* -bin/* \ No newline at end of file +bin/* +/.vs \ No newline at end of file diff --git a/ConsoleCommands.cs b/ConsoleCommands.cs index 96ad012..7814c17 100644 --- a/ConsoleCommands.cs +++ b/ConsoleCommands.cs @@ -441,6 +441,7 @@ public void OnEndMatchCommand(CCSPlayerController? player, CommandInfo? command) } [ConsoleCommand("css_restart", "Restarts the match")] + [ConsoleCommand("css_rr", "Restarts the match")] public void OnRestartMatchCommand(CCSPlayerController? player, CommandInfo? command) { if (IsPlayerAdmin(player, "css_restart", "@css/config")) diff --git a/MapVeto.cs b/MapVeto.cs index 3dc01e7..144bec5 100644 --- a/MapVeto.cs +++ b/MapVeto.cs @@ -199,7 +199,7 @@ public void HandeMapBanCommand(CCSPlayerController player, string map) if (player.UserId != vetoCaptains[currentTeamToBan]) return; if (!BanMap(map, playerTeam)) { - player.PrintToChat($"{chatPrefix} {map} is not a valid map."); + PrintToPlayerChat(player, $"{map} is not a valid map."); } else { HandleVetoStep(); } @@ -229,7 +229,7 @@ public void HandeMapPickCommand(CCSPlayerController player, string map) if (player.UserId != vetoCaptains[currentTeamToPick]) return; if (!PickMap(map, playerTeam)) { - player.PrintToChat($"{chatPrefix} {map} is not a valid map."); + PrintToPlayerChat(player, $"{map} is not a valid map."); } else { HandleVetoStep(); } diff --git a/MatchZy.cs b/MatchZy.cs index 669a871..9dfcb01 100644 --- a/MatchZy.cs +++ b/MatchZy.cs @@ -135,6 +135,7 @@ public override void Load(bool hotReload) { { ".skipveto", OnSkipVetoCommand }, { ".sv", OnSkipVetoCommand }, { ".restart", OnRestartMatchCommand }, + { ".rr", OnRestartMatchCommand }, { ".endmatch", OnEndMatchCommand }, { ".forceend", OnEndMatchCommand }, { ".reloadmap", OnMapReloadCommand }, diff --git a/Utility.cs b/Utility.cs index 3b1b637..96c1868 100644 --- a/Utility.cs +++ b/Utility.cs @@ -32,6 +32,25 @@ private void PrintToPlayerChat(CCSPlayerController player, string message) player.PrintToChat($"{chatPrefix} {message}"); } + private void ReplyToUserCommand(CCSPlayerController? player, string message, bool console = false) + { + if (player == null) + { + Server.PrintToConsole($"{chatPrefix} {message}"); + } + else + { + if (console) + { + player.PrintToConsole($"{chatPrefix} {message}"); + } + else + { + player.PrintToChat($"{chatPrefix} {message}"); + } + } + } + private void LoadAdmins() { string fileName = "MatchZy/admins.json"; @@ -1125,25 +1144,6 @@ public bool IsTeamSwapRequired() return false; } - private void ReplyToUserCommand(CCSPlayerController? player, string message, bool console = false) - { - if (player == null) - { - Server.PrintToConsole($"[MatchZy] {message}"); - } - else - { - if (console) - { - player.PrintToConsole($"[MatchZy] {message}"); - } - else - { - player.PrintToChat($"{chatPrefix} {message}"); - } - } - } - private void PauseMatch(CCSPlayerController? player, CommandInfo? command) { if (isMatchLive && isPaused) @@ -1357,9 +1357,11 @@ private string GetColorTreatedString(string message) private void SendAvailableCommandsMessage(CCSPlayerController? player) { if (!IsPlayerValid(player)) return; + + ReplyToUserCommand(player, "Available commands:"); + if (isPractice) { - ReplyToUserCommand(player, $"{ChatColors.Green}Available commands: {ChatColors.Default}"); player!.PrintToChat($" {ChatColors.Green}Spawns: {ChatColors.Default}.spawn, .ctspawn, .tspawn, .bestspawn, .worstspawn"); player.PrintToChat($" {ChatColors.Green}Bots: {ChatColors.Default}.bot, .nobots, .crouchbot, .boost, .crouchboost"); player.PrintToChat($" {ChatColors.Green}Nades: {ChatColors.Default}.loadnade, .savenade, .importnade, .listnades"); @@ -1370,20 +1372,17 @@ private void SendAvailableCommandsMessage(CCSPlayerController? player) } if (readyAvailable) { - ReplyToUserCommand(player, $"{ChatColors.Green}Available commands: {ChatColors.Default}"); player!.PrintToChat($" {ChatColors.Green}Ready/Unready: {ChatColors.Default}.ready, .unready"); return; } if (isSideSelectionPhase) { - ReplyToUserCommand(player, $"{ChatColors.Green}Available commands: {ChatColors.Default}"); player!.PrintToChat($" {ChatColors.Green}Side Selection: {ChatColors.Default}.stay, .switch"); return; } if (matchStarted) { string stopCommandMessage = isStopCommandAvailable ? ", .stop" : ""; - ReplyToUserCommand(player, $"{ChatColors.Green}Available commands: {ChatColors.Default}"); player!.PrintToChat($" {ChatColors.Green}Pause/Restore: {ChatColors.Default}.pause, .unpause, .tac, .tech{stopCommandMessage}"); return; }