X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=data%2FdefaultVoretournament.cfg;h=3becb06c993af09a8fcfde6e211be4ecd9682f84;hb=023b967fafcefd64453cba8e80bbbff0a4572d96;hp=3f7b2e529af548c77eca7adbb0fdecb9905c28c1;hpb=23bd3e26cd35c081f1e3e51ee783a8f73ed8d9ce;p=voretournament%2Fvoretournament.git

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 3f7b2e52..eaf99382 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1,4 +1,4 @@
-set g_voretournamentversion 0.1.1git	"Voretournament version (formatted for humans)"
+set g_voretournamentversion 0.5.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.5.1 RC1 will be 15101
-gameversion 01100
-gameversion_min 01100 // 0.1.1 still used this
-gameversion_max 02000 // 0.1.1 version allows any 0.2 release, but no more
+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
 
 // compatibility guideline:
 //   version a.b.c   = a0b0c
@@ -108,11 +108,19 @@ _cl_name "Player"
 _cl_playermodel models/player/vixen.zym
 _cl_playerskin 0
 crosshair 1
+seta crosshair_pickup 1
+seta crosshair_pickup_speed 4
 seta crosshair_effect_speed 0.25 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time"
 seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects"
 seta crosshair_hittest 1.25 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate"
 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_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"
 fov 90
 seta cl_velocityzoom 0	"velocity based zooming of fov, negative values zoom out"
 seta cl_velocityzoomtime 0.3	"time value for averaging speed values"
@@ -147,12 +155,23 @@ cl_bobcycle 0.6 // how long the cycle of up/down view movement takes (only works
 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_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"
+cl_bobfallspeed 200 "necessary amount of speed for bob-falling to occur"
 cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
 cl_rollangle 0 // 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
+r_damageblur 0 // motion blur when damaged, default is 0 (disabled in voretournament)
+
+r_bloom_blur 8
+r_bloom_brighten 4
+r_bloom_colorexponent 1
+r_bloom_colorscale 1
+r_bloom_colorsubtract 0.25
+r_bloom_resolution 320
+r_hdr_range 4
 
 // weapon model leaning / following
 cl_leanmodel 1 // enables weapon leaning effect when looking around
@@ -187,7 +206,7 @@ seta vid_x11_display ""	"voretournament-linux-*.sh will use this to start voreto
 cl_autodemo_nameformat demos/%Y-%m-%d_%H-%M
 
 // taunts and voices
-seta cl_autotaunt 1 "automatically taunt enemies when fragging them"
+seta cl_autotaunt 0.75 "automatically taunt enemies when fragging them"
 seta sv_taunt 1 "allow taunts on the server"
 seta sv_autotaunt 1 "allow autotaunts on the server"
 seta cl_voice_directional 1	"0 = all voices are non-directional, 1 = all voices are directional, 2 = only taunts are directional"
@@ -247,7 +266,7 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information,
 
 // use default physics
 set sv_friction_on_land 0
-exec physics26.cfg
+exec physics.cfg
 
 set sv_player_viewoffset "0 0 35" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"
@@ -268,7 +287,7 @@ seta sv_precacheitems 0
 set sv_spectator_speed_multiplier 1.5
 seta sv_spectate 1 "if set to 1, new clients are allowed to spectate or observe the game, if set to 0 joining clients spawn as players immediately (no spectating)"
 seta sv_defaultcharacter 0 "master switch, if set to 1 the further configuration for replacing all player models, skins and colors is taken from the sv_defaultplayermodel, sv_defaultplayerskin and sv_defaultplayercolors variables"
-seta sv_defaultplayermodel "models/player/nexus.zym" "default model selection, only works if sv_defaultcharacter is set to 1"
+seta sv_defaultplayermodel "models/player/vixen.zym" "default model selection, only works if sv_defaultcharacter is set to 1"
 seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1"
 seta sv_defaultplayermodel_red ""	"\"\" means see sv_defaultplayermodel"
 seta sv_defaultplayerskin_red 0
@@ -310,69 +329,10 @@ cl_movement_waterfriction $sv_waterfriction
 seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying"
 alias autoswitch "set cl_autoswitch $1 ; cmd autoswitch $1"
 
