r3647 - trunk/pro

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-05-23 04:04:29 -0400 (Fri, 23 May 2008)
New Revision: 3647

Modified:
   trunk/pro/default.cfg
Log:
fix pro's default.cfg again... I hate this, there should REALLY be a defaultPro.cfg with just the changed settings, and a quake.rc execing both default.cfg and that


Modified: trunk/pro/default.cfg
===================================================================
--- trunk/pro/default.cfg	2008-05-22 19:55:19 UTC (rev 3646)
+++ trunk/pro/default.cfg	2008-05-23 08:04:29 UTC (rev 3647)
@@ -35,6 +35,9 @@
 alias +hook +button6
 alias -hook -button6
 alias ready "cmd ready"
+alias lockteams "sv_cmd lockteams"
+alias unlockteams "sv_cmd unlockteams"
+alias nospectators "sv_cmd nospectators"
 
 alias bsp "ls maps/*.bsp"
 alias chmap "changelevel $*"
@@ -112,7 +115,18 @@
 
 // restart server if all players hit "ready"-button
 set sv_ready_restart 0
+set sv_ready_restart_after_countdown 0 //if set to 1 the players and map items are reset after the countdown ended, otherwise they're reset already at the beginning of the countdown
+set sv_ready_restart_repeatable 0 //allows the players to restart the game as often as needed
+set sv_ready_restart_nag 0 //whether to nag players who are not ready yet, the message is shown in intervals
+set sv_ready_restart_nag_duration 6 //how long to show the ready-nag, in seconds
+set sv_ready_restart_nag_interval 10 //how long the pause between the ready-nags is, in seconds
 
+//nifreks lockonrestart feature, used in team-based game modes, if set to 1 and all players readied up no other player can then join the game anymore, useful to block spectators from joining
+set teamplay_lockonrestart 0
+
+set g_maxplayers 0 //maximum number of players allowed to play at the same time, set to 0 to all players to join the game
+set g_maxplayers_spectator_blocktime 5 //if the players voted for the "nospectators" command, this setting defines the number of seconds a observer/spectator has time to join the game before he gets kicked
+
 // use default physics
 exec physicsPro.cfg
 
@@ -140,7 +154,6 @@
 set ekg 0
 
 cl_movement 1
-seta cl_autoswitch 1
 cl_netinputpacketlosstolerance 0
 cl_stairsmoothspeed 200
 cl_forwardspeed $sv_maxspeed
@@ -156,6 +169,9 @@
 cl_movement_stepheight $sv_stepheight
 cl_movement_track_canjump 0 // till DP bug gets fixed
 
+seta cl_autoswitch 1
+alias autoswitch "set cl_autoswitch $1 ; cmd autoswitch $1"
+
 seta cl_playerdetailreduction 0 // the higher, the less detailed
 
 set bot_number 0 // number of bots in server
@@ -246,6 +262,7 @@
 seta g_maplist_selectrandom 0 // if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle
 seta g_maplist_shuffle 1 // new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list.
 // timeout for kill credit when your damage knocks someone into a death trap
+set g_maplist_check_waypoints 0 // when 1, maps are skipped if there currently are bots, but the map has no waypoints
 set g_maxpushtime 8.0
 
 set g_cloaked 0
@@ -845,25 +862,37 @@
 
 // usercommands. These can be edited and bound by the menu.
 seta "userbind1_press" "say_team quad soon";  seta "userbind1_release" "";  seta "userbind1_description" "team: quad soon"
-seta "userbind2_press" "say_team free item %x^7 (%y^7); g_waypointsprite_team_here_p";  seta "userbind2_release" "";  seta "userbind2_description" "team: free item, icon"
-seta "userbind3_press" "say_team took item (%l^7); g_waypointsprite_team_here";  seta "userbind3_release" "";  seta "userbind3_description" "team: took item, icon"
+seta "userbind2_press" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p";  seta "userbind2_release" "";  seta "userbind2_description" "team: free item, icon"
+seta "userbind3_press" "say_team took item (l:%l^7); g_waypointsprite_team_here";  seta "userbind3_release" "";  seta "userbind3_description" "team: took item, icon"
 seta "userbind4_press" "say_team negative";  seta "userbind4_release" "";  seta "userbind4_description" "team: negative"
