X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=commands.cfg;h=798104a68c065d0d5dfd1c9265c02886f06c6237;hb=HEAD;hp=d5b03ee3e4dc89d5b120f75c9e211088240ae850;hpb=ee6a8d98fd285c5625e938984daa6fe2fd949d96;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/commands.cfg b/commands.cfg index d5b03ee3e..ae8719a0f 100644 --- a/commands.cfg +++ b/commands.cfg @@ -2,15 +2,27 @@ // Master config for managing various command aliases and settings // ================================================================= -// Execute commands based on whether it is dedicated a server or a client. -alias "_detect_dedicated_$qport" "${* asis}" +// create if_client and if_dedicated aliases that allow executing commands based on +// whether it is a dedicated server or a client +alias _def_detect_dedicated "alias _detect_dedicated_${qport ?} \"\"" +_def_detect_dedicated +alias "_detect_dedicated_" "${* asis}" +alias "_detect_dedicated_${qport ?}" "${* asis}" alias "_detect_dedicated_0" "" -alias _if_dedicated "_detect_dedicated_$qport ${* asis}" +alias _if_dedicated "_detect_dedicated_${qport ?} ${* asis}" alias if_client "${* asis}" alias if_dedicated "${* asis}" _if_dedicated alias if_client "" if_client alias if_dedicated "" +// these aliases are now useless, remove them +// NOTE for some reason _detect_dedicated_ no longer exists in dedicated +unalias _def_detect_dedicated +if_client unalias "_detect_dedicated_" +unalias "_detect_dedicated_${qport ?}" +unalias _detect_dedicated_0 +unalias _if_dedicated + // for easy access by QC if_dedicated set is_dedicated 1 if_client set is_dedicated 0 @@ -112,7 +124,6 @@ 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" @@ -150,10 +161,16 @@ 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 ${* ?}" +seta team_selection_type 1 "Team selection type: 0 menu, 1 scoreboard" 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" +alias _team_selection_show00 "menu_cmd directmenu TeamSelect" +alias _team_selection_show01 "menu_cmd directmenu TeamSelect" +alias _team_selection_show10 "menu_cmd directmenu TeamSelect" +alias _team_selection_show11 "_scoreboard_team_selection 1" +alias team_selection_show "_team_selection_show${_scoreboard_team_selection_available}${team_selection_type}" + +// legacy alias +alias menu_showteamselect team_selection_show // ======================================================== // cmd (client-to-server command) - server/command/cmd.qc @@ -165,20 +182,22 @@ seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they ar // commented out commands are really only intended for internal use, or already have declaration in the engine alias autoswitch "qc_cmd_cmd autoswitch ${* ?}" // Whether or not to switch automatically when getting a better weapon +alias clear_bestcptimes "qc_cmd_cmd clear_bestcptimes ${* ?}" // Clear all your best checkpoint times for this Race/CTS match alias clientversion "qc_cmd_cmd clientversion ${* ?}" // Release version of the game alias join "qc_cmd_cmd join ${* ?}" // Become a player in the game +//alias kill "qc_cmd_cmd kill ${* ?}" // Become a member of the dead alias minigame "qc_cmd_cmd minigame ${* ?}" // Start a minigame //alias mv_getpicture "qc_cmd_cmd mv_getpicture ${* ?}" // Retrieve mapshot picture from the server alias physics "qc_cmd_cmd physics ${* ?}" // Change physics set -alias ready "qc_cmd_cmd ready ${* ?}" // Qualify as ready to end warmup stage (or restart server if allowed) -//alias say "qc_cmd_cmd say ${* ?}" // Print a message to chat to all players -//alias say_team "qc_cmd_cmd say_team ${* ?}" // Print a message to chat to all team mates +alias ready "qc_cmd_cmd ready ${* ?}" // Qualify as ready to end warmup stage +//alias say "qc_cmd_cmd say ${* ?}" // Send a public chat message to all players +//alias say_team "qc_cmd_cmd say_team ${* ?}" // Send a chat message to all team mates alias selectteam "qc_cmd_cmd selectteam ${* ?}" // Attempt to choose a team to join into alias selfstuff "qc_cmd_cmd selfstuff ${* ?}" // Stuffcmd a command to your own client alias sentcvar "qc_cmd_cmd sentcvar ${* ?}" // New system for sending a client cvar to the server -alias spectate "qc_cmd_cmd spectate ${* ?}" // Become an observer -alias suggestmap "qc_cmd_cmd suggestmap ${* ?}" // Suggest a map to the mapvote at match end -//alias tell "qc_cmd_cmd tell ${* ?}" // Send a message directly to a player +alias spectate "qc_cmd_cmd spectate ${* ?}" // Become a spectator +alias suggestmap "qc_cmd_cmd suggestmap ${* ?}" // Suggest a map to appear at the map voting screen +//alias tell "qc_cmd_cmd tell ${* ?}" // Send a private chat message to a player which may be visible to server admins alias voice "qc_cmd_cmd voice ${* ?}" // Send voice message via sound alias wpeditor "qc_cmd_cmd wpeditor ${* ?}" // Waypoint editor commands @@ -230,6 +249,7 @@ alias gotomap "qc_cmd_sv gotomap ${* ?}" // Simple 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 moveplayer "qc_cmd_sv moveplayer ${* ?}" // Change the team/status of a player +alias nextmap "qc_cmd_sv nextmap ${* ?}" // Set/Query the next map alias nospectators "qc_cmd_sv nospectators ${* ?}" // Automatically remove spectators from a match 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 @@ -269,7 +289,7 @@ 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 @@ -278,14 +298,19 @@ alias mute "qc_cmd_sv mute ${* ?}" // Disall alias unban "qc_cmd_sv unban ${* ?}" // Remove an existing ban alias unmute "qc_cmd_sv unmute ${* ?}" // Unmute a client (Remove an existing muting ban) -// other aliases for ban commands -alias bans "banlist" +// alternative aliases for ban commands +alias bans "qc_cmd_sv banlist ${* ?}" +alias muteban "qc_cmd_sv mute ${* ?}" +alias unmuteban "qc_cmd_sv unmute ${* ?}" +alias chatban "qc_cmd_sv mute ${* ?}" +alias unchatban "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 +alias ignore "qc_cmd_cmd ignore ${* ?}" // Ignore a player in the game keeping them out of your personal chat log +alias unignore "qc_cmd_cmd unignore ${* ?}" // Remove an existing ignore of a player +alias clear_ignores "qc_cmd_cmd clear_ignores" // Remove all existing ignores of players // Server alias playban "qc_cmd_sv playban ${* ?}" // Ban disallowing a client from playing (forced to spectate) @@ -294,7 +319,8 @@ alias voteban "qc_cmd_sv voteban ${* ?}" // Ban 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 mutebans "g_chatban_list ${* ?}" +alias chatbans "g_chatban_list ${* ?}" alias playbans "g_playban_list ${* ?}" alias votebans "g_voteban_list ${* ?}" @@ -369,6 +395,7 @@ set sv_vote_stop 15 "a player can not call a vote again for this many seconds wh 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