-seta bot_config_file bots.txt "Name and path of the bot configuration file"
-seta bot_number 0	"Minimum number of bots"
-seta bot_usemodelnames 0	"Use player model names for bot names"
-set bot_nofire 0	"When set, bots never fire. Mainly for testing in g_waypointeditor mode"
-seta bot_prefix ^8[BOT]^7	"Prefix in front of the bot names"
-seta bot_suffix ""	"Suffix behind the bot names"
-seta skill_auto 0	"when 1, \"skill\" gets adjusted to match the best player on the map"
-// general bot AI cvars
-set bot_ai_thinkinterval 0.05
-set bot_ai_strategyinterval 3 "How often a new objective is chosen"
-set bot_ai_enemydetectioninterval 0.5 "How often bots pick a new target"
-set bot_ai_enemydetectionradius 10000 "How far bots can see enemies"
-set bot_ai_dodgeupdateinterval 0.1 "How often scan for items to dodge. Currently not in use."
-set bot_ai_chooseweaponinterval 0.3 "How often the best weapon according to the situation will be chosen"
-set bot_ai_dangerdetectioninterval 0.1 "How often scan for waypoints with dangers near"
-set bot_ai_dangerdetectionupdates 64 "How many waypoints will be considered for danger detection"
-set bot_ai_aimskill_blendrate 2	"How much correction will be applied to the aiming angle"
-set bot_ai_aimskill_fixedrate 15
-set bot_ai_aimskill_firetolerance_distdegrees 180
-set bot_ai_aimskill_firetolerance_mindegrees 2 "Minimum angle tolerance. Used on large distances"
-set bot_ai_aimskill_firetolerance_maxdegrees 60 "Maximum firing angle. Used on close range"
-set bot_ai_aimskill_mouse 1 "How much of the aiming filters are applied"
-set bot_ai_keyboard_distance 250 "Keyboard emulation is disabled after this distance to the goal"
-set bot_ai_keyboard_treshold 0.57
-set bot_ai_aimskill_offset 0.3 "Amount of error induced to the bots aim"
-set bot_ai_aimskill_think 1 "Aiming velocity. Use values below 1 for slower aiming"
-set bot_ai_custom_weapon_priority_distances "300 850"	"Define close and far distances in any order. Based on the distance to the enemy bots will choose different weapons"
-set bot_ai_custom_weapon_priority_far   "hook"
-set bot_ai_custom_weapon_priority_mid   "hook"
-set bot_ai_custom_weapon_priority_close "hook"
-set bot_ai_weapon_combo 1	"Enable bots to do weapon combos"
-set bot_ai_weapon_combo_threshold 0.3	"Try to make a combo N seconds after the last attack"
-set bot_ai_friends_aware_pickup_radius "500"	"Bots will not pickup items if a team mate is this distance near the item"
-set bot_ai_ignoregoal_timeout 3	"Ignore goals making bots to get stuck in front of a wall for N seconds"
-set bot_ai_bunnyhop_skilloffset 7	"Bots with skill equal or greater than this value will perform the  \"bunnyhop\" technique"
-set bot_ai_bunnyhop_startdistance 250 "Run to goals located further than this distance"
-set bot_ai_bunnyhop_stopdistance 220 "Stop jumping after reaching this distance to the goal"
-set bot_ai_bunnyhop_firstjumpdelay 0.5 "Start running to the goal only if it was seen for more than N seconds"
-set bot_ai_vore_decide_pred 4 "How fast bots decide what to do with their prey, at lowest skill"
-set bot_ai_vore_decide_prey 4 "How fast bots decide what to do with their predator, at lowest skill"
-set bot_ai_vore_decide_giveuphealth 50 "If a bot is inside the stomach, having less than this amount of health causes them to give up and trigger digestion, at lowest skill"
-set bot_ai_vore_decide_fear 2 "How much bots will fear players more powerful than them, and therefore avoid them in some situations"
-set bot_god 0 "god mode for bots"
-set bot_ai_navigation_jetpack 0 "Enable bots to navigat maps using the jetpack"
-set bot_ai_navigation_jetpack_mindistance 3500 "Bots will try fly to objects located farther than this distance"
-// Better don't touch these, there are hard to tweak!
-set bot_ai_aimskill_order_mix_1st 0.01 "Amount of the 1st filter output to apply to the aiming angle"
-set bot_ai_aimskill_order_mix_2nd 0.1 "Amount of the 1st filter output to apply to the aiming angle"
-set bot_ai_aimskill_order_mix_3th 0.01 "Amount of the 1st filter output to apply to the aiming angle"
-set bot_ai_aimskill_order_mix_4th 0.05 "Amount of the 1st filter output to apply to the aiming angle"
-set bot_ai_aimskill_order_mix_5th 0.01 "Amount of the 1st filter output to apply to the aiming angle"
-set bot_ai_aimskill_order_filter_1st 0.4 "Position filter"v
-set bot_ai_aimskill_order_filter_1st 0.4 "Position filter"
-set bot_ai_aimskill_order_filter_2nd 0.4 "Movement filter"
-set bot_ai_aimskill_order_filter_3th 0.2 "Acceleration filter"
-set bot_ai_aimskill_order_filter_4th 0.4 "Position prediction filter. Used rarely"
-set bot_ai_aimskill_order_filter_5th 0.5 "Movement prediction filter. Used rarely"
+exec bots.cfg
 
 // waypoint editor enable
 set g_waypointeditor 0
