X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=effectinfo.txt;h=129dba36e2c6a09ec35974649391ee051a7a9853;hp=085f729ab1e6390b9868cfaca777068ed81da7ce;hb=HEAD;hpb=2723c198edcbe2200be63a7b40df8be555fb2497

diff --git a/effectinfo.txt b/effectinfo.txt
index 085f729ab1..da8070787f 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -2506,6 +2506,29 @@ effect poisonfield
 	size 1 1
 	tex 0 8
 	velocityjitter 5 5 5
+effect darkfield
+	type smoke
+	airfriction 1
+	alpha 256 256 50
+	bounce 1.500000
+	color 0x600089 0x000000
+	count 10
+	gravity -0.010000
+	originjitter 333 333 0
+	sizeincrease 10
+	size 1 1
+	tex 0 8
+	velocityjitter 5 5 30
+effect darkfield
+	type smoke
+	alpha 256 256 50
+	color 0x600089 0x000000
+	count 5
+	gravity -0.001000
+	originjitter 333 333 0
+	sizeincrease 10
+	size 1 1
+	tex 48 55
 effect icefield
 	type smoke
 	airfriction 1
@@ -2769,6 +2792,18 @@ effect tr_bullet
 	tex 0 8
 	trailspacing 16
 	velocityjitter 4 4 4
+effect tr_bullet
+	type bubble
+	alpha 256 256 128
+	bounce 1.500000
+	color 0x404040 0x808080
+	gravity -0.125000
+	liquidfriction 4
+	size 0.5 0.6
+	tex 62 62
+	trailspacing 16
+	underwater
+	velocityjitter 16 16 16
 effect smoking_smallemitter
 	type alphastatic
 	airfriction -1
@@ -5620,7 +5655,7 @@ effect tr_hagar
 	trailspacing 16
 	underwater
 	velocityjitter 16 16 16
-effect damage_laser
+effect damage_blaster
 	type smoke
 	airfriction -0.350000
 	alpha 128 16 128
@@ -5655,7 +5690,7 @@ effect damage_shotgun
 	originjitter 1 1 1
 	size 8 16
 	tex 0 8
-effect damage_shotgun_alien
+effect alien_damage_shotgun
 	type blood
 	airfriction 1
 	alpha 256 256 64
@@ -5669,7 +5704,7 @@ effect damage_shotgun_alien
 	tex 24 32
 	velocityjitter 64 64 64
 	velocitymultiplier 5
-effect damage_shotgun_alien
+effect alien_damage_shotgun
 	type alphastatic
 	alpha 100 256 400
 	color 0x000000 0x204010
@@ -5677,7 +5712,7 @@ effect damage_shotgun_alien
 	originjitter 1 1 1
 	size 8 16
 	tex 0 8
-effect damage_shotgun_robot
+effect robot_damage_shotgun
 	type blood
 	airfriction 1
 	alpha 256 256 64
@@ -5691,7 +5726,7 @@ effect damage_shotgun_robot
 	tex 24 32
 	velocityjitter 64 64 64
 	velocitymultiplier 5
-effect damage_shotgun_robot
+effect robot_damage_shotgun
 	type alphastatic
 	alpha 100 256 400
 	color 0x000000 0x301860
@@ -5699,7 +5734,7 @@ effect damage_shotgun_robot
 	originjitter 1 1 1
 	size 8 16
 	tex 0 8
-effect damage_uzi
+effect damage_machinegun
 	type blood
 	airfriction 1
 	alpha 256 256 64
@@ -5713,14 +5748,14 @@ effect damage_uzi
 	tex 24 32
 	velocityjitter 32 32 32
 	velocitymultiplier 5
-effect damage_uzi
+effect damage_machinegun
 	type alphastatic
 	alpha 100 256 400
 	color 0x000000 0x420000
 	count 1
 	size 6 12
 	tex 0 8
-effect damage_uzi_alien
+effect alien_damage_machinegun
 	type blood
 	airfriction 1
 	alpha 256 256 64
@@ -5734,14 +5769,14 @@ effect damage_uzi_alien
 	tex 24 32
 	velocityjitter 32 32 32
 	velocitymultiplier 5
