X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=data%2FdefaultVT.cfg;h=944483fcfad5c410c01d2641daf1e7c43d25eaaa;hb=5c4b3022351ea8bc467cbbacca823314a90586ec;hp=0fcaf58ec36c983222f7fd7e23f2129eb2a65aa7;hpb=603e043971aa9e17c39a2c7673989f578e0235a8;p=voretournament%2Fvoretournament.git

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 0fcaf58e..944483fc 100644
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1,4 +1,4 @@
-set g_voretournamentversion 0.6.0git	"Voretournament version (formatted for humans)"
+set g_voretournamentversion 0.7.0git	"Voretournament version (formatted for humans)"
 
 //!<showbrand
 showbrand 3
@@ -35,9 +35,9 @@ seta g_configversion 0	"Configuration file version (used to upgrade settings) 0:
 // servers either
 //
 // e.g. Voretournament 1.6.1 RC1 will be 16101
-gameversion 06001
-gameversion_min 05000 // 0.5.0 still used this
-gameversion_max 07000 // 0.7.0 version allows any 0.6 release, but no more
+gameversion 07001
+gameversion_min 06000 // 0.6.0 still used this
+gameversion_max 08000 // 0.7.0 version allows any 0.8 release, but no more
 
 // compatibility guideline:
 //   version a.b.c   = a0b0c
@@ -107,14 +107,16 @@ _cl_color 187
 _cl_name "Player"
 _cl_playermodel models/player/vixen.zym
 _cl_playerskin 0
-crosshair 13
+seta crosshair 11
+seta crosshair_primary 13
+seta crosshair_secondary 14
 seta crosshair_color "1 1 0.5"
 seta crosshair_alpha 1
 seta crosshair_size 0.35
 seta crosshair_pickup 0.5 "crosshair grows then shrinks back when picking up an item"
 seta crosshair_color_by_health 1 "if enabled, crosshair color will depend on current health"
-seta crosshair_unarmed_dim_color 0.5 "dim crosshair color by this amount when we aren't holding a weapon"
-seta crosshair_unarmed_dim_alpha 0.5 "dim crosshair alpha by this amount when we aren't holding a weapon"
+seta crosshair_unarmed_dim_color 0.75 "dim crosshair color to this amount when we aren't holding a weapon"
+seta crosshair_unarmed_dim_alpha 0.75 "dim crosshair alpha to this amount when we aren't holding a weapon"
 seta crosshair_pickup_speed 4 "speed of the crosshair pickup effect"
 seta crosshair_ring_alpha 0.5 "alpha of the crosshair ammo ring"
 seta crosshair_ring_size 2.5 "size of the crosshair ammo ring"
@@ -142,6 +144,10 @@ seta cl_flash_pickup_color "0 0 1" "color of the pickup flash"
 seta cl_flash_vore 0.25 "if enabled, the screen flashes by this amount when eating or getting eaten"
 seta cl_flash_vore_color_prey "1 0 0" "color of the vore flash for prey"
 seta cl_flash_vore_color_pred "0 1 0" "color of the vore flash for predators"
+seta cl_flash_respawn 0.25 "if enabled, the screen flashes by this amount when picking up an item"
+seta cl_flash_respawn_color "1 1 1" "color of the pickup flash"
+seta cl_spawnfov 0.5 "the field of view starts zoomed out by this amount when you spawn"
+seta cl_spawnfov_speed 1 "the fov fades back to normal at this speed"
 fov 90
 seta cl_velocityzoom -0.2	"velocity based zooming of fov, negative values zoom out"
 seta cl_velocityzoomtime 0.3	"time value for averaging speed values"
@@ -151,6 +157,7 @@ seta cl_zoomsensitivity 0	"how zoom changes sensitivity (0 = weakest, 1 = strong
 freelook 1
 sensitivity 6
 v_gamma 1.125000
+v_glslgamma 0 // might prevent issues with some video cards
 viewsize 100
 // fullscreen 1024x768x32bit
 vid_bitsperpixel 32
@@ -161,7 +168,7 @@ vid_pixelheight 1
 seta menu_vid_width 1024
 seta menu_vid_height 768
 seta menu_vid_pixelheight 1
