also allow joinspeed==0 with jointime>0

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_nex.qc

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 61af784e0e08d8f0c92ce1fb79ec41bc9a0e7c6e..493fd005bea62bfd546c6b66949c7b0bd5a3ed94 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -45,8 +45,9 @@ void W_Nex_Attack (float issecondary)
 
        if(cvar("g_balance_nex_charge"))
        {
-               charge = self.nex_charge;
+               charge = cvar("g_balance_nex_charge_mindmg") / mydmg + (1 - cvar("g_balance_nex_charge_mindmg") / mydmg) * self.nex_charge;
                self.nex_charge *= cvar("g_balance_nex_charge_shot_multiplier"); // do this AFTER setting mydmg/myforce
+                                                                                // O RLY? -- divVerent
        }
        else
                charge = 1;
@@ -86,6 +87,7 @@ float w_nex(float req)
        {
                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)
                {
                        if (weapon_prepareattack(0, cvar("g_balance_nex_primary_refire")))