-effect damage_uzi_alien
+effect alien_damage_machinegun
 	type alphastatic
 	alpha 100 256 400
 	color 0x000000 0x204010
 	count 1
 	size 6 12
 	tex 0 8
-effect damage_uzi_robot
+effect robot_damage_machinegun
 	type blood
 	airfriction 1
 	alpha 256 256 64
@@ -5755,7 +5790,7 @@ effect damage_uzi_robot
 	tex 24 32
 	velocityjitter 32 32 32
 	velocitymultiplier 5
-effect damage_uzi_robot
+effect robot_damage_machinegun
 	type alphastatic
 	alpha 100 256 400
 	color 0x000000 0x301860
@@ -5786,7 +5821,7 @@ effect damage_minelayer
 	size 4 8
 	tex 0 8
 	velocityjitter 11 11 50
-effect damage_grenadelauncher
+effect damage_mortar
 	type smoke
 	alpha 512 64 1024
 	color 0x8f0d00 0xff5a00
@@ -5798,7 +5833,7 @@ effect damage_grenadelauncher
 	size 4 8
 	tex 48 55
 	velocityjitter 22 22 50
-effect damage_grenadelauncher
+effect damage_mortar
 	type alphastatic
 	alpha 128 32 128
 	color 0x000000 0x111111
@@ -5810,6 +5845,46 @@ effect damage_grenadelauncher
 	size 4 8
 	tex 0 8
 	velocityjitter 11 11 50
+effect damage_arc
+	type static
+	airfriction -0.650000
+	alpha 48 8 48
+	color 0x66ffff 0x2288ff
+	count 2
+	gravity -0.000100
+	liquidfriction 0.600000
+	notunderwater
+	originjitter 2 2 2
+	rotate 180 360 -30 30
+	sizeincrease -14
+	size 4 8
+	tex 47 47
+	velocityjitter 6 6 12
+effect damage_arc
+	type smoke
+	airfriction -0.500000
+	alpha 64 16 64
+	color 0x2244ff 0x002266
+	count 4
+	notunderwater
+	originjitter 3 3 3
+	rotate 0 180 -30 30
+	sizeincrease 10
+	size 3 6
+	tex 0 8
+	velocityjitter 0.3 0.3 0.5
+effect damage_arc
+	type spark
+	airfriction 1
+	alpha 768 64 256
+	bounce 1.500000
+	color 0x003090 0x00CCFF
+	count 0.500000
+	gravity 0.150000
+	liquidfriction 0.600000
+	size 1 1
+	tex 66 68
+	velocityjitter 24 24 24
 effect damage_electro
 	type static
 	airfriction -0.500000
@@ -5902,7 +5977,7 @@ effect damage_hlac
 	size 2 4
 	tex 0 8
 	velocityjitter 0.4 0.4 0.6
-effect damage_nex
+effect damage_vortex
 	type static
 	airfriction -0.500000
 	alpha 64 8 64
@@ -5916,7 +5991,7 @@ effect damage_nex
 	size 5 10
 	tex 47 47
 	velocityjitter 8 8 16
-effect damage_nex
+effect damage_vortex
 	type smoke
 	airfriction -0.350000
 	alpha 64 16 64
@@ -5928,7 +6003,7 @@ effect damage_nex
 	size 4 8
 	tex 0 8
 	velocityjitter 0.5 0.5 0.8
-effect damage_nex
+effect damage_vortex
 	type spark
 	airfriction 2
 	alpha 255 255 112
@@ -5941,7 +6016,7 @@ effect damage_nex
 	tex 41 41
 	velocityjitter 100 100 300
 	velocitymultiplier 3
-effect damage_minstanex
+effect damage_vaporizer
 	type static
 	airfriction -0.500000
 	alpha 64 8 64
@@ -5955,7 +6030,7 @@ effect damage_minstanex
 	size 5 10
 	tex 47 47
 	velocityjitter 8 8 16
-effect damage_minstanex
+effect damage_vaporizer
 	type smoke
 	airfriction -0.350000
 	alpha 64 16 64
@@ -5967,7 +6042,7 @@ effect damage_minstanex
 	size 4 8
 	tex 0 8
 	velocityjitter 0.5 0.5 0.8
