Merge pull request #10119 from RoosterDragon/sort-effects-with-actors

Interleave renderables for effects and actors

mods/cnc/sequences/misc.yaml

@@ -1,6 +1,7 @@
 fb4:
 	idle:
 		Length: 4
+		ZOffset: 1023
 
 fire:
 	1: fire1
@@ -14,6 +15,7 @@ fire:
 
 120mm:
 	idle:
+		ZOffset: 1023
 
 smoke_m:
 	idle:
@@ -33,30 +35,37 @@ smoke_m:
 laserfire:
 	idle:veh-hit3
 		Length: *
+		ZOffset: 511
 
 dragon:
 	idle:
 		Facings: 32
+		ZOffset: 1023
 
 smokey:
 	idle:
 		Length: *
+		ZOffset: 1023
 
 bomb:
 	idle:
 		Length: *
+		ZOffset: 1023
 
 missile:
 	idle:
 		Facings: 32
+		ZOffset: 1023
 
 patriot:
 	idle:
 		Facings: 32
+		ZOffset: 1023
 
 explosion:
 	Defaults:
 		Length: *
+		ZOffset: 511
 	nuke_explosion: atomsfx
 	piff: piff
 	piffs: piffpiff
@@ -79,18 +88,23 @@ rank:
 		Length: *
 
 rallypoint:
-	flag:flagfly
+	flag: flagfly
 		Length: *
 		Offset: 10,-5
-	circles:fpls
+		ZOffset: 2535
+	circles: fpls
 		Length: *
+		ZOffset: 2047
 
 beacon:
+	Defaults:
+		ZOffset: 2535
 	arrow: mouse2
 		Start: 5
 		Offset: 1,-12
 	circles: fpls
 		Length: *
+		ZOffset: 2047
 	airstrike: bombicon
 		Offset: 0,-42
 	atomic: atomicon
@@ -107,6 +121,7 @@ allyrepair:
 	repair:
 		Length: *
 		Tick: 160
+		ZOffset: 2047
 
 crate:
 	idle:
@@ -134,6 +149,7 @@ xcrated:
 crate-effects:
 	Defaults:
 		Length: *
+		ZOffset: 2047
 	airstrike: deviator
 	nuke: missile2
 	dollar: dollar
@@ -149,17 +165,10 @@ crate-effects:
 	armorup: armorcrate
 	speedup: speedcrate
 
-atomicup:
-	idle:
-		Length: *
-
-atomicdn:
-	idle:
-		Length: *
-
 atomic:
 	Defaults:
 		Length: *
+		ZOffset: 1023
 	up: atomicup
 	down: atomicdn
 
@@ -167,11 +176,12 @@ ionsfx:
 	idle:
 		Length: *
 		Offset: 0, -78
-		ZOffset: 1
+		ZOffset: 1023
 
 bomblet:
 	idle:
 		Length: *
+		ZOffset: 1023
 
 mpspawn:
 	idle:
@@ -233,6 +243,7 @@ poweroff:
 	offline:
 		Length: *
 		Tick: 160
+		ZOffset: 2047
 
 icon:
 	Defaults:
@@ -245,6 +256,7 @@ moveflsh:
 	idle:
 		Length: *
 		Tick: 80
+		ZOffset: 2047
 
 resources:
 	Defaults:

mods/cnc/weapons/other.yaml

@@ -125,6 +125,7 @@ Laser:
 	Projectile: LaserZap
 		Width: 85
 		HitAnim: laserfire
+		ZOffset: 2047
 	Warhead@1Dam: SpreadDamage
 		Spread: 42
 		Damage: 360