Merge branch 'master' into terencehill/itemstime

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

diff --git a/commands.cfg b/commands.cfg
index fa73f413fb37310d7e99ca599863c19c5cba4dc3..d5ad7830b1a78788f4b593645c7c4e67e6275511 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -12,8 +12,12 @@ _if_dedicated alias if_client ""
 if_client alias if_dedicated ""
 
 if_dedicated "alias" qc_cmd_sv     "sv_cmd $$*"
+if_client    "alias" qc_cmd_sv     "echo This command only works on servers: sv_cmd $${* !}"
+if_dedicated "alias" qc_cmd_cl     "echo This command only works on clients: cl_cmd $${* !}"
 if_client    "alias" qc_cmd_cl     "cl_cmd $$*"
+if_dedicated "alias" qc_cmd_cmd    "echo This command only works on clients: cmd $${* !}"
 if_client    "alias" qc_cmd_cmd    "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 $$*"
@@ -21,6 +25,9 @@ if_client    "alias" qc_cmd_svcl   "cl_cmd $$*"
 if_dedicated "alias" qc_cmd_svcmd  "sv_cmd $$*"
 if_client    "alias" qc_cmd_svcmd  "cmd $$*"
 
+if_dedicated "alias" help "sv_cmd help"
+if_client    "alias" help "cl_cmd help; cmd help"
+
 
 // ========
 //  common
@@ -32,7 +39,7 @@ alias info                 "qc_cmd_svcmd  info                 ${* ?}" // Reques
 alias ladder               "qc_cmd_svcmd  ladder               ${* ?}" // Get information about top players if supported
 alias lsmaps               "qc_cmd_svcmd  lsmaps               ${* ?}" // List maps which can be used with the current game mode
 alias lsnewmaps            "qc_cmd_svcmd  lsnewmaps            ${* ?}" // List maps which have no records or are seemingly unplayed yet
-alias maplist              "qc_cmd_svcmd  maplist              ${* ?}" // Display full server maplist reply
+alias printmaplist         "qc_cmd_svcmd  printmaplist         ${* ?}" // Display full server maplist reply
 alias rankings             "qc_cmd_svcmd  rankings             ${* ?}" // Print information about rankings
 alias records              "qc_cmd_svcmd  records              ${* ?}" // List top 10 records for the current map
 alias teamstatus           "qc_cmd_svcmd  teamstatus           ${* ?}" // Show information about player and team scores
@@ -43,9 +50,10 @@ alias vote                 "qc_cmd_svcmd  vote                 ${* ?}" // Reques
 alias who                  "qc_cmd_svcmd  who                  ${* ?}" // Display detailed client information about all players
 
 // generic commands (across all programs)
-alias addtolist            "qc_cmd_svmenu addtolist            ${* ?}" // Add a string to a cvar at the end of a list
+alias addtolist            "qc_cmd_svmenu addtolist            ${* ?}" // Add a string to a cvar
 alias dumpcommands         "qc_cmd_svmenu dumpcommands         ${* ?}" // Dump all commands on the program to *_cmd_dump.txt
 alias maplist              "qc_cmd_svmenu maplist              ${* ?}" // Automatic control of maplist
+alias removefromlist       "qc_cmd_svmenu removefromlist       ${* ?}" // Remove a string from a cvar
 alias rpn                  "qc_cmd_svmenu rpn                  ${* ?}" // RPN calculator
 //alias settemp            "qc_cmd_svmenu settemp              ${* ?}" // Temporarily set a value to a cvar which is restored later
 //alias settemp_restore    "qc_cmd_svmenu settemp_restore      ${* ?}" // Restore all cvars set by settemp command
@@ -104,6 +112,8 @@ alias hud                  "qc_cmd_cl     hud                  ${* ?}" // Comman
 alias localprint           "qc_cmd_cl     localprint           ${* ?}" // Create your own centerprint sent to yourself
 //alias mv_download        "qc_cmd_cl     mv_download          ${* ?}" // Retrieve mapshot picture from the server
 alias sendcvar             "qc_cmd_cl     sendcvar             ${* ?}" // Send a cvar to the server (like weaponpriority)
+//alias vyes               "qc_cmd_cl     vyes                 ${* ?}" // COMPATIBILITY COMMAND FOR 0.5 CLIENTS
+//alias vno                "qc_cmd_cl     vno                  ${* ?}" // COMPATIBILITY COMMAND FOR 0.5 CLIENTS
 
 // other aliases for local commands
 alias hud_configure "qc_cmd_cl hud configure"
@@ -128,7 +138,7 @@ seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they ar
 alias autoswitch           "qc_cmd_cmd    autoswitch           ${* ?}" // Whether or not to switch automatically when getting a better weapon
 alias checkfail            "qc_cmd_cmd    checkfail            ${* ?}" // Report if a client-side check failed
 alias clientversion        "qc_cmd_cmd    clientversion        ${* ?}" // Release version of the game
-//alias getmapvotepic      "qc_cmd_cmd    getmapvotepic        ${* ?}" // Retrieve mapshot picture from the server
+//alias mv_getpicture      "qc_cmd_cmd    mv_getpicture        ${* ?}" // Retrieve mapshot picture from the server
 alias join                 "qc_cmd_cmd    join                 ${* ?}" // Become a player in the game
 alias ready                "qc_cmd_cmd    ready                ${* ?}" // Qualify as ready to end warmup stage (or restart server if allowed)
 alias reportcvar           "qc_cmd_cmd    reportcvar           ${* ?}" // Old system for sending a client cvar to the server
@@ -217,10 +227,13 @@ alias settemp_restore "qc_cmd_svcl settemp_restore"
 // ===================================
 //  banning - server/command/ipban.qc
 // ===================================
-alias bans "sv_cmd bans"
-alias ban "sv_cmd ban ${* ?}"         // usage: ban address(maybe incomplete, like 1.2.3) bantime(seconds)
-alias kickban "sv_cmd kickban ${* ?}" // usage: kickban # playerno bantime(seconds) masksize(bytes)
-alias unban "sv_cmd unban ${* ?}"     // usage: unban 3 (number from bans)
+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 unban                "qc_cmd_sv     unban                ${* ?}" // Remove an existing ban
+
+// other aliases for ban commands
+alias bans "banlist"
 
 
 // =================================