From: FruitieX <rasse@rasse-laptop.(none)>
Date: Mon, 18 Oct 2010 21:10:39 +0000 (+0300)
Subject: only add a "base charge" up to 50%
X-Git-Tag: xonotic-v0.1.0preview~285^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=03e7bd4e6f35f70a929c890555212d1c0e10e405;p=xonotic%2Fxonotic-data.pk3dir.git

only add a "base charge" up to 50%
---

diff --git a/balance25.cfg b/balance25.cfg
index 158f67684..8fb2e008a 100644
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -444,6 +444,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 set g_balance_nex_charge 0
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
 set g_balance_nex_charge_minspeed 400
diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 11d85e433..eaff81828 100644
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -455,6 +455,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 9999999
 set g_balance_nex_charge 0
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
 set g_balance_nex_charge_minspeed 400
diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index 654ec6cc1..445e8b156 100644
--- a/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@ -443,6 +443,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 set g_balance_nex_charge 0
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
 set g_balance_nex_charge_minspeed 400
diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 9a49f3da9..517f5c9cf 100644
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -444,6 +444,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 set g_balance_nex_charge 0
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
 set g_balance_nex_charge_minspeed 400
diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 9d4f67a94..b1c5a0a81 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -444,6 +444,7 @@ 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_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_minspeed 400
diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index f41620f7c..1d2117def 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -1335,7 +1335,7 @@ void SV_PlayerPhysics()
 		float f;
 		f = (xyspeed - cvar("g_balance_nex_charge_minspeed")) / (cvar("g_balance_nex_charge_maxspeed") - cvar("g_balance_nex_charge_minspeed"));
 		// add the extra charge
-		self.nex_charge += cvar("g_balance_nex_charge_velocity_rate") * f * frametime;
+		self.nex_charge = min(1, self.nex_charge + cvar("g_balance_nex_charge_velocity_rate") * f * frametime);
 	}
 :end
 	if(self.flags & FL_ONGROUND)
diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index a50dc11fb..c185e15ad 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -81,7 +81,7 @@ float w_nex(float req)
 	}
 	else if (req == WR_THINK)
 	{
-		if(cvar("g_balance_nex_charge"))
+		if(cvar("g_balance_nex_charge") && self.nex_charge < cvar("g_balance_nex_charge_limit"))
 			self.nex_charge = min(1, self.nex_charge + cvar("g_balance_nex_charge_rate") * frametime / W_TICSPERFRAME);
 		if (self.BUTTON_ATCK)
 		{