X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=effectinfo.txt;h=5e06d075e6bf292b1c41e3889b90412272a78dd0;hb=f1640e9882a14d88d3b2ad0c673dacfed8fecfa0;hp=74ff0a5c64d8be6cf1715e1ab1e2841be8decd0f;hpb=d9ba706420bdb2cdc135fa9925855ed8a8783519;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/effectinfo.txt b/effectinfo.txt
index 74ff0a5c6..5e06d075e 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -6539,30 +6539,179 @@ airfriction 4
 color 0x4F4B46 0x000000
 rotate -180 180 -20 20
 
+// metal impact effect
+// used in qcsrc/server/mutators/sandbox.qc:	pointparticles(particleeffectnum("impact_metal"), self.origin, '0 0 0', 1);
+effect impact_metal
+count 1
+type alphastatic
+tex 0 8
+size 3 6
+sizeincrease 10
+alpha 25 64 50
+gravity -0.01
+color 0x000000 0x886666
+originjitter 20 20 5
+// sparks
+effect impact_metal
+count 2
+type spark
+tex 41 41
+color 0xFFCC22 0xFF4422
+size 2 2
+alpha 255 255 112
+bounce 1.8
+stretchfactor 0.5
+velocityjitter 200 200 300
+velocitymultiplier 2
+airfriction 2
+gravity 1
+
+// stone impact effect
+// used in qcsrc/server/mutators/sandbox.qc:	pointparticles(particleeffectnum("impact_stone"), self.origin, '0 0 0', 1);
+effect impact_stone
+count 1
+type alphastatic
+tex 0 8
+size 3 6
+sizeincrease 15
+alpha 50 128 75
+gravity -0.01
+color 0x000000 0xcc9966
+originjitter 20 20 5
+// debris
+effect impact_stone
+notunderwater
+count 1
+type alphastatic
+tex 66 68
+color 0x000000 0x886644
+size 1 2
+alpha 450 750 300
+gravity 1.3
+airfriction 0.5
+bounce 1.2
+velocityjitter 124 124 324
+rotate -180 180 -1000 1000
+
+// wood impact effect
+// used in qcsrc/server/mutators/sandbox.qc:	pointparticles(particleeffectnum("impact_wood"), self.origin, '0 0 0', 1);
+effect impact_wood
+count 1
+type alphastatic
+tex 0 8
+size 3 6
+sizeincrease 10
+alpha 50 128 75
+gravity -0.01
+color 0x000000 0xcc9966
+originjitter 20 20 5
+// sparks
+effect impact_wood
+count 2
+type spark
+tex 41 41
+color 0x221100 0x221100
+size 1 8
+alpha 255 255 75
+bounce 1.5
+velocityjitter 180 180 260
+velocitymultiplier 2
+airfriction 2
+gravity 1
+
+// flesh impact effect
+// used in qcsrc/server/mutators/sandbox.qc:	pointparticles(particleeffectnum("impact_flesh"), self.origin, '0 0 0', 1);
+effect impact_flesh
+count 0.5
+type alphastatic
+tex 0 8
+size 8 12
+alpha 100 256 400
+color 0x000000 0x420000
+originjitter 11 11 11
+// blood splash
+effect impact_flesh
+count 0.3
+type blood
+tex 24 32
+size 2 6
+alpha 256 256 64
+color 0xA8FFFF 0xA8FFFFF
+bounce -1
+airfriction 1
+liquidfriction 4
+velocityjitter 96 96 96
+velocitymultiplier 5
+staincolor 0x808080 0x808080
+staintex 16 24
+
+// hagar trail
+// smoke
+effect tr_hagar
+trailspacing 4
+type smoke
+color 0x101010 0x000000
+tex 0 8
+size 3 2
+bounce 1
+sizeincrease 10
+alpha 300 400 780
+originjitter 1 1 1
+velocityjitter 1 1 1
+velocitymultiplier -0.02
+//gravity -0.11
+// fire
+effect tr_hagar
+notunderwater
+trailspacing 4
+type static
+color 0xffdf72 0x811200
+tex 48 55
+size 5 2
+sizeincrease -15
+alpha 100 144 988
+airfriction 8
+velocityjitter 32 32 32
+velocitymultiplier -1.0
+// bubbles
+effect tr_hagar
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0x404040 0x808080
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+
 // laser damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_laser
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_laser
+notunderwater
 count 3
 type smoke
 tex 0 8
 color 0x880000 0xff4400
