X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=commands.cfg;h=79366e4b703af1967b2ef20e8a1299536d4d9974;hb=94f293de630d6173c5303adf65e45d4f4a83863a;hp=d009e13d67df48e5224ac7488b28834650762ff4;hpb=86c9dc7c3696c329496b06375c1e79fb407401ce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/commands.cfg b/commands.cfg
index d009e13d6..79366e4b7 100644
--- a/commands.cfg
+++ b/commands.cfg
@@ -172,7 +172,7 @@ alias team_pink "cmd selectteam pink; cmd join"
 alias team_yellow "cmd selectteam yellow; cmd join"
 alias team_auto "cmd selectteam auto; cmd join"
 
-alias spec "spectate"
+alias spec "spectate ${* ?}"
 
 // mutator aliases
 alias sandbox "cmd g_sandbox ${* ?}"
@@ -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
@@ -235,6 +235,7 @@ alias movetoblue "moveplayer ${1 ?} blue"
 alias movetopink "moveplayer ${1 ?} pink"
 alias movetoyellow "moveplayer ${1 ?} yellow"
 alias movetoauto "moveplayer ${1 ?} auto"
+alias movetospec "moveplayer ${1 ?} spec"
 
 
 // =======================================================
@@ -299,6 +300,12 @@ set sv_vote_command_restriction_movetored "1;"
 set sv_vote_command_restriction_movetoblue "1;"
 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
@@ -308,9 +315,9 @@ set sv_vote_change 1 "Allow voters to change their mind after already voting"
 set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams" "these commands can be voted"
 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" "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)
-set sv_vote_master 1	"Allows the use of the vote master system"
-set sv_vote_master_callable 1 "When set, users can use \"vmaster\" to call a vote to become master of voting commands"
+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)
+set sv_vote_master 0	"Allows the use of the vote master system"
+set sv_vote_master_callable 0 "When set, users can use \"vmaster\" to call a vote to become master of voting commands"
 set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master"
 set sv_vote_master_playerlimit 2 "Minimum number of players needed for a player to be allowed to vote for master"
 set sv_vote_no_stops_vote 1 "Allow the vote caller to stop his own vote simply by voting no"
@@ -335,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"
 
@@ -355,4 +362,4 @@ alias vext "vcall extendmatchtime"
 //  rcon server commands
 // ======================
 rcon_secure 1
-set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoauto movetored movetoblue movetoyellow movetopink"
+set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoauto movetored movetoblue movetoyellow movetopink movetospec"