X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2FdefaultVoretournament.cfg;h=f1202cc420f78be21dc9ca8d7ec1cc5e12c2f616;hp=2d60bdb9a865b63ef0cb6fce22628e32cc11a60d;hb=30d7f93ccf99d857f6cd5d6806e4c3e0b53fef1b;hpb=39c58514a95b81d4cde41e6c07c25faf4e20593b

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 2d60bdb9..f1202cc4 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1,4 +1,4 @@
-set g_voretournamentversion 0.4.0git	"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 04000
-gameversion_min 03000 // 0.3.0 still used this
-gameversion_max 05000 // 0.4.0 version allows any 0.5 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,6 +108,8 @@ _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"
@@ -153,6 +155,9 @@ 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
@@ -193,7 +198,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"
@@ -316,71 +321,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 1.35 "How fast bots decide what to do with their prey, at lowest skill"
-set bot_ai_vore_decide_prey 1.35 "How fast bots decide what to do with their predator, at lowest skill"
-set bot_ai_vore_decide_swallow 0.2 "How often bots decide if to swallow someone or not"
-set bot_ai_vore_fear 2 "How much bots will fear players more powerful than them and avoid them in some situations"
-set bot_ai_vore_teamhealabandon 0.75 "Probability (from 0 to 1) of the bot abandoning a team heal when seeing an enemy they can vore, at highest skill"
-set bot_ai_vore_stayinteamstomach 0 "When enabled, a bot will stay in a team mate's stomach even if he was teamhealed to the max and could willingly leave"
-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"
@@ -390,7 +334,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)"
@@ -439,6 +383,7 @@ 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"
@@ -523,7 +468,7 @@ 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)"
 
@@ -1114,6 +1059,30 @@ con_chatwidth 0.6
 con_notifysize 10
 con_notifyalign 0
 
+seta hud_damage 0.55 "an improved version of gl_polyblend for damage, draw an image instead when hurt"
+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.25 "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_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_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"
+
 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"
@@ -1436,9 +1405,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"
@@ -1522,6 +1488,8 @@ set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us whe
 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 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"