From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 18 Jul 2010 19:03:30 +0000 (+0300)
Subject: allow the electro beam to set off secondary blobs (at a radius of 50 from trace_endpos)!
X-Git-Tag: xonotic-v0.1.0preview~423^2~51
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=28b567980c405ba49b61274002fd7cd5b156dd2f

allow the electro beam to set off secondary blobs (at a radius of 50 from trace_endpos)!
---

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index ac93a59d07..0db2471a69 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 7f48f134c2..9e3e5b25b2 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';