-seta "userbind5_press" "say_team need help (%l^7) (%h^7 %a^7 %w^7); g_waypointsprite_team_helpme";  seta "userbind5_release" "";  seta "userbind5_description" "team: need help, icon"
-seta "userbind6_press" "say_team enemy seen (%y^7); g_waypointsprite_team_danger_p";  seta "userbind6_release" "";  seta "userbind6_description" "team: enemy seen, icon"
-seta "userbind7_press" "say_team defending (%l^7) (%h^7 %a^7 %w^7); g_waypointsprite_team_here";  seta "userbind7_release" "";  seta "userbind7_description" "team: defending, icon"
-seta "userbind8_press" "say_team roaming (%l^7) (%h^7 %a^7 %w^7); g_waypointsprite_team_here";  seta "userbind8_release" "";  seta "userbind8_description" "team: roaming, icon"
-seta "userbind9_press" "say_team attacking (%l^7) (%h^7 %a^7 %w^7); g_waypointsprite_team_here";  seta "userbind9_release" "";  seta "userbind9_description" "team: attacking, icon"
-seta "userbind10_press" "say_team killed flagcarrier (%y^7); g_waypointsprite_team_p"; seta "userbind10_release" ""; seta "userbind10_description" "team: killed flag, icon"
-seta "userbind11_press" "say_team dropped flag (%d^7); g_waypointsprite_team_here_d"; seta "userbind11_release" ""; seta "userbind11_description" "team: dropped flag, icon"
-seta "userbind12_press" "say :-) / nice one"; seta "userbind12_release" ""; seta "userbind12_description" "chat: nice one"
-seta "userbind13_press" "say good game"; seta "userbind13_release" ""; seta "userbind13_description" "chat: good game"
-seta "userbind14_press" "say hi / good luck and have fun"; seta "userbind14_release" ""; seta "userbind14_description" "chat: hi / good luck"
-seta "userbind15_press" ""; seta "userbind15_release" ""; seta "userbind15_description" ""
+seta "userbind5_press" "say_team need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_helpme";  seta "userbind5_release" "";  seta "userbind5_description" "team: need help, icon"
+seta "userbind6_press" "say_team enemy seen (l:%y^7); g_waypointsprite_team_danger_p";  seta "userbind6_release" "";  seta "userbind6_description" "team: enemy seen, icon"
+seta "userbind7_press" "say_team defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind7_release" "";  seta "userbind7_description" "team: defending, icon"
+seta "userbind8_press" "say_team roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind8_release" "";  seta "userbind8_description" "team: roaming, icon"
+seta "userbind9_press" "say_team attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind9_release" "";  seta "userbind9_description" "team: attacking, icon"
+seta "userbind10_press" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_p"; seta "userbind10_release" ""; seta "userbind10_description" "team: killed flag, icon"
+seta "userbind11_press" "say_team dropped flag (l:%d^7); g_waypointsprite_team_here_d"; seta "userbind11_release" ""; seta "userbind11_description" "team: dropped flag, icon"
+seta "userbind12_press" "say_team dropped gun %w (l:%l^7); g_waypointsprite_team_here; dropweapon"; seta "userbind12_release" ""; seta "userbind12_description" "team: drop, icon"
+seta "userbind13_press" "say :-) / nice one"; seta "userbind13_release" ""; seta "userbind13_description" "chat: nice one"
+seta "userbind14_press" "say good game"; seta "userbind14_release" ""; seta "userbind14_description" "chat: good game"
+seta "userbind15_press" "say hi / good luck and have fun"; seta "userbind15_release" ""; seta "userbind15_description" "chat: hi / good luck"
 seta "userbind16_press" ""; seta "userbind16_release" ""; seta "userbind16_description" ""
 seta "userbind17_press" ""; seta "userbind17_release" ""; seta "userbind17_description" ""
 seta "userbind18_press" ""; seta "userbind18_release" ""; seta "userbind18_description" ""
 seta "userbind19_press" ""; seta "userbind19_release" ""; seta "userbind19_description" ""
 seta "userbind20_press" ""; seta "userbind20_release" ""; seta "userbind20_description" ""
+seta "userbind21_press" ""; seta "userbind21_release" ""; seta "userbind21_description" ""
+seta "userbind22_press" ""; seta "userbind22_release" ""; seta "userbind22_description" ""
+seta "userbind23_press" ""; seta "userbind23_release" ""; seta "userbind23_description" ""
+seta "userbind24_press" ""; seta "userbind24_release" ""; seta "userbind24_description" ""
+seta "userbind25_press" ""; seta "userbind25_release" ""; seta "userbind25_description" ""
+seta "userbind26_press" ""; seta "userbind26_release" ""; seta "userbind26_description" ""
+seta "userbind27_press" ""; seta "userbind27_release" ""; seta "userbind27_description" ""
+seta "userbind28_press" ""; seta "userbind28_release" ""; seta "userbind28_description" ""
+seta "userbind29_press" ""; seta "userbind29_release" ""; seta "userbind29_description" ""
+seta "userbind30_press" ""; seta "userbind30_release" ""; seta "userbind30_description" ""
+seta "userbind31_press" ""; seta "userbind31_release" ""; seta "userbind31_description" ""
+seta "userbind32_press" ""; seta "userbind32_release" ""; seta "userbind32_description" ""
 alias _userbind_call "${$1}"
 alias +userbind "_userbind_call userbind${1}_press"
 alias -userbind "_userbind_call userbind${1}_release"
@@ -912,12 +941,12 @@
 // useful keybind to maximize the chat area temporarily
 set _backup_con_chatvars_set 0
 alias _restore_con_chatvars_0 ""
-alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard"
+alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; sbar_flagstatus_right $_backup_sbar_flagstatus_right; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
 alias _restore_con_chatvars "_restore_con_chatvars_$_backup_con_chatvars_set"
-alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard"
+alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_sbar_flagstatus_right $sbar_flagstatus_right; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
 alias _backup_con_chatvars_1 ""
 alias _backup_con_chatvars "_backup_con_chatvars_$_backup_con_chatvars_set"
-alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -7; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0"
+alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -7; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; sbar_flagstatus_right 1; scr_centertime 0; r_track_sprites 0"
 alias -con_chat_maximize "_restore_con_chatvars"
 
 // tab completion
@@ -958,3 +987,6 @@
 gl_texturecompression_q3bspdeluxemaps 0
 gl_texturecompression_q3bsplightmaps 1
 gl_texturecompression_sky 1
+
+set menu_mouse_absolute 0 // TODO make this seta if the engine understands this right
+seta menu_mouse_speed 1