X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2FdefaultVT.cfg;h=48b31cda66911f95c720b0277975d8d57ce98557;hp=e52e4eb77d2ba59111ace6713ce0f61301883c22;hb=1fe69de7e0e617b2abcee517725a7208ad3b64d1;hpb=10f62ccfdf26da253a0f44198ea5028a1eb68f85

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index e52e4eb7..48b31cda 100644
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -178,17 +178,25 @@ cl_bobmodel 1 // whether to have gun model move around on screen when moving (on
 cl_rollangle 2 // amount of view tilt when strafing, default is 2.0
 v_kicktime 0.5 // how long damage kicks of the view last, default is 0 seconds
 gl_polyblend 0.5 // whether to use screen tints, default is 1
-r_motionblur 0 // motion blur value, default is 0
 r_damageblur 0 // motion blur when damaged, default is 0 (disabled in voretournament)
+r_motionblur 0 // motion blur value, default is 0
+r_motionblur_maxblur 1
 
 r_bloom_blur 8
 r_bloom_brighten 4
 r_bloom_colorexponent 1
-r_bloom_colorscale 1
+r_bloom_colorscale 0.75
 r_bloom_colorsubtract 0.25
 r_bloom_resolution 320
 r_hdr_range 4
 
+r_hdr_irisadaptation 1 "adjust scene brightness according to light intensity at player location"
+r_hdr_irisadaptation_multiplier 2 "brightness at which value will be 1.0"
+r_hdr_irisadaptation_minvalue 0.65 "minimum value that can result from multiplier / brightness"
+r_hdr_irisadaptation_maxvalue 1.35 "maximum value that can result from multiplier / brightness"
+r_hdr_irisadaptation_value 1 "current value as scenebrightness multiplier, changes continuously when irisadaptation is active"
+r_hdr_irisadaptation_fade 0.5 "fade rate at which value adjusts"
+
 // weapon model leaning / following
 cl_leanmodel 1 // enables weapon leaning effect when looking around
 cl_leanmodel_side_speed 0.7 "gun leaning sideways speed"
@@ -396,7 +404,7 @@ set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: s
 set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"
 set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"
 seta g_maplist_mostrecent_count 3	"number of most recent maps that are blocked from being played again"
-seta g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep2 basement farewell greatwall_revisited soylent"
+seta g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep2 basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace"
 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_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"
@@ -598,6 +606,8 @@ set g_bloodloss 0   "amount of health below which blood loss occurs"
 
 set g_footsteps 1	"serverside footstep sounds"
 
+set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)"
+
 set g_multijump 1	"Number of multiple jumps to allow (jumping again in the air), -1 allows for infinite jumps"
 set g_multijump_add 0	"0 = make the current z velocity equal to jumpvelocity, 1 = add jumpvelocity to the current z velocity"
 set g_multijump_speed -125	"Minimum vertical speed a player must have in order to jump again"
@@ -1160,13 +1170,16 @@ seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highligh
 seta sbar_timer_increment 0 "1 = show elapsed time on the timer"
 seta sbar_timer_scale 1 "scale multiplier of the timer"
 seta sbar_ring1 1 "enables the first HUD ring"
-seta sbar_ring1_scale 100 "scale of the first HUD ring"
+seta sbar_ring1_scale 80 "scale of the first HUD ring"
 seta sbar_ring1_text_scale 12 "scale of the text on the first HUD ring"
 seta sbar_ring1_alpha 0.75 "alpha of the first HUD ring"
+seta sbar_ring1_info_voredelay 1 "show the first HUD ring for indicating vore delay"
+seta sbar_ring1_info_kickdelay 1 "show the first HUD ring for indicating kick delay"
 seta sbar_ring2 1 "enables the second HUD ring"
-seta sbar_ring2_scale 60 "scale of the second HUD ring"
+seta sbar_ring2_scale 40 "scale of the second HUD ring"
 seta sbar_ring2_text_scale 10 "scale of the text on the second HUD ring"
 seta sbar_ring2_alpha 0.75 "alpha of the second HUD ring"
+seta sbar_ring2_info_regurgitateprepare 1 "show the second HUD ring for indicating regurgitation preparing"
 seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
 
 // for menu server list (eventually make them have engine support?)
@@ -1252,13 +1265,13 @@ alias sethostname "set menu_use_default_hostname 0; hostname $*"
 set sv_foginterval 0
 
 // Audio track names (for old-style "cd loop NUMBER" usage)
-set g_cdtracks_remaplist "feeding_frenzy digital-pursuit brokenlight ninesix sixtyfour_revisited infiltrator stone_fortress high_tech_lab space_walk meltdown inner-peace out-there neon variable quiet boss_theme ghost-town" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"
+set g_cdtracks_remaplist "dark_intro feeding_frenzy digital-pursuit brokenlight ninesix sixtyfour_revisited infiltrator contemplation covert_operations determination stone_fortress high_tech_lab attack space_walk meltdown inner-peace out-there echelon techno_geek neon variable quiet boss_theme ghost-town" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"
 set g_cdtracks_dontusebydefault "" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"
 cd remap $g_cdtracks_remaplist
 seta cl_intermission 1 "play intermission music"
 seta cl_intermission_cdtrack_win "win_music"
 seta cl_intermission_cdtrack_lose "lose_music"
-seta menu_cdtrack feeding_frenzy
+seta menu_cdtrack dark_intro
 
 // maxidle (in seconds): kick players idle for more than that amount of time
 set sv_maxidle 0
@@ -1561,13 +1574,15 @@ set g_vore_regurgitatecolor_release "0.4 0.6 0.1" "the color players will have w
 set g_vore_regurgitatecolor_release_fade 0.01 "how quickly the regurgitation color washes off players once they leave the stomach"
 set g_vore_regurgitatecolor_digest "0.15 0.25 0" "the color players will have when digested, only works when g_vore_keepdeadprey is disabled"
 set g_vore_keepdeadprey 0.75 "If enabled, prey remains in the stomach after dying, else the predator throws up their dead body. 0 = disabled, 1 = ernabled, anything between = probability"
+set g_vore_neighborprey_distance 16 "Distance by which prey inside the same stomach are positioned away from each other. 0 disables seeing neighboring prey"
+set g_vore_neighborprey_scale 1 "When neighborprey is enabled, all prey is resized by this amount"
 
 set g_healthsize 100 "Players who are low on health shrink and become smaller, value specifies health at which the player has default size"
 set g_healthsize_movementfactor 0.5 "Amount by which player size affects jumping and running"
 set g_healthsize_exteriorweapon_scalefactor 1 "Amount by which player size resizes the exterior weapon model"
 set g_healthsize_weapon_scalefactor 1 "Amount by which player size resizes the view weapon model"
 set g_healthsize_weapon_scalefactor_pos 10 "Amount by which the view model is moved vertically based on player size"
-set g_healthsize_vore_pos 2 "Amount by which view height changes for prey, based on the size difference between them and their predator"
+set g_healthsize_vore_pos 4 "Amount by which view height changes for prey, based on the size difference between them and their predator"
 set g_healthsize_min 50 "Player size may not drop below this amount of health"
 set g_healthsize_max 150 "Player size may not grow past this amount of health"
 
@@ -1682,8 +1697,9 @@ set vid_netwmfullscreen 0 // doesn't support non-native res
 r_drawparticles_nearclip_min 8
 r_drawparticles_nearclip_max 16
 
-// exact gloss looks better, e.g. on g-23
+// exact gloss looks better
 r_shadow_glossexact 1
+r_shadow_glossintensity 2.5
 
 // use fake light if map has no lightmaps
 r_fakelight 1