X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=commands.cfg;h=c034a9cfaa95fbdf3e595b878e9b9631683c09e9;hb=48e100236aa1c8f908502130ee0b7da30d9b5f98;hp=b75030490c575b29270eeb200251014939ab6130;hpb=a50c56436b75ccfc71ca376320b26f02050ad94c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/commands.cfg b/commands.cfg index b75030490..c034a9cfa 100644 --- a/commands.cfg +++ b/commands.cfg @@ -2,11 +2,6 @@ // Master config for managing various command aliases and settings // ================================================================= -// This alias allows for common commands to be executed, even on both -// dedicated servers and normal clients. If dedicated, then it remains -// as sv_cmd... If a normal client, then it is changed to menu_cmd. -alias qc_cmd "sv_cmd $*" - // Execute commands based on whether it is dedicated a server or a client. alias "_detect_dedicated_$qport" "${* asis}" alias "_detect_dedicated_0" "" @@ -16,40 +11,47 @@ alias if_dedicated "${* asis}" _if_dedicated alias if_client "" if_client alias if_dedicated "" -if_client alias cmd_prefix "cmd" -if_dedicated alias cmd_prefix "sv_cmd" +if_client set cmd_prefix "cmd" +if_dedicated set cmd_prefix "sv_cmd" + +if_dedicated "alias" qc_cmd_svmenu "sv_cmd $$*" +if_client "alias" qc_cmd_svmenu "menu_cmd $$*" +if_dedicated "alias" qc_cmd_svcl "sv_cmd $$*" +if_client "alias" qc_cmd_svcl "cl_cmd $$*" +if_dedicated "alias" qc_cmd_svcmd "sv_cmd $$*" +if_client "alias" qc_cmd_svcmd "cmd $$*" // ======== // common // ======== -alias cvar_changes "${cmd_prefix !} cvar_changes" -alias cvar_purechanges "${cmd_prefix !} cvar_purechanges" -alias info "${cmd_prefix !} info ${* ?}" -alias ladder "${cmd_prefix !} ladder" -alias lsmaps "${cmd_prefix !} lsmaps" -alias lsnewmaps "${cmd_prefix !} lsnewmaps" -alias maplist "${cmd_prefix !} maplist" -alias rankings "${cmd_prefix !} rankings" -alias records "${cmd_prefix !} records" -alias teamstatus "${cmd_prefix !} teamstatus" -alias time "${cmd_prefix !} time" -alias timein "${cmd_prefix !} timein" -alias timeout "${cmd_prefix !} timeout" -alias vote "${cmd_prefix !} vote ${* ?}" -alias who "${cmd_prefix !} who" - -alias g_hitplots_add "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals ${1 !} union def" -alias g_hitplots_remove "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals ${1 !} difference def" - -alias g_maplist_add "qc_cmd maplist add ${* ?}" -alias g_maplist_remove "qc_cmd maplist remove ${* ?}" -alias g_maplist_putfirst "qc_cmd maplist remove ${* ?} ; qc_cmd maplist add ${* ?}" -alias g_maplist_shufflenow "qc_cmd maplist shuffle" -alias g_maplist_cleanup "qc_cmd maplist cleanup" // removes maps that don't exist from the map list - -alias addfav "qc_cmd addtolist net_slist_favorites ${* ?}" -alias addvote "qc_cmd addtolist sv_vote_commands ${* ?}" +alias cvar_changes "qc_cmd_svcmd cvar_changes" +alias cvar_purechanges "qc_cmd_svcmd cvar_purechanges" +alias info "qc_cmd_svcmd info ${* ?}" +alias ladder "qc_cmd_svcmd ladder" +alias lsmaps "qc_cmd_svcmd lsmaps" +alias lsnewmaps "qc_cmd_svcmd lsnewmaps" +alias maplist "qc_cmd_svcmd maplist" +alias rankings "qc_cmd_svcmd rankings" +alias records "qc_cmd_svcmd records" +alias teamstatus "qc_cmd_svcmd teamstatus" +alias time "qc_cmd_svcmd time" +alias timein "qc_cmd_svcmd timein" +alias timeout "qc_cmd_svcmd timeout" +alias vote "qc_cmd_svcmd vote ${* ?}" +alias who "qc_cmd_svcmd who ${* ?}" + +alias g_hitplots_add "qc_cmd_svmenu rpn /g_hitplots_individuals g_hitplots_individuals ${1 !} union def" +alias g_hitplots_remove "qc_cmd_svmenu rpn /g_hitplots_individuals g_hitplots_individuals ${1 !} difference def" + +alias g_maplist_add "qc_cmd_svmenu maplist add ${* ?}" +alias g_maplist_remove "qc_cmd_svmenu maplist remove ${* ?}" +alias g_maplist_putfirst "qc_cmd_svmenu maplist remove ${* ?} ; qc_cmd maplist add ${* ?}" +alias g_maplist_shufflenow "qc_cmd_svmenu maplist shuffle" +alias g_maplist_cleanup "qc_cmd_svmenu maplist cleanup" // removes maps that don't exist from the map list + +alias addfav "qc_cmd_svmenu addtolist net_slist_favorites ${* ?}" +alias addvote "qc_cmd_svmenu addtolist sv_vote_commands ${* ?}" // ======================== @@ -72,6 +74,7 @@ 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" // command executed before loading a map by the menu // makes sure maxplayers is at least minplayers or bot_number + 1 @@ -87,9 +90,11 @@ if_client alias blurtest "cl_cmd blurtest" if_client alias debugmodel "cl_cmd debugmodel ${* ?}" //if_client alias handlevote "cl_cmd handlevote ${* ?}" if_client alias hud "cl_cmd hud ${* ?}" +if_client alias localprint "cl_cmd localprint ${* ?}" //if_client alias mv_download "cl_cmd mv_download ${* ?}" if_client alias sendcvar "cl_cmd sendcvar ${* ?}" //if_client alias settemp "cl_cmd settemp ${* ?}" +//if_client alias settemp_restore "cl_cmd settemp_restore" // other aliases for local commands if_client alias hud_configure "cl_cmd hud configure" @@ -106,7 +111,7 @@ alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\"" // cmd (client-to-server command) - server/command/cmd.qc // ======================================================== set sv_clientcommand_antispam_time 1 "Amount of seconds after a command before another command can be called again without being considered spam. (Use -1 for no antispam limit)" -set sv_clientcommand_antispam_count 5 "Amount of commands considered spam before commands are rejected. +set sv_clientcommand_antispam_count 8 "Amount of commands considered spam before commands are rejected." seta sv_status_privacy 1 "hide IP addresses from \"status\" and \"who\" replies shown to clients" seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying" @@ -198,14 +203,8 @@ alias movetoauto "moveplayer ${1 ?} auto" // Aliases for settemp subsystem. Warning: Do not touch. // Usage: settemp variable value, next map resets it. // ======================================================= -set settemp_list 0 -set settemp_idx 0 -set _settemp_var UNUSED -alias settemp "_settemp_var \"_settemp_x$settemp_idx\"; qc_cmd rpn /settemp_idx settemp_idx 1 add def; _settemp \"$1\" \"$2\"" -alias _settemp "settemp_list \"1 $1 $_settemp_var $settemp_list\"; set $_settemp_var \"${$1}\"; $1 \"$2\"" -alias settemp_restore "_settemp_restore_${settemp_list asis}" -alias _settemp_restore_0 "set settemp_var 0; set settemp_list 0" -alias _settemp_restore_1 "$1 \"${$2}\"; _settemp_restore_${3- asis}" +alias settemp "qc_cmd_svcl settemp $$*" +alias settemp_restore "qc_cmd_svcl settemp_restore" // =================================== @@ -222,13 +221,14 @@ alias unban "sv_cmd unban ${* ?}" // usage: unban 3 (number from bans) // ================================= 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 chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted" +set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto" "these commands can be voted" set sv_vote_only_commands "" -set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" "maybe add kickban here (but then sv_vote_master 0)" +set sv_vote_master_commands "movetored movetoblue movetoyellow movetopink" "Commands which vote masters can execute by themselves" // 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_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" 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 30 "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" @@ -264,4 +264,10 @@ alias vdoend "vdo endmatch" // 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\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" +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" + +// ============================= +// other miscellaneous aliases +// ============================= +alias autoscreenshot "screenshot screenshots/autoscreenshot/${1 !}-${2 !}.jpg; echo \"^5A screenshot has been taken at request of the server.\"" +