-effect damage_minstanex
+effect damage_vaporizer
 	type spark
 	airfriction 2
 	alpha 255 255 112
@@ -6115,7 +6190,7 @@ effect damage_fireball
 	size 4 8
 	tex 0 8
 	velocityjitter 11 11 50
-effect damage_rocketlauncher
+effect damage_devastator
 	type smoke
 	alpha 512 64 1024
 	color 0x8f0c00 0xff2a00
@@ -6127,7 +6202,7 @@ effect damage_rocketlauncher
 	size 5 10
 	tex 48 55
 	velocityjitter 22 22 30
-effect damage_rocketlauncher
+effect damage_devastator
 	type alphastatic
 	alpha 128 32 128
 	color 0x000000 0x111111
@@ -6773,6 +6848,93 @@ effect nade_neutral
 	trailspacing 16
 	underwater
 	velocityjitter 16 16 16
+effect nade_green
+	type smoke
+	alpha 100 100 250
+	color 0x40ff9b 0x40ff9b
+	sizeincrease -1
+	size 3 3
+	tex 65 65
+	trailspacing 1
+effect nade_green
+	type smoke
+	alpha 30 30 150
+	color 0xff0000 0xffa2a2
+	notunderwater
+	sizeincrease -10
+	size 15 25
+	tex 65 65
+	trailspacing 8
+effect nade_green
+	type bubble
+	alpha 256 256 256
+	bounce 1.500000
+	color 0x40ff9b 0x40ff9b
+	gravity -0.125000
+	liquidfriction 4
+	size 1 1
+	tex 62 62
+	trailspacing 16
+	underwater
+	velocityjitter 16 16 16
+effect nade_brown
+	type smoke
+	alpha 100 100 250
+	color 0xa85400 0xa85400
+	sizeincrease -1
+	size 3 3
+	tex 65 65
+	trailspacing 1
+effect nade_brown
+	type smoke
+	alpha 30 30 150
+	color 0xff0000 0xffa2a2
+	notunderwater
+	sizeincrease -10
+	size 15 25
+	tex 65 65
+	trailspacing 8
+effect nade_brown
+	type bubble
+	alpha 256 256 256
+	bounce 1.500000
+	color 0xa85400 0xa85400
+	gravity -0.125000
+	liquidfriction 4
+	size 1 1
+	tex 62 62
+	trailspacing 16
+	underwater
+	velocityjitter 16 16 16
+effect nade_purple
+	type smoke
+	alpha 100 100 250
+	color 0x540054 0x540054
+	sizeincrease -1
+	size 3 3
+	tex 65 65
+	trailspacing 1
+effect nade_purple
+	type smoke
+	alpha 30 30 150
+	color 0xff0000 0xffa2a2
+	notunderwater
+	sizeincrease -10
+	size 15 25
+	tex 65 65
+	trailspacing 8
+effect nade_purple
+	type bubble
+	alpha 256 256 256
+	bounce 1.500000
+	color 0x540054 0x540054
+	gravity -0.125000
+	liquidfriction 4
+	size 1 1
+	tex 62 62
+	trailspacing 16
+	underwater
+	velocityjitter 16 16 16
 effect nade_red_burn
 	type smoke
 	alpha 100 100 250
@@ -6973,6 +7135,86 @@ effect nade_neutral_burn
 	tex 71 73
 	trailspacing 16
 	velocityjitter 10 10 10
