]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/command/sv_cmd.qc
Soft reset: Fix warmup limit and repeatable restart
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / sv_cmd.qc
index 62edb992f9749b723ab8c559d979c5280f098aa9..3e4195e509491e8cf41b9fcfb8850d63acab9228 100644 (file)
@@ -1,35 +1,30 @@
 #include "sv_cmd.qh"
-#include "_mod.qh"
 
+#include <common/constants.qh>
 #include <common/effects/all.qh>
-
-#include "banning.qh"
-#include "cmd.qh"
-#include "common.qh"
-#include "getreplies.qh"
-#include "radarmap.qh"
-
-#include "../anticheat.qh"
-#include "../campaign.qh"
-#include "../client.qh"
-#include "../player.qh"
-#include "../g_world.qh"
-#include "../ipban.qh"
-#include "../teamplay.qh"
-
-#include "../bot/api.qh"
-
-#include <server/mutators/_mod.qh>
 #include <common/gamemodes/_mod.qh>
-
-#include <common/constants.qh>
-#include <common/net_linked.qh>
 #include <common/mapinfo.qh>
+#include <common/monsters/sv_monsters.qh>
+#include <common/net_linked.qh>
 #include <common/notifications/all.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
-
-#include <common/monsters/sv_monsters.qh>
+#include <server/anticheat.qh>
+#include <server/bot/api.qh>
+#include <server/campaign.qh>
+#include <server/client.qh>
+#include <server/command/_mod.qh>
+#include <server/command/banning.qh>
+#include <server/command/cmd.qh>
+#include <server/command/common.qh>
+#include <server/command/getreplies.qh>
+#include <server/command/radarmap.qh>
+#include <server/intermission.qh>
+#include <server/ipban.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/teamplay.qh>
+#include <server/world.qh>
 
 //  used by GameCommand_make_mapinfo()
 void make_mapinfo_Think(entity this)
@@ -133,8 +128,8 @@ void GameCommand_adminmsg(int request, int argc)
                                                sprint(client, strcat("\{1}\{13}^3", GetCallerName(NULL), "^7: ", admin_message, "\n"));
                                        }
 
-                                       successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
-                                       LOG_TRACE("Message sent to ", playername(client, false));
+                                       successful = strcat(successful, (successful ? ", " : ""), playername(client.netname, client.team, false));
+                                       LOG_TRACE("Message sent to ", playername(client.netname, client.team, false));
                                        continue;
                                }
 
@@ -149,9 +144,9 @@ void GameCommand_adminmsg(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd adminmsg clients \"message\" [infobartime]");
-                       LOG_HELP("  'clients' is a list (separated by commas) of player entity ID's or nicknames");
-                       LOG_HELP("  If infobartime is provided, the message will be sent to infobar.");
+                       LOG_HELP("Usage:^3 sv_cmd adminmsg <clients> \"<message>\" [<infobartime>]");
+                       LOG_HELP("  <clients> is a list (separated by commas) of player entity ID's or nicknames");
+                       LOG_HELP("  If <infobartime> is provided, the message will be sent to infobar.");
                        LOG_HELP("  Otherwise, it will just be sent as a centerprint message.");
                        LOG_HELP("Examples: adminmsg 2,4 \"this infomessage will last for ten seconds\" 10");
                        LOG_HELP("          adminmsg 2,5 \"this message will be a centerprint\"");
@@ -166,7 +161,13 @@ void GameCommand_allready(int request)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       ReadyRestart();
+                       if(warmup_stage)
+                       {
+                               ReadyRestart(true);
+                       }
+                       else
+                               LOG_INFO("Not in warmup.");
+
                        return;
                }
 
