tweak the electro cvars further, and remove the velocityfactor stuff

diff --git a/balance.cfg b/balance.cfg
index f014c8dadb9b26b25fd9e4ef20f80fe5ae4f2c40..941f2329bd7e6a8b6908ccc9f83b1a84aaae6d15 100644 (file)
--- 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 db7fe5241fa50d7b3650ad2bc2ed119b1b4e95ed..82f958e3af52b5082a46f7263d76b5ea5eb706a2 100644 (file)
--- 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 d3db7152a6c87bc1b5fb42848239ee246ce53241..e48eba308b0c4ed65a56ffbce82711e7b0b66960 100644 (file)
--- 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 e14b720572011ef3ff8bb632f8372bed607e6ff7..715ae6f6771094300f8457a82fceacfc0938fd03 100644 (file)
--- 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 ede9c066764650f480d814e10b6b8537c22767f6..2eb8abb395f36af776c83af3354ef0f94064dbda 100644 (file)
--- 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 a0c758280ed6748aa524be009a01ae56913bccd2..42b9887cee8579728b50254d9cf9b9d2ff5dc999 100644 (file)
--- 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");