Remove MuzzleSplitFacings and expose MuzzleSequence to testing.

2020-08-08 16:04:12 +02:00
parent b03ab1212f
commit c48eb572e3
9 changed files with 93 additions and 52 deletions
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -96,7 +96,6 @@ GACTWR:
 		LocalOffset: 588,120,1358
 		MuzzleSequence: muzzle
 		MuzzlePalette: effect-ignore-lighting
-		MuzzleSplitFacings: 8
 	Armament@VULCSECONDARY:
 		RequiresCondition: tower.vulcan
 		Name: secondary
@@ -104,7 +103,6 @@ GACTWR:
 		LocalOffset: 588,-120,1358
 		MuzzleSequence: muzzle
 		MuzzlePalette: effect-ignore-lighting
-		MuzzleSplitFacings: 8
 	Armament@ROCKET:
 		RequiresCondition: tower.rocket
 		Weapon: RPGTower
--- a/mods/ts/rules/nod-vehicles.yaml
+++ b/mods/ts/rules/nod-vehicles.yaml
@@ -30,7 +30,6 @@ BGGY:
 		LocalOffset: 0,-61,543, 0,61,543
 		MuzzleSequence: muzzle
 		MuzzlePalette: effect-ignore-lighting
-		MuzzleSplitFacings: 8
 	AttackFrontal:
 		Voice: Attack
 		PauseOnCondition: empdisable
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
@@ -1210,36 +1210,26 @@ gactwr:
 		UseTilesetCode: false
 	turret-sam: gtctwr_d
 		Facings: 32
-	muzzle0: mgun-n
-		Length: *
-		Offset: 0, 0, 12
-		UseTilesetCode: false
-	muzzle1: mgun-nw
-		Length: *
-		Offset: 0, 0, 12
-		UseTilesetCode: false
-	muzzle2: mgun-w
-		Length: *
-		Offset: 0, 0, 12
-		UseTilesetCode: false
-	muzzle3: mgun-sw
-		Length: *
-		Offset: 0, 0, 12
-		UseTilesetCode: false
-	muzzle4: mgun-s
-		Length: *
-		Offset: 0, 0, 12
-		UseTilesetCode: false
-	muzzle5: mgun-se
-		Length: *
-		Offset: 0, 0, 12
-		UseTilesetCode: false
-	muzzle6: mgun-e
-		Length: *
-		Offset: 0, 0, 12
-		UseTilesetCode: false
-	muzzle7: mgun-ne
-		Length: *
+	muzzle:
+		Combine:
+			mgun-n:
+				Length: 6
+			mgun-nw:
+				Length: 6
+			mgun-w:
+				Length: 6
+			mgun-sw:
+				Length: 6
+			mgun-s:
+				Length: 6
+			mgun-se:
+				Length: 6
+			mgun-e:
+				Length: 6
+			mgun-ne:
+				Length: 6
+		Facings: 8
+		Length: 6
 		Offset: 0, 0, 12
 		UseTilesetCode: false
 	emp-overlay: emp_fx01
--- a/mods/ts/sequences/vehicles.yaml
+++ b/mods/ts/sequences/vehicles.yaml
@@ -105,16 +105,27 @@ bike:
 bggy:
 	Inherits: ^VehicleOverlays
 	Defaults:
-		Length: *
 		Offset: 0, 0, 24
-	muzzle0: mgun-n
-	muzzle1: mgun-nw
-	muzzle2: mgun-w
-	muzzle3: mgun-sw
-	muzzle4: mgun-s
-	muzzle5: mgun-se
-	muzzle6: mgun-e
-	muzzle7: mgun-ne
+	muzzle:
+		Combine:
+			mgun-n:
+				Length: 6
+			mgun-nw:
+				Length: 6
+			mgun-w:
+				Length: 6
+			mgun-sw:
+				Length: 6
+			mgun-s:
+				Length: 6
+			mgun-se:
+				Length: 6
+			mgun-e:
+				Length: 6
+			mgun-ne:
+				Length: 6
+		Facings: 8
+		Length: 6
 	icon: bggyicon
 		Offset: 0, 0