Merge branch 'master' into terencehill/menu_quit_game

[xonotic/xonotic-data.pk3dir.git] / ruleset-XDF.cfg

diff --git a/ruleset-XDF.cfg b/ruleset-XDF.cfg
index 1bf071d564e0d82762d09fa12cf2f535abcc233b..8f622bbcaa332efba9454986903397d625036e4c 100644 (file)
--- a/ruleset-XDF.cfg
+++ b/ruleset-XDF.cfg
@@ -12,7 +12,10 @@ g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no
 g_balance_kill_antispam 0
 g_forced_respawn 1
 // g_playerclip_collisions 0 // do not check playerclips
-g_powerups -1 // needed for speed powerup
+// Powerups including speed enabled by default.
+g_powerups_strength 0
+g_powerups_shield 0
+g_powerups_invisibility 0
 g_buffs 0
 g_start_delay 3
 g_use_ammunition 0
@@ -20,13 +23,7 @@ g_weapon_stay 1
 teamplay_mode 2 // friendly fire and self damage
 sv_vote_nospectators 1
 timelimit_override 20
-
-// speed powerup (q3 haste replacement)
-g_movement_highspeed_q3_compat 1
-g_balance_powerup_speed_time 30
-g_balance_powerup_speed_highspeed 1.3  // q3 haste lasts 30 seconds
-g_balance_powerup_speed_attackrate 0.7692307692   // 1/1.3
-g_balance_powerup_speed_weaponspeed 1  // do not increase projectile speed
+sv_maxidle_playertospectator 0
 
 // game mode settings
 g_cts_finish_kill_delay 2