Merge pull request #3643 from reaperrr/cncmuzzles

CnC mod muzzles and offsets

mods/cnc/rules/structures.yaml

@@ -534,8 +534,9 @@ GUN:
 	RenderBuildingTurreted:
 	Armament:
 		Weapon: TurretGun
-		LocalOffset: -71,0,85
+		LocalOffset: 512,0,112
 	AttackTurreted:
+	WithMuzzleFlash:
 	AutoTarget:
 	-RenderBuilding:
 	-DeadBuildingState:
@@ -685,9 +686,10 @@ ATWR:
 		Range: 9
 	Turreted:
 		ROT:255
+		Offset: 128,128,-85
 	Armament:
 		Weapon: TowerMissle
-		LocalOffset: 299,299,-85, 299,-299,-85
+		LocalOffset: 256,128,0, 256,-128,0
 		LocalYaw: -100,100
 	AttackTurreted:
 	AutoTarget:

mods/cnc/rules/vehicles.yaml

@@ -149,8 +149,9 @@ ARTY:
 		Range: 9
 	Armament:
 		Weapon: ArtilleryShell
-		LocalOffset: 299, 0, 128
+		LocalOffset: 624,0,208
 	AttackFrontal:
+	WithMuzzleFlash:
 	RenderUnit:
 	Explodes:
 		Weapon: UnitExplode
@@ -183,7 +184,7 @@ FTNK:
 		Range: 5
 	Armament:
 		Weapon: BigFlamer
-		LocalOffset: 213,213,-85, 213,-213,-85
+		LocalOffset: 512,128,42, 512,-128,42
 	AttackFrontal:
 	RenderUnit:
 	AutoTarget:
@@ -327,8 +328,9 @@ LTNK:
 		Weapon: 70mm
 		Recoil: 85
 		RecoilRecovery: 17
-		LocalOffset: -128,0,85
+		LocalOffset: 720,0,90
 	AttackTurreted:
+	WithMuzzleFlash:
 	RenderUnit:
 	WithTurret:
 	AutoTarget:
@@ -364,8 +366,9 @@ MTNK:
 		Weapon: 120mm
 		Recoil: 128
 		RecoilRecovery: 26
-		LocalOffset: 0,0,43
+		LocalOffset: 768,0,90
 	AttackTurreted:
+	WithMuzzleFlash:
 	RenderUnit:
 	WithTurret:
 	AutoTarget:
@@ -403,16 +406,17 @@ HTNK:
 		ROT: 3
 	Armament@PRIMARY:
 		Weapon: 120mmDual
-		LocalOffset: 800, 180, 340, 800, -180, 340
+		LocalOffset: 900,180,340, 900,-180,340
 		Recoil: 170
 		RecoilRecovery: 42
 	Armament@SECONDARY:
 		Name: secondary
 		Weapon: MammothMissiles
-		LocalOffset: -85, 384, 340, -85, -384, 340
+		LocalOffset: -85,384,340, -85,-384,340
 		LocalYaw: -100, 100
 		Recoil: 42
 	AttackTurreted:
+	WithMuzzleFlash@PRIMARY:
 	RenderUnit:
 	WithTurret:
 	AutoTarget:

mods/cnc/sequences/structures.yaml

@@ -338,6 +338,9 @@ gun:
 		Start: 0
 		Length: *
 		Tick: 80
+	muzzle: gunfire2
+		Start: 0
+		Length: *
 
 sam:
 	closed-idle:
@@ -403,4 +406,7 @@ atwr:
 		Start: 0
 		Length: *
 		Tick: 80
+	muzzle: gunfire2
+		Start: 0
+		Length: *
 

mods/cnc/sequences/vehicles.yaml

@@ -87,6 +87,9 @@ mtnk:
 	turret:
 		Start: 32
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: *
 
 ltnk:
 	idle:
@@ -95,6 +98,9 @@ ltnk:
 	turret:
 		Start: 32
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: *
 
 htnk:
 	idle:
@@ -103,6 +109,9 @@ htnk:
 	turret:
 		Start: 32
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: *
 
 jeep:
 	idle:
@@ -125,7 +134,7 @@ ftnk:
 	idle:
 		Start: 0
 		Facings: 32
-	muzzle: flame
+	muzzle: flame2
 		Start: 0
 		Length: 13
 		Facings: 8
@@ -175,6 +184,9 @@ arty:
 	idle:
 		Start: 0
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: *
 
 apc:
 	idle: