From: Mario <mario.mario@y7mail.com>
Date: Sat, 18 Apr 2020 14:02:59 +0000 (+1000)
Subject: Move the new TE_TEI_G3_HIT effect to the bottom of effectinfo, possibly fixes issues... 
X-Git-Tag: xonotic-v0.8.5~1104
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=cc3305a5486a29b5ff070153e2c4e77904893769;p=xonotic%2Fxonotic-data.pk3dir.git

Move the new TE_TEI_G3_HIT effect to the bottom of effectinfo, possibly fixes issues with outdated clients
---

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
diff --git a/qcsrc/common/effects/effectinfo.inc b/qcsrc/common/effects/effectinfo.inc
index 7c2dde1ed..3713e9a1a 100644
--- a/qcsrc/common/effects/effectinfo.inc
+++ b/qcsrc/common/effects/effectinfo.inc
@@ -5154,49 +5154,6 @@ TE_TEI_G3(YELLOW, "0xffff00", "0xffff11", "0x202000", "0x404000")
 TE_TEI_G3(PINK, "0xFF00FF", "0xFF11FF", "0x200020", "0x400040")
 #undef TE_TEI_G3
 
-// Vaporizer hit effect
-DEF(TE_TEI_G3_HIT);
-SUB(TE_TEI_G3_HIT) {
-	MY(alpha_min) = 128;
-	MY(alpha_max) = 128;
-	MY(alpha_fade) = 256;
-	MY(color_min) = "0xFFFFFF";
-	MY(color_max) = "0xFFFFFF";
-	MY(countabsolute) = 1;
-	MY(size_min) = 8;
-	MY(size_max) = 8;
-	MY(tex_min) = 200;
-	MY(tex_max) = 200;
-	MY(type) = "beam";
-}
-SUB(TE_TEI_G3_HIT) /* rings */ {
-	MY(airfriction) = -4;
-	MY(alpha_min) = 256;
-	MY(alpha_max) = 256;
-	MY(alpha_fade) = 512;
-	MY(color_min) = "0xFFFFFF";
-	MY(color_max) = "0xFFFFFF";
-	MY(sizeincrease) = -2;
-	MY(size_min) = 2;
-	MY(size_max) = 2;
-	MY(trailspacing) = 20;
-	MY(type) = "smoke";
-	MY(velocityjitter) = '2.0 2.0 2.0';
-}
-SUB(TE_TEI_G3_HIT) {
-	MY(airfriction) = -4;
-	MY(alpha_min) = 256;
-	MY(alpha_max) = 256;
-	MY(alpha_fade) = 512;
-	MY(color_min) = "0xFFFFFF";
-	MY(color_max) = "0xFFFFFF";
-	MY(sizeincrease) = -6;
-	MY(size_min) = 10;
-	MY(size_max) = 10;
-	MY(trailspacing) = 40;
-	MY(type) = "smoke";
-}
-
 #include "effectinfo_gentle_particlegibs.inc"
 
 #include "effectinfo_onslaught.inc"
@@ -9086,3 +9043,46 @@ SUB(tr_bullet_weak) {
 	MY(underwater) = true;
 	MY(velocityjitter) = '16.0 16.0 16.0';
 }
+
+// Vaporizer hit effect
+DEF(TE_TEI_G3_HIT);
+SUB(TE_TEI_G3_HIT) {
+	MY(alpha_min) = 128;
+	MY(alpha_max) = 128;
+	MY(alpha_fade) = 256;
+	MY(color_min) = "0xFFFFFF";
+	MY(color_max) = "0xFFFFFF";
+	MY(countabsolute) = 1;
+	MY(size_min) = 8;
+	MY(size_max) = 8;
+	MY(tex_min) = 200;
+	MY(tex_max) = 200;
+	MY(type) = "beam";
+}
+SUB(TE_TEI_G3_HIT) /* rings */ {
+	MY(airfriction) = -4;
+	MY(alpha_min) = 256;
+	MY(alpha_max) = 256;
+	MY(alpha_fade) = 512;
+	MY(color_min) = "0xFFFFFF";
+	MY(color_max) = "0xFFFFFF";
+	MY(sizeincrease) = -2;
+	MY(size_min) = 2;
+	MY(size_max) = 2;
+	MY(trailspacing) = 20;
+	MY(type) = "smoke";
+	MY(velocityjitter) = '2.0 2.0 2.0';
+}
+SUB(TE_TEI_G3_HIT) {
+	MY(airfriction) = -4;
+	MY(alpha_min) = 256;
+	MY(alpha_max) = 256;
+	MY(alpha_fade) = 512;
+	MY(color_min) = "0xFFFFFF";
+	MY(color_max) = "0xFFFFFF";
+	MY(sizeincrease) = -6;
+	MY(size_min) = 10;
+	MY(size_max) = 10;
+	MY(trailspacing) = 40;
+	MY(type) = "smoke";
+}