Merge pull request #9664 from reaperrr/td-aggreg-seq

Use aggregate sequences for all TD flame/chem muzzles

mods/cnc/rules/defaults.yaml

@@ -372,14 +372,12 @@
 		Weapon: Chemspray
 		LocalOffset: 384,0,0
 		MuzzleSequence: muzzle
-		MuzzleSplitFacings: 8
 	AttackFrontal:
 		Voice: Attack
 	BodyOrientation:
 		QuantizedFacings: 8
 	WithSpriteBody:
 	WithMuzzleOverlay:
-		SplitFacings: true
 	Guard:
 		Voice: Move
 	Guardable:

mods/cnc/rules/infantry.yaml

@@ -120,10 +120,8 @@ E5:
 		LocalOffset: 341,0,256
 		FireDelay: 3
 		MuzzleSequence: muzzle
-		MuzzleSplitFacings: 8
 	AttackFrontal:
 	WithMuzzleOverlay:
-		SplitFacings: true
 	-PoisonedByTiberium:
 	WithInfantryBody:
 		AttackSequence: shoot

mods/cnc/rules/vehicles.yaml

@@ -182,11 +182,9 @@ FTNK:
 		Weapon: BigFlamer
 		LocalOffset: 512,128,42, 512,-128,42
 		MuzzleSequence: muzzle
-		MuzzleSplitFacings: 8
 	AttackFrontal:
 	AutoTarget:
 	WithMuzzleOverlay:
-		SplitFacings: true
 	Explodes:
 		Weapon: FlametankExplode
 		EmptyWeapon: FlametankExplode

mods/cnc/sequences/infantry.yaml

@@ -1,59 +1,67 @@
 vice:
 	idle:
 		Length: *
-	muzzle0: chem-n
+	muzzle:
-		Length: *
+		Combine:
-		Offset: 3,4
+			chem-n:
-	muzzle1: chem-nw
+				Length: *
-		Length: *
+				Offset: 1,2
-		Offset: 4,1
+			chem-nw:
-	muzzle2: chem-w
+				Length: *
-		Length: *
+				Offset: 8,2
-		Offset: 7,-3
+			chem-w:
-	muzzle3: chem-sw
+				Length: *
-		Length: *
+				Offset: 8,-3
-		Offset: 3,-6
+			chem-sw:
-	muzzle4: chem-s
+				Length: *
-		Length: *
+				Offset: 7,-6
-		Offset: 1,-6
+			chem-s:
-	muzzle5: chem-se
+				Length: *
-		Length: *
+				Offset: 1,-6
-		Offset: -3,-5
+			chem-se:
-	muzzle6: chem-e
+				Length: *
-		Length: *
+				Offset: -5,-6
-		Offset: -6,-3
+			chem-e:
-	muzzle7: chem-ne
+				Length: *
-		Length: *
+				Offset: -7,-3
-		Offset: -1,0
+			chem-ne:
+				Length: *
+				Offset: -3,2
+		Facings: 8
+		Length: 13
 	icon: viceicnh
 
 pvice:
 	idle:
 		Length: *
-	muzzle0: chem-n
+	muzzle:
-		Length: *
+		Combine:
-		Offset: 3,4
+			chem-n:
-	muzzle1: chem-nw
+				Length: *
-		Length: *
+				Offset: 1,2
-		Offset: 4,1
+			chem-nw:
-	muzzle2: chem-w
+				Length: *
-		Length: *
+				Offset: 8,2
-		Offset: 7,-3
+			chem-w:
-	muzzle3: chem-sw
+				Length: *
-		Length: *
+				Offset: 8,-3
-		Offset: 3,-6
+			chem-sw:
-	muzzle4: chem-s
+				Length: *
-		Length: *
+				Offset: 7,-6
-		Offset: 1,-6
+			chem-s:
-	muzzle5: chem-se
+				Length: *
-		Length: *
+				Offset: 1,-6
-		Offset: -3,-5
+			chem-se:
-	muzzle6: chem-e
+				Length: *
-		Length: *
+				Offset: -5,-6
-		Offset: -6,-3
+			chem-e:
-	muzzle7: chem-ne
+				Length: *
-		Length: *
+				Offset: -7,-3
-		Offset: -1,0
+			chem-ne:
+				Length: *
+				Offset: -3,2
+		Facings: 8
+		Length: 13
 	icon: viceicnh
 
 e1:
@@ -555,30 +563,34 @@ e5:
 		Length: 4
 		Tick: 1600
 		ZOffset: -511
-	muzzle0: chem-n
+	muzzle:
-		Length: *
+		Combine:
-		Offset: 1,2
+			chem-n:
-	muzzle1: chem-nw
+				Length: *
-		Length: *
+				Offset: 1,2
-		Offset: 8,2
+			chem-nw:
-	muzzle2: chem-w
+				Length: *
-		Length: *
+				Offset: 8,2
-		Offset: 8,-3
+			chem-w:
-	muzzle3: chem-sw
+				Length: *
-		Length: *
+				Offset: 8,-3
-		Offset: 7,-6
+			chem-sw:
-	muzzle4: chem-s
+				Length: *
-		Length: *
+				Offset: 7,-6
-		Offset: 1,-6
+			chem-s:
-	muzzle5: chem-se
+				Length: *
-		Length: *
+				Offset: 1,-6
-		Offset: -5,-6
+			chem-se:
-	muzzle6: chem-e
+				Length: *
-		Length: *
+				Offset: -5,-6
-		Offset: -7,-3
+			chem-e:
-	muzzle7: chem-ne
+				Length: *
-		Length: *
+				Offset: -7,-3
-		Offset: -3,2
+			chem-ne:
+				Length: *
+				Offset: -3,2
+		Facings: 8
+		Length: 13
 	icon: e5icnh.tem
 		AddExtension: False
 

mods/cnc/sequences/vehicles.yaml

@@ -145,30 +145,34 @@ bike.destroyed:
 ftnk:
 	idle:
 		Facings: 32
-	muzzle0: flame-n
+	muzzle:
-		Length: *
+		Combine:
-		Offset: 3,8
+			flame-n:
-	muzzle1: flame-nw
+				Length: *
-		Length: *
+				Offset: 3,6
-		Offset: 4,6
+			flame-nw:
-	muzzle2: flame-w
+				Length: *
-		Length: *
+				Offset: 8,7
-		Offset: 7,2
+			flame-w:
-	muzzle3: flame-sw
+				Length: *
-		Length: *
+				Offset: 8,2
-		Offset: 3,-2
+			flame-sw:
-	muzzle4: flame-s
+				Length: *
-		Length: *
+				Offset: 7,-2
-		Offset: 1,-2
+			flame-s:
-	muzzle5: flame-se
+				Length: *
-		Length: *
+				Offset: 3,-2
-		Offset: -3,-1
+			flame-se:
-	muzzle6: flame-e
+				Length: *
-		Length: *
+				Offset: -5,-2
-		Offset: -6,2
+			flame-e:
-	muzzle7: flame-ne
+				Length: *
-		Length: *
+				Offset: -7,2
-		Offset: -5,6
+			flame-ne:
+				Length: *
+				Offset: -7,8
+		Facings: 8
+		Length: 13
 	icon: ftnkicnh.tem
 		AddExtension: False