From: FruitieX <rasse@rasse-laptop.(none)>
Date: Mon, 18 Oct 2010 21:17:57 +0000 (+0300)
Subject: don't consume cells if charge is 100% and secondary is held down, nerf velocity charg... 
X-Git-Tag: xonotic-v0.1.0preview~285^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5a8e66dd1482c1854bee87107af5254e1e01bea9;p=xonotic%2Fxonotic-data.pk3dir.git

don't consume cells if charge is 100% and secondary is held down, nerf velocity charge slightly, increase the base charge rate, increase secondary charge rate slightly. This way it hopefully requires a bit more effort to get up to 120 damage.
---

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index b1c5a0a81..66c1e991a 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -430,23 +430,23 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 2000
 
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
-set g_balance_nex_secondary_charge_rate 0.1
+set g_balance_nex_secondary_charge_rate 0.15
 set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0
 set g_balance_nex_secondary_animtime 0
-set g_balance_nex_secondary_ammo 5
+set g_balance_nex_secondary_ammo 4
 set g_balance_nex_secondary_damagefalloff_mindist 0
 set g_balance_nex_secondary_damagefalloff_maxdist 0
 set g_balance_nex_secondary_damagefalloff_halflife 0
 set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_charge 1
-set g_balance_nex_charge_start 0.25
-set g_balance_nex_charge_rate 0.025
+set g_balance_nex_charge_start 0.2
+set g_balance_nex_charge_rate 0.05
 set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.675
-set g_balance_nex_charge_velocity_rate 0.175
+set g_balance_nex_charge_velocity_rate 0.15
 set g_balance_nex_charge_minspeed 400
 set g_balance_nex_charge_maxspeed 1000
 // }}}
diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index c185e15ad..b30b2255d 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -95,7 +95,7 @@ float w_nex(float req)
 		{
 			if(cvar("g_balance_nex_secondary_charge"))
 			{
-				if(self.ammo_cells)
+				if(self.ammo_cells && self.nex_charge < 1)
 				{
 					self.nex_charge = min(1, self.nex_charge + cvar("g_balance_nex_secondary_charge_rate") * frametime / W_TICSPERFRAME);
 					self.ammo_cells = max(0, self.ammo_cells - cvar("g_balance_nex_secondary_ammo") * frametime / W_TICSPERFRAME);