From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 27 Jul 2010 06:18:36 +0000 (+0200)
Subject: electro lightning: paint with decals
X-Git-Tag: xonotic-v0.1.0preview~403^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55b4f06dd5afbf5215aa41342fbee145243fd224;p=xonotic%2Fxonotic-data.pk3dir.git

electro lightning: paint with decals
---

diff --git a/effectinfo.txt b/effectinfo.txt
index a9fdc33e0..dddf34c88 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -4976,15 +4976,25 @@ velocityjitter 156 156 156
 // used in qcsrc/server/w_electro.qc:	pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_electro.qc:	pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect electro_lightning
+countabsolute 1
+type decal
+tex 59 59
+size 16 16
+alpha 256 256 0
+originjitter 2 2 2
+lightradius 50
+lightradiusfade 200
+lightcolor 3.125 4.375 10
+effect electro_lightning
 count 300
 type spark
 color 0x283880 0x283880 // 0x202020 0x404040
 tex 65 65
-size 5 5
+size 3 3
 alpha 256 256 1024
 originjitter 1.5 1.5 1.5
 velocityjitter 6 6 6
-sizeincrease 20
+sizeincrease 15
 velocitymultiplier 2000
 effect electro_lightning
 count 30
diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index efa16533d..e53cd0026 100644
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -3,6 +3,7 @@
 .vector velocity;
 .float HookSound;
 .float HookSilent;
+.float HookRange;
 
 void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float alpha, float drawflag)
 {
@@ -48,7 +49,7 @@ void Draw_GrapplingHook_trace_callback(vector start, vector hit, vector end)
 
 void Draw_GrapplingHook()
 {
-	vector a, b;
+	vector a, b, atrans;
 	string tex, snd;
 	vector rgb;
 	float t;
@@ -86,7 +87,10 @@ void Draw_GrapplingHook()
 				break;
 			case ENT_CLIENT_LGBEAM:
 			case ENT_CLIENT_GAUNTLET:
-				b = view_origin + view_forward * vlen(self.velocity - self.origin); // honor original length of beam!
+				if(self.HookRange)
+					b = view_origin + view_forward * self.HookRange;
+				else
+					b = view_origin + view_forward * vlen(self.velocity - self.origin); // honor original length of beam!
 				WarpZone_TraceLine(view_origin, b, MOVE_NORMAL, world);
 				b = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
 				a = view_origin + view_forward * vs_x + view_right * -vs_y + view_up * vs_z;
@@ -157,12 +161,14 @@ void Draw_GrapplingHook()
 	WarpZone_TraceBox_ThroughZone(a, '0 0 0', '0 0 0', b, ((self.HookType == ENT_CLIENT_HOOK) ? MOVE_NOTHING : MOVE_NORMAL), world, world, Draw_GrapplingHook_trace_callback);
 	Draw_GrapplingHook_trace_callback_tex = string_null;
 
+	atrans = WarpZone_TransformOrigin(WarpZone_trace_transform, a);
+
 	switch(self.HookType)
 	{
 		default:
 		case ENT_CLIENT_HOOK:
 			setorigin(self, trace_endpos); // hook endpoint!
-			self.angles = vectoangles(trace_endpos - WarpZone_TransformOrigin(WarpZone_trace_transform, a));
+			self.angles = vectoangles(trace_endpos - atrans);
 			break;
 		case ENT_CLIENT_LGBEAM:
 		case ENT_CLIENT_GAUNTLET:
@@ -176,7 +182,7 @@ void Draw_GrapplingHook()
 		case ENT_CLIENT_HOOK:
 			break;
 		case ENT_CLIENT_LGBEAM:
-			pointparticles(particleeffectnum("electro_lightning"), b, normalize(a - b), frametime);
+			pointparticles(particleeffectnum("electro_lightning"), trace_endpos, normalize(atrans - trace_endpos), frametime);
 			break;
 		case ENT_CLIENT_GAUNTLET:
 			break;
@@ -203,6 +209,17 @@ void Ent_ReadHook(float bIsNew, float type)
 	if(sf & 1)
 	{
 		self.owner = playerslots[ReadByte() - 1];
+		switch(self.HookType)
+		{
+			default:
+			case ENT_CLIENT_HOOK:
+			case ENT_CLIENT_GAUNTLET:
+				self.HookRange = 0;
+				break;
+			case ENT_CLIENT_LGBEAM:
+				self.HookRange = ReadCoord();
+				break;
+		}
 	}
 	if(sf & 2)
 	{
diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 92ed5e75a..25011c541 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -195,6 +195,7 @@ float lgbeam_send(entity to, float sf)
 	if(sf & 1)
 	{
 		WriteByte(MSG_ENTITY, num_for_edict(self.owner));
+		WriteCoord(MSG_ENTITY, cvar("g_balance_electro_primary_range"));
 	}
 	if(sf & 2)
 	{