-set bot_ignore_bots 0	"When set, bots don't shoot at other bots"
-set bot_join_empty 0	"When set, bots also play if no player has joined the server"
-set bot_vs_human 0	"Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count)"
 
 alias g_waypointeditor_spawn "impulse 103"
 alias g_waypointeditor_remove "impulse 104"
@@ -382,7 +342,7 @@ alias g_waypointeditor_unreachable "impulse 107"
 
 locs_enable 0
 pausable 0
-seta g_spawnshieldtime 0.5 "number of seconds you are invincible after you spawned, this shield is lost after you fire"
+seta g_spawnshieldtime 1 "number of seconds you are invincible after you spawned, this shield is lost after you fire or vore"
 seta g_antilag 2	"AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 = server side hit scan in the past, 3 = unverified client side hit scan)"
 set g_antilag_nudge 0 "don't touch"
 set g_antilag_bullets 1 "Bullets AntiLag (0 = no AntiLag, 1 = server side hit scan in the past) - DO NOT TOUCH (severely changes weapon balance)"
@@ -416,7 +376,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 "basement basementctf soylent"
+seta g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep2 basement farewell greatwall_revisited soylent"
 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"
@@ -425,11 +385,16 @@ set samelevel 0 "when 1, always play the same level over and over again"
 set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
 
 set g_cloaked 0 "display all players mostly invisible"
+set g_player_colisions 1 "when disabled, players won't colide with each other"
 set g_player_alpha 1
 set g_player_brightness 0	"set to 2 for brighter players"
 seta g_balance_cloaked_alpha 0.25
 
 set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"
+set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps"
+
+// a cruel way to fix some "falling forever" situations (eg. facing horizontal warpzones)
+set g_deathspeed 6000 "players going faster than this will die"
 
 set welcome_message_time 8
 
@@ -497,7 +462,7 @@ seta timelimit_overtimes 0 "how many overtimes to add at max"
 seta timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all overtimes were added and still no winner was found"
 
 // common team values
-set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
+seta g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
 
 seta teamplay_default 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
 seta g_mirrordamage 0.3	"for teamplay 4: mirror damage factor"
@@ -511,18 +476,18 @@ seta g_balance_teams_force 0	"automatically balance out teams when players move
 seta g_balance_teams_prevent_imbalance	0	"prevent players from changing to larger teams"
 set g_tdm_teams 2 "how many teams are in team deathmatch (set by mapinfo)"
 seta g_tdm_teams_override 0	"how many teams are in team deathmatch"
-set g_tdm_team_spawns 0 "when 1, a map can define team spawnpoints for TDM"
+set g_tdm_team_spawns 1 "when 1, a map can define team spawnpoints for TDM"
 set g_changeteam_banned 0	"not allowed to change team"
 set g_changeteam_fragtransfer 0	"% of frags you get to keep when you change teams (rounded down)"
 
 set sv_teamnagger 1 "enable a nag message when the teams are unbalanced"
 
 // dm
-set g_dm 1 "Deathmatch: killing any other player is one frag, player with most frags wins"
+seta g_dm 1 "Deathmatch: killing any other player is one frag, player with most frags wins"
 set gamecfg 1	// "deathmatch"
 
 // ctf
