From f2e1181ca79b8415e15d91333db3f84655655600 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Fri, 22 Oct 2010 23:38:38 +0300 Subject: [PATCH] give the nex a minimum damage of 40 (instead of 0), nerf secondary charge rate to compensate (ammo usage halved too, though) --- balance25.cfg | 1 + balanceLeeStricklin.cfg | 1 + balanceNexSVN.cfg | 1 + balanceSamual.cfg | 1 + balanceXonotic.cfg | 5 +++-- qcsrc/server/w_nex.qc | 2 +- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/balance25.cfg b/balance25.cfg index 8fb2e008ab..22fdaf09dc 100644 --- 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 eaff81828b..b1c2673422 100644 --- 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 445e8b156b..bb704d3ca9 100644 --- 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 517f5c9cfb..4b4a91c624 100644 --- 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 084810b55a..4014c023ef 100644 --- 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 61af784e0e..29b8be7ef0 100644 --- 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 -- 2.39.2