-seta menu_vid_scale 0
+seta menu_vid_scale -0.25
 // 2D resolution 800x600
 vid_conwidth 800
 vid_conheight 600
@@ -171,9 +178,9 @@ v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
 // these settings determine how much the view is affected by movement/damage
 cl_smoothviewheight 0.2 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition
 cl_deathfade 0.03 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
-cl_bobcycle 0.6 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
+cl_bobcycle 0.55 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
 cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0), default is 0.01
-cl_bob2cycle 0.6 // how long the cycle of left/right view movement takes (only works if cl_bob2 is not 0), default is 0.6
+cl_bob2cycle 0.55 // how long the cycle of left/right view movement takes (only works if cl_bob2 is not 0), default is 0.6
 cl_bob2 0.01 // how much view moves left/right when moving (does not move if cl_bob2cycle is 0), default is 0.01
 cl_bobfall 0.05 "how much the view swings down when falling (influenced by the speed you hit the ground with)"
 cl_bobfallcycle 3 "speed of the bobfall swing"
@@ -186,20 +193,20 @@ r_damageblur 0 // motion blur when damaged, default is 0 (disabled in voretourna
 r_motionblur 0 // motion blur value, default is 0
 r_motionblur_maxblur 1
 
-r_bloom_blur 8
-r_bloom_brighten 4
+r_bloom_blur 16
+r_bloom_brighten 2.75
 r_bloom_colorexponent 1
-r_bloom_colorscale 0.75
-r_bloom_colorsubtract 0.25
+r_bloom_colorscale 1
+r_bloom_colorsubtract 0.2
 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_minvalue 0.75 "minimum value that can result from multiplier / brightness"
+r_hdr_irisadaptation_maxvalue 1.25 "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"
+r_hdr_irisadaptation_fade 0.35 "fade rate at which value adjusts"
 
 // weapon model leaning / following
 cl_leanmodel 1 // enables weapon leaning effect when looking around
@@ -292,7 +299,14 @@ set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the p
 set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"
 set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"
 
-set sv_gibhealth 75 "Minus health a dead body must have in order to get gibbed"
+set g_leanplayer_damage 0.1 "lean players that are shot by this amount, based on the force they take"
+set g_leanplayer_damage_fade 0.95 "how fast players return to normal angles, based on damage taken"
+set g_leanplayer_damage_max 10 "damage leaning is limited to this amount"
+set g_leanplayer_acceleration 0.05 "lean players as they accelerate, by this amount"
+set g_leanplayer_acceleration_fade 5 "velocity averaging steps for acceleration, higher values cause a shorter leaning"
+set g_leanplayer_acceleration_max 10 "acceleration leaning is limited to this amount"
+
+set sv_gibhealth -150 "Amount of health a dead body must have in order to get gibbed, influenced by player size"
 
 // fragmessage: This allows extra information to be displayed with the frag centerprints. 
 set sv_fragmessage_information_ping 0 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
@@ -410,7 +424,7 @@ set g_casings 1 "enable casings"
 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 stormkeep basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace"
+seta g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace strength toxic racetrack cyberparcour"
 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"
@@ -667,6 +681,15 @@ seta cl_notify_carried_items "3" "notify you of carried items when you obtain th
 seta cl_hitsound 1 "play a hit notifier sound when you have hit an enemy"
 seta cl_announcer default "name of the announcer you wish to use from data/sound/announcer"
 
+seta cl_helper 1 "enable helper system (voice that warns you in certain circumstances)"
+seta cl_helper_voice default "name of the helper you wish to use from data/sound/helper"
+seta cl_helper_pause 3 "number of seconds that must pass before the helper system can be triggered again"
+seta cl_helper_item_health 25 "the helper will warn you when going below this amount of health"
+seta cl_helper_item_armor 15 "the helper will warn you when going below this amount of armor"
+seta cl_helper_item_ammo_fuel 25 "the helper will warn you when going below this amount of ammo"
+seta cl_helper_item_speed 1000 "the helper will warn you when going faster than this speed"
+seta cl_helper_item_stomachload 0.75 "the helper will warn you when your stomach is dangerously loaded by this amount"
+
 seta cl_eventchase_death 1 "camera goes into 3rd person mode when the player is dead"
 seta cl_eventchase_distance 140 "final camera distance"
 seta cl_eventchase_speed 1.3 "how fast the camera slides back, 0 is instant"
