X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=effectinfo.txt;h=8c6a51feaa9fa55bc4ff0c15f2acc28a3a487944;hb=d7bcee3b2458ac62e6d5cd9529c46fc8fcb7b9dd;hp=f7ee6975209a7aee47ab373d0df0de66027f3ea0;hpb=d464b8e24227e71a33447c76220f5bf169047154;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/effectinfo.txt b/effectinfo.txt
index f7ee69752..8c6a51fea 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -3418,30 +3418,6 @@ effect TE_TEI_G3PINK_HIT
 	sizeincrease -6
 	size 10 10
 	trailspacing 40
-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 particlegibs_damage_hit
 	type blood
 	airfriction 3
@@ -8379,3 +8355,27 @@ 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