-set g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
+seta g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
 set g_ctf_flag_returntime 30
 set g_ctf_flagcarrier_selfdamage 1
 set g_ctf_flagcarrier_selfforce 1
@@ -547,10 +512,10 @@ set g_ctf_flag_pickup_effects 1
 set g_ctf_flag_capture_effects 1
 set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too"
 
-exec ctfscoring-ai.cfg
+exec ctfscoring.cfg
 
 // domination
-set g_domination			0 "Domination: capture and hold control points to gain points"
+seta g_domination			0 "Domination: capture and hold control points to gain points"
 set g_domination_default_teams		2 "default number of teams for maps that aren't domination-specific"
 seta g_domination_teams_override		0 "use a specific number of teams in domination games (minimum 2), disables dom_team entities"
 set g_domination_disable_frags		0 "players can't get frags normally, only get points from kills"
@@ -562,7 +527,7 @@ set g_domination_point_glow		0 "domination point glow (warning, slow)"
 //set g_domination_balance_team_points	1 "# of points received is based on team sizes"
 
 // last man standing
-set g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives, and the survivor wins"
+seta g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives, and the survivor wins"
 set g_lms_lives_override -1
 set g_lms_regenerate 0
 set g_lms_campcheck_interval 10
@@ -573,40 +538,43 @@ set g_lms_last_join 3	"if g_lms_join_anytime is false, new players can only join
 set g_lms_join_anytime 1	"if true, new players can join, but get same amount of lives as the worst player"
 
 // arena
-set g_arena 0 "Arena: many one-on-one rounds are played to find the winner"
+seta g_arena 0 "Arena: many one-on-one rounds are played to find the winner"
 set g_arena_maxspawned 2	"maximum number of players to spawn at once (the rest is spectating, waiting for their turn)"
 set g_arena_roundbased 1	"if disabled, the next player will spawn as soon as someone dies"
 set g_arena_warmup 5	"time, newly spawned players have to prepare themselves in round based matches"
 set g_arena_powerups 0	"enables powerups (superhealth, strength and shield), which are removed by default"
 
 // ca
-set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
+seta g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
 set g_ca_point_limit 10 "point limit 10 is standard for clan arena"
 set g_ca_point_leadlimit 0
 set g_ca_warmup 10 "how long the players will have time to run around the map before the round starts"
 
 // onslaught
-set g_onslaught 0 "Onslaught: take control points towards the enemy generator and then destroy it"
-set g_onslaught_gen_health 5000
-set g_onslaught_cp_health 1000
+seta g_onslaught 0 "Onslaught: take control points towards the enemy generator and then destroy it"
+set g_onslaught_gen_health 2000
+set g_onslaught_cp_health 240
 set g_onslaught_cp_buildhealth 100
 set g_onslaught_cp_buildtime 10
-set g_onslaught_cp_regen 20
+set g_onslaught_cp_regen 5
 
 // assault
-set g_assault 0 "Assault: attack the enemy base as fast as you can, then defend the base against the enemy for that time to win"
+seta g_assault 0 "Assault: attack the enemy base as fast as you can, then defend the base against the enemy for that time to win"
 
 // race
-set g_race 0 "Race: be faster than your opponents"
+seta g_race 0 "Race: be faster than your opponents"
 set g_race_qualifying_timelimit 0
 set g_race_qualifying_timelimit_override -1
 set g_race_teams 0	"when 2, 3, or 4, the race is played as a team game (the team members can add up their laps)"
 
 // cts
-set g_cts 0 "CTS: complete the stage"
+seta g_cts 0 "CTS: complete the stage"
 
 // rpg
-set g_rpg 0 "RPG: RolePlay / Free Roam gametype"
+seta g_rpg 0 "RPG: RolePlay / Free Roam gametype"
+set g_rpg_canleave 1 "when enabled, anyone can leave a predator's stomach in RPG (like leaving a team mate in team games)"
+set g_rpg_botattack 1 "bot behavior in RPG. 0 causes bots to never attack, 1 allows bots to swallow you harmlessly, 2 allows bots to attack normally"
+set g_rpg_turretattack 0 "if disabled, turrets don't attack anyone in RPG games. Otherwise, they attack everyone."
 
 // server game balance settings
 // powerup balance settings