@@ -1169,9 +1192,7 @@ sbar_info_pos 50
 seta sbar_alpha_bg 0.8 "alpha value of the HUD background"
 seta sbar_alpha_fg 1 "alpha value of the HUD foreground items"
 seta sbar_border_thickness 1 "scoreboard border thickness"
-seta sbar_color_bg_r 0.5 "red color component of the HUD background"
-seta sbar_color_bg_g 0 "green color component of the HUD background"
-seta sbar_color_bg_b 1 "blue color component of the HUD background"
+seta sbar_color_bg "0.5 0.25 1" "default color of the HUD background"
 seta sbar_color_bg_team 1 "team color multiplier of the HUD background"
 seta sbar_scoreboard_offset 100 "scoreboard vertical position"
 seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha"
@@ -1591,28 +1612,31 @@ set g_vore_biggersize 0 "when enabled, a player can't swallow someone larger tha
 set g_vore_showhealth 1 "when enabled, a predator can see their prey's health on the stomach board, and prey can see the health of players he's joining in the stomach"
 set g_vore_gurglesound 1 "predators make an ambient gurgling sound"
 set g_vore_soundocclusion 0.25 "directional player sounds are cut to this amount of their initial volume for eaten players (simulates hearing harder from the stomach)"
-set g_vore_regurgitatecolor_release "0.6 0.4 0" "the color players will have when regurgitated alive"
-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.3 0.15 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_vore_regurgitatecolor_color_normal "0.6 0.4 0" "the color players will have when regurgitated without having been digested"
+set g_vore_regurgitatecolor_color_digest "0.3 0.15 0" "the color players will have when regurgitated after having been digested"
+set g_vore_regurgitatecolor_fade 0.01 "how quickly the regurgitation color washes off players once they leave the stomach, does not apply to dead bodies"
+set g_vore_regurgitatecolor_particles 0.75 "players who are dirty from regurgitation generate particles this often, based on the amount of goo they have on them"
+set g_vore_neighborprey_distance 8 "Distance by which prey inside the same stomach are positioned away from each other. 0 disables seeing neighboring prey"
 set g_vore_swallowmodel_range 100 "Distance by which the swallow model oscillates based on swallow progress"
 
-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 1 "Players shrink and grow based on health, by this amount"
+set g_healthsize_center 100 "Health at which the player has the default size"
+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"
+set g_healthsize_death 0.25 "Dead players are further shrunken by this amount"
+set g_healthsize_death_min -100 "Health at which dead players stop being shrunken"
 set g_healthsize_movementfactor 0.5 "Amount by which player size affects jumping and running"
+set g_healthsize_soundfactor 0.5 "The sounds players make are amplified or reduced by this amount based on their size"
 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 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"
 
 // part of an ugly hack for the menu audio sliders to work with the cutsound feature
-seta menu_volume 0.5
-seta menu_bgmvolume 1
+seta menu_volume 1
+seta menu_bgmvolume 0.5
 set volume $menu_volume
 set bgmvolume $menu_bgmvolume
+set mastervolume 1.4
 
 set sv_weaponstats_damagefile "" "when set to a file name, per-weapon damage stats get written to that file"
 set sv_weaponstats_killfile "" "when set to a file name, per-weapon kill stats get written to that file"
@@ -1663,7 +1687,8 @@ set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
 
 // sucks less than the old one
-cl_decals_newsystem 1
+seta cl_decals_newsystem 1
+seta cl_decals_models 0
 
 // FIXME temporary
 set menu_font_size_snapping_fix 1
@@ -1721,7 +1746,8 @@ r_drawparticles_nearclip_max 16
 
 // exact gloss looks better
 r_shadow_glossexact 1
-r_shadow_glossintensity 2.5
+r_shadow_glossintensity 3
+r_shadow_glossexponent 32
 
 // use fake light if map has no lightmaps
 r_fakelight 1