From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 15 May 2010 17:56:57 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/fruitiex/xpmbalance'
X-Git-Tag: xonotic-v0.1.0preview~614
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=21cd0bef7a9329d0201610bccedf8a29048b0291;hp=18d6521b3f7e760b9d2329bd0fd51067b91d8f1f

Merge remote branch 'refs/remotes/origin/fruitiex/xpmbalance'
---

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index 4d2fd05f69..f3b12059be 100644
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -248,8 +248,8 @@ set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 // }}}
 // {{{ shotgun
-set g_balance_shotgun_primary_bullets 36
-set g_balance_shotgun_primary_damage 3
+set g_balance_shotgun_primary_bullets 25
+set g_balance_shotgun_primary_damage 4
 set g_balance_shotgun_primary_force 10
 set g_balance_shotgun_primary_spread 0.18
 set g_balance_shotgun_primary_refire 1
@@ -275,8 +275,8 @@ set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.007
 set g_balance_uzi_first_refire 0.15
 set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 7
-set g_balance_uzi_sustained_force 30
+set g_balance_uzi_sustained_damage 5
+set g_balance_uzi_sustained_force 10
 set g_balance_uzi_sustained_spread 0.02
 set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
@@ -392,10 +392,10 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 7
 set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
-set g_balance_nex_damage 100
+set g_balance_nex_damage 80
 set g_balance_nex_force 200
 set g_balance_nex_refire 1.25
-set g_balance_nex_animtime 0.8
+set g_balance_nex_animtime 1.25
 set g_balance_nex_ammo 5
 set g_balance_nex_damagefalloff_mindist 1000
 set g_balance_nex_damagefalloff_maxdist 3000