@@ -618,6 +586,7 @@ set g_bloodloss 0   "amount of health below which blood loss occurs"
 set g_footsteps 1	"serverside footstep sounds"
 
 // effects
+r_glsl_postprocess 1
 r_picmipsprites 0 // Voretournament uses sprites that should never be picmipped (team mate, typing, waypoints)
 r_mipsprites 1
 r_mipskins 1
@@ -889,23 +858,24 @@ set quit_and_redirect ""	"set to an IP to redirect all players at the end of the
 
 // singleplayer campaign
 set g_campaign 0
-seta g_campaign_name "voretournament25"
+set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink"
+set g_campaign_changelevel 0 "When disabled, levels won't be automatically change after a match was won or lost (you're taken back to the menu instead)"
+seta g_campaign_name "voretournament"
 set g_campaign_skill 0
-set g_campaignvoretournament20_index 0
-set g_campaignvoretournament25_index 1
+set g_campaignvoretournament_index 0
 
 alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"
 alias singleplayer_continue "set scmenu_campaign_goto -1"
 alias singleplayer_levellist "set scmenu_campaign_dump 1; togglemenu; wait; togglemenu"
 
 // Green's fullbright skins
-alias cl_fbskin_green "playermodel models/player/nexus.zym; playerskin 6; color 3 3"
-alias cl_fbskin_red "playermodel models/player/nexus.zym; playerskin 6; color 4 4"
-alias cl_fbskin_orange "playermodel models/player/nexus.zym; playerskin 6; color 14 14"
-alias cl_fbskin_off "playermodel models/player/nexus.zym; playerskin 0"
-alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 51"
-alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 68"
-alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 238"
+alias cl_fbskin_green "playermodel models/player/vixen.zym; playerskin 6; color 3 3"
+alias cl_fbskin_red "playermodel models/player/vixen.zym; playerskin 6; color 4 4"
+alias cl_fbskin_orange "playermodel models/player/vixen.zym; playerskin 6; color 14 14"
+alias cl_fbskin_off "playermodel models/player/vixen.zym; playerskin 0"
+alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/vixen.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 51"
+alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/vixen.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 68"
+alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/vixen.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 238"
 alias sv_fbskin_off "g_fullbrightplayers 0; sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
 
 seta sv_servermodelsonly 1
@@ -1001,7 +971,7 @@ alias addfav "qc_cmd addtolist net_slist_favorites $*"
 alias addvote "qc_cmd addtolist sv_vote_commands $*"
 
 // key hunt
-set g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score"
+seta g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score"
 set g_balance_keyhunt_delay_return 60
 set g_balance_keyhunt_delay_round 5
 set g_balance_keyhunt_delay_tracking 10
@@ -1082,7 +1052,7 @@ alias _userbind_call "${$1}"
 alias +userbind "_userbind_call userbind${1}_press"
 alias -userbind "_userbind_call userbind${1}_release"
 
-seta menu_skin "simplygoo"
+seta menu_skin "earthy"
 set menu_slowmo 1
 seta menu_sounds 2 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
 
@@ -1098,6 +1068,46 @@ con_chatwidth 0.6
 con_notifysize 10
 con_notifyalign 0
 
