X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=data%2Feffectinfo.txt;h=04ba5b88f3d1478fa1f43433bc3d46267fccd1f0;hb=eca8a51e6501c17c4daf43cae50eb81339a9badc;hp=80602e4d099d4fd116660a6b75a14fe6e1729b34;hpb=9e5ff31eeb9c68d4b6aabbde33591eb2048b3573;p=voretournament%2Fvoretournament.git

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index 80602e4d..04ba5b88 100644
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -847,6 +847,9 @@ type static
 color 0xF263EA 0xF263EA
 size 32 32
 alpha 128 128 128
+lightradius 140
+lightradiusfade 140
+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
@@ -868,9 +871,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 +2057,16 @@ 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)
 effect grabber_impact
-lightradius 160
-lightradiusfade 800
-lightcolor 1 0 0
+lightradius 120
+lightradiusfade 700
+lightcolor 0.3 0.6 1
 
 
 
@@ -4521,14 +4522,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 +4537,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
@@ -4615,12 +4619,12 @@ 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