X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=effectinfo.txt;h=c07774a05b99473c12eb20e5f9de754fc87f895c;hp=b2544fa0740c89e540773baa6b08dd9cd12483c0;hb=299c4cfe5a806ae33e954f396e0ae48ff77f87b3;hpb=923c8fc119df8210450991c59b8567e2352e9412

diff --git a/effectinfo.txt b/effectinfo.txt
index b2544fa07..c07774a05 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -2751,14 +2751,36 @@ effect flac_explode
 	velocityjitter 256 256 256
 	velocityoffset 0 0 80
 effect tr_bullet
-	type spark
-	alpha 256 256 2560
-	color 0xff8960 0xff8533
-	size 4 4
-	stretchfactor 0.200000
-	tex 70 70
-	trailspacing 750
-	velocitymultiplier 3
+	type beam
+	alpha 500 600 10000
+	color 0xf03000 0xff6010
+	countabsolute 1
+	sizeincrease -3
+	size 0.6 0.8
+	tex 200 200
+effect tr_bullet
+	type smoke
+	airfriction -4
+	alpha 256 256 350
+	color 0x202020 0x404040
+	notunderwater
+	sizeincrease 0.400000
+	size 1 2
+	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
@@ -7581,6 +7603,15 @@ effect arc_lightning
 	underwater
 	velocityjitter 250 250 250
 	velocitymultiplier 20
+effect arc_lightning
+	type smoke
+	alpha 40 40 350
+	color 0x80C0FF 0x80C0FF
+	countabsolute 1
+	sizeincrease 400
+	size 4 4
+	tex 38 38
+	velocitymultiplier 100
 effect arc_beam
 	type spark
 	airfriction -10
@@ -8253,3 +8284,34 @@ effect arc_bolt_explode
 	tex 40 40
 	velocityjitter 224 224 224
 	velocityoffset 0 0 80
+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
+	alpha 256 256 350
+	color 0x202020 0x404040
+	notunderwater
+	sizeincrease 0.400000
+	size 1 2
+	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