+effect nade_brown_burn
+	type smoke
+	alpha 100 100 250
+	color 0xa85400 0xff3c00
+	sizeincrease -1
+	size 5 5
+	tex 65 65
+	trailspacing 1
+effect nade_brown_burn
+	type smoke
+	alpha 200 200 1000
+	color 0xff0000 0xffa2a2
+	notunderwater
+	sizeincrease -30
+	size 45 25
+	tex 65 65
+	trailspacing 64
+effect nade_brown_burn
+	type bubble
+	alpha 256 256 256
+	bounce 1.500000
+	color 0xa85400 0xff3c00
+	gravity -0.125000
+	liquidfriction 4
+	size 1 1
+	tex 62 62
+	trailspacing 16
+	underwater
+	velocityjitter 16 16 16
+effect nade_brown_burn
+	type smoke
+	alpha 300 900 1500
+	color 0xa85400 0xff3c00
+	originjitter 2 2 2
+	rotate -180 180 20 -20
+	sizeincrease -40
+	size 15 25
+	tex 71 73
+	trailspacing 16
+	velocityjitter 10 10 10
+effect nade_purple_burn
+	type smoke
+	alpha 100 100 250
+	color 0x540054 0xff3c00
+	sizeincrease -1
+	size 5 5
+	tex 65 65
+	trailspacing 1
+effect nade_purple_burn
+	type smoke
+	alpha 200 200 1000
+	color 0xff0000 0xffa2a2
+	notunderwater
+	sizeincrease -30
+	size 45 25
+	tex 65 65
+	trailspacing 64
+effect nade_purple_burn
+	type bubble
+	alpha 256 256 256
+	bounce 1.500000
+	color 0x540054 0xff3c00
+	gravity -0.125000
+	liquidfriction 4
+	size 1 1
+	tex 62 62
+	trailspacing 16
+	underwater
+	velocityjitter 16 16 16
+effect nade_purple_burn
+	type smoke
+	alpha 300 900 1500
+	color 0x540054 0xff3c00
+	originjitter 2 2 2
+	rotate -180 180 20 -20
+	sizeincrease -40
+	size 15 25
+	tex 71 73
+	trailspacing 16
+	velocityjitter 10 10 10
 effect nade_blue_explode
 	type decal
 	alpha 256 256 0
@@ -7523,63 +7765,393 @@ effect nade_neutral_explode
 	size 20 40
 	tex 71 73
 	velocityjitter 324 324 324
-effect shockwave_attack
-	type spark
-	airfriction 1
-	alpha 4096 4096 20000
-	color 0xb44215 0xff0000
-	count 1
-	originjitter 2 2 2
-	rotate -180 180 4000 -4000
-	sizeincrease 1.500000
-	size 5 7
-	stretchfactor 2.300000
-	tex 43 43
-	velocityjitter 10 10 10
-	velocitymultiplier 10
-effect shockwave_attack
-	type spark
-	airfriction 1
-	alpha 4096 4096 20000
-	color 0xff4200 0xff0000
-	count 1
-	originjitter 2 2 2
-	sizeincrease 1.500000
-	size 7 9
-	stretchfactor 2
-	tex 8 15
-	velocityjitter 10 10 10
-	velocitymultiplier 10
-effect arc_lightning
+effect nade_green_explode
 	type decal
-	alpha 32 32 0
+	alpha 256 256 0
 	countabsolute 1
