X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=effectinfo.txt;h=c2f702fa5ab243ac7d032a8583bb07e0c8d82570;hb=b12ef86ae1464d5bf43eb113a27e0e5b80fd21a5;hp=dfc83b7ae6960d88210349a41719b3b544ba1ec2;hpb=eb3aeb12cb42f0f0cc9af7060f8d3a620fb7a790;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/effectinfo.txt b/effectinfo.txt
index dfc83b7ae..c2f702fa5 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -775,7 +775,7 @@ effect teleport
 count 500
 type spark
 tex 64 64
-color 0xff8400 0xff2a00
+color 0x807aff 0x4463d5
 size 1 1
 alpha 0 256 100
 stretchfactor 2
@@ -793,7 +793,7 @@ tex 65 65
 size 150 150
 alpha 190 190 180
 sizeincrease -80
-color 0xff8400 0xff2a00
+color 0x807aff 0x4463d5
 
 
 
@@ -6539,9 +6539,158 @@ 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
@@ -6557,8 +6706,8 @@ 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
+// 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
@@ -6573,7 +6722,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_shotgun
+effect damage_shotgun
 count 1
 type alphastatic
 tex 0 8
@@ -6583,8 +6732,8 @@ color 0x000000 0x420000
 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
+// 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
@@ -6599,7 +6748,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_shotgun_alien
+effect damage_shotgun_alien
 count 1
 type alphastatic
 tex 0 8
@@ -6609,8 +6758,8 @@ color 0x000000 0x204010
 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
+// 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
@@ -6625,7 +6774,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_shotgun_robot
+effect damage_shotgun_robot
 count 1
 type alphastatic
 tex 0 8
@@ -6635,8 +6784,8 @@ color 0x000000 0x301860
 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
+// 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
@@ -6651,7 +6800,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_uzi
+effect damage_uzi
 count 1
 type alphastatic
 tex 0 8
@@ -6661,8 +6810,8 @@ color 0x000000 0x420000
 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
+// 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
@@ -6677,7 +6826,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_uzi_alien
+effect damage_uzi_alien
 count 1
 type alphastatic
 tex 0 8
@@ -6687,8 +6836,8 @@ color 0x000000 0x204010
 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
+// 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
@@ -6703,7 +6852,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_uzi_robot
+effect damage_uzi_robot
 count 1
 type alphastatic
 tex 0 8
@@ -6713,9 +6862,9 @@ color 0x000000 0x301860
 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
+// 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
@@ -6727,7 +6876,8 @@ 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
@@ -6739,16 +6889,17 @@ gravity -0.3
 originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_minelayer
