From ed6e845709b9b46dfc0fa7c6f690b1d40758b5c7 Mon Sep 17 00:00:00 2001 From: Samual Date: Wed, 18 Jan 2012 14:01:08 -0500 Subject: [PATCH] Move crosshair settings into its own config file --- crosshairs.cfg | 155 +++++++++++++++++++++++++++++++++++++++++++++ defaultXonotic.cfg | 122 +---------------------------------- 2 files changed, 156 insertions(+), 121 deletions(-) create mode 100644 crosshairs.cfg diff --git a/crosshairs.cfg b/crosshairs.cfg new file mode 100644 index 000000000..c66cd7159 --- /dev/null +++ b/crosshairs.cfg @@ -0,0 +1,155 @@ +// ================================================ +// Master config for different crosshair settings +// ================================================ + +// main crosshair settings +seta crosshair 16 +seta crosshair_enabled 2 // main toggle for enabling/disabling crosshair rendering, used mostly just for the menu... 1 = with per-weapon crosshairs, 2 = custom crosshair +seta crosshair_color "0.6 0.8 1" +seta crosshair_alpha 0.5 +seta crosshair_size 0.4 + +// crosshair dot settings +seta crosshair_dot 0 +seta crosshair_dot_alpha 1 +seta crosshair_dot_size 0.600000 +seta crosshair_dot_color "1 0 0" +seta crosshair_dot_color_custom 1 "use a custom color for the crosshair dot" + +// smooth transitions for crosshair changes +seta crosshair_effect_speed -1 "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" + +// item pickup animation settings +seta crosshair_pickup 0.25 +seta crosshair_pickup_speed 4 + +// hit indication animation settings +seta crosshair_hitindication 0.5 +seta crosshair_hitindication_color "10 -10 -10" +seta crosshair_hitindication_speed 5 + +// hit testing/tracing for special effects for the crosshair +set g_trueaim_minrange 44 "TrueAim minimum range (TrueAim adjusts shots so they hit the crosshair point even though the gun is not at the screen center)" +seta crosshair_hittest 1 "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" + +// change color based on special case +seta crosshair_color_by_health 0 "if enabled, crosshair color will depend on current health" +seta crosshair_color_per_weapon 1 "when 1, each gun will display the crosshair with a different color" + + +// =============================== +// Per weapon crosshair settings +// =============================== +// main settings +seta crosshair_per_weapon 1 "when 1, each gun will display a different crosshair" + +// per weapon settings +seta crosshair_laser "" "crosshair to display when wielding the laser" +seta crosshair_laser_color "1 0.35 0.2" "crosshair color to display when wielding the laser" +seta crosshair_laser_alpha 0.75 "crosshair alpha value to display when wielding the laser" +seta crosshair_laser_size 0.4 "crosshair size when wielding the laser" +seta crosshair_shotgun "" "crosshair to display when wielding the shotgun" +seta crosshair_shotgun_color "0.7 0.7 0.7" "crosshair color to display when wielding the shotgun" +seta crosshair_shotgun_alpha 1.1 "crosshair alpha value to display when wielding the shotgun" +seta crosshair_shotgun_size 0.65 "crosshair size when wielding the shotgun" +seta crosshair_uzi "" "crosshair to display when wielding the machinegun" +seta crosshair_uzi_color "0.4 0.9 0.35" "crosshair color to display when wielding the machinegun" +seta crosshair_uzi_alpha 0.9 "crosshair alpha value to display when wielding the machinegun" +seta crosshair_uzi_size 0.6 "crosshair size when wielding the machinegun" +seta crosshair_grenadelauncher "" "crosshair to display when wielding the mortar" +seta crosshair_grenadelauncher_color "1 0.15 0" "crosshair color to display when wielding the mortar" +seta crosshair_grenadelauncher_alpha 1.15 "crosshair alpha value to display when wielding the mortar" +seta crosshair_grenadelauncher_size 0.7 "crosshair size when wielding the mortar" +seta crosshair_minelayer "" "crosshair to display when wielding the mortar" +seta crosshair_minelayer_color "0.75 0.75 0" "crosshair color to display when wielding the mortar" +seta crosshair_minelayer_alpha 1.15 "crosshair alpha value to display when wielding the mortar" +seta crosshair_minelayer_size 0.9 "crosshair size when wielding the mortar" +seta crosshair_electro "" "crosshair to display when wielding the electro" +seta crosshair_electro_color "0.35 0.5 1" "crosshair color to display when wielding the electro" +seta crosshair_electro_alpha 1 "crosshair alpha value to display when wielding the electro" +seta crosshair_electro_size 0.5 "crosshair size when wielding the electro" +seta crosshair_crylink "" "crosshair to display when wielding the crylink" +seta crosshair_crylink_color "0.85 0.25 1" "crosshair color to display when wielding the crylink" +seta crosshair_crylink_alpha 0.85 "crosshair alpha value to display when wielding the crylink" +seta crosshair_crylink_size 0.4 "crosshair size when wielding the crylink" +seta crosshair_nex "" "crosshair to display when wielding the nex gun" +seta crosshair_nex_color "0 0.9 1" "crosshair color to display when wielding the nex gun" +seta crosshair_nex_alpha 0.85 "crosshair alpha value to display when wielding the nex gun" +seta crosshair_nex_size 0.65 "crosshair size when wielding the nex gun" +seta crosshair_hagar "" "crosshair to display when wielding the hagar" +seta crosshair_hagar_color "0.85 0.5 0.35" "crosshair color to display when wielding the hagar" +seta crosshair_hagar_alpha 1 "crosshair alpha value to display when wielding the hagar" +seta crosshair_hagar_size 0.8 "crosshair size when wielding the hagar" +seta crosshair_rocketlauncher "" "crosshair to display when wielding the rocketlauncher" +seta crosshair_rocketlauncher_color "1 0.75 0.2" "crosshair color to display when wielding the rocketlauncher" +seta crosshair_rocketlauncher_alpha 1 "crosshair alpha value to display when wielding the rocketlauncher" +seta crosshair_rocketlauncher_size 0.5875 "crosshair size when wielding the rocketlauncher" +seta crosshair_porto "" "crosshair to display when wielding the porto" +seta crosshair_porto_color "0.5 1 0.5" "crosshair color to display when wielding the porto" +seta crosshair_porto_alpha 0.85 "crosshair alpha value to display when wielding the porto" +seta crosshair_porto_size 0.6 "crosshair size when wielding the porto" +seta crosshair_minstanex "" "crosshair to display when wielding the minstanex gun" +seta crosshair_minstanex_color "0.65 0.65 1" "crosshair color to display when wielding the minstanex gun" +seta crosshair_minstanex_alpha 1 "crosshair alpha value to display when wielding the minstanex gun" +seta crosshair_minstanex_size 0.4 "crosshair size when wielding the minstanex gun" +seta crosshair_hook "" "crosshair to display when wielding the hook" +seta crosshair_hook_color "0.65 1 0.85" "crosshair color to display when wielding the hook" +seta crosshair_hook_alpha 0.85 "crosshair alpha value to display when wielding the hook" +seta crosshair_hook_size 0.5 "crosshair size when wielding the hook" +seta crosshair_hlac "" "crosshair to display when wielding the H.L.A.C" +seta crosshair_hlac_color "1 0.65 0.2" "crosshair color to display when wielding the H.L.A.C." +seta crosshair_hlac_alpha 1 "crosshair alpha value to display when wielding the H.L.A.C." +seta crosshair_hlac_size 0.6 "crosshair size when wielding the H.L.A.C." +seta crosshair_seeker "" "crosshair to display when wielding the TAG Seeker" +seta crosshair_seeker_color "1 0.35 0.35" "crosshair color to display when wielding the TAG seeker" +seta crosshair_seeker_alpha 0.9 "crosshair alpha value to display when wielding the TAG seeker" +seta crosshair_seeker_size 0.8 "crosshair size when wielding the TAG seeker" +seta crosshair_rifle "" "crosshair to display when wielding the rifle" +seta crosshair_rifle_color "0.85 0.5 0.25" "crosshair color to display when wielding the rifle" +seta crosshair_rifle_alpha 1 "crosshair alpha value to display when wielding the rifle" +seta crosshair_rifle_size 0.5 "crosshair size when wielding the rifle" +seta crosshair_tuba "" "crosshair to display when wielding the tuba" +seta crosshair_tuba_color "0.85 0.5 0.25" "crosshair color to display when wielding the tuba" +seta crosshair_tuba_alpha 1 "crosshair alpha value to display when wielding the tuba" +seta crosshair_tuba_size 1 "crosshair size when wielding the tuba" +seta crosshair_fireball "" "crosshair to display when wielding the fireball" +seta crosshair_fireball_color "0.2 1.0 0.2" "crosshair color to display when wielding the fireball" +seta crosshair_fireball_alpha 1 "crosshair alpha value to display when wielding the fireball" +seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" + + +// ========================= +// Crosshair ring settings +// ========================= + +// ring around crosshair, used for various purposes (such as indicating bullets left in clip, nex charge) +seta crosshair_ring 1 "main cvar to enable or disable normal crosshair rings" +seta crosshair_ring_inner 0 "allow inner rings to be drawn too" +seta crosshair_ring_size 2 "ring size" +seta crosshair_ring_alpha 0.2 "ring alpha" + +// nexgun ring +seta crosshair_ring_nex 1 "draw a ring showing the current charge of the nexgun" +seta crosshair_ring_nex_alpha 0.15 +seta crosshair_ring_nex_inner_alpha 0.15 +seta crosshair_ring_nex_inner_color_red 0.8 +seta crosshair_ring_nex_inner_color_green 0 +seta crosshair_ring_nex_inner_color_blue 0 +seta crosshair_ring_nex_currentcharge_scale 30 +seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05 + +// minelayer ring +seta crosshair_ring_minelayer 1 +seta crosshair_ring_minelayer_alpha 0.15 + +// hagar ring +seta crosshair_ring_hagar 1 +seta crosshair_ring_hagar_alpha 0.15 + +// reload ring +seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair rings" +seta crosshair_ring_reload_size 2.5 "reload ring size" +seta crosshair_ring_reload_alpha 0.2 "reload ring alpha" \ No newline at end of file diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index aee61f200..6c0c9e6bf 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -61,126 +61,7 @@ _cl_color 112 _cl_name Player _cl_playermodel models/player/erebus.iqm _cl_playerskin 0 -seta crosshair 16 -seta crosshair_enabled 2 // main toggle for enabling/disabling crosshair rendering, used mostly just for the menu... 1 = with per-weapon crosshairs, 2 = custom crosshair -seta crosshair_color "0.6 0.8 1" -seta crosshair_alpha 0.300000 -seta crosshair_size 0.500000 -seta crosshair_dot 0 -seta crosshair_dot_alpha 1 -seta crosshair_dot_size 0.600000 -seta crosshair_dot_color "1 0 0" -seta crosshair_dot_color_custom 1 "use a custom color for the crosshair dot" -seta crosshair_pickup 0.25 -seta crosshair_pickup_speed 4 -seta crosshair_hitindication 0.5 -seta crosshair_hitindication_color "10 -10 -10" -seta crosshair_hitindication_speed 5 -seta crosshair_per_weapon 0 "when 1, each gun will display a different crosshair" -seta crosshair_color_per_weapon 1 "when 1, each gun will display the crosshair with a different color" -seta crosshair_effect_speed -1 "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 "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 crosshair_laser "" "crosshair to display when wielding the laser" -seta crosshair_laser_color "1 0.35 0.2" "crosshair color to display when wielding the laser" -seta crosshair_laser_alpha 0.75 "crosshair alpha value to display when wielding the laser" -seta crosshair_laser_size 0.4 "crosshair size when wielding the laser" -seta crosshair_shotgun "" "crosshair to display when wielding the shotgun" -seta crosshair_shotgun_color "0.7 0.7 0.7" "crosshair color to display when wielding the shotgun" -seta crosshair_shotgun_alpha 1.1 "crosshair alpha value to display when wielding the shotgun" -seta crosshair_shotgun_size 0.65 "crosshair size when wielding the shotgun" -seta crosshair_uzi "" "crosshair to display when wielding the machinegun" -seta crosshair_uzi_color "0.4 0.9 0.35" "crosshair color to display when wielding the machinegun" -seta crosshair_uzi_alpha 0.9 "crosshair alpha value to display when wielding the machinegun" -seta crosshair_uzi_size 0.6 "crosshair size when wielding the machinegun" -seta crosshair_grenadelauncher "" "crosshair to display when wielding the mortar" -seta crosshair_grenadelauncher_color "1 0.15 0" "crosshair color to display when wielding the mortar" -seta crosshair_grenadelauncher_alpha 1.15 "crosshair alpha value to display when wielding the mortar" -seta crosshair_grenadelauncher_size 0.7 "crosshair size when wielding the mortar" -seta crosshair_minelayer "" "crosshair to display when wielding the mortar" -seta crosshair_minelayer_color "0.75 0.75 0" "crosshair color to display when wielding the mortar" -seta crosshair_minelayer_alpha 1.15 "crosshair alpha value to display when wielding the mortar" -seta crosshair_minelayer_size 0.9 "crosshair size when wielding the mortar" -seta crosshair_electro "" "crosshair to display when wielding the electro" -seta crosshair_electro_color "0.35 0.5 1" "crosshair color to display when wielding the electro" -seta crosshair_electro_alpha 1 "crosshair alpha value to display when wielding the electro" -seta crosshair_electro_size 0.5 "crosshair size when wielding the electro" -seta crosshair_crylink "" "crosshair to display when wielding the crylink" -seta crosshair_crylink_color "0.85 0.25 1" "crosshair color to display when wielding the crylink" -seta crosshair_crylink_alpha 0.85 "crosshair alpha value to display when wielding the crylink" -seta crosshair_crylink_size 0.4 "crosshair size when wielding the crylink" -seta crosshair_nex "" "crosshair to display when wielding the nex gun" -seta crosshair_nex_color "0 0.9 1" "crosshair color to display when wielding the nex gun" -seta crosshair_nex_alpha 0.85 "crosshair alpha value to display when wielding the nex gun" -seta crosshair_nex_size 0.65 "crosshair size when wielding the nex gun" -seta crosshair_hagar "" "crosshair to display when wielding the hagar" -seta crosshair_hagar_color "0.85 0.5 0.35" "crosshair color to display when wielding the hagar" -seta crosshair_hagar_alpha 1 "crosshair alpha value to display when wielding the hagar" -seta crosshair_hagar_size 0.8 "crosshair size when wielding the hagar" -seta crosshair_rocketlauncher "" "crosshair to display when wielding the rocketlauncher" -seta crosshair_rocketlauncher_color "1 0.75 0.2" "crosshair color to display when wielding the rocketlauncher" -seta crosshair_rocketlauncher_alpha 1 "crosshair alpha value to display when wielding the rocketlauncher" -seta crosshair_rocketlauncher_size 0.5875 "crosshair size when wielding the rocketlauncher" -seta crosshair_porto "" "crosshair to display when wielding the porto" -seta crosshair_porto_color "0.5 1 0.5" "crosshair color to display when wielding the porto" -seta crosshair_porto_alpha 0.85 "crosshair alpha value to display when wielding the porto" -seta crosshair_porto_size 0.6 "crosshair size when wielding the porto" -seta crosshair_minstanex "" "crosshair to display when wielding the minstanex gun" -seta crosshair_minstanex_color "0.65 0.65 1" "crosshair color to display when wielding the minstanex gun" -seta crosshair_minstanex_alpha 1 "crosshair alpha value to display when wielding the minstanex gun" -seta crosshair_minstanex_size 0.4 "crosshair size when wielding the minstanex gun" -seta crosshair_hook "" "crosshair to display when wielding the hook" -seta crosshair_hook_color "0.65 1 0.85" "crosshair color to display when wielding the hook" -seta crosshair_hook_alpha 0.85 "crosshair alpha value to display when wielding the hook" -seta crosshair_hook_size 0.5 "crosshair size when wielding the hook" -seta crosshair_hlac "" "crosshair to display when wielding the H.L.A.C" -seta crosshair_hlac_color "1 0.65 0.2" "crosshair color to display when wielding the H.L.A.C." -seta crosshair_hlac_alpha 1 "crosshair alpha value to display when wielding the H.L.A.C." -seta crosshair_hlac_size 0.6 "crosshair size when wielding the H.L.A.C." -seta crosshair_seeker "" "crosshair to display when wielding the TAG Seeker" -seta crosshair_seeker_color "1 0.35 0.35" "crosshair color to display when wielding the TAG seeker" -seta crosshair_seeker_alpha 0.9 "crosshair alpha value to display when wielding the TAG seeker" -seta crosshair_seeker_size 0.8 "crosshair size when wielding the TAG seeker" -seta crosshair_rifle "" "crosshair to display when wielding the rifle" -seta crosshair_rifle_color "0.85 0.5 0.25" "crosshair color to display when wielding the rifle" -seta crosshair_rifle_alpha 1 "crosshair alpha value to display when wielding the rifle" -seta crosshair_rifle_size 0.5 "crosshair size when wielding the rifle" -seta crosshair_tuba "" "crosshair to display when wielding the tuba" -seta crosshair_tuba_color "0.85 0.5 0.25" "crosshair color to display when wielding the tuba" -seta crosshair_tuba_alpha 1 "crosshair alpha value to display when wielding the tuba" -seta crosshair_tuba_size 1 "crosshair size when wielding the tuba" -seta crosshair_fireball "" "crosshair to display when wielding the fireball" -seta crosshair_fireball_color "0.2 1.0 0.2" "crosshair color to display when wielding the fireball" -seta crosshair_fireball_alpha 1 "crosshair alpha value to display when wielding the fireball" -seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" -seta crosshair_color_by_health 0 "if enabled, crosshair color will depend on current health" - -// ring around crosshair, used for various purposes (such as indicating bullets left in clip, nex charge) -seta crosshair_ring 1 "main cvar to enable or disable normal crosshair rings" -seta crosshair_ring_inner 0 "allow inner rings to be drawn too" -seta crosshair_ring_size 2 "ring size" -seta crosshair_ring_alpha 0.2 "ring alpha" - -seta crosshair_ring_nex 1 "draw a ring showing the current charge of the nexgun" -seta crosshair_ring_nex_alpha 0.15 -seta crosshair_ring_nex_inner_alpha 0.15 -seta crosshair_ring_nex_inner_color_red 0.8 -seta crosshair_ring_nex_inner_color_green 0 -seta crosshair_ring_nex_inner_color_blue 0 -seta crosshair_ring_nex_currentcharge_scale 30 -seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05 - -seta crosshair_ring_minelayer 1 -seta crosshair_ring_minelayer_alpha 0.15 - -seta crosshair_ring_hagar 1 -seta crosshair_ring_hagar_alpha 0.15 - -seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair rings" -seta crosshair_ring_reload_size 2.5 "reload ring size" -seta crosshair_ring_reload_alpha 0.2 "reload ring alpha" + seta cl_reticle 1 "control for toggling whether ANY zoom reticles are shown" seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" @@ -459,7 +340,6 @@ locs_enable 0 pausable 0 set g_spawnshieldtime 1 "number of seconds you are invincible after you spawned, this shield is lost after you fire" set 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_trueaim_minrange 44 "TrueAim minimum range (TrueAim adjusts shots so they hit the crosshair point even though the gun is not at the screen center)" 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)" set g_shootfromclient 2 "let client decide if it has the gun left or right; if set to 2, center handedness is allowed; see also cl_gunalign" -- 2.39.2