@@ -189,8 +190,7 @@ void GameCommand_allspec(int request, int argc)
                        string reason = argv(1);
                        int n = 0;
                        FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), {
-                               if (it.caplayer) it.caplayer = 0;
-                               PutObserverInServer(it);
+                               PutObserverInServer(it, true);
                                ++n;
                        });
                        if (n)   bprint(strcat("Successfully forced all (", ftos(n), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n"));
@@ -201,8 +201,8 @@ void GameCommand_allspec(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd allspec [reason]");
-                       LOG_HELP("  Where 'reason' is an optional argument for explanation of allspec command.");
+                       LOG_HELP("Usage:^3 sv_cmd allspec [<reason>]");
+                       LOG_HELP("  Where <reason> is an optional argument for explanation of allspec command.");
                        LOG_HELP("See also: ^2moveplayer, shuffleteams^7");
                        return;
                }
@@ -233,8 +233,8 @@ void GameCommand_anticheat(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd anticheat client");
-                       LOG_HELP("  'client' is the entity number or name of the player.");
+                       LOG_HELP("Usage:^3 sv_cmd anticheat <client>");
+                       LOG_HELP("  <client> is the entity number or name of the player.");
                        return;
                }
        }
@@ -435,10 +435,10 @@ void GameCommand_bot_cmd(int request, int argc, string command)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd bot_cmd client command [argument]");
-                       LOG_HELP("  'client' can be either the name of the bot or a progressive number (not the entity number!)");
+                       LOG_HELP("Usage:^3 sv_cmd bot_cmd <client> <command> [<arguments>]");
+                       LOG_HELP("  <client> can be either the name of the bot or a progressive number (not the entity number!)");
                        LOG_HELP("           can also be '*' or 'all' to allow sending the command to all the bots");
-                       LOG_HELP("  For full list of commands, see bot_cmd help [command].");
+                       LOG_HELP("  For full list of commands, see bot_cmd help [<command>].");
                        LOG_HELP("Examples: sv_cmd bot_cmd 1 cc \"say something\"");
                        LOG_HELP("          sv_cmd bot_cmd 1 presskey jump");
                        LOG_HELP("          sv_cmd bot_cmd * pause");
@@ -464,8 +464,8 @@ void GameCommand_cointoss(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd cointoss [result1 result2]");
-                       LOG_HELP("  Where 'result1' and 'result2' are user created options.");
+                       LOG_HELP("Usage:^3 sv_cmd cointoss [<result1> <result2>]");
+                       LOG_HELP("  Where <result1> and <result2> are user created options.");
                        return;
                }
        }
@@ -505,10 +505,10 @@ void GameCommand_database(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd database action filename");
-                       LOG_HELP("  Where 'action' is the command to complete,");
-                       LOG_HELP("  and 'filename' is what it acts upon.");
-                       LOG_HELP("  Full list of commands here: \"save, dump, load.\"");
+                       LOG_HELP("Usage:^3 sv_cmd database <action> <filename>");
+                       LOG_HELP("  Where <action> is the command to complete,");
+                       LOG_HELP("  and <filename> is what it acts upon.");
+                       LOG_HELP("  Full list of commands here: save, dump, load.");
                        return;
                }
        }
@@ -531,7 +531,7 @@ void GameCommand_defer_clear(int request, int argc)
                                if (accepted > 0)
                                {
                                        stuffcmd(client, "defer clear\n");
-                                       LOG_INFO("defer clear stuffed to ", playername(client, false));
+                                       LOG_INFO("defer clear stuffed to ", playername(client.netname, client.team, false));
                                }
                                else { LOG_INFO("defer_clear: ", GetClientErrorString(accepted, argv(1)), "."); }
 
@@ -543,8 +543,8 @@ void GameCommand_defer_clear(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd defer_clear client");
-                       LOG_HELP("  'client' is the entity number or name of the player.");
+                       LOG_HELP("Usage:^3 sv_cmd defer_clear <client>");
+                       LOG_HELP("  <client> is the entity number or name of the player.");
                        LOG_HELP("See also: ^2defer_clear_all^7");
                        return;
                }
@@ -598,10 +598,10 @@ void GameCommand_delrec(int request, int argc)  // perhaps merge later with reco
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd delrec ranking [map]");
-                       LOG_HELP("  'ranking' is which ranking level to clear up to, ");
+                       LOG_HELP("Usage:^3 sv_cmd delrec <ranking> [<map>]");
+                       LOG_HELP("  <ranking> is which ranking level to clear up to, ");
                        LOG_HELP("  it will clear all records up to nth place.");
-                       LOG_HELP("  if 'map' is not provided it will use current map.");
+                       LOG_HELP("  if <map> is not provided it will use current map.");
                        return;
                }
        }
@@ -720,10 +720,15 @@ void GameCommand_gametype(int request, int argc)
        {
                case CMD_REQUEST_COMMAND:
                {
+                       if (!world_initialized)
+                       {
+                               LOG_INFOF("This command works only when the server is running.");
+                               return;
+                       }
                        if (argv(1) != "")
                        {
                                string s = argv(1);
-                               Gametype t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
+                               Gametype t = MapInfo_Type_FromString(s, false), tsave = MapInfo_CurrentGametype();
 
                                if (t)
                                {
@@ -745,7 +750,7 @@ void GameCommand_gametype(int request, int argc)
                                }
                                else
                                {
-                                       bprint("Game type switch to ", s, " failed: this type does not exist!\n");
+                                       bprint("Failed to switch to ", s, ": this game type does not exist!\n");
                                }
 
                                return;
@@ -756,8 +761,8 @@ void GameCommand_gametype(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd gametype mode");
-                       LOG_HELP("  Where 'mode' is the gametype mode to switch to.");
+                       LOG_HELP("Usage:^3 sv_cmd gametype <mode>");
+                       LOG_HELP("  Where <mode> is the gametype mode to switch to.");
                        LOG_HELP("See also: ^2gotomap^7");
                        return;
                }
@@ -793,15 +798,14 @@ void GameCommand_gettaginfo(int request, int argc)
                                if (i)
                                {
                                        v = gettaginfo(tmp_entity, i);
-                                       LOG_INFOF(
-                                               "model %s frame %s tag %s index %s parent %s",
+                                       LOG_HELPF("model %s frame %s tag %s index %s parent %s",
                                                tmp_entity.model, ftos(tmp_entity.frame), gettaginfo_name, ftos(i), ftos(gettaginfo_parent)
                                        );
-                                       LOG_INFOF(" vector = %s %s %s", ftos(v.x), ftos(v.y), ftos(v.z));
-                                       LOG_INFOF(" offset = %s %s %s", ftos(gettaginfo_offset.x), ftos(gettaginfo_offset.y), ftos(gettaginfo_offset.z));
-                                       LOG_INFOF(" forward = %s %s %s", ftos(gettaginfo_forward.x), ftos(gettaginfo_forward.y), ftos(gettaginfo_forward.z));
-                                       LOG_INFOF(" right = %s %s %s", ftos(gettaginfo_right.x), ftos(gettaginfo_right.y), ftos(gettaginfo_right.z));
-                                       LOG_INFOF(" up = %s %s %s", ftos(gettaginfo_up.x), ftos(gettaginfo_up.y), ftos(gettaginfo_up.z));
+                                       LOG_HELPF(" vector = %s %s %s", ftos(v.x), ftos(v.y), ftos(v.z));
+                                       LOG_HELPF(" offset = %s %s %s", ftos(gettaginfo_offset.x), ftos(gettaginfo_offset.y), ftos(gettaginfo_offset.z));
+                                       LOG_HELPF(" forward = %s %s %s", ftos(gettaginfo_forward.x), ftos(gettaginfo_forward.y), ftos(gettaginfo_forward.z));
+                                       LOG_HELPF(" right = %s %s %s", ftos(gettaginfo_right.x), ftos(gettaginfo_right.y), ftos(gettaginfo_right.z));
+                                       LOG_HELPF(" up = %s %s %s", ftos(gettaginfo_up.x), ftos(gettaginfo_up.y), ftos(gettaginfo_up.z));
                                        if (argc >= 6)
                                        {
                                                v.y = -v.y;
@@ -822,7 +826,7 @@ void GameCommand_gettaginfo(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]");
+                       LOG_HELP("Usage:^3 sv_cmd gettaginfo <model> <frame> <index> [<command1>] [<command2>]");
                        LOG_HELP("See also: ^2bbox, trace^7");
                        return;
                }
@@ -881,7 +885,7 @@ void GameCommand_animbench(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]");
+                       LOG_HELP("Usage:^3 sv_cmd animbench <model> <frame1> <frame2>");
                        LOG_HELP("See also: ^2bbox, trace^7");
                        return;
                }
@@ -894,6 +898,11 @@ void GameCommand_gotomap(int request, int argc)
        {
                case CMD_REQUEST_COMMAND:
                {
+                       if (!world_initialized)
+                       {
+                               LOG_INFOF("This command works only when the server is running.");
+                               return;
+                       }
                        if (argv(1))
                        {
                                LOG_INFO(GotoMap(argv(1)));
@@ -905,8 +914,8 @@ void GameCommand_gotomap(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd gotomap map");
-                       LOG_HELP("  Where 'map' is the *.bsp file to change to.");
+                       LOG_HELP("Usage:^3 sv_cmd gotomap <map>");
+                       LOG_HELP("  Where <map> is the *.bsp file to change to.");
                        LOG_HELP("See also: ^2gametype^7");
                        return;
                }
@@ -980,13 +989,13 @@ void GameCommand_moveplayer(int request, int argc)
                        string targets = strreplace(",", " ", argv(1));
                        string original_targets = strreplace(" ", ", ", targets);
                        string destination = argv(2);
+                       if (destination == "spec")
+                               destination = "spectator";
 
-                       string successful, t;
-                       successful = string_null;
-
-                       // lets see if the target(s) even actually exist.
                        if ((targets) && (destination))
                        {
+                               string successful = string_null;
+                               string t;
                                for ( ; targets; )
                                {
                                        t = car(targets);
@@ -998,98 +1007,91 @@ void GameCommand_moveplayer(int request, int argc)
 
                                        if (accepted <= 0)
                                        {
-                                               LOG_INFO("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : "."));
-                                               continue;
+                                               LOG_INFO("moveplayer: ", GetClientErrorString(accepted, t), ".");
                                        }
-
-                                       // Where are we putting this player?
-                                       if (destination == "spec" || destination == "spectator")
+                                       else if (destination == "spectator")
                                        {
+                                               string pl_name = playername(client.netname, client.team, false);
                                                if (!IS_SPEC(client) && !IS_OBSERVER(client))
                                                {
-                                                       if (client.caplayer) client.caplayer = 0;
-                                                       PutObserverInServer(client);
+                                                       PutObserverInServer(client, true);
 
-                                                       successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
+                                                       successful = strcat(successful, (successful ? ", " : ""), pl_name);
                                                }
                                                else
                                                {
-                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already spectating.");
+                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", pl_name, ") is already spectating.");
                                                }
-                                               continue;
                                        }
                                        else
                                        {
-                                               if (!IS_SPEC(client) && !IS_OBSERVER(client))
+                                               if (!teamplay)
                                                {
-                                                       if (teamplay)
-                                                       {
-                                                               // set up
-                                                               int save = Player_GetForcedTeamIndex(client);
-                                                               Player_SetForcedTeamIndex(client, TEAM_FORCE_DEFAULT);
-
-                                                               // find the team to move the player to
-                                                               int team_num = Team_ColorToTeam(destination);
-                                                               entity balance;
-                                                               if (team_num == client.team)  // already on the destination team
-                                                               {
-                                                                       // keep the forcing undone
-                                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already on the ", Team_ColoredFullName(client.team), (targets ? "^7, skipping to next player.\n" : "^7."));
-                                                                       continue;
-                                                               }
-                                                               else if (team_num == 0)  // auto team
-                                                               {
-                                                                       balance = TeamBalance_CheckAllowedTeams(client);
-                                                                       team_num = Team_IndexToTeam(TeamBalance_FindBestTeam(balance, client, false));
-                                                               }
-                                                               else
-                                                               {
-                                                                       balance = TeamBalance_CheckAllowedTeams(client);
-                                                               }
-                                                               Player_SetForcedTeamIndex(client, save);
+                                                       LOG_INFO("Can't change teams when currently not playing a team game.");
+                                                       return;
+                                               }
 
-                                                               // Check to see if the destination team is even available
-                                                               int team_id = Team_TeamToIndex(team_num);
-                                                               if (team_id == -1)
-                                                               {
-                                                                       LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist.");
-                                                                       TeamBalance_Destroy(balance);
-                                                                       return;
-                                                               }
-                                                               if (!TeamBalance_IsTeamAllowed(balance, team_id))
-                                                               {
-                                                                       LOG_INFOF("Sorry, can't move player to %s team if it doesn't exist.", destination);
-                                                                       TeamBalance_Destroy(balance);
-                                                                       return;
-                                                               }
-                                                               TeamBalance_Destroy(balance);
+                                               string pl_name = playername(client.netname, client.team, false);
+                                               if (IS_SPEC(client) || IS_OBSERVER(client))
+                                               {
+                                                       // well technically we could, but should we allow that? :P
+                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", pl_name, ") is not in the game.");
+                                                       continue;
+                                               }
 
-                                                               // If so, lets continue and finally move the player
-                                                               Player_SetForcedTeamIndex(client, TEAM_FORCE_DEFAULT);
-                                                               if (MoveToTeam(client, team_id, 6))
-                                                               {
-                                                                       successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
-                                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.");
-                                                               }
-                                                               else
-                                                               {
-                                                                       LOG_INFO("Unable to move player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ")");
-                                                               }
-                                                               continue;
-                                                       }
-                                                       else
-                                                       {
-                                                               LOG_INFO("Can't change teams when currently not playing a team game.");
-                                                               return;
-                                                       }
+                                               // set up
+                                               int save = Player_GetForcedTeamIndex(client);
+                                               Player_SetForcedTeamIndex(client, TEAM_FORCE_DEFAULT);
+
+                                               // find the team to move the player to
+                                               int team_num = Team_ColorToTeam(destination);
+                                               entity balance;
+                                               if (team_num == client.team)  // already on the destination team
+                                               {
+                                                       // keep the forcing undone
+                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", pl_name, ") is already on the ", Team_ColoredFullName(team_num), ".");
+                                                       continue;
+                                               }
+                                               else if (team_num == 0)  // auto team
+                                               {
+                                                       balance = TeamBalance_CheckAllowedTeams(client);
+                                                       team_num = Team_IndexToTeam(TeamBalance_FindBestTeam(balance, client, false));
                                                }
                                                else
                                                {
-                                                       LOG_INFO("Can't change teams if the player isn't in the game.");  // well technically we could, but should we allow that? :P
+                                                       balance = TeamBalance_CheckAllowedTeams(client);
+                                               }
+                                               Player_SetForcedTeamIndex(client, save);
+
+                                               // Check to see if the destination team is even available
+                                               int team_id = Team_TeamToIndex(team_num);
+                                               if (team_id == -1)
+                                               {
+                                                       LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist.");
+                                                       TeamBalance_Destroy(balance);
                                                        return;
                                                }
+                                               if (!TeamBalance_IsTeamAllowed(balance, team_id))
+                                               {
+                                                       LOG_INFOF("Sorry, can't move player to %s team if it doesn't exist.", destination);
+                                                       TeamBalance_Destroy(balance);
+                                                       return;
+                                               }
+                                               TeamBalance_Destroy(balance);
+
+                                               // If so, lets continue and finally move the player
+                                               Player_SetForcedTeamIndex(client, TEAM_FORCE_DEFAULT);
+                                               if (MoveToTeam(client, team_id, 6))
+                                               {
+                                                       successful = strcat(successful, (successful ? ", " : ""), pl_name);
+                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", pl_name, ") has been moved to the ", Team_ColoredFullName(team_num), "^7.");
+                                               }
+                                               else
+                                               {
+                                                       LOG_INFO("Unable to move player ", ftos(GetFilteredNumber(t)), " (", pl_name, ")");
+                                               }
                                        }
-                               }
+                               } // loop end
 
                                if (successful) bprint("Successfully moved players ", successful, " to destination ", destination, ".\n");
                                else LOG_INFO("No players given (", original_targets, ") are able to move.");
@@ -1102,10 +1104,10 @@ void GameCommand_moveplayer(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd moveplayer clients destination");
-                       LOG_HELP("  'clients' is a list (separated by commas) of player entity ID's or nicknames");
-                       LOG_HELP("  'destination' is what to send the player to, be it team or spectating");
-                       LOG_HELP("  Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"");
+                       LOG_HELP("Usage:^3 sv_cmd moveplayer <clients> <destination>");
+                       LOG_HELP("  <clients> is a list (separated by commas) of player entity ID's or nicknames");
+                       LOG_HELP("  <destination> is what to send the player to, be it team or spectating");
+                       LOG_HELP("  Full list of destinations here: spec, spectator, red, blue, yellow, pink, auto.");
                        LOG_HELP("Examples: sv_cmd moveplayer 1,3,5 red");
                        LOG_HELP("          sv_cmd moveplayer 2 spec");
                        LOG_HELP("See also: ^2allspec, shuffleteams^7");
@@ -1227,8 +1229,8 @@ void GameCommand_setbots(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd setbots botnumber");
-                       LOG_HELP("  Where 'botnumber' is the amount of bots to set bot_number cvar to.");
+                       LOG_HELP("Usage:^3 sv_cmd setbots <botnumber>");
+                       LOG_HELP("  Where <botnumber> is the amount of bots to set bot_number cvar to.");
                        LOG_HELP("See also: ^2bot_cmd^7");
                        return;
                }
@@ -1304,6 +1306,26 @@ void GameCommand_shuffleteams(int request)
        }
 }
 
+void GameCommand_reset(int request)
+{
+       switch (request)
+       {
+               case CMD_REQUEST_COMMAND:
+               {
+                       ReadyRestart(false);
+                       return;
+               }
+
+               default:
+               case CMD_REQUEST_USAGE:
+               {
+                       LOG_HELP("Usage:^3 sv_cmd reset");
+                       LOG_HELP("  No arguments required.");
+                       return;
+               }
+       }
+}
+
 void GameCommand_stuffto(int request, int argc)
 {
        // This... is a fairly dangerous and powerful command... - It allows any arguments to be sent to a client via rcon.
@@ -1338,9 +1360,9 @@ void GameCommand_stuffto(int request, int argc)
                                LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                        case CMD_REQUEST_USAGE:
                        {
-                               LOG_HELP("Usage:^3 sv_cmd stuffto client \"command\"");
-                               LOG_HELP("  'client' is the entity number or name of the player,");
-                               LOG_HELP("  and 'command' is the command to be sent to that player.");
+                               LOG_HELP("Usage:^3 sv_cmd stuffto <client> \"<command>\"");
+                               LOG_HELP("  <client> is the entity number or name of the player,");
+                               LOG_HELP("  and <command> is the command to be sent to that player.");
                                return;
                        }
                }
@@ -1511,7 +1533,7 @@ void GameCommand_trace(int request, int argc)
                                        }
                                }
 
-                                       // no default case, just go straight to invalid
+                               // no default case, just go straight to invalid
                        }
                }
 
