From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 13 Jan 2011 19:04:12 +0000 (+0100)
Subject: Merge remote branch 'origin/samual/uzianimtime'
X-Git-Tag: xonotic-v0.5.0~318^2~125
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0dc38ae2f93086eff28e4ca231f436d5a1469b6c

Merge remote branch 'origin/samual/uzianimtime'
---

0dc38ae2f93086eff28e4ca231f436d5a1469b6c
diff --cc balanceXonotic.cfg
index 8ca152f1cb,3cf4aa1f6b..be945fa670
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -271,10 -269,11 +271,11 @@@ set g_balance_uzi_spread_max 0.
  set g_balance_uzi_spread_add 0.008
  
  set g_balance_uzi_burst 3				// # of bullets in a burst (if set to 2 or more)
+ set g_balance_uzi_burst_animtime 0.45
  set g_balance_uzi_burst_refire 0.05		// refire between burst bullets
  set g_balance_uzi_burst_refire2 0.45 	// refire after burst
 -set g_balance_uzi_burst_spread 0.05
 -set g_balance_uzi_burst_damage 20       // 100 dps, delivered in 0.15s	
 +set g_balance_uzi_burst_spread 0.07
 +set g_balance_uzi_burst_damage 25
  set g_balance_uzi_burst_force 50
  set g_balance_uzi_burst_ammo 3