X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Feffectinfo.txt;h=50b157f9a039a1234b993ab1fb408774e2d9e9fe;hp=748f17f2b8476fa6b06230ccb9e5080e32308e92;hb=4dd411e2a424fb935e7bedaf526a24d4d80774de;hpb=8202847265122c73a212f389808e8c84189b2a6b

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index 748f17f2..50b157f9 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 200
+lightradiusfade 120
+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,16 +883,19 @@ type static
 color 0xF263EA 0xF263EA
 size 32 32
 alpha 128 128 128
+lightradius 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
-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
 
 
 
@@ -868,9 +907,7 @@ lightcolor 2 2 2
 
 
 
-// used in qcsrc/server/w_hlac.qc:	pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
-// used in qcsrc/server/w_hlac.qc:	pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
-// used in qcsrc/server/w_laser.qc:	pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
+// used nowhere in code
 effect laser_muzzleflash
 count 1
 type smoke
@@ -2056,16 +2093,209 @@ velocityjitter 256 256 256
 // used in qcsrc/server/g_grabber.qc:	pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1)
 effect grapple_muzzleflash
 lightradius 160
-lightradiusfade 800
-lightcolor 1 0 0
-
-
+lightradiusfade 600
+lightcolor 1 0.2 0.1
 
 // used in qcsrc/server/g_grabber.qc:	pointparticles(particleeffectnum("grabber_impact"), self.origin, '0 0 0', 1)
+// decal
 effect grabber_impact
-lightradius 160
-lightradiusfade 800
-lightcolor 1 0 0
+countabsolute 1
+type decal
+tex 47 47
+size 10 10
+alpha 256 256 0
+originjitter 14 14 14
+lightradius 90
+lightradiusfade 480
+lightcolor 0 2 4
+rotate -180 180 0 0
+// rotating something
+effect grabber_impact
+count 5
+type smoke
+tex 46 46
+color 0x1680A0 0x1680A0
+size 18 24
+sizeincrease 15
+alpha 55 55 65
+rotate 90 -90 250 -250
+// shockwave
+effect grabber_impact
+countabsolute 1
+type static
+tex 33 33
+color 0x1680A0 0x1680A0
+size 12 12
+alpha 50 50 400
+sizeincrease 450
+// shockwave2
+effect grabber_impact
+countabsolute 1
+type static
+tex 65 65
+color 0x1680A0 0x1680A0
+size 5 5
+alpha 50 50 100
+sizeincrease 250
+// flare effect
+effect grabber_impact
+countabsolute 1
+type static
+tex 37 37
+color 0x80C0FF 0x80C0FF
+size 8 8
+alpha 256 256 128
+// small sparks which form a sphere as they slow down
+//effect grabber_impact
+//count 128
+//type spark
+//color 0x2030FF 0x80C0FF
+//size 1 2
+//alpha 256 256 512
+//bounce 2
+//airfriction 8
+//liquidfriction 8
+//velocityjitter 384 384 384
+// small sparks which glow brightly but live briefly
+effect grabber_impact
+count 32
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 2 2
+alpha 0 128 512
+bounce 2
+stretchfactor 3
+velocityjitter 600 600 600
+velocitymultiplier 0.5
+airfriction 9
+// small sparks that live longer
+effect grabber_impact
+count 8
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 1 1
+alpha 255 255 112
+bounce 1.6
+stretchfactor 0.7
+velocityjitter 300 300 600
+velocitymultiplier 2.5
+airfriction 2
+gravity 1
+
+// used in qcsrc/server/w_grabber.qc:	pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1);
+// decal
+effect grabber_impact2
+countabsolute 1
+type decal
+tex 47 47
+size 18 18
+alpha 256 256 0
+originjitter 14 14 14
+lightradius 180
+lightradiusfade 240
+lightcolor 0 2 4
+rotate -180 180 0 0
+// rotating something
+effect grabber_impact2
+count 15
+type smoke
+tex 46 46
+color 0x1680A0 0x1680A0
+size 20 26
+sizeincrease 15
+alpha 55 55 50
+rotate 180 -180 500 -500
+// shockwave
+effect grabber_impact2
+countabsolute 1
+type static
+tex 33 33
+color 0x1680A0 0x1680A0
+size 16 16
+alpha 50 50 400
+sizeincrease 900
+// shockwave2
+effect grabber_impact2
+countabsolute 1
+type static
+tex 65 65
+color 0x1680A0 0x1680A0
+size 7 7
+alpha 50 50 100
+sizeincrease 500
+// flare effect
+effect grabber_impact2
+countabsolute 1
+type static
+tex 37 37
+color 0x80C0FF 0x80C0FF
+size 14 14
+alpha 256 256 64
+// small sparks which form a sphere as they slow down
+//effect grabber_impact2
+//count 128
+//type spark
+//color 0x2030FF 0x80C0FF
+//size 1 2
+//alpha 256 256 512
+//bounce 2
+//airfriction 8
+//liquidfriction 8
+//velocityjitter 384 384 384
+// small sparks which glow brightly but live briefly
+effect grabber_impact2
+count 64
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 4 4
+alpha 0 128 512
+bounce 2
+stretchfactor 3
+velocityjitter 600 600 600
+velocitymultiplier 0.5
+airfriction 9
+// small sparks that live longer
+effect grabber_impact2
+count 24
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 2 2
+alpha 255 255 112
+bounce 1.6
+stretchfactor 0.7
+velocityjitter 300 300 600
+velocitymultiplier 2.5
+airfriction 2
+gravity 1
+
+// used in qcsrc/server/cl_weaponsystem.qc:	pointparticles(particleeffectnum("grabber_reload"), org, '0 0 0', 1);
+effect grabber_reload
+count 10
+type blood
+tex 24 32
+size 2 4
+alpha 512 512 128
+color 0xFF9900 0x994400
+bounce -1
+airfriction 1
+liquidfriction 4
+velocityjitter 128 128 32
+velocitymultiplier 5
+color 0xFF9900 0x994400
+staintex 16 24
+//blood mist
+effect grabber_reload
+countabsolute 5
+type alphastatic
+tex 0 8
+size 4 5
+alpha 100 256 400
+color 0xFF9900 0x994400
+originjitter 4 4 4
 
 
 