@@ -1519,10 +1541,10 @@ void GameCommand_trace(int request, int argc)
                        LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd trace command [startpos endpos] [endpos_height]");
-                       LOG_HELP("  Where startpos and endpos are parameters for 'walk' and 'showline' commands,");
-                       LOG_HELP("  'endpos_height' is an optional parameter for 'walk' command,");
-                       LOG_HELP("  Full list of commands here: \"debug, debug2, walk, showline.\"");
+                       LOG_HELP("Usage:^3 sv_cmd trace <command> [<startpos> <endpos>] [<endpos_height>]");
+                       LOG_HELP("  Where <startpos> and <endpos> are parameters for the 'walk' and 'showline' commands,");
+                       LOG_HELP("  <endpos_height> is an optional parameter for the 'walk' command,");
+                       LOG_HELP("  Full list of commands here: debug, debug2, walk, showline.");
                        LOG_HELP("See also: ^2bbox, gettaginfo^7");
                        return;
                }
@@ -1587,9 +1609,9 @@ void GameCommand_warp(int request, int argc)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       LOG_HELP("Usage:^3 sv_cmd warp [level]");
-                       LOG_HELP("  'level' is the level to change campaign mode to.");
-                       LOG_HELP("  if 'level' is not provided it will change to the next level.");
+                       LOG_HELP("Usage:^3 sv_cmd warp [<level>]");
+                       LOG_HELP("  <level> is the level to change campaign mode to.");
+                       LOG_HELP("  if <level> is not provided it will change to the next level.");
                        return;
                }
        }
