give the nex a minimum damage of 40 (instead of 0), nerf secondary charge rate to...

diff --git a/balance25.cfg b/balance25.cfg
index 8fb2e008abe24d533d1283178d548505fa736b70..22fdaf09dcce3f01b2386439d1575f56d9c1ca49 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -442,6 +442,7 @@ set g_balance_nex_secondary_damagefalloff_halflife 0
 set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_charge 0
+set g_balance_nex_charge_mindmg 40
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
 set g_balance_nex_charge_limit 0.5

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index eaff81828b33d704520959dabc0e8083ff37f725..b1c267342275ccf9f8fa8841d6c6d0183be0b915 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -453,6 +453,7 @@ set g_balance_nex_secondary_damagefalloff_halflife 9999999
 set g_balance_nex_secondary_damagefalloff_forcehalflife 9999999
 
 set g_balance_nex_charge 0
+set g_balance_nex_charge_mindmg 40
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
 set g_balance_nex_charge_limit 0.5

diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index 445e8b156bbde7da0e87cb2859f21a235cc64b68..bb704d3ca9064277bedd981c25cdde73b5d4d8d0 100644 (file)
--- a/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@ -441,6 +441,7 @@ set g_balance_nex_secondary_damagefalloff_halflife 1500
 set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 
 set g_balance_nex_charge 0
+set g_balance_nex_charge_mindmg 40
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
 set g_balance_nex_charge_limit 0.5

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 517f5c9cfbcb15c5daef1f99b74f27ed4e68ea0a..4b4a91c624cd70aaedffaf1ae7c7fb44784f8e0f 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -442,6 +442,7 @@ set g_balance_nex_secondary_damagefalloff_halflife 1500
 set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 
 set g_balance_nex_charge 0
+set g_balance_nex_charge_mindmg 40
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
 set g_balance_nex_charge_limit 0.5

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 084810b55a679d4cac8355c9193f578145651465..4014c023efe0cc8a6298a60fe336dc372aecd9e7 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -430,18 +430,19 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 2000
 
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
-set g_balance_nex_secondary_charge_rate 0.15
+set g_balance_nex_secondary_charge_rate 0.1
 set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0
 set g_balance_nex_secondary_animtime 0
-set g_balance_nex_secondary_ammo 4
+set g_balance_nex_secondary_ammo 2
 set g_balance_nex_secondary_damagefalloff_mindist 0
 set g_balance_nex_secondary_damagefalloff_maxdist 0
 set g_balance_nex_secondary_damagefalloff_halflife 0
 set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_charge 1
+set g_balance_nex_charge_mindmg 40
 set g_balance_nex_charge_start 0.2
 set g_balance_nex_charge_rate 0.05
 set g_balance_nex_charge_limit 0.5

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 61af784e0e08d8f0c92ce1fb79ec41bc9a0e7c6e..29b8be7ef0e6efd823fb934de4afd5eac1f959fe 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -45,7 +45,7 @@ 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
        }
        else