r2231 - trunk/pro

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Mar 15 12:50:49 EDT 2007


Author: esteel
Date: 2007-03-15 12:50:49 -0400 (Thu, 15 Mar 2007)
New Revision: 2231

Modified:
   trunk/pro/default.cfg
Log:
merged some of the data/default.cfg changes into pro/default.cfg


Modified: trunk/pro/default.cfg
===================================================================
--- trunk/pro/default.cfg	2007-03-15 16:37:54 UTC (rev 2230)
+++ trunk/pro/default.cfg	2007-03-15 16:50:49 UTC (rev 2231)
@@ -1,5 +1,5 @@
 // Nexuiz version (formatted for humans)
-set g_nexuizversion "2.2svn"
+set g_nexuizversion 2.2svn
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -11,7 +11,6 @@
 // servers either
 //
 // e.g. Nexuiz 1.5.1 RC1 will be 15101
-
 gameversion 20000
 
 // say aliases
@@ -24,9 +23,6 @@
 alias asay_drop "say_team (%l) dropped %w ; impulse 17"
 
 // other aliases
-alias +scores "+showscores; ping"
-alias -scores "-showscores"
-
 alias +hook +button6
 alias -hook -button6
 alias ready "cmd ready"
@@ -42,44 +38,46 @@
 alias ply "playdemo demos/$1"
 alias tdem "timedemo demos/$1"
 
-alias ccl "cmd clogin $1"
-alias cc "cmd ccmd $*"
-
 alias dropweapon "impulse 17"
-alias +show_info "+button7"
-alias -show_info "-button7"
+alias +show_info +button7
+alias -show_info -button7
 
-alias team_red "cmd selectteam red"
-alias team_blue "cmd selectteam blue"
-alias team_pink "cmd selectteam pink"
-alias team_yellow "cmd selectteam yellow"
-alias team_auto "cmd selectteam auto"
+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"
+bind f6 team_auto
 
+// merge lightmaps up to 1024x1024 textures
+// the default of 2048x2048 is too heavy for my rig (SavageX)
+mod_q3bsp_lightmapmergepower 3
+
 // player defaults
-seta _cl_color 153
-seta _cl_name Player
-seta _cl_playermodel models/player/marine.zym
-seta _cl_playerskin 0
-seta crosshair 5
-seta fov 90
-seta freelook 1
-seta sensitivity 6
+_cl_color 153
+_cl_name Player
+_cl_playermodel models/player/marine.zym
+_cl_playerskin 0
+crosshair 5
+fov 90
+freelook 1
+sensitivity 6
 seta scmenu_mouse_speed 1
-seta v_gamma 1.125000
-seta viewsize 110
-seta bgmvolume 1
-seta volume 0.5
+v_gamma 1.125000
+viewsize 110
+bgmvolume 1
+volume 0.5
 // fullscreen 800x600x32bit
-seta vid_bitsperpixel 32
-seta vid_fullscreen 1
-seta vid_width 800
-seta vid_height 600
+vid_bitsperpixel 32
+vid_fullscreen 1
+vid_width 800
+vid_height 600
 // 2D resolution 640x480
-seta vid_conwidth 640
-seta vid_conheight 480
-scr_conforcewhiledisconnected 0
-scr_menuforcewhiledisconnected 1
+vid_conwidth 640
+vid_conheight 480
 v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
+cl_bob 0
+cl_rollangle 0
 
 // nexuiz-linux-*.sh will use this
 seta vid_x11_display ""
@@ -89,37 +87,33 @@
 //   ":n/layout"   use DISPLAY=:n, create it if needed with ServerLayout layout
 
 // server settings
-seta hostname "Nexuiz Server"
-seta sv_maxrate 10000
+hostname "Nexuiz Server"
+sv_maxrate 10000
 set sv_mapchange_delay 5
 set minplayers 0
+sv_cullentities_trace 1
 
-// disable rcon-like clientcommands to avoid server being open with default password
-seta sv_clientcommands 0
-seta sv_clientcommands_password "hackme"
-
 // restart server if all players hit "ready"-button
 set sv_ready_restart 0
 