@@ -1625,7 +1647,7 @@ void GameCommand_(int request)
 
 // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
 SERVER_COMMAND(adminmsg, "Send an admin message to a client directly") { GameCommand_adminmsg(request, arguments); }
-SERVER_COMMAND(allready, "Restart the server and reset the players") { GameCommand_allready(request); }
+SERVER_COMMAND(allready, "Ends warmup and starts the match") { GameCommand_allready(request); }
 SERVER_COMMAND(allspec, "Force all players to spectate") { GameCommand_allspec(request, arguments); }
 SERVER_COMMAND(anticheat, "Create an anticheat report for a client") { GameCommand_anticheat(request, arguments); }
 SERVER_COMMAND(animbench, "Benchmark model animation (LAGS)") { GameCommand_animbench(request, arguments); }
@@ -1648,6 +1670,7 @@ SERVER_COMMAND(nospectators, "Automatically remove spectators from a match") { G
 SERVER_COMMAND(printstats, "Dump eventlog player stats and other score information") { GameCommand_printstats(request); }
 SERVER_COMMAND(radarmap, "Generate a radar image of the map") { GameCommand_radarmap(request, arguments); }
 SERVER_COMMAND(reducematchtime, "Decrease the timelimit value incrementally") { GameCommand_reducematchtime(request); }
+SERVER_COMMAND(reset, "Soft restart the server and reset the players") { GameCommand_reset(request); }
 SERVER_COMMAND(setbots, "Adjust how many bots are in the match") { GameCommand_setbots(request, arguments); }
 SERVER_COMMAND(shuffleteams, "Randomly move players to different teams") { GameCommand_shuffleteams(request); }
 SERVER_COMMAND(stuffto, "Send a command to be executed on a client") { GameCommand_stuffto(request, arguments); }
@@ -1716,8 +1739,8 @@ void GameCommand(string command)
                        LOG_HELP("\nGeneric commands shared by all programs:");
                        GenericCommand_macro_help();
 
-                       LOG_HELP("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are listed above.\n"
-                               "For help about a specific command, type sv_cmd help COMMAND");
+                       LOG_HELP("\nUsage:^3 sv_cmd <command>^7, where possible commands are listed above.\n"
+                               "For help about a specific command, type sv_cmd help <command>");
 
                        return;
                }