Merge pull request #4864 from Mailaender/overlay-fix

Fixed husk flames

OpenRA.Mods.RA/BelowUnits.cs

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA
 
 		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
 		{
-			return r.Select(a => a.WithZOffset(offset));
+			return r.Select(a => a.WithZOffset(a.ZOffset + offset));
 		}
 	}
 }

mods/cnc/sequences/misc.yaml

@@ -8,10 +8,12 @@ fire:
 		Start: 0
 		Length: *
 		Offset: 0,-3
+		ZOffset: 1023
 	2: fire2
 		Start: 0
 		Length: *
 		Offset: 0,-3
+		ZOffset: 1023
 
 120mm:
 	idle:

mods/d2k/sequences/misc.yaml

@@ -198,21 +198,25 @@ fire:
 		Start: 3712
 		Length: 10
 		Offset: 0,-3
+		ZOffset: 1023
 		BlendMode: Additive
 	2: DATA
 		Start: 3723
 		Length: 11
 		Offset: 0,-3
+		ZOffset: 1023
 		BlendMode: Additive
 	3: DATA
 		Start: 3885
 		Length: 13
 		Offset: 0,-3
+		ZOffset: 1023
 		BlendMode: Additive
 	4: DATA
 		Start: 3712
 		Length: 10
 		Offset: 0,-3
+		ZOffset: 1023
 		BlendMode: Additive
 
 smoke_m:

mods/ra/sequences/misc.yaml

@@ -126,12 +126,15 @@ smoke_m:
 	idle:
 		Start: 0
 		Length: *
+		ZOffset: 1023
 	loop:
 		Start: 49
 		Length: 42
+		ZOffset: 1023
 	end:
 		Start: 0
 		Length: 26
+		ZOffset: 1023
 
 dragon:
 	idle:
@@ -142,6 +145,7 @@ smokey:
 	idle:
 		Start: 0
 		Length: *
+		ZOffset: 1023
 
 bomb:
 	idle:
@@ -390,28 +394,34 @@ smokland:
 		Start: 0
 		Length: 60
 		Tick: 120
+		ZOffset: 1023
 	idle: playersmoke
 		Start: 60
 		Length: 32
 		Tick: 120
+		ZOffset: 1023
 
 fire:
 	1: fire1
 		Start: 0
 		Length: *
 		Offset: 0,-3
+		ZOffset: 1023
 	2: fire2
 		Start: 0
 		Length: *
 		Offset: 0,-3
+		ZOffset: 1023
 	3: fire3
 		Start: 0
 		Length: *
 		Offset: 0,-3
+		ZOffset: 1023
 	4: fire4
 		Start: 0
 		Length: *
 		Offset: 0,-3
+		ZOffset: 1023
 
 rank:
 	rank:

mods/ra/sequences/vehicles.yaml

@@ -9,6 +9,7 @@ mcvhusk:
 	idle:
 		Start: 0
 		Facings: 32
+		ZOffset: -1023
 
 truk:
 	idle:
@@ -68,11 +69,13 @@ hhusk:
 	idle:
 		Start: 0
 		Facings: 32
+		ZOffset: -1023
 
 hhusk2:
 	idle:
 		Start: 0
 		Facings: 32
+		ZOffset: -1023
 
 1tnk:
 	idle: