fix a typo in the balance config

diff --git a/balance25.cfg b/balance25.cfg
index 899b7fc9bcf45e660a6a43dcb25da0685653e22d..b79f68d6975338e6209ca8dd61a83bbceb0a7ab8 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -408,7 +408,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_velocitydependent 0
 set g_balance_nex_velocitydependent_minspeed 400
-set g_balance_nex_velocitydependent_minspeed 1000
+set g_balance_nex_velocitydependent_maxspeed 1000
 // }}}
 // {{{ minstanex
 set g_balance_minstanex_refire 1

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 23977eadf6c9cd376e0d40d5e32ab0d41ac0d6f8..10078ea49c77c22082cba5f662cca3cc6feaad44 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -419,7 +419,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 9999999
 
 set g_balance_nex_velocitydependent 0
 set g_balance_nex_velocitydependent_minspeed 400
-set g_balance_nex_velocitydependent_minspeed 1000
+set g_balance_nex_velocitydependent_maxspeed 1000
 // }}}
 // {{{ minstanex
 set g_balance_minstanex_refire 1

diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index e32819dc7f7430c6a7e1bc07a74fdad6935184f4..2cf5e8688110f61bb4585d4d46c5a3bd0c05ead1 100644 (file)
--- a/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@ -408,7 +408,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 
 set g_balance_nex_velocitydependent 0
 set g_balance_nex_velocitydependent_minspeed 400
-set g_balance_nex_velocitydependent_minspeed 1000
+set g_balance_nex_velocitydependent_maxspeed 1000
 // }}}
 // {{{ minstanex
 set g_balance_minstanex_refire 1

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index e1a6f7442cebcca70b3bcc38a0790b1cbb92e8bd..dd20eee40cefe043625123dd7212082cf16ad68e 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -408,7 +408,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 
 set g_balance_nex_velocitydependent 0
 set g_balance_nex_velocitydependent_minspeed 400
-set g_balance_nex_velocitydependent_minspeed 1000
+set g_balance_nex_velocitydependent_maxspeed 1000
 // }}}
 // {{{ minstanex
 set g_balance_minstanex_refire 1

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index e34a2472b30c63d1680d3fb95758729d3002ddb2..0f8abc017b88969030ce42efe6163c2f21afdd89 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -386,7 +386,7 @@ set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
 set g_balance_nex_primary_damage 125
-set g_balance_nex_primary_force 400
+set g_balance_nex_primary_force 500
 set g_balance_nex_primary_refire 1
 set g_balance_nex_primary_animtime 0.75
 set g_balance_nex_primary_ammo 5
@@ -397,7 +397,7 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 2000
 
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_damage 125
-set g_balance_nex_secondary_force -500
+set g_balance_nex_secondary_force -700
 set g_balance_nex_secondary_refire 1
 set g_balance_nex_secondary_animtime 0.75
 set g_balance_nex_secondary_ammo 5
@@ -408,7 +408,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 2000
 
 set g_balance_nex_velocitydependent 1
 set g_balance_nex_velocitydependent_minspeed 400
-set g_balance_nex_velocitydependent_minspeed 1000
+set g_balance_nex_velocitydependent_maxspeed 1000
 // }}}
 // {{{ minstanex
 set g_balance_minstanex_refire 1.25

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index b5eacda72ab9dadab58463d62f9252105ba9e24f..e6b16d193e5f517babe1eb8fbe2c0a4f414a4c69 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -46,13 +46,11 @@ void W_Nex_Attack (float issecondary)
        if(cvar("g_balance_nex_velocitydependent")) // player velocity dependent damage and force
        {
                myvel = vlen(self.velocity);
-
-               if(myvel < cvar("g_balance_nex_velocitydependent_minspeed"))
-                       myvel = bound(cvar("g_balance_nex_velocitydependent_minspeed"), myvel, cvar("g_balance_nex_velocitydependent_maxspeed"));
+               myvel = bound(cvar("g_balance_nex_velocitydependent_minspeed"), myvel, cvar("g_balance_nex_velocitydependent_maxspeed"));
 
                // TODO: make it more obvious (through effects, indicator on weapon) that damage increases when speed increases
-               mydmg *= cvar("g_balance_nex_velocitydependent_maxspeed") / myvel;
-               myforce *= cvar("g_balance_nex_velocitydependent_maxspeed") / myvel;
+               mydmg *= myvel / cvar("g_balance_nex_velocitydependent_maxspeed");
+               myforce *= myvel / cvar("g_balance_nex_velocitydependent_maxspeed");
        }
 
        W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", mydmg);