Merge branch 'terencehill/mapvote_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / balance-xdf.cfg

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 94e98a6461ccc1f85ded776b3bd7685f9c6f71ad..d8d4df60d53e2a6c916d61a7785bb07df3efd8b8 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -49,6 +49,22 @@ set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 200
+set g_mayhem_start_armor 200
+set g_mayhem_start_ammo_shells 60
+set g_mayhem_start_ammo_nails 320
+set g_mayhem_start_ammo_rockets 160
+set g_mayhem_start_ammo_cells 180
+set g_mayhem_start_ammo_plasma 180
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 200
+set g_tmayhem_start_armor 200
+set g_tmayhem_start_ammo_shells 60
+set g_tmayhem_start_ammo_nails 320
+set g_tmayhem_start_ammo_rockets 160
+set g_tmayhem_start_ammo_cells 180
+set g_tmayhem_start_ammo_plasma 180
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 60
@@ -221,9 +237,9 @@ set g_balance_powerup_invincible_takeforce 0.33
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_invisibility_alpha 0.15
 set g_balance_powerup_invisibility_time 30
-set g_balance_powerup_speed_attackrate 0.8
-set g_balance_powerup_speed_highspeed 1.5
-set g_balance_powerup_speed_time 30
+set g_balance_powerup_speed_attackrate 0.7692307692   // 1/1.3
+set g_balance_powerup_speed_highspeed 1.3
+set g_balance_powerup_speed_time 30 // q3 haste lasts 30 seconds unless count field set otherwise
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30