Merge branch 'master' into Mario/status_effects_extended

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

diff --git a/ruleset-XDF.cfg b/ruleset-XDF.cfg
index 1bf071d564e0d82762d09fa12cf2f535abcc233b..fccb89576e053b5945ffbfbe0030980e902cca62 100644 (file)
--- a/ruleset-XDF.cfg
+++ b/ruleset-XDF.cfg
@@ -12,8 +12,7 @@ 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
-g_buffs 0
+g_powerups 0 // no powerups until the speed powerup has its own model
 g_start_delay 3
 g_use_ammunition 0
 g_weapon_stay 1
@@ -21,12 +20,31 @@ teamplay_mode 2 // friendly fire and self damage
 sv_vote_nospectators 1
 timelimit_override 20
 
+// general buff settings
+g_buffs_cooldown_activate 0
+g_buffs_cooldown_respawn 0
+g_buffs_randomize 0
+
+// disabled buffs
+g_buffs_ammo 0
+g_buffs_resistance 0
+g_buffs_medic 0
+g_buffs_vengeance 0
+g_buffs_bash 0
+g_buffs_disability 0
+g_buffs_vampire 0
+g_buffs_jump 0
+g_buffs_inferno 0
+g_buffs_swapper 0
+g_buffs_magnet 0
+g_buffs_luck 0
+g_buffs_flight 0
+
 // 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
 
 // game mode settings
 g_cts_finish_kill_delay 2