@@ -4521,14 +4751,14 @@ velocityjitter 256 256 256
 velocitymultiplier -0.1
 
 
-// gauntlet laser
+// grabber melee
 // based off morphed's cl_gentle
-// used in qcsrc/server/w_laser.qc
+// used in qcsrc/server/w_grabber.qc
 effect grabber_melee
 tex 43 43
 count 3
 type spark
-color 0xffffff 0x0000ff
+color 0xffffff 0x0033ff
 size 8 16
 sizeincrease 34
 alpha 128 128 292
@@ -4536,6 +4766,9 @@ gravity 0
 airfriction 5
 liquidfriction 10
 velocityjitter 25 25 25
+lightradius 200
+lightradiusfade 200
+lightcolor 0.4 0.7 0.9
 
 
 //torch flame, spawn it as fast as you can  20 times per second or more, supports direction but not required
@@ -4607,26 +4840,28 @@ velocitymultiplier 20
 velocityoffset 0 0 10
 airfriction 1
 
-effect regurgitate
+// regurgitate effect
+// used in: vore.qc:	pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1)
+effect vore_regurgitate
 count 30
 type blood
 tex 24 32
 size 12 24
 alpha 512 512 128
-color 0xDC9BCD 0x6937CD
+color 0x9B9BCD 0x3769CD
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 192 192 192
-velocitymultiplier 15
+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
 size 25 30
 alpha 100 256 400
 color 0x000000 0x408000
-originjitter 110 110 110
\ No newline at end of file
+originjitter 110 110 110