X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=defaultXonotic.cfg;h=af790edb714da48ee9c857797161ab903262ec5b;hb=3093090eb162c3bb09589383b69c1d7dfc1672d2;hp=25e2a284be05289cf34171f86f950f4ee90ae66e;hpb=b72b7d384a5e0f1db2610510699777b75a308418;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 25e2a284b..af790edb7 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -57,7 +57,7 @@ _cl_playerskin 0 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)" -seta cl_reticle_item_nex 1 "draw aiming reticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha" +seta cl_reticle_item_vortex 1 "draw aiming reticle for the vortex weapon's zoom, 0 disables and values between 0 and 1 change alpha" seta cl_reticle_item_normal 1 "draw reticle when zooming with the zoom button, 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" @@ -141,9 +141,8 @@ set rpn_linear_to_sRGB "dup 1.0 2.4 div pow 1.055 mul 0.055 sub exch 12.92 mul d // q3map_skylight 9.32523632 3 alias skybox_nosRGB_to_sRGB "rpn $3 402.123 $4 div div $rpn_sRGB_to_linear 402.123 $4 div mul /new_skylight: $3 402.123 $4 div div $1 256 div $2 0.017453 mul sin mul add $rpn_sRGB_to_linear $3 402.123 $4 div div $rpn_sRGB_to_linear sub 256 mul $2 0.017453 mul sin div /new_sunlight:" -set cl_orthoview 0 "WARNING: WILL BREAK CONFIG!!! enable top-down view of the map- meant to be used for radar map images" +set cl_orthoview 0 "enable top-down view of the map- meant to be used for radar map images (note: orthoview sets cvars temporarily, requires restart to return them to normal)" set cl_orthoview_nofog 1 "disable fog while in orthoview-- note, should not be enabled on ALL maps, i.e. oilrig works fine with this disabled" -set cl_orthoview_resolution 512 "resolution accuracy multiplier for deciding fov scaling and view distance" // these settings determine how much the view is affected by movement/damage cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition @@ -360,9 +359,9 @@ set bot_ai_keyboard_threshold 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 "minstanex nex rifle electro rocketlauncher grenadelauncher hagar hlac crylink laser uzi fireball seeker shotgun tuba minelayer" "Desired weapons for far distances ordered by priority" -set bot_ai_custom_weapon_priority_mid "minstanex rocketlauncher nex fireball seeker grenadelauncher electro uzi crylink hlac hagar shotgun laser rifle tuba minelayer" "Desired weapons for middle distances ordered by priority" -set bot_ai_custom_weapon_priority_close "minstanex shotgun nex uzi hlac tuba seeker hagar crylink grenadelauncher electro rocketlauncher laser fireball rifle minelayer" "Desired weapons for close distances ordered by priority" +set bot_ai_custom_weapon_priority_far "vaporizer vortex rifle electro rocketlauncher grenadelauncher hagar hlac crylink laser machinegun fireball seeker shotgun tuba minelayer" "Desired weapons for far distances ordered by priority" +set bot_ai_custom_weapon_priority_mid "vaporizer rocketlauncher vortex fireball seeker grenadelauncher electro machinegun crylink hlac hagar shotgun laser rifle tuba minelayer" "Desired weapons for middle distances ordered by priority" +set bot_ai_custom_weapon_priority_close "vaporizer shotgun vortex machinegun hlac tuba seeker hagar crylink grenadelauncher electro rocketlauncher laser fireball rifle minelayer" "Desired weapons for close distances ordered by priority" set bot_ai_weapon_combo 1 "Enable bots to do weapon combos" set bot_ai_weapon_combo_threshold 0.4 "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" @@ -1129,12 +1128,12 @@ sv_allowdownloads 0 // download protocol is evil set g_jump_grunt 0 "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?" -seta cl_weaponpriority "minstanex nex fireball grenadelauncher uzi hagar rifle electro rocketlauncher crylink minelayer shotgun hlac tuba laser porto seeker hook" "weapon priority list" +seta cl_weaponpriority "minstanex vortex fireball grenadelauncher machinegun hagar rifle electro rocketlauncher crylink minelayer shotgun hlac tuba laser porto seeker hook" "weapon priority list" seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)" seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives" -seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy" -seta cl_weaponpriority2 "minstanex nex rifle" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact" -seta cl_weaponpriority3 "minstanex nex rifle uzi shotgun" "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun. Default value: hitscan all" +seta cl_weaponpriority1 "minstanex vortex crylink hlac electro laser" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy" +seta cl_weaponpriority2 "minstanex vortex rifle" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact" +seta cl_weaponpriority3 "minstanex vortex rifle machinegun shotgun" "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun. Default value: hitscan all" seta cl_weaponpriority4 "grenadelauncher minelayer hlac hagar crylink seeker shotgun" "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun. Default value: spam weapons" seta cl_weaponpriority5 "laser hook porto" "use impulse 205 for prev gun from this list, 215 for best gun, 225 for next gun. Default value: weapons for moving" seta cl_weaponpriority6 "" "use impulse 206 for prev gun from this list, 216 for best gun, 226 for next gun" @@ -1193,32 +1192,9 @@ set g_showweaponspawns 1 "display sprites for weapon spawns found on the map whe // Quake-Joule: 1 qJ = 1 qN * 1 qu // Quake-Pascal: 1 qPa = 1 qN / 1 qu^2 -set g_ballistics_materialconstant 1414213562 -set g_ballistics_mindistance 16 +set g_ballistics_mindistance 2 // enable ballistics starting from 2 qu set g_ballistics_density_player 0.50 // players are 2x as easy to pass as walls set g_ballistics_density_corpse 0.10 // corpses are 10x as easy to pass as walls -// unit: qJ / qu^3 (energy needed per volume unit of solid to push/burn away -// parameter: bullet constant: mass / area in g/qu^2 -// = mass / (pi/4 * caliber^2) -// with caliber in inches, mass in grams: -// = 1.273239544735163 * mass / caliber^2 -// with caliber in inches, mass in grains: -// = 0.082633246453312 * mass / caliber^2 - -// bullet max travel distance inside solid: -// 0.5 * v^2 * bulletconstant / g_ballistics_materialconstant - -// some bullet constants: -// http://hypertextbook.com/facts/2000/ShantayArmstrong.shtml -// second bullet: caliber .45, mass 16.2g, bullet constant 101.859163578813 -// third bullet: caliber .338, mass 16.2g, bullet constant 180.5476053421592 -// fourth bullet: caliber .25, mass 2.3g, bullet constant 46.85521524625399 -// http://en.wikipedia.org/wiki/.50_BMG -// caliber .5, 360 grains, bullet constant 118.9918748927693 -// AK-47: -// caliber .3, 62 grains, bullet constant 56.92512533450383 -// .3 winchester magnum: -// caliber .3, 150 grains, bullet constant 137.7220774221867 set cl_stripcolorcodes 0 "experimental feature (notes: strips ALL color codes from messages!)" @@ -1391,19 +1367,19 @@ cl_decals_newsystem 1 // set the cvars to "0" to totally disable a weapon set g_weaponreplace_laser "" set g_weaponreplace_shotgun "" -set g_weaponreplace_uzi "" +set g_weaponreplace_machinegun "" set g_weaponreplace_grenadelauncher "" set g_weaponreplace_electro "" set g_weaponreplace_crylink "" -set g_weaponreplace_nex "" +set g_weaponreplace_vortex "" set g_weaponreplace_hagar "" set g_weaponreplace_rocketlauncher "" set g_weaponreplace_porto "" -set g_weaponreplace_minstanex "" +set g_weaponreplace_vaporizer "" set g_weaponreplace_hook "" set g_weaponreplace_tuba "" set g_weaponreplace_fireball "" -set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility in mapinfo files)" +set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping machinegun and shotgun (for Q3A map compatibility in mapinfo files)" set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)" @@ -1556,8 +1532,7 @@ scr_loadingscreen_scale_base 1 scr_loadingscreen_scale_limit 2 // other config files -exec mutator_new_toys.cfg // run BEFORE balance to make sure balance wins -exec balanceXonotic.cfg +exec balance-xonotic.cfg exec effects-normal.cfg exec physicsX.cfg exec turrets.cfg