From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 13 Jul 2011 15:14:51 +0000 (+0300)
Subject: Player respawn effect
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=815f8b2c1db97bb2c48913705d9b687ca8d5fb43

Player respawn effect
---

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index fea6d3da..17337589 100644
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -839,7 +839,43 @@ velocityjitter 32 32 0
 //lightcolor 0.4 0.9 0.9
 
 // flare particle and light
-// used in qcsrc/server/t_items.qc:	//pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1)
+// used in qcsrc/server/cl_client.qc:	pointparticles(particleeffectnum("player_respawn"), self.origin, '0 0 0', 1);
+effect player_respawn
+countabsolute 1
+type static
+color 0xF263EA 0xF263EA
+size 48 48
+alpha 128 128 96
+lightradius 240
+lightradiusfade 160
+lightcolor 0.9 0.6 0.9
+// cloud of particles which expand rapidly and then slow to form a ball
+effect player_respawn
+count 1024
+type spark
+tex 41 41
+color 0xF263EA 0xF263EA
+size 2 2
+alpha 256 256 512
+//originjitter 24 24 24
+velocityjitter 256 256 256
+// sparks flying and floating around
+effect player_respawn
+count 512
+type spark
+tex 40 40
+color 0x807aff 0x4463d5
+size 1 3
+alpha 0 256 128
+//gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 750 750 1250
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 0.6
+
+// flare particle and light
 // used in qcsrc/server/t_items.qc:	pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1)
 effect item_respawn
 countabsolute 1
@@ -848,7 +884,7 @@ color 0xF263EA 0xF263EA
 size 32 32
 alpha 128 128 128
 lightradius 140
-lightradiusfade 140
+lightradiusfade 120
 lightcolor 0.9 0.6 0.9
 // cloud of particles which expand rapidly and then slow to form a ball
 effect item_respawn
diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 91d566f1..eb74e49d 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -997,6 +997,7 @@ void PutClientInServer (void)
 
 		if (cvar("g_spawnsound"))
 			sound (self, CHAN_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTN_NORM);
+		pointparticles(particleeffectnum("player_respawn"), self.origin, '0 0 0', 1);
 
 		if(g_assault) {
 			if(self.team == assault_attacker_team)
diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 2ad83362..d99ff79f 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -144,7 +144,6 @@ void Item_Respawn (void)
 		sound (self, CHAN_TRIGGER, "misc/itemrespawn.wav", VOL_BASE, ATTN_NORM);	// play respawn sound
 	setorigin (self, self.origin);
 
-	//pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1);
 	pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1);
 }