-seta g_viewweapon_bobintensity 0
-seta g_viewweapon_q1pitching 0
-seta cl_forwardspeed 400
-seta cl_backspeed 400
-seta cl_sidespeed 400
-seta cl_upspeed 400
-seta cl_movement 1
+cl_forwardspeed 400
+cl_backspeed 400
+cl_sidespeed 400
+cl_upspeed 400
+cl_movement 1
+cl_netinputpacketlosstolerance 0
 cl_movement_accelerate 5.5
 cl_movement_edgefriction 0
 cl_movement_friction 5
 cl_movement_jumpvelocity 300
-set cl_movement_maxairspeed 220
+cl_movement_maxairspeed 220
 cl_movement_maxspeed 400
 cl_movement_stepheight 34
-seta cl_stairsmoothspeed 200
+cl_stairsmoothspeed 200
 seta cl_autoswitch 1
 edgefriction 0
 set g_balance_jumpheight 350
-set sv_maxairspeed 220
+sv_maxairspeed 220
 sv_accelerate 10
 sv_airaccelerate 0.5
 sv_friction 5
@@ -132,8 +126,8 @@
 seta sv_defaultplayermodel models/player/nexus.zym
 seta sv_defaultplayerskin 0
 set sv_autoscreenshot 0
-set net_messagetimeout 300
-set net_connecttimeout 30
+net_messagetimeout 300
+net_connecttimeout 30
 sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
 set sv_airaccel_sideways_friction 0.3
 set sv_airaccel_qw 0.93
@@ -143,7 +137,7 @@
 set bot_number 0 // number of bots in server
 seta bot_usemodelnames 0 // whether bots should be named after the models
 set bot_nofire 0 // makes bots not attack at all, mainly for testing in g_waypointeditor mode
-seta bot_prefix "[BOT]"
+seta bot_prefix [BOT]
 seta bot_suffix ""
 // general bot AI cvars
 set bot_ai_strategyinterval 2
@@ -158,7 +152,7 @@
 set bot_ai_keyboard_treshold 0.94
 set bot_ai_aimskill_offset 1
 set bot_ai_aimskill_think 1
-// Beter don't touch these, there are hard to tweak!
+// Better don't touch these, there are hard to tweak!
 set bot_ai_aimskill_order_mix_1st 0.01
 set bot_ai_aimskill_order_mix_2nd 0.1
 set bot_ai_aimskill_order_mix_3th 0.01
@@ -180,6 +174,7 @@
 alias g_waypointeditor_relinkall "impulse 105"
 alias g_waypointeditor_saveall "impulse 106"
 
+locs_enable 0
 pausable 0
 set g_antilag 0
 set g_weapon_stay 0
@@ -219,10 +214,10 @@
 set g_casings 0
 set g_norecoil 0
 set g_throughfloor 1