-	lightcolor 3.1 4.4 10
-	lightradiusfade 200
-	lightradius 50
-	originjitter 2 2 2
-	size 16 16
-	tex 16 32
-effect arc_lightning
-	type static
-	airfriction 110
-	alpha 256 256 512
-	color 0xDDFDFF 0xFDFDFF
-	count 100
-	originjitter 20 20 20
-	rotate 0 360 -36000 36000
-	sizeincrease -5
-	size 0 5
-	stretchfactor 1
-	tex 71 74
-	velocityjitter 250 250 250
-	velocitymultiplier 100
-effect arc_lightning
-	type static
-	airfriction 5
-	alpha 256 256 512
-	color 0xDDFDFF 0xFDFDFF
-	count 100
+	lightcolor 100 20 20
+	lightradiusfade 1500
+	lightradius 300
+	originjitter 26 26 26
+	size 88 88
+	tex 8 16
+effect nade_green_explode
+	type smoke
+	alpha 80 80 650
+	color 0xff0000 0xffa2a2
+	countabsolute 1
+	sizeincrease 1800
+	size 32 32
+	tex 33 33
+	velocitymultiplier 44
+effect nade_green_explode
+	type smoke
+	airfriction 30
+	alpha 400 656 2000
+	color 0x40ff9b 0xa647d3
+	count 16
+	notunderwater
+	originjitter 50 50 50
+	rotate -180 180 -9 9
+	sizeincrease 555
+	size 20 24
+	tex 48 55
+	velocityjitter 320 320 320
+effect nade_green_explode
+	type spark
+	airfriction -9
+	alpha 1500 3000 13000
+	color 0x40ff9b 0xff4200
+	count 8
+	sizeincrease 40
+	size 60 90
+	stretchfactor 80
+	tex 48 55
+	velocityjitter 30 30 30
+effect nade_green_explode
+	type smoke
+	airfriction 0.040000
+	alpha 128 328 390
+	blend alpha
+	color 0x222222 0x000000
+	count 32
+	gravity 0.400000
+	originjitter 50 50 10
+	rotate -180 180 2 -2
+	sizeincrease 50
+	size 60 30
+	tex 0 7
+	velocityjitter 200 200 200
+	velocityoffset 0 0 180
+effect nade_green_explode
+	type bubble
+	alpha 128 256 64
+	bounce 1.500000
+	color 0x404040 0x808080
+	count 32
+	gravity -0.125000
+	liquidfriction 0.250000
+	originjitter 16 16 16
+	size 3 6
+	tex 62 62
+	underwater
+	velocityjitter 196 196 196
+effect nade_green_explode
+	type spark
+	airfriction 1
+	alpha 644 956 484
+	bounce 1.600000
+	color 0xff0000 0xffa2a2
+	count 8
+	gravity 1
+	liquidfriction 0.800000
+	notunderwater
+	originjitter 16 16 16
+	size 1 2
+	tex 40 40
+	velocityjitter 424 424 624
+	velocityoffset 0 0 80
+effect nade_green_explode
+	type spark
+	airfriction 0.700000
+	alpha 644 956 684
+	color 0xff0000 0xffa2a2
+	count 16
+	gravity 0.500000
+	liquidfriction 0.800000
+	originjitter 16 16 16
+	size 1 2
+	tex 40 40
+	velocityjitter 424 424 624
+	velocityoffset 0 0 80
+effect nade_green_explode
+	type smoke
+	alpha 644 956 2500
+	color 0xff0000 0xffa2a2
+	count 8
+	notunderwater
+	originjitter 64 64 64
+	rotate -180 180 -100 100
+	size 20 40
+	tex 71 73
+	velocityjitter 324 324 324
+effect nade_brown_explode
+	type decal
+	alpha 256 256 0
+	countabsolute 1
+	lightcolor 100 20 20
+	lightradiusfade 1500
+	lightradius 300
+	originjitter 26 26 26
+	size 88 88
+	tex 8 16
+effect nade_brown_explode
+	type smoke
+	alpha 80 80 650
+	color 0xff0000 0xffa2a2
+	countabsolute 1
+	sizeincrease 1800
+	size 32 32
+	tex 33 33
+	velocitymultiplier 44
+effect nade_brown_explode
+	type smoke
+	airfriction 30
+	alpha 400 656 2000
+	color 0xa85400 0xa647d3
+	count 16
+	notunderwater
+	originjitter 50 50 50
+	rotate -180 180 -9 9
+	sizeincrease 555
+	size 20 24
+	tex 48 55
+	velocityjitter 320 320 320
+effect nade_brown_explode
+	type spark
+	airfriction -9
+	alpha 1500 3000 13000
+	color 0xa85400 0xff4200
+	count 8
+	sizeincrease 40
+	size 60 90
+	stretchfactor 80
+	tex 48 55
+	velocityjitter 30 30 30
+effect nade_brown_explode
+	type smoke
+	airfriction 0.040000
+	alpha 128 328 390
+	blend alpha
+	color 0x222222 0x000000
+	count 32
+	gravity 0.400000
+	originjitter 50 50 10
+	rotate -180 180 2 -2
+	sizeincrease 50
+	size 60 30
+	tex 0 7
+	velocityjitter 200 200 200
+	velocityoffset 0 0 180
+effect nade_brown_explode
+	type bubble
+	alpha 128 256 64
+	bounce 1.500000
+	color 0x404040 0x808080
+	count 32
+	gravity -0.125000
+	liquidfriction 0.250000
+	originjitter 16 16 16
+	size 3 6
+	tex 62 62
+	underwater
+	velocityjitter 196 196 196
+effect nade_brown_explode
+	type spark
+	airfriction 1
+	alpha 644 956 484
+	bounce 1.600000
+	color 0xff0000 0xffa2a2
+	count 8
+	gravity 1
+	liquidfriction 0.800000
+	notunderwater
+	originjitter 16 16 16
+	size 1 2
+	tex 40 40
+	velocityjitter 424 424 624
+	velocityoffset 0 0 80
+effect nade_brown_explode
+	type spark
+	airfriction 0.700000
+	alpha 644 956 684
+	color 0xff0000 0xffa2a2
+	count 16
+	gravity 0.500000
+	liquidfriction 0.800000
+	originjitter 16 16 16
+	size 1 2
+	tex 40 40
+	velocityjitter 424 424 624
+	velocityoffset 0 0 80
+effect nade_brown_explode
+	type smoke
+	alpha 644 956 2500
+	color 0xff0000 0xffa2a2
+	count 8
+	notunderwater
+	originjitter 64 64 64
+	rotate -180 180 -100 100
+	size 20 40
+	tex 71 73
+	velocityjitter 324 324 324
+effect nade_purple_explode
+	type decal
+	alpha 256 256 0
+	countabsolute 1
+	lightcolor 100 20 20
+	lightradiusfade 1500
+	lightradius 300
+	originjitter 26 26 26
+	size 88 88
+	tex 8 16
+effect nade_purple_explode
+	type smoke
+	alpha 80 80 650
+	color 0xff0000 0xffa2a2
+	countabsolute 1
+	sizeincrease 1800
+	size 32 32
+	tex 33 33
+	velocitymultiplier 44
+effect nade_purple_explode
+	type smoke
+	airfriction 30
+	alpha 400 656 2000
+	color 0x540054 0xa647d3
+	count 16
+	notunderwater
+	originjitter 50 50 50
+	rotate -180 180 -9 9
+	sizeincrease 555
+	size 20 24
+	tex 48 55
+	velocityjitter 320 320 320
+effect nade_purple_explode
+	type spark
+	airfriction -9
+	alpha 1500 3000 13000
+	color 0x540054 0xff4200
+	count 8
+	sizeincrease 40
+	size 60 90
+	stretchfactor 80
+	tex 48 55
+	velocityjitter 30 30 30
+effect nade_purple_explode
+	type smoke
+	airfriction 0.040000
+	alpha 128 328 390
+	blend alpha
+	color 0x222222 0x000000
+	count 32
+	gravity 0.400000
+	originjitter 50 50 10
+	rotate -180 180 2 -2
+	sizeincrease 50
+	size 60 30
+	tex 0 7
+	velocityjitter 200 200 200
+	velocityoffset 0 0 180
+effect nade_purple_explode
+	type bubble
+	alpha 128 256 64
+	bounce 1.500000
+	color 0x404040 0x808080
+	count 32
+	gravity -0.125000
+	liquidfriction 0.250000
+	originjitter 16 16 16
+	size 3 6
+	tex 62 62
+	underwater
+	velocityjitter 196 196 196
+effect nade_purple_explode
+	type spark
+	airfriction 1
+	alpha 644 956 484
+	bounce 1.600000
+	color 0xff0000 0xffa2a2
+	count 8
+	gravity 1
+	liquidfriction 0.800000
+	notunderwater
+	originjitter 16 16 16
+	size 1 2
+	tex 40 40
+	velocityjitter 424 424 624
+	velocityoffset 0 0 80
+effect nade_purple_explode
+	type spark
+	airfriction 0.700000
+	alpha 644 956 684
+	color 0xff0000 0xffa2a2
+	count 16
+	gravity 0.500000
+	liquidfriction 0.800000
+	originjitter 16 16 16
+	size 1 2
+	tex 40 40
+	velocityjitter 424 424 624
+	velocityoffset 0 0 80
+effect nade_purple_explode
+	type smoke
+	alpha 644 956 2500
+	color 0xff0000 0xffa2a2
+	count 8
+	notunderwater
+	originjitter 64 64 64
+	rotate -180 180 -100 100
+	size 20 40
+	tex 71 73
+	velocityjitter 324 324 324
+effect shockwave_attack
+	type spark
+	airfriction 1
+	alpha 4096 4096 20000
+	color 0xb44215 0xff0000
+	count 1
+	originjitter 2 2 2
+	rotate -180 180 4000 -4000
+	sizeincrease 1.500000
+	size 5 7
+	stretchfactor 2.300000
+	tex 43 43
+	velocityjitter 10 10 10
+	velocitymultiplier 10
+effect shockwave_attack
+	type spark
+	airfriction 1
+	alpha 4096 4096 20000
+	color 0xff4200 0xff0000
+	count 1
+	originjitter 2 2 2
+	sizeincrease 1.500000
+	size 7 9
+	stretchfactor 2
+	tex 8 15
+	velocityjitter 10 10 10
+	velocitymultiplier 10
+effect arc_lightning
+	type decal
+	alpha 32 32 0
+	countabsolute 1
+	lightcolor 3.1 4.4 10
+	lightradiusfade 200
+	lightradius 50
+	originjitter 2 2 2
+	size 16 16
+	tex 16 32
+effect arc_lightning
+	type static
+	airfriction 110
+	alpha 256 256 512
+	color 0xDDFDFF 0xFDFDFF
+	count 100
+	originjitter 20 20 20
+	rotate 0 360 -36000 36000
+	sizeincrease -5
+	size 0 5
+	stretchfactor 1
+	tex 71 74
+	velocityjitter 250 250 250
+	velocitymultiplier 100
+effect arc_lightning
+	type static
+	airfriction 5
+	alpha 256 256 512
+	color 0xDDFDFF 0xFDFDFF
+	count 100
 	liquidfriction 5
 	orientation spark
 	originjitter 20 20 20
@@ -8272,14 +8844,14 @@ effect arc_bolt_explode
 	tex 40 40
 	velocityjitter 224 224 224
 	velocityoffset 0 0 80
-//effect tr_bullet_weak
-//	type beam
-//	alpha 150 200 1000
-//	color 0xf03000 0xff6010
-//	countabsolute 1
-//	sizeincrease -3
-//	size 0.6 0.8
-//	tex 200 200
+effect tr_bullet_weak
+	type beam
+	alpha 75 100 3000
+	color 0xf03000 0xff6010
+	countabsolute 1
+	sizeincrease -3
+	size 0.6 0.8
+	tex 200 200
 effect tr_bullet_weak
 	type smoke
 	airfriction -4
@@ -8291,3 +8863,66 @@ effect tr_bullet_weak
 	tex 0 8
 	trailspacing 16
 	velocityjitter 4 4 4
+effect tr_bullet_weak
+	type bubble
+	alpha 256 256 128
+	bounce 1.500000
+	color 0x404040 0x808080
+	gravity -0.125000
+	liquidfriction 4
+	size 0.5 0.6
+	tex 62 62
+	trailspacing 32
+	underwater
+	velocityjitter 16 16 16
+effect TE_TEI_G3_HIT
+	type beam
+	alpha 128 128 256
+	color 0xFFFFFF 0xFFFFFF
+	countabsolute 1
+	size 8 8
+	tex 200 200
+effect TE_TEI_G3_HIT
+	type smoke
+	airfriction -4
+	alpha 256 256 512
+	color 0xFFFFFF 0xFFFFFF
+	sizeincrease -2
+	size 2 2
+	trailspacing 20
+	velocityjitter 2 2 2
+effect TE_TEI_G3_HIT
+	type smoke
+	airfriction -4
+	alpha 256 256 512
+	color 0xFFFFFF 0xFFFFFF
+	sizeincrease -6
+	size 10 10
+	trailspacing 40
+effect respawn_ghost
+	count 75
+	type static
+	color 0xA0A0A0 0xFFFFFF
+	size 2 2
+	alpha 32 64 128
+	airfriction 1
+	liquidfriction 4
+	originoffset 0 0 -8
+	originjitter 28 28 16
+	velocityjitter 0 0 256
+effect item_despawn
+	type snow
+//	type smoke
+	blend add
+	alpha 192 256 256
+	color 0xff9600 0xffefb8
+	count 32
+	originjitter 8 8 8
+	sizeincrease 1
+	size 0.5 1
+	tex 48 55
+	velocityjitter 16 16 32
+	lightradius 48
+	lightradiusfade 64
+	lightcolor 1 0.75 0.36
+	lightshadow 1