X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2FdefaultVoretournament.cfg;h=15098213d1b8e4fa212573aaf49d2060d57f7ce6;hp=3ab5cb93be5fb39703cb777571ff019c0dfc2a2b;hb=9f40eda7868f8c3998f417e39cc2f29d9554b6b3;hpb=42d657e9fe93789a299c87a22f095b7ac5526ac1

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 3ab5cb93..15098213 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -110,7 +110,14 @@ _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_ring_alpha 0.5
+seta crosshair_ring_size 3
+seta crosshair_swallowindicator 1
+seta crosshair_swallowindicator_size 0.5
+seta crosshair_swallowindicator_color_red 1
+seta crosshair_swallowindicator_color_green 1
+seta crosshair_swallowindicator_color_blue 1
+seta crosshair_effect_speed 0.15 "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"
@@ -131,8 +138,6 @@ freelook 1
 sensitivity 6
 v_gamma 1.125000
 viewsize 100
-bgmvolume 1
-volume 0.5
 // fullscreen 1024x768x32bit
 vid_bitsperpixel 32
 vid_fullscreen 1
@@ -206,9 +211,9 @@ 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 0.75 "automatically taunt enemies when fragging them"
-seta sv_vore_autotaunt_repeat_min 2.5 "how many seconds to attempt playing vore taunts, minimum"
-seta sv_vore_autotaunt_repeat_max 10 "how many seconds to attempt playing vore taunts, maximum"
+seta cl_autotaunt 0.65 "automatically taunt enemies when fragging them"
+seta sv_vore_autotaunt_repeat_min 0.5 "how many seconds to attempt playing vore taunts, minimum"
+seta sv_vore_autotaunt_repeat_max 2 "how many seconds to attempt playing vore taunts, maximum"
 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"
@@ -718,6 +723,7 @@ bind MOUSE2 +attack2
 bind MOUSE3 +zoom
 bind MOUSE4 weaplast
 bind MOUSE5 +hook
+bind r reload
 bind q +regurgitate
 bind e +digest
 bind BACKSPACE dropweapon
@@ -725,7 +731,7 @@ bind g dropweapon
 bind f +use
 
 // misc
-bind r +jetpack
+bind f +jetpack
 bind ` toggleconsole
 bind ~ toggleconsole
 bind TAB +showscores
@@ -1515,7 +1521,8 @@ seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the co
 
 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 14 "your view gets tilted by this amount when swallowing or regurgitating someone"
+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_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_fade 0.1 "fading speed of the volume change"
@@ -1535,8 +1542,10 @@ set g_vore_regurgitatecolor_digest "0.15 0.25 0" "the color players will have wh
 set g_vore_keepdeadprey 1 "If enabled, prey remains inside the stomach after dying from digestion, else the predator throws up their dead body"
 
 // part of an ugly hack for the menu audio sliders to work with the cutsound feature
-set menu_volume $volume
-set menu_bgmvolume $bgmvolume
+seta menu_volume 0.5
+seta menu_bgmvolume 1
+set volume $menu_volume
+set bgmvolume $menu_bgmvolume
 
 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"