-set g_maplist_defaultlist "'dm_aggressor''dm_aneurysm''dm_basement''dm_bleach''dm_bluesky''dm_bloodprison''dm_darkzone''dm_downer''dm_evilspace''dm_farewell''dm_runningman''dm_runningman_1on1remix''dm_silvercity''dm_skyway''dm_slimepit''dm_soylent''dm_starship''dm_stormkeep''dm_toxic''dm_warfare''dom_aggressor''dom_aneurysm''dom_basement''dom_bleach''dom_darkzone''dom_downer''dom_evilspace''dom_runningman''dom_runningman_1on1remix''dom_silvercity''dom_skyway''dom_slimepit''dom_soylent''dom_starship''dom_stormkeep''dom_toxic''lms_aggressor''lms_basement''lms_bleach''lms_bluesky''lms_bloodprison''lms_downer''lms_evilspace''lms_farewell''lms_runningman''lms_runningman_1on1remix''lms_skyway''lms_slimepit''lms_soylent''lms_starship''lms_stormkeep''lms_toxic''lms_warfare''rune_aggressor''rune_aneurysm''rune_basement''rune_bleach''rune_darkzone''rune_downer''rune_evilspace''rune_runningman''rune_runningman_1on1remix''rune_silvercity''rune_skyway''rune_slimepit''rune_soylent''rune_starship''rune_stormkeep''rune_toxic''tdm_aggressor''tdm_aneurysm''tdm_basement''tdm_bleach''tdm_darkzone''tdm_downer''tdm_evilspace''tdm_farewell''tdm_runningman''tdm_runningman_1on1remix''tdm_silvercity''tdm_skyway''tdm_slimepit''tdm_soylent''tdm_starship''tdm_stormkeep''tdm_toxic''tdm_warfare'"
+set g_maplist_defaultlist 'dm_aggressor''dm_aneurysm''dm_basement''dm_bleach''dm_bluesky''dm_bloodprison''dm_darkzone''dm_downer''dm_evilspace''dm_farewell''dm_runningman''dm_runningman_1on1remix''dm_silvercity''dm_skyway''dm_slimepit''dm_soylent''dm_starship''dm_stormkeep''dm_toxic''dm_warfare''dom_aggressor''dom_aneurysm''dom_basement''dom_bleach''dom_darkzone''dom_downer''dom_evilspace''dom_runningman''dom_runningman_1on1remix''dom_silvercity''dom_skyway''dom_slimepit''dom_soylent''dom_starship''dom_stormkeep''dom_toxic''lms_aggressor''lms_basement''lms_bleach''lms_bluesky''lms_bloodprison''lms_downer''lms_evilspace''lms_farewell''lms_runningman''lms_runningman_1on1remix''lms_skyway''lms_slimepit''lms_soylent''lms_starship''lms_stormkeep''lms_toxic''lms_warfare''rune_aggressor''rune_aneurysm''rune_basement''rune_bleach''rune_darkzone''rune_downer''rune_evilspace''rune_runningman''rune_runningman_1on1remix''rune_silvercity''rune_skyway''rune_slimepit''rune_soylent''rune_starship''rune_stormkeep''rune_toxic''tdm_aggressor''tdm_aneurysm''tdm_basement''tdm_bleach''tdm_darkzone''tdm_downer''tdm_evilspace''tdm_farewell''tdm_runningman''tdm_runningman_1on1remix''tdm_silvercity''tdm_skyway''tdm_slimepit''tdm_soylent''tdm_starship''tdm_stormkeep''tdm_toxic''tdm_warfare'
 seta g_maplist $g_maplist_defaultlist
 seta g_maplist_index 0 // this is used internally for saving position in maplist cycle
-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_selectrandom 0 // if 1, a random map will be chosen as next map; DEPRECATED in favor of g_maplist_shuffle
 seta g_maplist_shuffle 0 // 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.
 alias g_maplist_shufflenow "set _g_maplist_shufflenow 1"
 alias g_maplist_add "set _g_maplist_add $1"
@@ -236,19 +231,12 @@
 
 set welcome_message_time		8
 
-set exit_cfg "empty.cfg"
+set exit_cfg empty.cfg
 alias clearmap	"disconnect; exec $exit_cfg"
 
 seta g_grappling_hook 0
-set g_grappling_hook_tarzan 1
-set g_balance_grapplehook_speed_fly 1800
-set g_balance_grapplehook_speed_pull 2000
-set g_balance_grapplehook_force_rubber 2000
-set g_balance_grapplehook_force_rubber_overstretch 1000
-set g_balance_grapplehook_length_min 50
-set g_balance_grapplehook_stretch 50
-set g_balance_grapplehook_airfriction 0.2
 set g_balance_grapplehook_health 130
+exec newhook.cfg
 
 // this means that timelimit can be overidden globally and fraglimit can be overidden for each game mode: DM/TDM, Domination, CTF, and Runematch.
 seta timelimit_override -1
@@ -274,6 +262,8 @@
 set g_rune_respawn_waves 0
 set g_tdm_respawn_delay 0
 set g_tdm_respawn_waves 0
+// honor g_respawn_mapsettings_delay and g_respawn_mapsettings_waves
+set g_respawn_mapsettings 1
 
 // maximum overtime
 seta timelimit_maxovertime 5
@@ -429,14 +419,14 @@
 set g_balance_laser_animtime 0.3
 set g_balance_laser_lifetime 9
 
-set g_balance_shotgun_primary_bullets 10
-set g_balance_shotgun_primary_damage 6
+set g_balance_shotgun_primary_bullets 5
+set g_balance_shotgun_primary_damage 12
 set g_balance_shotgun_primary_spread 0.07
 set g_balance_shotgun_primary_refire 0.5
 set g_balance_shotgun_primary_animtime 0.2
 set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_secondary_bullets 10
