Merge branch 'bones_was_here/gunoffset' into 'master'

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

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 16a5c1aef5f9ed5a9cc9d78730e9bd5be3cb90b7..189be9c718544d7eb19e52dc8d67329c6df49e39 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -34,7 +34,7 @@ set g_ca_start_ammo_cells 180
 set g_ca_start_ammo_plasma 180
 set g_ca_start_ammo_fuel 0
 set g_ft_start_health 100
-set g_ft_start_armor 0 
+set g_ft_start_armor 100
 set g_ft_start_ammo_shells 60
 set g_ft_start_ammo_nails 320
 set g_ft_start_ammo_rockets 160
@@ -224,7 +224,6 @@ 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_weaponspeed 1.5
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30
@@ -264,4 +263,8 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
 exec bal-wep-xonotic.cfg