Merge pull request #3627 from pchote/muzzleflash

Improved Muzzleflash support

mods/cnc/rules/aircraft.yaml

@@ -69,6 +69,7 @@ HELI:
 		Weapon: HeliAGGun
 		LocalOffset: 128,-213,-85, 128,213,-85
 	Armament@SECONDARY:
+		Name: secondary
 		Weapon: HeliAAGun
 		LocalOffset: 128,-213,-85, 128,213,-85
 	AttackHeli:
@@ -82,7 +83,9 @@ HELI:
 	RenderUnit:
 	WithRotor:
 		Offset: 0,0,85
-	WithMuzzleFlash:
+	WithMuzzleFlash@PRIMARY:
+	WithMuzzleFlash@SECONDARY:
+		Armament: secondary
 	WithShadow:
 	LeavesHusk:
 		HuskActor: HELI.Husk

mods/cnc/rules/vehicles.yaml

@@ -106,12 +106,15 @@ APC:
 		RecoilRecovery: 18
 		LocalOffset: 85,85,299, 85,-85,299
 	Armament@SECONDARY:
+		Name: secondary
 		Weapon: APCGun.AA
 		Recoil: 96
 		RecoilRecovery: 18
 		LocalOffset: 85,85,299, 85,-85,299
 	AttackTurreted:
-	WithMuzzleFlash:
+	WithMuzzleFlash@PRIMARY:
+	WithMuzzleFlash@SECONDARY:
+		Armament: secondary
 	RenderUnit:
 	WithTurret:
 	AutoTarget:
@@ -404,6 +407,7 @@ HTNK:
 		Recoil: 170
 		RecoilRecovery: 42
 	Armament@SECONDARY:
+		Name: secondary
 		Weapon: MammothMissiles
 		LocalOffset: -85, 384, 340, -85, -384, 340
 		LocalYaw: -100, 100

mods/ra/maps/drop-zone-w/map.yaml

@@ -248,9 +248,12 @@ Rules:
 		Armament@PRIMARY:
 			Weapon:M60mg
 		Armament@SECONDARY:
+			Name: secondary
 			Weapon:M60mg
 		AttackFrontal:
-		WithMuzzleFlash:
+		WithMuzzleFlash@PRIMARY:
+		WithMuzzleFlash@SECONDARY:
+			Armament: secondary
 		MustBeDestroyed:
 		-GivesBounty:
 	PT:

mods/ra/rules/aircraft.yaml

@@ -145,6 +145,7 @@ YAK:
 		Weapon: ChainGun.Yak
 		LocalOffset: 256,-213,0
 	Armament@SECONDARY:
+		Name: secondary
 		Weapon: ChainGun.Yak
 		LocalOffset: 256,213,0
 	AttackPlane:
@@ -163,7 +164,9 @@ YAK:
 		ReloadTicks: 11
 	IronCurtainable:
 	ReturnOnIdle:
-	WithMuzzleFlash:
+	WithMuzzleFlash@PRIMARY:
+	WithMuzzleFlash@SECONDARY:
+		Armament: secondary
 	Contrail:
 		Offset: -853,0,0
 	LeavesHusk:
@@ -294,6 +297,7 @@ HIND:
 		Weapon: ChainGun
 		LocalOffset: 85,-213,-85
 	Armament@SECONDARY:
+		Name: secondary
 		Weapon: ChainGun
 		LocalOffset: 85,213,-85
 	AttackHeli:
@@ -314,7 +318,9 @@ HIND:
 	IronCurtainable:
 	Selectable:
 		Bounds: 38,32,0,0
-	WithMuzzleFlash:
+	WithMuzzleFlash@PRIMARY:
+	WithMuzzleFlash@SECONDARY:
+		Armament: secondary
 	LeavesHusk:
 		HuskActor: HIND.Husk
 	SmokeTrailWhenDamaged: