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 a0cc24b7b991b2f32c025e75591c20e5f5f75e4d..1bf071d564e0d82762d09fa12cf2f535abcc233b 100644 (file)
--- a/ruleset-XDF.cfg
+++ b/ruleset-XDF.cfg
@@ -12,16 +12,21 @@ 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 0  // set to -1 or patch xonotic
-g_spawnpoints_auto_move_out_of_solid 1
+g_powerups -1 // needed for speed powerup
+g_buffs 0
 g_start_delay 3
-g_use_ammunition 0 "if set to 0 all weapons have unlimited ammunition"
-g_weapon_stay 1 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo"
+g_use_ammunition 0
+g_weapon_stay 1
 teamplay_mode 2 // friendly fire and self damage
 sv_vote_nospectators 1
 timelimit_override 20
-g_buffs_cooldown_respawn 0.1
-g_buffs_randomize 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