-size 6 14
+size 2 4
 sizeincrease 8
 alpha 128 16 128
 gravity 0
-originjitter 4 4 4
+originjitter 2 2 2
 velocityjitter 0.4 0.4 0.6
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
 
 // shotgun damage effect, normal blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_shotgun
-count 0.5
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_shotgun
+count 0.6
 type blood
 tex 24 32
-size 2 7
+size 2 4
 alpha 256 256 64
 color 0xA8FFFF 0xA8FFFFF
 bounce -1
@@ -6573,22 +6722,22 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_shotgun
-countabsolute 1
+effect damage_shotgun
+count 1
 type alphastatic
 tex 0 8
 size 8 16
 alpha 100 256 400
 color 0x000000 0x420000
-originjitter 6 6 6
+originjitter 1 1 1
 
 // shotgun damage effect, alien blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_shotgun_alien
-count 0.5
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_shotgun_alien
+count 0.6
 type blood
 tex 24 32
-size 2 7
+size 2 4
 alpha 256 256 64
 color 0xDC9BCD 0xDC9BCD
 bounce -1
@@ -6599,22 +6748,22 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_shotgun_alien
-countabsolute 1
+effect damage_shotgun_alien
+count 1
 type alphastatic
 tex 0 8
 size 8 16
 alpha 100 256 400
 color 0x000000 0x204010
-originjitter 6 6 6
+originjitter 1 1 1
 
 // shotgun damage effect, robot blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_shotgun_robot
-count 0.5
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_shotgun_robot
+count 0.6
 type blood
 tex 24 32
-size 2 7
+size 2 4
 alpha 256 256 64
 color 0xC0D890 0xC0D890
 bounce -1
@@ -6625,110 +6774,110 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_shotgun_robot
-countabsolute 1
+effect damage_shotgun_robot
+count 1
 type alphastatic
 tex 0 8
 size 8 16
 alpha 100 256 400
 color 0x000000 0x301860
-originjitter 6 6 6
+originjitter 1 1 1
 
 // uzi damage effect, normal blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_uzi
-count 0.25
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_uzi
+count 0.3
 type blood
 tex 24 32
-size 2 6
+size 2 4
 alpha 256 256 64
 color 0xA8FFFF 0xA8FFFFF
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_uzi
-countabsolute 1
+effect damage_uzi
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x420000
-originjitter 6 6 6
+originjitter 0 0 0
 
 // uzi damage effect, alien blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_uzi_alien
-count 0.25
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_uzi_alien
+count 0.3
 type blood
 tex 24 32
-size 2 6
+size 2 4
 alpha 256 256 64
 color 0xDC9BCD 0xDC9BCD
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_uzi_alien
-countabsolute 1
+effect damage_uzi_alien
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x204010
-originjitter 6 6 6
+originjitter 0 0 0
 
 // uzi damage effect, robot blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_uzi_robot
-count 0.25
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_uzi_robot
+count 0.3
 type blood
 tex 24 32
-size 2 6
+size 2 4
 alpha 256 256 64
 color 0xC0D890 0xC0D890
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_uzi_robot
-countabsolute 1
+effect damage_uzi_robot
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x301860
-originjitter 6 6 6
+originjitter 0 0 0
 
 // minelayer damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_minelayer
-//notunderwater
-count 2
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_minelayer
+notunderwater
+count 3
 type smoke
 tex 48 55
 size 4 8
-alpha 256 16 256
+alpha 512 64 1024
 gravity -0.5
 color 0x8f0d00 0xff5a00
-sizeincrease -10
-originoffset 0 0 5
-originjitter 4 4 4
+sizeincrease -15
+originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
-effect weapondamage_minelayer
+effect damage_minelayer
+notunderwater
 type alphastatic
 count 2
 tex 0 8
@@ -6737,33 +6886,33 @@ sizeincrease 5
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
-originoffset 0 0 10
 originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_minelayer
