OK weapons: Removed unused stuff from shotgun and machinegun.

[xonotic/xonotic-data.pk3dir.git] / defaultXDF.cfg

diff --git a/defaultXDF.cfg b/defaultXDF.cfg
index f5a5442e3b08b78da0772105bdb6cb78f2d1c4d2..d504b2a617b536278b0b88c554f4926ecabe0c7b 100644 (file)
--- a/defaultXDF.cfg
+++ b/defaultXDF.cfg
@@ -2,16 +2,15 @@
 //  Xonotic Defrag
 // ================
 
-exec defaultXonotic.cfg
-exec balanceXDF.cfg
+exec defaultServer.cfg
+exec balance-xdf.cfg
 exec physicsXDF.cfg
 
 // general gameplay
 set g_jump_grunt 1 // make enemies even easier to hear when they're jumping around
 set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly)
-set g_balance_kill_antispam 0 
+set g_balance_kill_antispam 0
 set g_forced_respawn 1
-set g_jump_grunt 1
 // g_playerclip_collisions 0 // do not check playerclips
 set g_powerups 0  // set to -1 or patch xonotic
 set g_spawnpoints_auto_move_out_of_solid 1
@@ -21,6 +20,7 @@ set g_weapon_stay 1 "1: ghost weapons can be picked up too but give no ammo, 2:
 set teamplay_mode 2 // friendly fire and self damage
 set sv_vote_nospectators 1
 set timelimit_override 20
+set g_buffs_cooldown_respawn 0.1
 
 // game mode settings
 set g_cts_finish_kill_delay 2