From cd8fe121eadda1ff8bb7d3761c45a5d85687f6d5 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sun, 18 Jul 2010 23:43:06 +0300 Subject: [PATCH] tweak the electro cvars further, and remove the velocityfactor stuff --- balance.cfg | 1 - balance25.cfg | 1 - balanceFruit.cfg | 7 +++---- balanceSamual.cfg | 1 - balanceXPM.cfg | 1 - qcsrc/server/w_electro.qc | 2 +- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/balance.cfg b/balance.cfg index f014c8dad..941f2329b 100644 --- a/balance.cfg +++ b/balance.cfg @@ -316,7 +316,6 @@ set g_balance_electro_primary_refire 0.6 set g_balance_electro_primary_animtime 0.3 set g_balance_electro_primary_ammo 2 set g_balance_electro_primary_range 0 -set g_balance_electro_primary_velocityfactor 0 set g_balance_electro_secondary_damage 50 set g_balance_electro_secondary_spread 0.05 set g_balance_electro_secondary_edgedamage 0 diff --git a/balance25.cfg b/balance25.cfg index db7fe5241..82f958e3a 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -316,7 +316,6 @@ set g_balance_electro_primary_refire 0.6 set g_balance_electro_primary_animtime 0.3 set g_balance_electro_primary_ammo 2 set g_balance_electro_primary_range 0 -set g_balance_electro_primary_velocityfactor 0 set g_balance_electro_secondary_damage 50 set g_balance_electro_secondary_spread 0.05 set g_balance_electro_secondary_edgedamage 0 diff --git a/balanceFruit.cfg b/balanceFruit.cfg index d3db7152a..e48eba308 100644 --- a/balanceFruit.cfg +++ b/balanceFruit.cfg @@ -305,10 +305,10 @@ set g_balance_grenadelauncher_secondary_bouncestop 0.075 set g_balance_electro_lightning 1 set g_balance_electro_primary_damage 120 set g_balance_electro_primary_edgedamage 0 -set g_balance_electro_primary_force 13 +set g_balance_electro_primary_force 900 set g_balance_electro_primary_force_up 100 set g_balance_electro_primary_radius 850 -set g_balance_electro_primary_comboradius 50 +set g_balance_electro_primary_comboradius 30 set g_balance_electro_primary_speed 0 set g_balance_electro_primary_spread 0 set g_balance_electro_primary_lifetime 0 @@ -316,7 +316,6 @@ set g_balance_electro_primary_refire 0.03333333 set g_balance_electro_primary_animtime 0.03333333 set g_balance_electro_primary_ammo 1 set g_balance_electro_primary_range 800 -set g_balance_electro_primary_velocityfactor 0.75 set g_balance_electro_secondary_damage 30 set g_balance_electro_secondary_spread 0.05 set g_balance_electro_secondary_edgedamage 0 @@ -325,7 +324,7 @@ set g_balance_electro_secondary_radius 100 set g_balance_electro_secondary_speed 700 set g_balance_electro_secondary_speed_up 0 set g_balance_electro_secondary_speed_z 200 -set g_balance_electro_secondary_spread 0 +set g_balance_electro_secondary_spread 0.15 set g_balance_electro_secondary_lifetime 2.5 set g_balance_electro_secondary_refire 0.2 set g_balance_electro_secondary_refire2 1 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index e14b72057..715ae6f67 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -316,7 +316,6 @@ set g_balance_electro_primary_refire 0.6 set g_balance_electro_primary_animtime 0.3 set g_balance_electro_primary_ammo 2 set g_balance_electro_primary_range 0 -set g_balance_electro_primary_velocityfactor 0 set g_balance_electro_secondary_damage 50 set g_balance_electro_secondary_spread 0.05 set g_balance_electro_secondary_edgedamage 0 diff --git a/balanceXPM.cfg b/balanceXPM.cfg index ede9c0667..2eb8abb39 100644 --- a/balanceXPM.cfg +++ b/balanceXPM.cfg @@ -316,7 +316,6 @@ set g_balance_electro_primary_refire 0 set g_balance_electro_primary_animtime 0.05 set g_balance_electro_primary_ammo 40 set g_balance_electro_primary_range 800 -set g_balance_electro_primary_velocityfactor 45 set g_balance_electro_secondary_damage 50 set g_balance_electro_secondary_spread 0.05 set g_balance_electro_secondary_edgedamage 0 diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index a0c758280..42b9887ce 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -238,7 +238,7 @@ void exteriorlgbeam_think() self.ammo_cells = max(0, self.ammo_cells - cvar("g_balance_electro_primary_ammo") * cvar("g_balance_electro_primary_refire")); vector force; - force = angle * cvar("g_balance_electro_primary_force") + trace_ent.velocity * cvar("g_balance_electro_primary_velocityfactor") + '0 0 1' * cvar("g_balance_electro_primary_force_up"); + force = angle * cvar("g_balance_electro_primary_force") + '0 0 1' * cvar("g_balance_electro_primary_force_up"); Damage (trace_ent, self.owner, self.owner, cvar("g_balance_electro_primary_damage") * cvar("g_balance_electro_primary_refire"), WEP_ELECTRO, trace_endpos, force * cvar("g_balance_electro_primary_refire")); W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner); self.nextdamagethink = time + cvar("g_balance_electro_primary_refire"); -- 2.39.2