+/*effect damage_minelayer
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280
-lightcolor 0.9 0.6 0.2
+lightcolor 0.7 0.4 0.2*/
 
 // grenadelauncher damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_grenadelauncher
-//notunderwater
-count 2
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_grenadelauncher
+notunderwater
+count 3
 type smoke
 tex 48 55
 size 4 8
-alpha 256 16 256
+alpha 512 64 1024
 gravity -0.5
 color 0x8f0d00 0xff5a00
-sizeincrease -10
-originoffset 0 0 10
-originjitter 4 4 4
+sizeincrease -15
+originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
-effect weapondamage_grenadelauncher
+effect damage_grenadelauncher
+notunderwater
 type alphastatic
 count 2
 tex 0 8
@@ -6772,36 +6921,38 @@ sizeincrease 5
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
-originoffset 0 0 10
 originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_grenadelauncher
+/*effect damage_grenadelauncher
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280
-lightcolor 0.9 0.6 0.2
+lightcolor 0.7 0.4 0.2*/
 
 // electro damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_electro
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_electro
+notunderwater
 count 2
 type static
 tex 47 47
 color 0x66ffff 0x2288ff
-size 5 10
-sizeincrease -16
+size 6 10
+sizeincrease -14
 alpha 48 8 48
 gravity -0.0001
 airfriction 0.2
 liquidfriction 0.8
-originjitter 8 8 8
+originjitter 3 3 3
 velocityjitter 8 8 16
 velocitymultiplier 0
 airfriction -0.5
 rotate 180 360 -30 30
 // plasma smoke
-effect weapondamage_electro
+effect damage_electro
+notunderwater
 count 4
 type smoke
 tex 0 8
@@ -6815,33 +6966,50 @@ velocityjitter 0.4 0.4 0.6
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
+// bouncing sparks
+effect damage_electro
+count 0.5
+type spark
+tex 66 68
+color 0x003090 0x00CCFF
+size 1 1
+alpha 768 64 256
+gravity 0.2
+airfriction 1
+bounce 1.5
+liquidfriction 0.8
+velocityoffset 0 0 0
+velocityjitter 32 32 32
 // light
-effect weapondamage_electro
+/*effect damage_electro
+notunderwater
 trailspacing 8
 lightradius 50
 lightradiusfade 220
-lightcolor 0.2 0.8 1.0
+lightcolor 0.2 0.6 0.8*/
 
 // crylink damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_crylink
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_crylink
+notunderwater
 count 2
 type static
 tex 38 38
 color 0xff44ff 0x9966ff
-size 4 8
+size 0.5 1
 sizeincrease -8
 alpha 48 16 48
 gravity -0.0001
 airfriction 0.6
 liquidfriction 0.8
-originjitter 4 4 8
+originjitter 3 3 3
 velocityjitter 10 10 20
 velocitymultiplier 0
 airfriction -0.5
 rotate 180 360 -30 30
 // plasma smoke
-effect weapondamage_crylink
+effect damage_crylink
+notunderwater
 count 4
 type smoke
 tex 0 8
@@ -6850,26 +7018,41 @@ size 5 10
 sizeincrease 6
 alpha 64 16 64
 gravity 0.001
-originjitter 4 4 6
+originjitter 4 4 4
 velocityjitter 0.4 0.4 0.6
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
+// floating sparks
+effect damage_crylink
+count 0.3
+type spark
+color 0x903090 0xFFD0FF
+size 0.5 0.5
+sizeincrease -5
+alpha 192 192 128
+gravity 0
+airfriction 0.2
+liquidfriction 0.8
+velocityoffset 0 0 0
+velocityjitter 12 12 12
 // light
-effect weapondamage_crylink
+/*effect damage_crylink
+notunderwater
 trailspacing 8
 lightradius 50
 lightradiusfade 240
-lightcolor 0.8 0.2 1.0
+lightcolor 0.6 0.2 0.8*/
 
 // hlac damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_hlac
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_hlac
+notunderwater
 count 3
 type smoke
 tex 0 8
 color 0x880000 0xff4400
-size 4 8
+size 2 4
 sizeincrease 10
 alpha 128 16 128
 gravity 0
