X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2FdefaultVT.cfg;h=419ddd8d37ccb0ed67373b82afae08788808460e;hp=7b5dac26089cbbacff9d991a6dee96bea0e023f5;hb=a802081a2b1ef61fc5e5355046397764ff3b2fe5;hpb=c54190e3d2b73e3f168ed657d21e358e139a59d0

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 7b5dac26..419ddd8d 100644
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1,4 +1,4 @@
-set g_voretournamentversion 0.5.0git	"Voretournament version (formatted for humans)"
+set g_voretournamentversion 0.6.0git	"Voretournament version (formatted for humans)"
 
 //!<showbrand
 showbrand 3
@@ -34,10 +34,10 @@ seta g_configversion 0	"Configuration file version (used to upgrade settings) 0:
 // version won't see old servers, and clients of the old version won't see new
 // servers either
 //
-// e.g. Voretournament 1.5.1 RC1 will be 15101
-gameversion 05000
-gameversion_min 04000 // 0.4.0 still used this
-gameversion_max 06000 // 0.5.0 version allows any 0.6 release, but no more
+// 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
 
 // compatibility guideline:
 //   version a.b.c   = a0b0c
@@ -107,16 +107,19 @@ _cl_color 187
 _cl_name "Player"
 _cl_playermodel models/player/vixen.zym
 _cl_playerskin 0
-crosshair 11
-seta crosshair_pickup 1 "crosshair grows then shrinks back when picking up an item"
+crosshair 13
+seta crosshair_color "1 1 0.5"
+seta crosshair_alpha 0.3
+seta crosshair_size 0.4
+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_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 3 "size of the crosshair ammo ring"
+seta crosshair_ring_size 2.5 "size of the crosshair ammo ring"
 seta crosshair_swallowindicator 1 "when enabled, the crosshair will turn into a symbol to indicate you can swallow an enemy or team mate"
-seta crosshair_swallowindicator_size 0.5 "size of the crosshair swallow indicator"
+seta crosshair_swallowindicator_size 1 "size of the crosshair swallow indicator"
 seta crosshair_swallowindicator_color_red 1 "red amount for the crosshair swallow indicator, 0 for all color cvars uses normal crosshair color"
 seta crosshair_swallowindicator_color_green 1 "green amount for the crosshair swallow indicator, 0 for all color cvars uses normal crosshair color"
 seta crosshair_swallowindicator_color_blue 1 "blue amount for the crosshair swallow indicator, 0 for all color cvars uses normal crosshair color"
@@ -126,15 +129,19 @@ seta crosshair_hittest 1.25 "do a crosshair hit evaluation; also, the crosshair
 seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed"
 seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed"
 seta cl_artwork 1 "display intermission artwork"
-seta cl_artwork_win 2 "number of artwork_won_ images available in the gfx folder, 0 disables winning artwork"
-seta cl_artwork_lose 2 "number of artwork_lost_ images available in the gfx folder, 0 disables loosing artwork"
+seta cl_artwork_win 1 "number of artwork_won_ images available in the gfx folder, 0 disables winning artwork"
+seta cl_artwork_lose 1 "number of artwork_lost_ images available in the gfx folder, 0 disables loosing artwork"
 seta cl_artwork_stretch 0 "stretch artwork to fit the screen, even if it brakes image proportions"
 seta cl_artwork_alpha 1 "artwork alpha"
 seta cl_artwork_fade 0.3 "artwork fade in speed"
-
 seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
 seta cl_reticle_item_weapon 1 "draw aiming reticle for weapon zoom, 0 disables and values between 0 and 1 change alpha"
 seta cl_reticle_item_normal 1 "draw reticle when zooming without a weapon, 0 disables and values between 0 and 1 change alpha"
+seta cl_flash_pickup 0.25 "if enabled, the screen flashes by this amount when picking up an item"
+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"
 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"
@@ -162,7 +169,8 @@ vid_conheight 600
 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_deathfade 1 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
+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_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
@@ -174,17 +182,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"
@@ -272,6 +288,10 @@ set g_telefrags 1
 set g_telefrags_avoid 0
 set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed"
 
