Player respawn effect

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index fea6d3da59678855bb0eb09fe6b77b500ce55583..17337589b89b058e8ed6b623dc9fa21b3183bd0b 100644 (file)
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -839,7 +839,43 @@ velocityjitter 32 32 0
 //lightcolor 0.4 0.9 0.9\r
 \r
 // flare particle and light\r
-// 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)\r
+// used in qcsrc/server/cl_client.qc:  pointparticles(particleeffectnum("player_respawn"), self.origin, '0 0 0', 1);\r
+effect player_respawn\r
+countabsolute 1\r
+type static\r
+color 0xF263EA 0xF263EA\r
+size 48 48\r
+alpha 128 128 96\r
+lightradius 240\r
+lightradiusfade 160\r
+lightcolor 0.9 0.6 0.9\r
+// cloud of particles which expand rapidly and then slow to form a ball\r
+effect player_respawn\r
+count 1024\r
+type spark\r
+tex 41 41\r
+color 0xF263EA 0xF263EA\r
+size 2 2\r
+alpha 256 256 512\r
+//originjitter 24 24 24\r
+velocityjitter 256 256 256\r
+// sparks flying and floating around\r
+effect player_respawn\r
+count 512\r
+type spark\r
+tex 40 40\r
+color 0x807aff 0x4463d5\r
+size 1 3\r
+alpha 0 256 128\r
+//gravity 1\r
+bounce 1.5\r
+originjitter 1 1 1\r
+velocityjitter 750 750 1250\r
+velocitymultiplier 0.5\r
+airfriction 2\r
+stretchfactor 0.6\r
+\r
+// flare particle and light\r
 // used in qcsrc/server/t_items.qc:    pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1)\r
 effect item_respawn\r
 countabsolute 1\r
@@ -848,7 +884,7 @@ color 0xF263EA 0xF263EA
 size 32 32\r
 alpha 128 128 128\r
 lightradius 140\r
-lightradiusfade 140\r
+lightradiusfade 120\r
 lightcolor 0.9 0.6 0.9\r
 // cloud of particles which expand rapidly and then slow to form a ball\r
 effect item_respawn\r

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 91d566f1b50a62634e706a9df3c292e3e3730571..eb74e49db6e798da0ff03cf755b0649abfc4229a 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -997,6 +997,7 @@ void PutClientInServer (void)
 \r
                if (cvar("g_spawnsound"))\r
                        sound (self, CHAN_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTN_NORM);\r
+               pointparticles(particleeffectnum("player_respawn"), self.origin, '0 0 0', 1);\r
 \r
                if(g_assault) {\r
                        if(self.team == assault_attacker_team)\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 2ad8336226f2e9f8c01c1efa7cb470087605a8cd..d99ff79fe285114d60b1ebf099b5790ab6aa80b0 100644 (file)
--- 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\r
        setorigin (self, self.origin);\r
 \r
-       //pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1);\r
        pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1);\r
 }\r
 \r