@@ -6880,8 +7063,8 @@ airfriction -0.35
 rotate 0 180 -30 30
 
 // nex damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_nex
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_nex
 count 1
 type static
 tex 47 47
@@ -6892,13 +7075,13 @@ alpha 64 8 64
 gravity -0.0001
 airfriction 0.1
 liquidfriction 0.6
-originjitter 6 6 6
+originjitter 4 4 4
 velocityjitter 8 8 16
 velocitymultiplier 0
 airfriction -0.5
 rotate 180 360 -30 30
 // plasma smoke
-effect weapondamage_nex
+effect damage_nex
 count 2
 type smoke
 tex 0 8
@@ -6907,21 +7090,35 @@ size 4 8
 sizeincrease 8
 alpha 64 16 64
 gravity 0
-originjitter 4 4 4
+originjitter 2 2 2
 velocityjitter 0.5 0.5 0.8
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
+// bouncing sparks
+effect damage_nex
+count 0.2
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 1 1
+alpha 255 255 112
+bounce 1.6
+stretchfactor 0.7
+velocityjitter 100 100 300
+velocitymultiplier 3
+airfriction 2
+gravity 1
 // light
-effect weapondamage_nex
+/*effect damage_nex
 trailspacing 8
 lightradius 60
 lightradiusfade 280
-lightcolor 0.8 1.0 1.0
+lightcolor 0.6 0.8 0.8*/
 
 // minstanex damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_minstanex
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_minstanex
 count 2
 type static
 tex 47 47
@@ -6932,13 +7129,13 @@ alpha 64 8 64
 gravity -0.0001
 airfriction 0.1
 liquidfriction 0.6
-originjitter 6 6 6
+originjitter 4 4 4
 velocityjitter 8 8 16
 velocitymultiplier 0
 airfriction -0.5
 rotate 180 360 -30 30
 // plasma smoke
-effect weapondamage_minstanex
+effect damage_minstanex
 count 4
 type smoke
 tex 0 8
@@ -6947,380 +7144,269 @@ size 4 8
 sizeincrease 8
 alpha 64 16 64
 gravity 0
-originjitter 4 4 4
+originjitter 2 2 2
 velocityjitter 0.5 0.5 0.8
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
+// bouncing sparks
+effect damage_minstanex
+count 0.2
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 1 1
+alpha 255 255 112
+bounce 1.6
+stretchfactor 0.7
+velocityjitter 100 100 300
+velocitymultiplier 3
+airfriction 2
+gravity 1
 // light
-effect weapondamage_minstanex
+/*effect damage_minstanex
 trailspacing 8
 lightradius 60
 lightradiusfade 240
-lightcolor 0.8 1.0 1.0
+lightcolor 0.6 0.8 0.8*/
 
 // sniperrifle damage effect, normal blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_sniperrifle
-count 0.25
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_rifle
+count 0.3
 type blood
 tex 24 32
-size 2 6
+size 2 4
 alpha 256 256 64
 color 0xA8FFFF 0xA8FFFFF
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_sniperrifle
-countabsolute 1
+effect damage_rifle
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x420000
-originjitter 6 6 6
+originjitter 0 0 0
 
 // sniperrifle damage effect, alien blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_sniperrifle_alien
-count 0.25
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_rifle_alien
+count 0.3
 type blood
 tex 24 32
-size 2 6
+size 2 4
 alpha 256 256 64
 color 0xDC9BCD 0xDC9BCD
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_sniperrifle_alien
-countabsolute 1
+effect damage_rifle_alien
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x204010
-originjitter 6 6 6
+originjitter 0 0 0
 
 // sniperrifle damage effect, robot blood
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_sniperrifle_robot
-count 0.25
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_rifle_robot
+count 0.3
 type blood
 tex 24 32
-size 2 6
+size 2 4
 alpha 256 256 64
 color 0xC0D890 0xC0D890
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_sniperrifle_robot
-countabsolute 1
+effect damage_rifle_robot
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x301860
-originjitter 6 6 6
+originjitter 0 0 0
 
 // seeker damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_seeker
-//notunderwater
-count 2
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_seeker
+notunderwater
+count 3
 type smoke
 tex 48 55