+seta hud_damage 0.6 "an improved version of gl_polyblend for damage, draw an image instead when hurt"
+seta hud_damage_blur 10 "Use postprocessing to blur the screen when you have taken damage. This can be paired with current hud damage or just used alone. Higher values = more blur"
+seta hud_damage_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance"
+seta hud_damage_gentle_alpha_multiplier 0.10 "how much to multiply alpha of flash when using the cl_gentle version, it's much more opaque than the non-gentle version"
+seta hud_damage_gentle_color "1 0.7 1" "color of flash for cl_gentle version"
+seta hud_damage_color "1 0 0" "color of flash"
+seta hud_damage_factor 0.025 "(damage * factor) = how much to add to the alpha value"
+seta hud_damage_fade_rate 0.75 "how much to subtract from the alpha value each second"
+seta hud_damage_maxalpha 1.5 "how much to limit the alpha value to"
+seta hud_damage_pain_threshold 0.1 "how much alpha to ignore (must be bigger than the hud_damage_factor so that e.g. rot is ignored)"
+seta hud_damage_pain_threshold_lower 1.5 "how much we lower pain_threshold with when nearing 0 health (if pain_threshold gets negative then we always draw a flash at alpha = fabs(pain_threshold)"
+seta hud_damage_pain_threshold_lower_health 50 "at which health we start lowering pain_threshold"
+seta hud_damage_pain_threshold_pulsating_min 0.6 "minimum value when calculating the pulse: max(pulsating_min, fabs(sin(PI * time / period))"
+seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds"
+seta hud_powerup 0.5 "power of the sharpen effect when owning the shield or strength powerups"
+
+seta hud_stomach 0.6 "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_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"
+
+seta hud_postprocessing 1 "enables the ability for effects such as hud_damage_blur and hud_contents to apply a postprocessing method upon the screen - enabling this disables manual editing of the postprocess cvars"
+seta hud_postprocessing_maxbluralpha 0.5 "maximum alpha which the blur postprocess can be"
+seta hud_postprocessing_maxblurradius 10 "maximum radius which the blur postprocess can be"
+
+seta hud_contents 1 "an improved version of gl_polyblend for liquids such as water/lava/slime, draw a filler when inside the liquid"
+seta hud_contents_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur"
+seta hud_contents_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance"
+seta hud_contents_factor 1 "factor at which to multiply the current faded value."
+seta hud_contents_fadeintime 0.02 "factor of time it takes for the alpha level to reach normal value when entering the liquid"
+seta hud_contents_fadeouttime 0.1 "factor of time it takes for the alpha level to reach normal value when leaving the liquid"
+seta hud_contents_lava_alpha 0.7 "alpha of the lava color blend when inside it"
+seta hud_contents_lava_color "0.8 0.1 0" 
+seta hud_contents_slime_alpha 0.7 "alpha of the slime color blend when inside it"
+seta hud_contents_slime_color "0 0.4 0.1"
+seta hud_contents_water_alpha 0.5 "alpha of the water color blend when inside it"
+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"
+
 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"
@@ -1183,7 +1193,7 @@ sys_ticrate 0.0166667
 cl_netfps 60 // should match
 sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1
-sv_gameplayfix_consistentplayerprethink 1
+sv_gameplayfix_stepmultipletimes 1
 
 // delay for "kill" to prevent abuse
 set g_balance_kill_delay 5
@@ -1208,11 +1218,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" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"
+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_dontusebydefault "" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"
 cd remap $g_cdtracks_remaplist
-set sv_intermission_cdtrack ""
-set menu_cdtrack feeding_frenzy
+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
 
 // maxidle (in seconds): kick players idle for more than that amount of time
 set sv_maxidle 0
@@ -1252,7 +1264,7 @@ seta sv_status_privacy 1	"hide IP addresses from \"status\" replies shown to cli
 
 
 seta cl_teamradar 1	"show radar in teammatches when available"
-seta cl_teamradar_background_alpha 0	"set to -1 to disable"
+seta cl_teamradar_background_alpha 0.6	"set to -1 to disable"
 seta cl_teamradar_foreground_alpha 0.8	"alpha of the map"
 seta cl_teamradar_scale 4096 "distance you can see on the team radar"
 seta cl_teamradar_rotation 0	"rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
@@ -1418,9 +1430,6 @@ rcon_secure 1
 
 set menu_updatecheck 1
 
-set bot_navigation_ignoreplayers 0 // FIXME remove this once the issue is solved
-set bot_sound_monopoly 0 "when enabled, only bots can make any noise"
-
 // broken, sorry (cannot handle weapon attachment properly)
 //seta cl_forceplayermodels 0 "force all players to look like you; WARNING: animations can look very bad with this"
 //seta cl_forceplayermodelsfromvoretournament 0 "force models coming from voretournament; WARNING: animations can look very bad with this"
@@ -1431,6 +1440,8 @@ set g_mapinfo_settemp_acl "+*" "ACL for mapinfo setting cvars"
 // hooks
 alias _cl_hook_gamestart "set _cl_hook_gametype $1; _cl_hook_gamestart_stage2"
 alias _cl_hook_gamestart_stage2 "cl_hook_gamestart_all; cl_hook_gamestart_${_cl_hook_gametype}"