+/*effect damage_minelayer
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280
-lightcolor 0.7 0.4 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
+// 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
@@ -6760,7 +6911,8 @@ 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,15 +6924,17 @@ gravity -0.3
 originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_grenadelauncher
+/*effect damage_grenadelauncher
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280
-lightcolor 0.7 0.4 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
@@ -6797,7 +6951,8 @@ 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
@@ -6812,34 +6967,36 @@ velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
 // bouncing sparks
-effect weapondamage_electro
-notunderwater
+effect damage_electro
 count 0.5
 type spark
+tex 66 68
 color 0x003090 0x00CCFF
 size 1 1
-alpha 256 256 384
+alpha 768 64 256
 gravity 0.2
 airfriction 1
 bounce 1.5
 liquidfriction 0.8
-velocityoffset 0 0 20
-velocityjitter 64 64 64
+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.6 0.8
+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 2 4
+size 0.5 1
 sizeincrease -8
 alpha 48 16 48
 gravity -0.0001
@@ -6851,7 +7008,8 @@ 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
@@ -6866,29 +7024,30 @@ velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
 // floating sparks
-effect weapondamage_crylink
-notunderwater
-count 0.2
+effect damage_crylink
+count 0.3
 type spark
 color 0x903090 0xFFD0FF
 size 0.5 0.5
-sizeincrease -8
-alpha 192 192 256
+sizeincrease -5
+alpha 192 192 128
 gravity 0
 airfriction 0.2
 liquidfriction 0.8
 velocityoffset 0 0 0
-velocityjitter 48 48 48
+velocityjitter 12 12 12
 // light
-effect weapondamage_crylink
+/*effect damage_crylink
+notunderwater
 trailspacing 8
 lightradius 50
 lightradiusfade 240
-lightcolor 0.6 0.2 0.8
+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
@@ -6904,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
@@ -6922,7 +7081,7 @@ 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
@@ -6937,7 +7096,7 @@ velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
 // bouncing sparks
-effect weapondamage_nex
+effect damage_nex
 count 0.2
 type spark
 tex 41 41
@@ -6951,15 +7110,15 @@ velocitymultiplier 3
 airfriction 2
 gravity 1
 // light
-effect weapondamage_nex
+/*effect damage_nex
 trailspacing 8
 lightradius 60
 lightradiusfade 280
-lightcolor 0.6 0.8 0.8
+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
@@ -6976,7 +7135,7 @@ 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
@@ -6991,7 +7150,7 @@ velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
 // bouncing sparks
-effect weapondamage_minstanex
+effect damage_minstanex
 count 0.2
 type spark
 tex 41 41
@@ -7005,15 +7164,15 @@ velocitymultiplier 3
 airfriction 2
 gravity 1
 // light
-effect weapondamage_minstanex
+/*effect damage_minstanex
 trailspacing 8
 lightradius 60
 lightradiusfade 240
-lightcolor 0.6 0.8 0.8
+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
+// 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
@@ -7028,7 +7187,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_sniperrifle
+effect damage_rifle
 count 1
 type alphastatic
 tex 0 8
@@ -7038,8 +7197,8 @@ color 0x000000 0x420000
 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
+// 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
@@ -7054,7 +7213,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_sniperrifle_alien
+effect damage_rifle_alien
 count 1
 type alphastatic
 tex 0 8
@@ -7064,8 +7223,8 @@ color 0x000000 0x204010
 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
+// 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
@@ -7080,7 +7239,7 @@ velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
-effect weapondamage_sniperrifle_robot
+effect damage_rifle_robot
 count 1
 type alphastatic
 tex 0 8
@@ -7090,9 +7249,9 @@ color 0x000000 0x301860
 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
+// 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
@@ -7104,7 +7263,8 @@ sizeincrease -10
 originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
-effect weapondamage_seeker
+effect damage_seeker
+notunderwater
 type alphastatic
 count 2
 tex 0 8
@@ -7116,16 +7276,17 @@ gravity -0.3
 originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_seeker
+/*effect damage_seeker
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
-lightcolor 0.7 0.5 0.1
+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
+// 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
@@ -7137,7 +7298,8 @@ sizeincrease -10
 originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
-effect weapondamage_hagar
+effect damage_hagar
+notunderwater
 type alphastatic
 count 2
 tex 0 8
@@ -7149,16 +7311,17 @@ gravity -0.3
 originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_hagar
+/*effect damage_hagar
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
-lightcolor 0.7 0.5 0.1
+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
@@ -7170,7 +7333,8 @@ sizeincrease -10
 originjitter 8 8 8
 velocityjitter 22 22 50
 // smoke
-effect weapondamage_fireball
+effect damage_fireball
+notunderwater
 type alphastatic
 count 4
 tex 0 8
@@ -7182,16 +7346,17 @@ gravity -0.3
 originjitter 6 6 6
 velocityjitter 11 11 50
 // light
-effect weapondamage_fireball
+/*effect damage_fireball
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
-lightcolor 1.0 0.8 0.4
+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
@@ -7203,7 +7368,8 @@ sizeincrease -10
 originjitter 4 4 4
 velocityjitter 22 22 30
 // smoke
-effect weapondamage_rocketlauncher
+effect damage_rocketlauncher
+notunderwater
 type alphastatic
 count 3
 tex 0 8
@@ -7215,156 +7381,599 @@ gravity -0.3
 originjitter 4 4 4
 velocityjitter 11 11 50
 // light
-effect weapondamage_rocketlauncher
+/*effect damage_rocketlauncher
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280
-lightcolor 0.8 0.6 0.2
+lightcolor 0.8 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
+// fireflies
+// used nowhere in code
+effect fireflies
 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
+bounce -1
+airfriction 5
+time 1 2
+type static
+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
+
+// heal ray muzzleflash
+
+effect healray_muzzleflash
+countabsolute 1
+type smoke
+color 0x283880 0x283880 // 0x202020 0x404040
+tex 65 65
+size 20 20
+alpha 256 256 512
+originjitter 1.5 1.5 1.5
+velocityjitter 6 6 6
+sizeincrease -10
+velocitymultiplier 0.01
+lightradius 200
+lightradiusfade 2000
+lightcolor 1.5 3 6
+
+effect healray_muzzleflash
+count 22
 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
+tex 71 73
+color 0xD9FDFF 0x00f0ff
+size 1 15
+sizeincrease 3
+alpha 50 150 1924
+originjitter 1 1 1
+velocityjitter 150 150 150
+velocitymultiplier 0.4
+airfriction 5
+stretchfactor 3.9
 
-// 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
+effect healray_muzzleflash
+count 4
+type spark
+tex 70 70
+color 0xD9FDFF 0x00f0ff
+size 1 1
+alpha 110 228 4024
+originjitter 1 1 1
+velocityjitter 650 650 650
+velocitymultiplier 1.1
+stretchfactor 0.2
+
+
+
+//healray impact
+
+effect healray_impact
+countabsolute 1
+type decal
+tex 59 59
+size 32 32
+alpha 256 256 0
+color 0xd800ff 0xd800ff
+originjitter 17 17 17
+lightradius 125
+lightradiusfade 450
+lightcolor 0 4.375 0
+// shockwave
+effect healray_impact
+type smoke
+countabsolute 1
+tex 33 33
+size 32 32
+sizeincrease 1400
+color 0x00ff00 0x84c52f
+alpha 40 40 350
+velocitymultiplier 44
+// cloud of bouncing sparks
+effect healray_impact
+count 30
+type spark
+tex 70 70
+color 0x00ff00 0x84c52f
 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
+alpha 156 300 1024
+gravity 2
+airfriction 6
+originjitter 1 1 1
+velocityjitter 1112 1112 1112
+// inner cloud of smoke
+effect healray_impact
+count 15
+type smoke
+color 0x00ff00 0x84c52f
+tex 40 40
+size 2 3 
+alpha 200 456 512
+airfriction 3
+gravity -2
+velocityjitter 120 120 420
+rotate -180 180 -90 90
 
-// 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
+
+
+
+// big plasma muzzle flash
+
+effect bigplasma_muzzleflash
+countabsolute 1
+type smoke
+color 0x283880 0x283880 // 0x202020 0x404040
+tex 65 65
+size 50 50
+alpha 256 256 812
+originjitter 1.5 1.5 1.5
+velocityjitter 6 6 6
+sizeincrease -10
+velocitymultiplier 0.01
+lightradius 200
+lightradiusfade 2000
+lightcolor 1.5 3 6
+
+effect bigplasma_muzzleflash
+countabsolute 1
+type smoke
+color 0x00f0ff 0x00f0ff
+tex 74 74
+size 20 20
+alpha 56 56 1112
+sizeincrease 300
+
+effect bigplasma_muzzleflash
+count 14
+type spark
+tex 51 55
+color 0xD9FDFF 0x00f0ff
+size 5 10
+sizeincrease 135
+alpha 50 150 1924
+originjitter 1 1 1
+velocityjitter 350 350 350
+velocitymultiplier 0.4
+airfriction 5
+stretchfactor 1.9
+
+effect bigplasma_muzzleflash
+count 4
+type spark
+tex 70 70
+color 0xD9FDFF 0x00f0ff
+size 20 20
+alpha 110 228 4024
+originjitter 1 1 1
+velocityjitter 650 650 650
+velocitymultiplier 1.1
+stretchfactor 0.2
+
+
+// big plasma impact
+
+effect bigplasma_impact
+countabsolute 1
+type decal
+tex 59 59
+size 32 32
+alpha 256 256 0
+originjitter 17 17 17
+lightradius 125
+lightradiusfade 450
+lightcolor 3.125 4.375 10
+// shockwave
+effect bigplasma_impact
+type smoke
+countabsolute 1
+tex 33 33
+size 32 32
+sizeincrease 1400
+color 0x80C0FF 0x80C0FF
+alpha 40 40 350
+velocitymultiplier 44
+// cloud of bouncing sparks
+effect bigplasma_impact
+count 30
+type spark
+tex 70 70
+color 0x629dff 0x0018ff
+size 1 2
+alpha 156 300 1024
+gravity 2
+airfriction 6
+originjitter 1 1 1
+velocityjitter 1512 1512 1512
+// inner cloud of smoke
+effect bigplasma_impact
+count 15
+type smoke
+color 0x629dff 0x0018ff
+tex 48 55
+size 20 24
+sizeincrease 555
+alpha 200 456 1512
+airfriction 30
+originjitter 20 20 20
+velocityjitter 320 320 320
+rotate -180 180 -9 9
+// smoke
+effect bigplasma_impact
+type smoke
+count 16
+blend alpha
+tex 0 7
+size 60 30
+color 0x222222 0x000000
+alpha 128 328 390
+rotate -180 180 2 -2
+velocityjitter 100 100 200
+velocityoffset 0 0 180
+originjitter 80 80 10
+sizeincrease 30
+airfriction 0.04
+gravity 0.4
+// smoke in the middle
+effect bigplasma_impact
 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
+count 10
+tex 0 7
+size 60 70
+color 0x222222 0x000000
+alpha 128 328 310
+rotate -180 180 20 -20
+velocityjitter 10 10 10
+originjitter 80 80 80
+sizeincrease -10
+airfriction 0.04
+gravity -0.2
+
+// redflag_touch -- effects for touching the red flag
+// used nowhere in code
+effect redflag_touch
+count 35
 type spark
-tex 41 41
-color 0x221100 0x221100
-size 1 8
-alpha 255 255 75
+tex 40 40
+color 0xFF0000 0x970000
+size 1 3
+alpha 0 256 556
+gravity 1
 bounce 1.5
-velocityjitter 180 180 260
-velocitymultiplier 2
-airfriction 2
+originjitter 1 1 1
+velocityjitter 300 300 300
+velocitymultiplier 0.5
+airfriction 3
+
+// blueflag_touch -- effects for touching the blue flag
+// used nowhere in code
+effect blueflag_touch
+count 35
+type spark
+tex 40 40
+color 0x0000FF 0x000097
+size 1 3
+alpha 0 256 556
 gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 300 300 300
+velocitymultiplier 0.5
+airfriction 3
 
-// 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
+// red_pass
+// used nowhere in code
+effect red_pass
+trailspacing 64
+color 0xFF0000 0x970000
+size 2 2
+tex 32 32
+alpha 64 128 64
+airfriction 5
+sizeincrease 2
+type static
+effect red_pass
+trailspacing 12
+color 0xFF0000 0x970000
+size 1 1
 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
+alpha 32 64 32
+airfriction 9
+sizeincrease 8
+velocityjitter 64 64 64
+type static
+effect red_pass
+trailspacing 12
+color 0xFF0000 0x970000
+size 4 4
+//tex 48 55
+alpha 256 256 1280
+type static
 
-// hagar trail
-// smoke
-effect tr_hagar
-trailspacing 4
-type smoke
-color 0x101010 0x000000
+// blue_pass
+// used nowhere in code
+effect blue_pass
+trailspacing 64
+color 0x0000FF 0x000097
+size 2 2
+tex 32 32
+alpha 64 128 64
+airfriction 5
+sizeincrease 2
+type static
+effect blue_pass
+trailspacing 12
+color 0x0000FF 0x000097
+size 1 1
 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
+alpha 32 64 32
+airfriction 9
+sizeincrease 8
+velocityjitter 64 64 64
 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
+effect blue_pass
+trailspacing 12
+color 0x0000FF 0x000097
+size 4 4
+//tex 48 55
+alpha 256 256 1280
+type static
+
+// red_cap -- red team capture effect
+effect red_cap
+count 500
+type spark
+tex 64 64
+color 0xFF0000 0x970000
 size 1 1
-alpha 256 256 256
-gravity -0.125
+alpha 0 256 100
+stretchfactor 2
+//gravity 1
 bounce 1.5
-liquidfriction 4
-velocityjitter 16 16 16
+originjitter 1 1 1
+velocityjitter 1000 1000 1500
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 0.6
+effect red_cap
+countabsolute 1
+type smoke
+tex 65 65
+size 150 150
+alpha 190 190 180
+sizeincrease -80
+color 0xFF0000 0x970000
+
+// blue_cap -- blue team capture effect
+effect blue_cap
+count 500
+type spark
+tex 64 64
+color 0x0000FF 0x000097
+size 1 1
+alpha 0 256 100
+stretchfactor 2
+//gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 1000 1000 1500
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 0.6
+effect blue_cap
+countabsolute 1
+type smoke
+tex 65 65
+size 150 150
+alpha 190 190 180
+sizeincrease -80
+color 0x0000FF 0x000097
+
+// spawn_point_red -- red team idle spawn point effect
+effect spawn_point_red
+count 37.5
+type static
+color 0xFF0F0F 0xFF0F0F
+size 1.0 2.0
+alpha 64 128 128
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 16 16 64
+velocityjitter 32 32 0
+//lightradius 200
+//lighttime 0
+//lightcolor 0.4 0.9 0.9
+
+// spawn_point_blue -- blue team idle spawn point effect
+effect spawn_point_blue
+count 37.5
+type static
+color 0x0F0FFF 0x0F0FFF
+size 1.0 2.0
+alpha 64 128 128
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 16 16 64
+velocityjitter 32 32 0
+//lightradius 200
+//lighttime 0
+//lightcolor 0.4 0.9 0.9
+
+// spawn_point_yellow -- yellow team idle spawn point effect
+effect spawn_point_yellow
+count 37.5
+type static
+color 0xFFFF0F 0xFFFF0F
+size 1.0 2.0
+alpha 64 128 128
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 16 16 64
+velocityjitter 32 32 0
+//lightradius 200
+//lighttime 0
+//lightcolor 0.4 0.9 0.9
+
+// spawn_point_pink -- pink team idle spawn point effect
+effect spawn_point_pink
+count 37.5
+type static
+color 0xFF0FFF 0xFF0FFF
+size 1.0 2.0
+alpha 64 128 128
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 16 16 64
+velocityjitter 32 32 0
+//lightradius 200
+//lighttime 0
+//lightcolor 0.4 0.9 0.9
+
+// spawn_point_neutral -- neutral idle spawn point effect
+effect spawn_point_neutral
+count 37.5
+type static
+color 0xFFFFFF 0xFFFFFF
+size 1.0 2.0
+alpha 64 128 128
+gravity -0.1
+airfriction 0.2
+liquidfriction 0.8
+originjitter 16 16 64
+velocityjitter 32 32 0
+//lightradius 200
+//lighttime 0
+//lightcolor 0.4 0.9 0.9
+
+// spawn_event_red -- red team spawning effect
+effect spawn_event_red
+count 100
+type spark
+tex 64 64
+color 0xFF0F0F 0xFF0F0F
+size 1 1
+alpha 0 256 256
+stretchfactor 0.6
+//gravity 1
+bounce 1
+originjitter 1 1 1
+velocityjitter 500 500 500
+velocitymultiplier 0.1
+airfriction 2
+effect spawn_event_red
+countabsolute 1
+type smoke
+tex 65 65
+size 100 100
+alpha 190 190 180
+sizeincrease -80
+color 0xFF0F0F 0xFF0F0F
+
+// spawn_event_blue -- blue team spawning effect
+effect spawn_event_blue
+count 100
+type spark
+tex 64 64
+color 0x0F0FFF 0x0F0FFF
+size 1 1
+alpha 0 256 256
+stretchfactor 0.6
+//gravity 1
+bounce 1
+originjitter 1 1 1
+velocityjitter 500 500 500
+velocitymultiplier 0.1
+airfriction 2
+effect spawn_event_blue
+countabsolute 1
+type smoke
+tex 65 65
+size 100 100
+alpha 190 190 180
+sizeincrease -80
+color 0x0F0FFF 0x0F0FFF
+
+// spawn_event_yellow -- yellow team spawning effect
+effect spawn_event_yellow
+count 100
+type spark
+tex 64 64
+color 0xFFFF0F 0xFFFF0F
+size 1 1
+alpha 0 256 256
+stretchfactor 0.6
+//gravity 1
+bounce 1
+originjitter 1 1 1
+velocityjitter 500 500 500
+velocitymultiplier 0.1
+airfriction 2
+effect spawn_event_yellow
+countabsolute 1
+type smoke
+tex 65 65
+size 100 100
+alpha 190 190 180
+sizeincrease -80
+color 0xFFFF0F 0xFFFF0F
+
+// spawn_event_pink -- pink team spawning effect
+effect spawn_event_pink
+count 100
+type spark
+tex 64 64
+color 0xFF0FFF 0xFF0FFF
+size 1 1
+alpha 0 256 256
+stretchfactor 0.6
+//gravity 1
+bounce 1
+originjitter 1 1 1
+velocityjitter 500 500 500
+velocitymultiplier 0.1
+airfriction 2
+effect spawn_event_pink
+countabsolute 1
+type smoke
+tex 65 65
+size 100 100
+alpha 190 190 180
+sizeincrease -80
+color 0xFF0FFF 0xFF0FFF
+
+// spawn_event_neutral -- neutral spawning effect
+effect spawn_event_neutral
+count 100
+type spark
+tex 64 64
+color 0xFFFFFF 0xFFFFFF
+size 1 1
+alpha 0 256 256
+stretchfactor 0.6
+//gravity 1
+bounce 1
+originjitter 1 1 1
+velocityjitter 500 500 500
+velocitymultiplier 0.1
+airfriction 2
+effect spawn_event_neutral
+countabsolute 1
+type smoke
+tex 65 65
+size 100 100
+alpha 190 190 180
+sizeincrease -80
+color 0xFFFFFF 0xFFFFFF