X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=commands.cfg;h=ea4a41396fcfad5a4619661232e016c036350490;hb=37420850358de2c3ca095265ece240ca3051a126;hp=a6162badf4037b12ecdc6a15bd90b55b8e3e44d2;hpb=1cce8f153ec4ca4bce79cfcea74c949b9395cd07;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/commands.cfg b/commands.cfg index a6162badf..ea4a41396 100644 --- a/commands.cfg +++ b/commands.cfg @@ -111,12 +111,13 @@ alias tdem "timedemo $1" // =============================================== // menu_cmd (menu command) - menu/command/menu_cmd.qc // =============================================== +alias menu_showwelcomedialog "menu_cmd directmenu Welcome" alias menu_showteamselect "menu_cmd directmenu TeamSelect" alias menu_showhudexit "menu_cmd directmenu HUDExit" alias menu_showhudoptions "menu_cmd directpanelhudmenu ${* ?}" alias menu_showsandboxtools "menu_cmd directmenu SandboxTools" alias menu_showquitdialog "menu_cmd directmenu Quit" -alias menu_showdisconnectdialog "menu_cmd directmenu Disconnect" +alias menu_showgamemenudialog "menu_cmd directmenu GameMenu" alias menu_showmonstertools "menu_cmd directmenu MonsterTools" // command executed before loading a map by the menu @@ -149,6 +150,10 @@ alias radar "qc_cmd_cl hud radar ${* ?}" alias scoreboard_columns_help "qc_cmd_cl hud scoreboard_columns_help" alias scoreboard_columns_set "qc_cmd_cl hud scoreboard_columns_set ${* ?}" +set _scoreboard_team_selection_available 0 // set to 1 by CSQC +alias _team_selection_show1 "_scoreboard_team_selection 1" +alias _team_selection_show0 menu_showteamselect +alias team_selection_show "_team_selection_show$_scoreboard_team_selection_available" // ======================================================== // cmd (client-to-server command) - server/command/cmd.qc @@ -184,7 +189,7 @@ alias team_red "cmd selectteam red; cmd join" alias team_blue "cmd selectteam blue; cmd join" 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 team_auto "togglemenu 0; cmd selectteam auto; cmd join" alias spec "spectate ${* ?}" @@ -238,7 +243,8 @@ alias unlockteams "qc_cmd_sv unlockteams ${* ?}" // Enable alias warp "qc_cmd_sv warp ${* ?}" // Choose different level in campaign // other aliases for server commands -alias endmatch "timelimit -1" +set _endmatch 0 "if set to 1 ends the match immediately; use it instead of timelimit -1 (deprecated)" +alias endmatch "_endmatch 1" alias bots "minplayers 4; minplayers_per_team 2" alias nobots "minplayers 0; minplayers_per_team 0" @@ -263,17 +269,38 @@ alias settemp_restore "qc_cmd_svcl settemp_restore" // =================================== -// banning - server/command/ipban.qc +// banning - server/ipban.qc // =================================== alias ban "qc_cmd_sv ban ${* ?}" // Ban an IP address or a range of addresses (like 1.2.3) alias banlist "qc_cmd_sv banlist ${* ?}" // List all existing bans alias kickban "qc_cmd_sv kickban ${* ?}" // Disconnect a client and ban it at the same time alias mute "qc_cmd_sv mute ${* ?}" // Disallow a client from talking by muting them alias unban "qc_cmd_sv unban ${* ?}" // Remove an existing ban -alias unmute "qc_cmd_sv unmute ${* ?}" // Unmute a client +alias unmute "qc_cmd_sv unmute ${* ?}" // Unmute a client (Remove an existing muting ban) + +// alternative aliases for ban commands +alias bans "qc_cmd_sv banlist ${* ?}" +alias muteban "qc_cmd_sv mute ${* ?}" +alias unmuteban "qc_cmd_sv unmute ${* ?}" + + + +// Client +alias ignore "qc_cmd_cmd ignore ${* ?}" // Keep client out of your personal chat log for a match +alias unignore "qc_cmd_cmd unignore ${* ?}" // Remove an existing ignored client +alias clear_ignores "qc_cmd_cmd clear_ignores" // Remove all existing ignored clients + +// Server +alias playban "qc_cmd_sv playban ${* ?}" // Ban disallowing a client from playing (forced to spectate) +alias unplayban "qc_cmd_sv unplayban ${* ?}" // Remove an existing play ban client +alias voteban "qc_cmd_sv voteban ${* ?}" // Ban disallowing a client from voting +alias unvoteban "qc_cmd_sv unvoteban ${* ?}" // Remove an existing vote ban client + +// other aliases for muteban, playban and voteban lists +alias mutebans "g_muteban_list ${* ?}" +alias playbans "g_playban_list ${* ?}" +alias votebans "g_voteban_list ${* ?}" -// other aliases for ban commands -alias bans "banlist" // character classes (intersected with 32..126 minus ", $, ;, ^, \ - if you // want these, include them explicitly) @@ -337,14 +364,15 @@ 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, then run master commands directly using vdo" 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" +set sv_vote_no_stops_vote 1 "Allow the vote caller to stop their own vote simply by voting no" set sv_vote_singlecount 0 "set to 1 to count votes once after timeout or to 0 to count with every vote" set sv_vote_timeout 24 "a vote will timeout after this many seconds" -set sv_vote_wait 120 "a player can not call a vote again for this many seconds when his vote was not accepted" -set sv_vote_stop 15 "a player can not call a vote again for this many seconds when he stopped this vote (e.g. to correct it)" +set sv_vote_wait 120 "a player can not call a vote again for this many seconds when their vote was not accepted" +set sv_vote_stop 15 "a player can not call a vote again for this many seconds when they stopped this vote (e.g. to correct it)" set sv_vote_majority_factor 0.5 "What percentage of the PLAYERS constitute a majority? (Must be at least 0.5, recommended: 0.5)" set sv_vote_majority_factor_of_voted 0.5 "What percentage of the VOTERS constitute a majority too? (Must be at least 0.5, recommended: 0.5)" set sv_vote_gamestart 0 "Allow voting during map change" +set sv_vote_debug 0 "count votes by bots too for debugging purposes (to get a bot to vote exec this command: bot_cmd 1 cc vote yes) // when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities" set sv_vote_override_mostrecent 0