only add a "base charge" up to 50%

diff --git a/balance25.cfg b/balance25.cfg
index 158f676844e4c348a85e9015853fee0a21b20b86..8fb2e008abe24d533d1283178d548505fa736b70 100644 (file)
--- 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 11d85e4335640df92ab106a87df097491e73372a..eaff81828b33d704520959dabc0e8083ff37f725 100644 (file)
--- 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 654ec6cc10a4baad704f416a09b2d777133f0144..445e8b156bbde7da0e87cb2859f21a235cc64b68 100644 (file)
--- 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 9a49f3da96d7918954d3e9171b4466486252a640..517f5c9cfbcb15c5daef1f99b74f27ed4e68ea0a 100644 (file)
--- 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 9d4f67a94c6206a08a75c354f20aea20324fc239..b1c5a0a81b9f5ab708ba43af7d1498cd0e3cc2d6 100644 (file)
--- 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 f41620f7c0d567fd35c16200dee56128fc9c76b3..1d2117defffb0388fe023f9bf4ec7db3fd1ea6c0 100644 (file)
--- 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 a50dc11fb9ecb36fc1dfb9a7e029e8d310a5d5a6..c185e15ad13a62e4fa3c3d2c220b74957bd3572c 100644 (file)
--- 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)
                {