-set g_balance_shotgun_secondary_damage 6
+set g_balance_shotgun_secondary_bullets 5
+set g_balance_shotgun_secondary_damage 12
 set g_balance_shotgun_secondary_spread 0.07
 set g_balance_shotgun_secondary_refire 1.35
 set g_balance_shotgun_secondary_animtime 0.2
@@ -578,46 +568,31 @@
 r_shadow_bumpscale_bumpmap 4
 r_shadow_bumpscale_basetexture 5
 r_shadow_realtime_world_lightmaps 1
-seta cl_decals 1
-seta cl_decals_fadetime 1
-seta cl_decals_time 2
+cl_decals_fadetime 1
+cl_decals_time 2
 seta cl_nogibs 0
-seta cl_particles 1
-seta cl_particles_quality 0.5
-seta cl_particles_bubbles 1
-seta cl_stainmaps 0
-seta gl_flashblend 0
-seta gl_picmip 1
-seta r_bloom 1
-seta r_coronas 1
-seta r_dynamic 1
+cl_stainmaps 0
+gl_flashblend 0
 seta r_glsl 1
 seta r_glsl_deluxemapping 1
 seta r_glsl_offsetmapping 0
 seta r_glsl_offsetmapping_reliefmapping 0
 seta r_glsl_offsetmapping_scale 0.02
-seta r_shadow_gloss 1
-seta r_shadow_realtime_dlight_shadows 0
-seta r_shadow_realtime_world 0
-seta r_shadow_realtime_world_dlightshadows 0
-seta r_shadow_realtime_world_shadows 0
-seta r_sky 1
 // execute normal.cfg to make sure that all effect settings are reset
 exec normal.cfg
 
 // misc
-set host_maxfps 1000
-set host_minfps 10
-seta scr_conbrightness 0
-seta scr_screenshot_jpeg 1
-seta scr_screenshot_jpeg_quality 0.9
+scr_conalpha 0.8
+scr_conbrightness 0.2
+scr_screenshot_jpeg 1
+scr_screenshot_jpeg_quality 0.9
 sv_maxvelocity 1000000000
 cl_sound_wizardhit ""
 cl_sound_hknighthit ""
-cl_sound_tink1 "weapons/tink1.wav"
-cl_sound_ric1 "weapons/ric1.wav"
-cl_sound_ric2 "weapons/ric2.wav"
-cl_sound_ric3 "weapons/ric3.wav"
+cl_sound_tink1 weapons/tink1.wav
+cl_sound_ric1 weapons/ric1.wav
+cl_sound_ric2 weapons/ric2.wav
+cl_sound_ric3 weapons/ric3.wav
 cl_sound_r_exp3 ""
 sv_sound_land ""
 sv_sound_watersplash ""
@@ -690,17 +665,17 @@
 // team say
 bind kp_ins messagemode
 bind kp_del messagemode2
-bind kp_end "say_team quad soon (h:%h a:%a w:%w l:%l)"
-bind kp_downarrow "say_team item free x:%x (h:%h a:%a w:%w l:%l)"
-bind kp_pgdn "say_team took item (h:%h a:%a w:%w l:%l)"
-bind kp_leftarrow "say_team negative (h:%h a:%a w:%w l:%l)"
-bind kp_5 "say_team help me (h:%h a:%a w:%w l:%l)"
-bind kp_rightarrow "say_team incoming (h:%h a:%a w:%w l:%l)"
-bind kp_home "say_team defending (h:%h a:%a w:%w l:%l)"
-bind kp_uparrow "say_team roaming (h:%h a:%a w:%w l:%l)"
-bind kp_pgup "say_team attacking (h:%h a:%a w:%w l:%l)"
-bind kp_multiply "say_team killed flagcarrier (h:%h a:%a w:%w l:%l)"
-bind kp_slash "say_team dropped flag (h:%h a:%a w:%w l:%l)"
+bind kp_end "say_team quad soon (l:%l h:%h a:%a w:%w)"
+bind kp_downarrow "say_team item free x:%x (l:%l h:%h a:%a w:%w)"
+bind kp_pgdn "say_team took item (l:%l h:%h a:%a w:%w)"
+bind kp_leftarrow "say_team negative (l:%l h:%h a:%a w:%w)"
+bind kp_5 "say_team help me (l:%l h:%h a:%a w:%w)"
+bind kp_rightarrow "say_team enemy seen (l:%l h:%h a:%a w:%w)"
+bind kp_home "say_team defending (l:%l h:%h a:%a w:%w)"
+bind kp_uparrow "say_team roaming (l:%l h:%h a:%a w:%w)"
+bind kp_pgup "say_team attacking (l:%l h:%h a:%a w:%w)"
+bind kp_multiply "say_team killed flagcarrier (l:%l h:%h a:%a w:%w)"
+bind kp_slash "say_team dropped flag (l:%l h:%h a:%a w:%w)"
 bind kp_enter "say :-) / nice one"
 bind kp_plus "say good game"
 bind kp_minus "say hi / good luck and have fun"
