From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 12 Nov 2010 08:37:22 +0000 (+0100)
Subject: Merge remote branch 'origin/tzork/balance-tzork'
X-Git-Tag: xonotic-v0.1.0preview~153^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=30fdaa8e05b537534caf89e6a8601478e1a1c9cf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/tzork/balance-tzork'
---

30fdaa8e05b537534caf89e6a8601478e1a1c9cf
diff --cc balanceXonotic.cfg
index 6cc3e9797,702ddc68f..2f0587dde
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -263,8 -263,19 +263,19 @@@ set g_balance_shotgun_secondary_refire 
  set g_balance_shotgun_secondary_animtime 1
  // }}}
  // {{{ uzi
+ set g_balance_uzi_mode 0 				// Activates varible spread for sustained & burst mode secondary
+ set g_balance_uzi_spread_min 0.02
+ set g_balance_uzi_spread_max 0.6
+ set g_balance_uzi_spread_add 0.012
+ set g_balance_uzi_burst 0				// # of bullets in a burst (if set to 2 or more)
+ set g_balance_uzi_burst_refire 0.05		// refire between burst bullets
+ set g_balance_uzi_burst_refire2 0.75	// refire after burst
+ set g_balance_uzi_burst_spread 0.04
+ set g_balance_uzi_burst_damage 18		
+ set g_balance_uzi_burst_force 50
+ set g_balance_uzi_burst_ammo 3
  set g_balance_uzi_first 1
 -set g_balance_uzi_first_damage 18
 +set g_balance_uzi_first_damage 20
  set g_balance_uzi_first_force 35
  set g_balance_uzi_first_spread 0.03
  set g_balance_uzi_first_refire 0.2
@@@ -454,8 -475,9 +475,9 @@@ set g_balance_nex_charge_start 0.
  set g_balance_nex_charge_rate 0.05
  set g_balance_nex_charge_limit 0.5
  set g_balance_nex_charge_rot_rate 0.01
+ set g_balance_nex_charge_rot_pause 0 // Dont rot down untill this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0.675
 -set g_balance_nex_charge_velocity_rate 0.15
 +set g_balance_nex_charge_velocity_rate 0.2
  set g_balance_nex_charge_minspeed 400
  set g_balance_nex_charge_maxspeed 1000
  // }}}