-size 3 7
-alpha 256 16 256
-gravity -0.5
-color 0x8f0d00 0xff5a00
+size 4 8
+alpha 512 32 1024
+gravity -0.3
+color 0x8f0c00 0xff2200
 sizeincrease -10
-originoffset 0 0 5
-originjitter 5 5 7
+originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
-effect weapondamage_seeker
+effect damage_seeker
+notunderwater
 type alphastatic
 count 2
 tex 0 8
 size 2 4
-sizeincrease 5
+sizeincrease 10
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
-originoffset 0 0 10
-originjitter 5 5 7
+originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_seeker
+/*effect damage_seeker
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
-lightcolor 0.9 0.7 0.2
+lightcolor 0.7 0.5 0.1*/
 
 // hagar damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_hagar
-//notunderwater
-count 2
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_hagar
+notunderwater
+count 3
 type smoke
 tex 48 55
-size 3 7
-alpha 256 16 256
-gravity -0.5
-color 0x8f0d00 0xff5a00
+size 4 8
+alpha 512 32 1024
+gravity -0.3
+color 0x8f0c00 0xff3a00
 sizeincrease -10
-originoffset 0 0 5
-originjitter 5 5 7
+originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
-effect weapondamage_hagar
+effect damage_hagar
+notunderwater
 type alphastatic
 count 2
 tex 0 8
 size 2 4
-sizeincrease 5
+sizeincrease 10
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
-originoffset 0 0 10
-originjitter 5 5 7
+originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_hagar
+/*effect damage_hagar
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
-lightcolor 0.9 0.7 0.2
+lightcolor 0.7 0.5 0.1*/
 
 // fireball damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_fireball
-//notunderwater
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_fireball
+notunderwater
 count 4
 type smoke
 tex 48 55
-size 10 20
-alpha 192 16 192
+size 5 10
+alpha 256 16 512
 gravity -0.5
 color 0x8f0d00 0xff5a00
 sizeincrease -10
-originoffset 0 0 10
-originjitter 8 8 24
+originjitter 8 8 8
 velocityjitter 22 22 50
 // smoke
-effect weapondamage_fireball
+effect damage_fireball
+notunderwater
 type alphastatic
 count 4
 tex 0 8
-size 8 16
-sizeincrease 5
+size 4 8
+sizeincrease 10
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
-originoffset 0 0 10
-originjitter 8 8 24
+originjitter 6 6 6
 velocityjitter 11 11 50
 // light
-effect weapondamage_fireball
+/*effect damage_fireball
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
-lightcolor 0.9 0.6 0.2
+lightcolor 1.0 0.8 0.4*/
 
 // rocketlauncher damage effect
-// used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
-effect weapondamage_rocketlauncher
-//notunderwater
+// used in qcsrc/client/damage.qc:			pointparticles(self.team, org, '0 0 0', 1);
+effect damage_rocketlauncher
+notunderwater
 count 3
 type smoke
 tex 48 55
-size 7 14
-alpha 256 16 256
-gravity -0.5
-color 0x8f0d00 0xff5a00
+size 5 10
+alpha 512 64 1024
+gravity -0.7
+color 0x8f0c00 0xff2a00
 sizeincrease -10
-originoffset 0 0 10
-originjitter 5 5 7
-velocityjitter 22 22 50
+originjitter 4 4 4
+velocityjitter 22 22 30
 // smoke
-effect weapondamage_rocketlauncher
+effect damage_rocketlauncher
+notunderwater
 type alphastatic
 count 3
 tex 0 8
