X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=data%2FdefaultVoretournament.cfg;h=6db167205d4d89028d61979d5d016bf737d44912;hb=147a859f0dc3abe96a337c060287a3b56cd320fc;hp=d0ccbde0605f1acfca9a2b220e6693f50fb111f1;hpb=4766dbf975b974c4d0049470965182bd40be3bac;p=voretournament%2Fvoretournament.git

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index d0ccbde0..6db16720 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -107,12 +107,20 @@ _cl_color 187
 _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_ring_alpha 0.5
-seta crosshair_ring_size 3
-seta crosshair_effect_speed 0.25 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time"
+crosshair 11
+seta crosshair_pickup 1 "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_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_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"
+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"
@@ -123,8 +131,12 @@ seta cl_artwork_lose 2 "number of artwork_lost_ images available in the gfx fold
 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"
 fov 90
-seta cl_velocityzoom 0	"velocity based zooming of fov, negative values zoom out"
+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"
 seta cl_zoomfactor 5	"how much +zoom will zoom (1-16)"
 seta cl_zoomspeed 3.5	"how fast it will zoom (0.5-16), negative values mean instant zoom"
@@ -133,8 +145,6 @@ freelook 1
 sensitivity 6
 v_gamma 1.125000
 viewsize 100
-bgmvolume 1
-volume 0.5
 // fullscreen 1024x768x32bit
 vid_bitsperpixel 32
 vid_fullscreen 1
@@ -161,7 +171,7 @@ cl_bobfall 0.05 "how much the view swings down when falling (influenced by the s
 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
+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
@@ -720,6 +730,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
@@ -727,7 +738,7 @@ bind g dropweapon
 bind f +use
 
 // misc
-bind r +jetpack
+bind f +jetpack
 bind ` toggleconsole
 bind ~ toggleconsole
 bind TAB +showscores
@@ -890,7 +901,7 @@ sv_curl_defaulturl "http://www.alientrap.org/voretournament/contentdownload/getm
 
 set sv_motd ""
 
-seta cl_shownames 1	"show player names pointed to (0: never, 1: teamplay only, 2: always)"
+seta cl_shownames 2	"show player names pointed to (0: never, 1: teamplay only, 2: always)"
 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"
@@ -1517,7 +1528,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"
@@ -1537,8 +1549,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"