+alias _cl_hook_campaign_gamestart "set _cl_hook_gametype $1; _cl_hook_campaign_gamestart_stage2"
+alias _cl_hook_campaign_gamestart_stage2 "cl_hook_gamestart_all; cl_hook_gamestart_${_cl_hook_gametype}"
 alias cl_hook_gamestart_all
 alias cl_hook_gamestart_nop  //is only called when CSQC unloads before knowing the gametype, very unlikely
 alias cl_hook_gamestart_dm
@@ -1445,10 +1456,14 @@ alias cl_hook_gamestart_ons
 alias cl_hook_gamestart_as
 alias cl_hook_gamestart_rc
 alias cl_hook_gamestart_cts
+alias cl_hook_gamestart_rpg
 alias cl_hook_gameend
+alias cl_hook_campaign_gameend
 
 alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2"
 alias _sv_hook_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}"
+alias _sv_hook_campaign_gamestart "set _sv_hook_gametype $1; _sv_hook_campaign_gamestart_stage2"
+alias _sv_hook_campaign_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}"
 alias sv_hook_gamestart_all
 alias sv_hook_gamestart_dm
 alias sv_hook_gamestart_tdm
@@ -1462,8 +1477,10 @@ alias sv_hook_gamestart_ons
 alias sv_hook_gamestart_as
 alias sv_hook_gamestart_rc
 alias sv_hook_gamestart_cts
+alias sv_hook_gamestart_rpg
 alias sv_hook_gamerestart
 alias sv_hook_gameend
+alias sv_hook_campaign_gameend
 
 seta cl_casings_maxcount 100 "maximum amount of shell casings (must be at least 1)"
 seta cl_gibs_maxcount 100 "maximum amount of gibs (must be at least 1)"
@@ -1493,14 +1510,22 @@ seta g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the
 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 getting swallowed, 0 disables"
-set g_vore_regurgitatecolor_released "0.75 1 0.5" "the color players will have when released from the stomach alive"
-set g_vore_regurgitatecolor_digested "-0.125 0.25 0" "the color players will have when released from the stomach digested"
-set g_vore_gurglesound 1 "predators make an ambient gurgling sound"
+set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when swallowed, 0 disables"
+set cl_vore_punchangle 10 "your view gets tilted by this amount when swallowing or regurgitating someone"
+set cl_vore_cutvolume_sound 0.75 "sound volume is reduced to this amount when you are in a stomach"
+set cl_vore_cutvolume_music 0.5 "music volume is reduced to this amount when you are in a stomach"
+set cl_vore_cutvolume_fade 0.1 "fading speed of the volume change"
+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_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_dropweapon 0.75 "probability of dropping your weapon when being swallowed. 0 = never and 1 = always, does not apply to team mates"
-set g_vore_showpreyhealth 1 "when enabled, a predator can see their prey's health on the stomach board"
-set g_vore_soundocclusion 0.25 "directional player sounds are played at this amount of their normal volume for eaten players (simulates hearing harder from the stomach)"
+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.875 1 0.375" "the color players will have when regurgitated alive"
+set g_vore_regurgitatecolor_digest "0.125 0.25 0" "the color players will have when digested"
 
 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"
@@ -1550,6 +1575,9 @@ collision_endposnudge 1
 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
 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
+
 // FIXME temporary
 set menu_font_size_snapping_fix 1
 
@@ -1559,3 +1587,26 @@ seta _cl_userid "" "player ID (e.g. for tournaments)"
 // FIXME workaround for engine bug
 sv_gameplayfix_nudgeoutofsolid 0
 // to div0: remove this once 5b7ac1706712977bbc0297d2d53294e73574c7cd (svn r9537) is in the stable branch of the engine again
+
+// otherwise, antilag breaks
+sv_gameplayfix_consistentplayerprethink 1
+
+// support Q1BSP maps
+mod_q1bsp_polygoncollisions 1
+
+// improve some minor details
+sv_gameplayfix_gravityunaffectedbyticrate 1
+sv_gameplayfix_nogravityonground 1
+
+scr_conalpha 0.5
+scr_conalpha2factor 1
+scr_conalpha3factor 0.5
+scr_conalphafactor 0.8
+scr_conbrightness 0.35
+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
\ No newline at end of file