+set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns"
+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"
 
 // fragmessage: This allows extra information to be displayed with the frag centerprints. 
@@ -318,6 +338,8 @@ net_connecttimeout 30
 sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
 set ekg 0	"Throw huge amounts of gibs"
 
+seta sv_shownames_cull_distance 2500 "distance after which to not send origin/health/armor of another player"
+
 cl_movement 1
 cl_stairsmoothspeed 200
 cl_forwardspeed $sv_maxspeed
@@ -388,7 +410,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"
@@ -590,6 +612,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"
@@ -643,6 +667,10 @@ 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_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"
+
 seta cl_itembobheight 10
 seta cl_itembobspeed 0.5
 
@@ -896,7 +924,7 @@ sv_curl_defaulturl "http://www.alientrap.org/voretournament/contentdownload/getm
 
 set sv_motd ""
 
-seta cl_shownames 2	"show player names pointed to (0: never, 1: teamplay only, 2: always)"
+seta cl_shownames 0	"show player names pointed to (0: never, 1: teamplay only, 2: always) (deprecated in VoreTournament)"
 set sv_allow_shownames 1
 
 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"
@@ -1095,8 +1123,10 @@ seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds"
 
 seta hud_powerup 0 "power of the sharpen effect when owning the shield or strength powerups, default is 0.5"
 
+seta hud_saturation 0 "saturation changes based on the amount of armor you have"
+
 seta hud_stomach 0.65 "displays a splash on the screen when inside the stomach, value specifies alpha"
-seta hud_stomach_color "0.75 1 0" "color of the stomach screen splash"
+seta hud_stomach_color "1 1 0" "color of the stomach screen splash"
 seta hud_stomach_fade_in 0.2 "how quickly the stomach splash appears when you get swallowed"
 seta hud_stomach_fade_out 0.03 "how quickly the stomach splash disappears when you are regurgitated"
 
@@ -1121,14 +1151,28 @@ seta hud_contents_water_color "0.4 0.3 0.3"
 seta hud_contents_stomach_alpha 0.2 "alpha of the stomach color blend when inside it"
 seta hud_contents_stomach_color "0.3 0.2 0"
 
+seta hud_shownames 2 "1 = draw names of nearby team mates, 2 = also draw names of nearby enemies"
+seta hud_shownames_status 2 "1 = show when the team mate can be healed, 2 = also show health, 3 = also show armor"
+seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name"
+seta hud_shownames_fontsize 8 "font size"
+seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always"
+seta hud_shownames_alpha 0.7 "alpha"
+seta hud_shownames_resize 1 "enable resizing of the names, then the size cvars will correspond to the maximum size"
+seta hud_shownames_mindistance 1000 "start fading alpha/size at this distance"
+seta hud_shownames_maxdistance 1500 "alpha/size is 0 at this distance"
+seta hud_shownames_antioverlap 1 "if two tags get too close to each other, fade out the one further away from you"
+seta hud_shownames_antioverlap_distance 125 "2d distance to other tag after which to fade out"
+seta hud_shownames_offset 52 "offset (along z-axis) tag from player origin by this many units"
+seta hud_shownames_offset_healthsize 0.5 "offset (along z-axis) tag from player origin by this many units, based on player size"
+
 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.25 "red color component of the HUD background"
+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 0.5 "blue color component of the HUD background"
-seta sbar_color_bg_team 0.5 "team color multiplier of the HUD background"
+seta sbar_color_bg_b 1 "blue color component 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"
 seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha"
@@ -1139,13 +1183,22 @@ seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher
 seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
 seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"
 seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
-seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board indicators for self"
-seta sbar_stomachboard_color2 "0.5 0 0" "RGB color of the stomach board indicators for predator"
+seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board highlights when showing self"
+seta sbar_stomachboard_color2 "0.5 0.5 0" "RGB color of the stomach board highlights when showing team mate predators"
+seta sbar_stomachboard_color3 "0.5 0 0" "RGB color of the stomach board highlights when showing enemy predators"
 seta sbar_stomachboard_status_alpha 0.75 "alpha of the stomach board status"
 seta sbar_stomachboard_status_fade 1 "color fading speed of the stomach board status"
 seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight"
 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 110 "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_ring2 1 "enables the second HUD ring"
