Merge branch 'master' into Lyberta/KillSound

[xonotic/xonotic-data.pk3dir.git] / commands.cfg

diff --git a/commands.cfg b/commands.cfg
index 93b68f901e57154ec7512a2d98830fce7ec168ad..79366e4b703af1967b2ef20e8a1299536d4d9974 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -185,6 +185,7 @@ alias skinmob "editmob skin ${* ?}"
 alias namemob "editmob name ${* ?}"
 alias movemob "editmob movetarget ${* ?}"
 alias butcher "editmob butcher ${* ?}"
+alias mobbutcher "editmob butcher ${* ?}"
 
 
 // ============================================================
@@ -209,7 +210,6 @@ alias gettaginfo           "qc_cmd_sv     gettaginfo           ${* ?}" // Get sp
 alias gotomap              "qc_cmd_sv     gotomap              ${* ?}" // Simple command to switch to another map
 alias lockteams            "qc_cmd_sv     lockteams            ${* ?}" // Disable the ability for players to switch or enter teams
 alias make_mapinfo         "qc_cmd_sv     make_mapinfo         ${* ?}" // Automatically rebuild mapinfo files
-alias mobbutcher           "qc_cmd_sv     mobbutcher           ${* ?}" // Remove all monsters on the map
 alias moveplayer           "qc_cmd_sv     moveplayer           ${* ?}" // Change the team/status of a player
 alias nospectators         "qc_cmd_sv     nospectators         ${* ?}" // Automatically remove spectators from a match
 alias playerdemo           "qc_cmd_sv     playerdemo           ${* ?}" // Control the ability to save demos of players
@@ -302,6 +302,11 @@ set sv_vote_command_restriction_movetoyellow "1;"
 set sv_vote_command_restriction_movetopink "1;"
 set sv_vote_command_restriction_movetospec "1;"
 
+// help messages for votes that aren't implemeneted in the game code
+// examples used here are based on the usage output of implemented votes
+set sv_vote_command_help_restart "\nUsage:^3 vcall restart\n^7  No arguments required."
+set sv_vote_command_help_gotomap "\nUsage:^3 vcall gotomap mapname\n^7  Where 'mapname' is the name of the map to go to.\n  Type ^3lsmaps^7 to get a list of available maps to vote for."
+
 // =================================
 //  voting - server/command/vote.qc
 // =================================
@@ -337,7 +342,7 @@ alias vabstain  "qc_cmd_cmd vote abstain"
 
 // aliases for both client and server
 alias vcall     "qc_cmd_svcmd vote call ${* ?}"
-alias vhelp     "qc_cmd_svcmd vote help"
+alias vhelp     "qc_cmd_svcmd vote help ${* ?}"
 alias vstatus   "qc_cmd_svcmd vote status"
 alias vstop     "qc_cmd_svcmd vote stop"