Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance

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

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 2be1573cd34e0c6b049acfffbb8eba464b4bc328..fed520492c5857d644cc090c7533ad4ffb87f77a 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -360,7 +360,7 @@ float w_electro(float req)
        {
                if (self.BUTTON_ATCK)
                {
-                       if (weapon_prepareattack(0, cvar("g_balance_electro_primary_refire")))
+                       if (weapon_prepareattack(0, (cvar("g_balance_electro_lightning") ? 0 : cvar("g_balance_electro_primary_refire"))))
                        {
                                if(cvar("g_balance_electro_lightning"))
                                {