@@ -762,7 +737,7 @@
 alias printstats "set _printstats 1"	// print status on demand
 set sv_logscores_console 0		// print scores to server console
 set sv_logscores_file 0			// print scores to file
-set sv_logscores_filename "scores.log"	// filename
+set sv_logscores_filename scores.log	// filename
 set sv_logscores_bots 0			// exclude bots by default
 
 // spam (frag/capture) log
@@ -770,12 +745,12 @@
 set sv_eventlog_console 1
 set sv_eventlog_files 0
 seta sv_eventlog_files_counter 0
-set sv_eventlog_files_nameprefix "nexuiz"
-set sv_eventlog_files_namesuffix ".log"
+set sv_eventlog_files_nameprefix nexuiz
+set sv_eventlog_files_namesuffix .log
 
 set nextmap "" // override the maplist when switching to the next map
 set lastlevel ""
-set quit_when_empty "0" // set to 1, then the server exits when the next level starts
+set quit_when_empty 0 // set to 1, then the server exits when the next level starts
 
 // singleplayer campaign
 set g_campaign 0
@@ -788,20 +763,20 @@
 alias singleplayer_levellist "set scmenu_campaign_dump 1; togglemenu; wait; togglemenu"
 
 // Green's fullbright skins
-alias "player_fbskin_green" "playermodel models/player/nexus.zym;playerskin 3"
-alias "player_fbskin_red" "playermodel models/player/nexus.zym;playerskin 4"
-alias "player_fbskin_orange" "playermodel models/player/nexus.zym;playerskin 5"
-alias "player_fbskin_off" "playermodel models/player/nexus.zym;playerskin 0"
-alias "sv_defaultplayer_fbskin_green" "set sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 3"
-alias "sv_defaultplayer_fbskin_red" "sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 4"
-alias "sv_defaultplayer_fbskin_orange" "sv_defaultcharacter 1;set sv_defaultplayermodel models/player/nexus.zym;set sv_defaultplayerskin 5"
-alias "sv_defaultplayer_fbskin_off" "sv_defaultcharacter 0;set sv_defaultplayerskin 0"
+alias player_fbskin_green "playermodel models/player/nexus.zym;playerskin 3"
+alias player_fbskin_red "playermodel models/player/nexus.zym;playerskin 4"
+alias player_fbskin_orange "playermodel models/player/nexus.zym;playerskin 5"
+alias player_fbskin_off "playermodel models/player/nexus.zym;playerskin 0"
+alias sv_defaultplayer_fbskin_green "sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 3"
+alias sv_defaultplayer_fbskin_red "sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 4"
+alias sv_defaultplayer_fbskin_orange "sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 5"
+alias sv_defaultplayer_fbskin_off "sv_defaultcharacter 0;sv_defaultplayerskin 0"
 
 seta sv_servermodelsonly 1
 
-seta cl_curl_enabled 1
-seta cl_curl_maxspeed 300
-seta sv_curl_defaulturl "http://www.nexuiz.com/contentdownload/getmap.php?file="
+cl_curl_enabled 1
+cl_curl_maxspeed 300
+sv_curl_defaulturl "http://www.nexuiz.com/contentdownload/getmap.php?file="
 
 set sv_motd ""
 
@@ -814,3 +789,5 @@
 
 net_banlist ""
 seta _alientrap_net_banlist ""
+
+set g_waypoints_for_items 1 // make waypoints out of items; values: 0 = never, 1 = unless the mapper prevents it by worldspawn.spawnflags & 1, 2 = always




More information about the nexuiz-commits mailing list