From 28b567980c405ba49b61274002fd7cd5b156dd2f Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sun, 18 Jul 2010 22:03:30 +0300 Subject: [PATCH] allow the electro beam to set off secondary blobs (at a radius of 50 from trace_endpos)! --- balanceFruit.cfg | 2 +- qcsrc/server/w_electro.qc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/balanceFruit.cfg b/balanceFruit.cfg index ac93a59d0..0db2471a6 100644 --- a/balanceFruit.cfg +++ b/balanceFruit.cfg @@ -308,7 +308,7 @@ set g_balance_electro_primary_edgedamage 0 set g_balance_electro_primary_force 780 set g_balance_electro_primary_force_up 6000 set g_balance_electro_primary_radius 850 -set g_balance_electro_primary_comboradius 0 +set g_balance_electro_primary_comboradius 50 set g_balance_electro_primary_speed 0 set g_balance_electro_primary_spread 0 set g_balance_electro_primary_lifetime 0 diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 7f48f134c..9e3e5b25b 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -142,7 +142,7 @@ void W_Electro_Attack2() { local entity proj; - W_SetupShot_ProjectileSize (self, '0 0 -3', '0 0 -3', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage")); + W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage")); w_shotdir = v_forward; // no TrueAim for grenades please pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); @@ -166,7 +166,7 @@ void W_Electro_Attack2() proj.movetype = MOVETYPE_BOUNCE; W_SETUPPROJECTILEVELOCITY_UP(proj, g_balance_electro_secondary); proj.touch = W_Plasma_Touch; - setsize(proj, '0 0 -3', '0 0 -3'); + setsize(proj, '-3 -3 -3', '3 3 3'); proj.takedamage = DAMAGE_YES; proj.damageforcescale = cvar("g_balance_electro_secondary_damageforcescale"); proj.health = cvar("g_balance_electro_secondary_health"); @@ -239,6 +239,7 @@ void exteriorlgbeam_think() 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"); Damage (trace_ent, self.owner, self.owner, cvar("g_balance_electro_primary_damage") * frametime, WEP_ELECTRO, trace_endpos, force * frametime); + W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner); } self.angles = '0 0 0'; -- 2.39.2