Merge branch 'master' into fruitiex/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 21:38:22 +0000 (22:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 21:38:22 +0000 (22:38 +0100)
1  2 
balance25.cfg
balanceTest.cfg
defaultXonotic.cfg

diff --cc balance25.cfg
@@@ -222,10 -222,8 +222,10 @@@ set g_balance_laser_primary_refire 0.
  set g_balance_laser_primary_animtime 0.3
  set g_balance_laser_primary_lifetime 30
  set g_balance_laser_primary_shotangle 0
- set g_balance_laser_primary_delay 0
+ set g_balance_laser_primary_delay 0.05
  set g_balance_laser_primary_gauntlet 0
 +set g_balance_laser_primary_force_zscale 1
 +set g_balance_laser_primary_force_velocitybias 0
  set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
  set g_balance_laser_secondary_damage 35
  set g_balance_laser_secondary_edgedamage 10
diff --cc balanceTest.cfg
@@@ -222,10 -222,8 +222,10 @@@ set g_balance_laser_primary_refire 0.
  set g_balance_laser_primary_animtime 0.6
  set g_balance_laser_primary_lifetime 5
  set g_balance_laser_primary_shotangle 0
- set g_balance_laser_primary_delay 0
+ set g_balance_laser_primary_delay 0.03
  set g_balance_laser_primary_gauntlet 0
 +set g_balance_laser_primary_force_zscale 1
 +set g_balance_laser_primary_force_velocitybias 0.25
  set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
  set g_balance_laser_secondary_damage 35
  set g_balance_laser_secondary_edgedamage 10
Simple merge