X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=0c399bb183cde7a50c4ff80e690bd59764527ffc;hb=c7412d57c97da7e1d8a4e12c08271dbdb492ea94;hp=799781b1692a464201ec574edaa720e8065cda4b;hpb=7a08734e7432c0803b3c98f0964cbb3529f3bd07;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 799781b16..0c399bb18 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -793,6 +793,23 @@ set g_multijump 0	"Number of multiple jumps to allow (jumping again in the air),
 set g_multijump_add 0	"0 = make the current z velocity equal to jumpvelocity, 1 = add jumpvelocity to the current z velocity"
 set g_multijump_speed -999999	"Minimum vertical speed a player must have in order to jump again"
 
+set g_throughfloor_debug 0 "enable debugging messages for throughfloor calculations"
+set g_throughfloor_damage_max_stddev 2 "Maximum standard deviation for splash damage"
+set g_throughfloor_force_max_stddev 10 "Maximum standard deviation for splash force"
+set g_throughfloor_min_steps_player 1 "Minimum number of steps for splash damage"
+set g_throughfloor_min_steps_other 1 "Minimum number of steps for splash damage"
+set g_throughfloor_max_steps_player 100 "Maximum number of steps for splash damage"
+set g_throughfloor_max_steps_other 10 "Maximum number of steps for splash damage"
+// note: for damage X, 0.25 * ((1-g_throughfloor_damage)*X / g_throughfloor_damage_max_stddev)^2 steps are used
+// for these numbers:
+//   damage  25: 3
+//   damage  60: 15
+//   damage  80: 25
+//   damage 200: 157
+//   force  250: 10
+//   force  300: 15
+//   force  600: 57
+
 // effects
 r_glsl_vertextextureblend_usebothalphas 1 // allows to abuse texture blending as detail texture
 r_glsl_postprocess 0 // but note, hud_postprocessing enables this
@@ -1343,7 +1360,7 @@ set con_completion_vnextmap	map
 set con_completion_vdomap	map
 set con_completion_playermodel	models/player/*.iqm
 
-// these non-saved engine cvars shall be savedG
+// these non-saved engine cvars shall be saved
 seta cl_port $cl_port
 seta r_showsurfaces $r_showsurfaces
 seta r_ambient $r_ambient
@@ -1355,6 +1372,7 @@ seta vid_gl20 $vid_gl20
 seta vid_gl13 $vid_gl13
 seta r_drawviewmodel $r_drawviewmodel
 seta v_idlescale $v_idlescale
+seta net_slist_queriespersecond $net_slist_queriespersecond
 
 // ticrate
 //sys_ticrate 0.0166667
@@ -1564,7 +1582,8 @@ set cl_effects_lightningarc_branchfactor_add 0.1
 set g_hitplots 0 "when set to 1, hitplots are stored by the server to provide a means of proving that a triggerbot was used"
 seta g_hitplots_individuals "" "the individuals, by IP, that should have their hitplots recorded"
 
-set menu_updatecheck 1
+set menu_updatecheck 1 "check for updates"
+set menu_updatecheck_getpacks 1 "get update packs from update server"
 
 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"
@@ -1593,10 +1612,10 @@ alias cl_hook_gamestart_kh
 alias cl_hook_gamestart_ons
 alias cl_hook_gamestart_as
 alias cl_hook_gamestart_rc
-alias cl_hook_gamestart_nexball
+alias cl_hook_gamestart_nb
 alias cl_hook_gamestart_cts
 alias cl_hook_gamestart_ka
-alias cl_hook_gamestart_freezetag
+alias cl_hook_gamestart_ft
 alias cl_hook_gameend
 alias cl_hook_activeweapon
 
@@ -1615,10 +1634,10 @@ alias sv_hook_gamestart_kh
 alias sv_hook_gamestart_ons
 alias sv_hook_gamestart_as
 alias sv_hook_gamestart_rc
-alias sv_hook_gamestart_nexball
+alias sv_hook_gamestart_nb
 alias sv_hook_gamestart_cts
 alias sv_hook_gamestart_ka
-alias sv_hook_gamestart_freezetag
+alias sv_hook_gamestart_ft
 alias sv_hook_gamerestart
 alias sv_hook_gameend
 
@@ -1744,7 +1763,6 @@ cl_decals_newsystem 1
 set g_weaponreplace_laser ""
 set g_weaponreplace_shotgun ""
 set g_weaponreplace_uzi ""
-set g_weaponreplace_minelayer ""
 set g_weaponreplace_grenadelauncher ""
 set g_weaponreplace_electro ""
 set g_weaponreplace_crylink ""
@@ -1754,11 +1772,8 @@ set g_weaponreplace_rocketlauncher ""
 set g_weaponreplace_porto ""
 set g_weaponreplace_minstanex ""
 set g_weaponreplace_hook ""
-set g_weaponreplace_hlac ""
-set g_weaponreplace_rifle ""
 set g_weaponreplace_tuba ""
 set g_weaponreplace_fireball ""
-set g_weaponreplace_seeker ""
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility in mapinfo files)"
 
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
@@ -1903,12 +1918,14 @@ snd_identicalsoundrandomization_tics    1
 scr_loadingscreen_background 0
 scr_loadingscreen_barcolor "0 0.5 1"
 scr_loadingscreen_barheight 12
-scr_loadingscreen_count 13
+scr_loadingscreen_count 14
+scr_loadingscreen_firstforstartup 1
 scr_loadingscreen_scale 999
 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 ctfscoring-ai.cfg
 exec effects-normal.cfg