X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Feffectinfo.txt;h=d0d93e572b7373c453fee220d7c8a0f4b51debd5;hp=fea6d3da59678855bb0eb09fe6b77b500ce55583;hb=59b267c8b833950c830f2e5885f5e418268e0d9a;hpb=6319537cc67473c0d3b53cee8c1db2c7c640cb79

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index fea6d3da..d0d93e57 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 120
+lightradiusfade 60
+lightcolor 0.9 0.6 0.9
+// cloud of particles which expand rapidly and then slow to form a ball
+effect player_respawn
+count 256
+type spark
+tex 41 41
+color 0xF263EA 0xF263EA
+size 3 3
+alpha 256 256 512
+//originjitter 24 24 24
+velocityjitter 256 256 256
+// sparks flying and floating around
+effect player_respawn
+count 128
+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
@@ -847,19 +883,19 @@ type static
 color 0xF263EA 0xF263EA
 size 32 32
 alpha 128 128 128
-lightradius 140
-lightradiusfade 140
+lightradius 80
+lightradiusfade 60
 lightcolor 0.9 0.6 0.9
 // cloud of particles which expand rapidly and then slow to form a ball
 effect item_respawn
-count 256
+count 128
 type spark
 tex 41 41
 color 0xF263EA 0xF263EA
 size 2 2
-alpha 256 256 1280
+alpha 256 256 768
 //originjitter 24 24 24
-velocityjitter 256 256 256
+velocityjitter 192 192 192
 
 
 
@@ -4806,7 +4842,7 @@ airfriction 1
 
 // regurgitate effect
 // used in: vore.qc:	pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1)
-effect regurgitate
+effect vore_regurgitate
 count 30
 type blood
 tex 24 32
@@ -4820,8 +4856,8 @@ velocityjitter 192 192 32
 velocitymultiplier 5
 staincolor 0x408000 0x80FF00
 staintex 16 24
-//blood mist
-effect regurgitate
+//green mist
+effect vore_regurgitate
 countabsolute 10
 type alphastatic
 tex 0 8