-size 5 10
-sizeincrease 5
+size 4 8
+sizeincrease 10
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
-originoffset 0 0 10
-originjitter 5 5 7
+originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_rocketlauncher
+/*effect damage_rocketlauncher
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280
-lightcolor 0.9 0.6 0.2
-
-// metal impact effect
-// used in qcsrc/server/mutators/sandbox.qc:	pointparticles(particleeffectnum("impact_metal"), self.origin, '0 0 0', 1);
-effect impact_metal
-count 1
-type alphastatic
-tex 0 8
-size 3 6
-sizeincrease 10
-alpha 25 64 50
-gravity -0.01
-color 0x000000 0x886666
-originjitter 20 20 5
-// sparks
-effect impact_metal
-count 2
-type spark
-tex 41 41
-color 0xFFCC22 0xFF4422
-size 2 2
-alpha 255 255 112
-bounce 1.8
-stretchfactor 0.5
-velocityjitter 200 200 300
-velocitymultiplier 2
-airfriction 2
-gravity 1
-
-// stone impact effect
-// used in qcsrc/server/mutators/sandbox.qc:	pointparticles(particleeffectnum("impact_stone"), self.origin, '0 0 0', 1);
-effect impact_stone
-count 1
-type alphastatic
-tex 0 8
-size 3 6
-sizeincrease 15
-alpha 50 128 75
-gravity -0.01
-color 0x000000 0xcc9966
-originjitter 20 20 5
-// debris
-effect impact_stone
-notunderwater
-count 1
-type alphastatic
-tex 66 68
-color 0x000000 0x886644
-size 1 2
-alpha 450 750 300
-gravity 1.3
-airfriction 0.5
-bounce 1.2
-velocityjitter 124 124 324
-rotate -180 180 -1000 1000
+lightcolor 0.8 0.6 0.2*/
 
-// wood impact effect
-// used in qcsrc/server/mutators/sandbox.qc:	pointparticles(particleeffectnum("impact_wood"), self.origin, '0 0 0', 1);
-effect impact_wood
+// fireflies
+// used nowhere in code
+effect fireflies
 count 1
-type alphastatic
-tex 0 8
-size 3 6
-sizeincrease 10
-alpha 50 128 75
-gravity -0.01
-color 0x000000 0xcc9966
-originjitter 20 20 5
-// sparks
-effect impact_wood
-count 2
-type spark
-tex 41 41
-color 0x221100 0x221100
-size 1 8
-alpha 255 255 75
-bounce 1.5
-velocityjitter 180 180 260
-velocitymultiplier 2
-airfriction 2
-gravity 1
-
-// flesh impact effect
-// used in qcsrc/server/mutators/sandbox.qc:	pointparticles(particleeffectnum("impact_flesh"), self.origin, '0 0 0', 1);
-effect impact_flesh
-count 0.5
-type alphastatic
-tex 0 8
-size 8 12
-alpha 100 256 400
-color 0x000000 0x420000
-originjitter 11 11 11
-// blood splash
-effect impact_flesh
-count 0.3
-type blood
-tex 24 32
-size 2 6
-alpha 256 256 64
-color 0xA8FFFF 0xA8FFFFF
 bounce -1
-airfriction 1
-liquidfriction 4
-velocityjitter 96 96 96
-velocitymultiplier 5
-staincolor 0x808080 0x808080
-staintex 16 24
-
-// hagar trail
-// smoke
-effect tr_hagar
-trailspacing 4
-type smoke
-color 0x101010 0x000000
-tex 0 8
-size 3 2
-bounce 1
-sizeincrease 10
-alpha 300 400 780
-originjitter 1 1 1
-velocityjitter 1 1 1
-velocitymultiplier -0.02
-//gravity -0.11
-// fire
-effect tr_hagar
-notunderwater
-trailspacing 4
+airfriction 5
+time 1 2
 type static
-color 0xffdf72 0x811200
-tex 48 55
-size 5 2
-sizeincrease -15
-alpha 100 144 988
-airfriction 8
-velocityjitter 32 32 32
-velocitymultiplier -1.0
-// bubbles
-effect tr_hagar
-underwater
-trailspacing 16
-type bubble
-tex 62 62
-color 0x404040 0x808080
-size 1 1
-alpha 256 256 256
-gravity -0.125
-bounce 1.5
-liquidfriction 4
-velocityjitter 16 16 16
+tex 38 38
+color 0xff9600 0xffefb8
+size 2 3
+sizeincrease -0.3
+alpha 256 256 70
+gravity 0
+originoffset 8 8 8
+originjitter 32 32 32
+velocityoffset 2 2 2
+velocityjitter 64 64 64
+//lightradius 50
+//lightradiusfade 50
+//lightcolor 1 0.9 0.7
+//lightshadow 1