Add muzzleflash to GTWR. WithMuzzleFlash now actually uses the turret position.

OpenRA.Mods.RA/Combat.cs

@@ -219,7 +219,7 @@ namespace OpenRA.Mods.RA
 
 			var turretFacing = turreted != null  ? turreted.turretFacing : facing.Facing;
 
-			return Util.RotateVectorByFacing(barrel.Position, turretFacing, .7f);
+			return GetTurretPosition(self, facing, turret) + Util.RotateVectorByFacing(barrel.Position, turretFacing, .7f);
 		}
 
 		public static bool IsInRange( float2 attackOrigin, float range, Actor target )

OpenRA.Mods.RA/Weapon.cs

@@ -120,7 +120,6 @@ namespace OpenRA.Mods.RA
 				target = target,
 
 				src = (self.CenterLocation
-					+ Combat.GetTurretPosition(self, facing, Turret)
 					+ Combat.GetBarrelPosition(self, facing, Turret, barrel)).ToInt2(),
 				srcAltitude = move != null ? move.Altitude : 0,
 				dest = target.CenterLocation,

mods/cnc/rules/structures.yaml

@@ -686,14 +686,18 @@ GTWR:
 		HP: 600
 	RevealsShroud:
 		Range: 6
-	AttackOmni:
+	AttackTurreted:
 		PrimaryWeapon: HighV
+		PrimaryOffset: 0,0,0,-6
+		PrimaryLocalOffset:0,-6,0
 	AutoTarget:
 	DetectCloaked:
 		Range: 3
 	RenderDetectionCircle:
 	RenderRangeCircle:
-	
+	WithMuzzleFlash:
+	Turreted:
+		ROT:255
 ATWR:
 	Inherits: ^Building
 	RequiresPower:

mods/cnc/sequences/structures.yaml

@@ -379,6 +379,10 @@ gtwr:
 	make: gtwrmake
 		Start: 0
 		Length: *
+	muzzle: minigun
+		Start: 0
+		Length: 6
+		Facings: 8
 
 atwr:
 	idle:

mods/ra/rules/structures.yaml

@@ -381,8 +381,7 @@ PBOX:
 		Range: 6
 	AttackTurreted:
 		PrimaryWeapon: Vulcan
-		PrimaryOffset: 0,0,0,-2
-		PrimaryLocalOffset: 0,-12,0
+		PrimaryLocalOffset: 0,-11,0
 	AutoTarget:
 	IronCurtainable:
 	RenderRangeCircle:
@@ -415,8 +414,7 @@ HBOX:
 		Range: 6
 	AttackTurreted:
 		PrimaryWeapon: Vulcan
-		PrimaryOffset: 0,0,0,-2
-		PrimaryLocalOffset: 0,-12,0
+		PrimaryLocalOffset: 0,-11,0
 	AutoTarget:
 	IronCurtainable:
 	RenderRangeCircle: