X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=effectinfo.txt;h=4b488ff95df443b752feeee309ae33fc0ccabdd4;hb=refs%2Fheads%2FMario%2Felectro_combo_over_time;hp=129dba36e2c6a09ec35974649391ee051a7a9853;hpb=f24c1ab39321a756bb76d1699a775fe1e42040ab;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/effectinfo.txt b/effectinfo.txt
index 129dba36e..4b488ff95 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -8355,3 +8355,97 @@ effect tr_bullet_weak
 	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 electro_combo_long
+	type decal
+	alpha 256 256 0
+	countabsolute 1
+	lightcolor 4 5 6
+	lightradiusfade 300
+	lightradius 400
+	originjitter 17 17 17
+	size 64 64
+	tex 59 59
+effect electro_combo_long
+	type static
+	alpha 128 128 64
+	color 0x80C0FF 0x80C0FF
+	countabsolute 1
+	size 48 48
+	tex 38 38
+effect electro_combo_long
+	type static
+	airfriction 6
+	alpha 156 156 100
+	bounce 2
+	color 0x2030FF 0x80C0FF
+	count 5
+	liquidfriction 16
+	sizeincrease 50
+	size 32 32
+	tex 0 7
+	velocityjitter 512 512 512
+effect electro_combo_long
+	type spark
+	alpha 444 512 500
+	bounce 1.600000
+	color 0xa9cacf 0x0054ff
+	count 32
+	originjitter 1 1 1
+	size 2 4
+	stretchfactor 2
+	tex 41 41
+	velocityjitter 128 128 128
+	velocitymultiplier 0.300000
+	rotate -180 180 4000 -4000
+effect electro_combo_long
+	type smoke
+	alpha 256 256 256
+	color 0x202020 0x404040
+	count 0.125000
+	originjitter 20 20 20
+	size 24 24
+	tex 0 8
+	velocityjitter 32 32 32
+effect electro_combo_long
+	type smoke
+	alpha 40 40 20
+	color 0xa9cacf 0x0054ff
+	countabsolute 1
+	size 120 120
+	tex 33 33
+	velocitymultiplier 0.300000