From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 24 Jul 2010 17:26:32 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/fruitbalance'
X-Git-Tag: xonotic-v0.1.0preview~414^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=f60724df0f2a635ef1eeb4b8522059feed5e0236;hp=707b507ca6af727edb07ad82399c455a798de88c

Merge remote branch 'origin/fruitiex/fruitbalance'
---

diff --git a/effectinfo.txt b/effectinfo.txt
index 9f98d6af50..a9fdc33e06 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -4976,19 +4976,18 @@ 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 smoke
+count 300
+type spark
 color 0x283880 0x283880 // 0x202020 0x404040
 tex 65 65
-size 10 10
-alpha 256 256 1500
+size 5 5
+alpha 256 256 1024
 originjitter 1.5 1.5 1.5
 velocityjitter 6 6 6
-sizeincrease -20
-velocitymultiplier 0.01
-
+sizeincrease 20
+velocitymultiplier 2000
 effect electro_lightning
-count 3
+count 30
 type spark
 tex 8 15
 color 0xD9FDFF 0xD9FDFF
@@ -4999,9 +4998,8 @@ velocityjitter 150 150 150
 velocitymultiplier 0.5
 airfriction 2
 stretchfactor 1.5
-
 effect electro_lightning
-count 5
+count 50
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index 536ab7c6ec..efa16533d5 100644
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -169,6 +169,18 @@ void Draw_GrapplingHook()
 			setorigin(self, a); // beam origin!
 			break;
 	}
+
+	switch(self.HookType)
+	{
+		default:
+		case ENT_CLIENT_HOOK:
+			break;
+		case ENT_CLIENT_LGBEAM:
+			pointparticles(particleeffectnum("electro_lightning"), b, normalize(a - b), frametime);
+			break;
+		case ENT_CLIENT_GAUNTLET:
+			break;
+	}
 }
 
 void Remove_GrapplingHook()
diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc
index 6c27a5251e..407b86c746 100644
--- a/qcsrc/client/projectile.qc
+++ b/qcsrc/client/projectile.qc
@@ -22,6 +22,11 @@ void SUB_Stop()
 .float silent;
 .float traileffect;
 
+void Projectile_ResetTrail(vector to)
+{
+	self.trail_oldorigin = to;
+	self.trail_oldtime = time;
+}
 void Projectile_DrawTrail(vector to)
 {
 	vector from;
@@ -38,20 +43,8 @@ void Projectile_DrawTrail(vector to)
 
 	if (self.traileffect)
 	{
-		if(checkextension("DP_CSQC_BOXPARTICLES"))
-		{
-			/* looks good, but we can do better with particle count
-			particles_alphamin = particles_alphamax = self.alpha;
-			boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, 1, PARTICLES_USEALPHA);
-			*/
-			/* looks bad
-			boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, self.alpha, 0);
-			*/
-			particles_alphamin = particles_alphamax = sqrt(self.alpha);
-			boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, sqrt(self.alpha), PARTICLES_USEALPHA);
-		}
-		else
-			trailparticles(self, self.traileffect, from, to);
+		particles_alphamin = particles_alphamax = sqrt(self.alpha);
+		boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, sqrt(self.alpha), PARTICLES_USEALPHA);
 	}
 }
 
@@ -143,10 +136,7 @@ void Projectile_Draw()
 	if(drawn)
 		Projectile_DrawTrail(trailorigin);
 	else
-	{
-		self.trail_oldorigin = trailorigin;
-		self.trail_oldtime = time;
-	}
+		Projectile_ResetTrail(trailorigin);
 
 	if(!drawn)
 		return;
diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index e52c0d7ce8..c71f984a9f 100644
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -147,7 +147,7 @@ void WarpZone_FixView()
 		WarpZone_Outside();
 
 	// if we are near any warpzone planes - MOVE AWAY (work around nearclip)
-	float nearclip = 2;
+	float nearclip = 4;
 	e = WarpZone_Find(warpzone_fixview_origin - '1 1 1' * nearclip, warpzone_fixview_origin + '1 1 1' * nearclip);
 	if(e)
 	{