+seta sbar_ring2_scale 80 "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_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
 
 // for menu server list (eventually make them have engine support?)
@@ -1231,13 +1284,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 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
@@ -1520,27 +1573,39 @@ set g_triggerimpulse_radial_multiplier 1 "trigger_impulse radial field multiplie
 seta g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)"
 seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged"
 
-set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between 0 and 1 = alpha"
-set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when swallowed, 0 disables"
-set cl_vore_punchangle 12 "your view gets tilted by this amount when swallowing or regurgitating someone"
-set cl_vore_kick_punchangle 3 "your view gets tilted by this amount when receiving stomach kicks"
+seta cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between = alpha"
+seta cl_vore_swallowmodel 1 "when enabled, we see the swallow model around us while getting eaten. -1 = disabled, 1 = enabled, anything between = alpha"
 seta cl_vore_cutvolume_sound 0.75 "sound volume is reduced to this amount when you are in a stomach"
-seta cl_vore_cutvolume_music 0.5 "music volume is reduced to this amount when you are in a stomach"
+seta cl_vore_cutvolume_music 0.25 "music volume is reduced to this amount when you are in a stomach"
 seta cl_vore_cutvolume_fade 0.1 "fading speed of the volume change"
 seta cl_vore_autodigest 0 "when enabled, the player will automatically begin digesting enemy prey after eating them, as long as no team mates are inside (automated digest key)"
 set g_vore 1 "enables the vore system, you want this on!"
 set g_vore_digestion 1 "enables digestion system, you want this on!"
 set g_vore_kick 1 "enables stomach kick system, you want this on!"
+set g_vore_spawnshield 0 "when disabled, players with spawn shields cannot be swallowed"
 set g_vore_reversescoring 0 "reverses vore scoring, and gives digested prey a frag rather than the predator (offer yourself gameplay), does not affect suicides, weapon kills and team kills"
 set g_vore_teamvore 1 "allow players to swallow their team mates"
-set g_vore_biggergut 1 "when enabled, a player can't swallow someone with more players in their stomach than them"
+set g_vore_biggergut 0 "when enabled, a player can't swallow someone with more players in their stomach than them"
+set g_vore_biggersize 0 "when enabled, a player can't swallow someone larger than them, when g_healthsize is enabled"
 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.4 0.6 0.1" "the color players will have when regurgitated alive"
+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.15 0.25 0" "the color players will have when digested, only works when g_vore_keepdeadprey is disabled"
-set g_vore_keepdeadprey 1 "If enabled, prey remains inside the stomach after dying from digestion, else the predator throws up their dead body"
+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_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_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 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
@@ -1619,27 +1684,27 @@ mod_q1bsp_polygoncollisions 1
 sv_gameplayfix_gravityunaffectedbyticrate 1
 sv_gameplayfix_nogravityonground 1
 
-scr_conalpha 0.5
+scr_conalpha 0.75
 scr_conalpha2factor 1
 scr_conalpha3factor 0.5
-scr_conalphafactor 0.8
-scr_conbrightness 0.35
+scr_conalphafactor 1
+scr_conbrightness 0.5
 scr_conforcewhiledisconnected 1
 scr_conscroll2_x 0
 scr_conscroll2_y 0
 scr_conscroll3_x 0
 scr_conscroll3_y 0
-scr_conscroll_x -0.15
-scr_conscroll_y -0.25
+scr_conscroll_x -0.05
+scr_conscroll_y -0.15
 
 // loading screen
-scr_loadingscreen_scale 10000
+scr_loadingscreen_scale 1
 scr_loadingscreen_scale_base 1
 scr_loadingscreen_scale_limit 1
 scr_loadingscreen_background 0
 scr_loadingscreen_barcolor "0.5 1 0"
-scr_loadingscreen_barheight 16
-scr_loadingscreen_count 1
+scr_loadingscreen_barheight 12
+scr_loadingscreen_count 2
 scr_conforcewhiledisconnected 0
 scr_infobar_height 16
 
@@ -1653,8 +1718,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