From: z411 Date: Sun, 12 Dec 2021 17:58:54 +0000 (-0300) Subject: Change command name from reset to resetmatch X-Git-Tag: xonotic-v0.8.5~253^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1595461f25337356625051372b1bfaa218066bd8;p=xonotic%2Fxonotic-data.pk3dir.git Change command name from reset to resetmatch --- diff --git a/commands.cfg b/commands.cfg index f45e63430..a6162badf 100644 --- a/commands.cfg +++ b/commands.cfg @@ -229,7 +229,7 @@ alias nospectators "qc_cmd_sv nospectators ${* ?}" // Automa alias printstats "qc_cmd_sv printstats ${* ?}" // Dump eventlog player stats and other score information alias radarmap "qc_cmd_sv radarmap ${* ?}" // Generate a radar image of the map alias reducematchtime "qc_cmd_sv reducematchtime ${* ?}" // Decrease the timelimit value incrementally -alias reset "qc_cmd_sv reset ${* ?}" // Soft restart the map +alias resetmatch "qc_cmd_sv resetmatch ${* ?}" // Soft restart the map alias setbots "qc_cmd_sv setbots ${* ?}" // Adjust how many bots are in the match alias shuffleteams "qc_cmd_sv shuffleteams ${* ?}" // Randomly move players to different teams alias stuffto "qc_cmd_sv stuffto ${* ?}" // Send a command to be executed on a client @@ -308,7 +308,7 @@ set sv_vote_command_restriction_endmatch "0" set sv_vote_command_restriction_reducematchtime "0" set sv_vote_command_restriction_extendmatchtime "0" set sv_vote_command_restriction_allready "0" -set sv_vote_command_restriction_reset "0" +set sv_vote_command_restriction_resetmatch "0" set sv_vote_command_restriction_kick "1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;" // enough space for ban reason set sv_vote_command_restriction_kickban "1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;" // enough space for ban reason set sv_vote_command_restriction_cointoss "0" @@ -329,7 +329,7 @@ set sv_vote_command_help_gotomap "\nUsage:^3 vcall gotomap mapname\n^7 Where 'm // ================================= set sv_vote_call 1 "Allow users to call a vote for the commands in sv_vote_commands" set sv_vote_change 1 "Allow voters to change their mind after already voting" -set sv_vote_commands "restart fraglimit gotomap nextmap endmatch reducematchtime extendmatchtime allready reset kick cointoss movetoauto shuffleteams bots nobots" "these commands can be voted by players or used directly by masters (vdo) in addition to sv_vote_master_commands" +set sv_vote_commands "restart fraglimit gotomap nextmap endmatch reducematchtime extendmatchtime allready resetmatch kick cointoss movetoauto shuffleteams bots nobots" "these commands can be voted by players or used directly by masters (vdo) in addition to sv_vote_master_commands" set sv_vote_only_commands "" set sv_vote_limit 160 "Maximum allowed length of a vote command" set sv_vote_master_commands "movetored movetoblue movetoyellow movetopink movetospec" "Extra commands which vote masters can execute by themselves, along with the normal sv_vote_commands." // maybe add kickban here (but then sv_vote_master 0) @@ -379,4 +379,4 @@ alias vdoend "vdo endmatch" // rcon server commands // ====================== rcon_secure 1 -set rcon_restricted_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready reset kick cointoss movetoauto shuffleteams bots nobots movetored movetoblue movetoyellow movetopink movetospec kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\"" +set rcon_restricted_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready resetmatch kick cointoss movetoauto shuffleteams bots nobots movetored movetoblue movetoyellow movetopink movetospec kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\"" diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index d2848ac60..16008bd59 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -1306,7 +1306,7 @@ void GameCommand_shuffleteams(int request) } } -void GameCommand_reset(int request) +void GameCommand_resetmatch(int request) { switch (request) { @@ -1319,7 +1319,7 @@ void GameCommand_reset(int request) default: case CMD_REQUEST_USAGE: { - LOG_HELP("Usage:^3 sv_cmd reset"); + LOG_HELP("Usage:^3 sv_cmd resetmatch"); LOG_HELP(" No arguments required."); return; } @@ -1670,7 +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 game without changing teams; goes back to warmup if enabled") { GameCommand_reset(request); } +SERVER_COMMAND(resetmatch, "Soft restart the game without changing teams; goes back to warmup if enabled") { GameCommand_resetmatch(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); } diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 097b7e133..550919d73 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -768,7 +768,7 @@ int VoteCommand_parse(entity caller, string vote_command, string vote_list, floa case "allready": { if(!warmup_stage) { - print_to(caller, "Game already started. Use the reset command to restart the match."); + print_to(caller, "Game already started. Use the resetmatch command to restart the match."); return -1; }