From 9b858af2b71f81648f35008e84e1070cd8741ca0 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Mon, 30 May 2011 22:48:53 +1200
Subject: [PATCH] Add muzzleflash to GTWR. WithMuzzleFlash now actually uses
 the turret position.

---
 OpenRA.Mods.RA/Combat.cs           | 2 +-
 OpenRA.Mods.RA/Weapon.cs           | 1 -
 mods/cnc/rules/structures.yaml     | 8 ++++++--
 mods/cnc/sequences/structures.yaml | 4 ++++
 mods/ra/rules/structures.yaml      | 6 ++----
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs
index 2b79a04ee0..f6e9ae5347 100755
--- a/OpenRA.Mods.RA/Combat.cs
+++ b/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 )
diff --git a/OpenRA.Mods.RA/Weapon.cs b/OpenRA.Mods.RA/Weapon.cs
index b8b21815d1..b1396e281d 100644
--- a/OpenRA.Mods.RA/Weapon.cs
+++ b/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,
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index d56ff412f0..84ac3ecbc0 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/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:
diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml
index abb4d9d8d8..6614a2f559 100644
--- a/mods/cnc/sequences/structures.yaml
+++ b/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:
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index f8a3fa2fd7..10ef55a0d1 100644
--- a/mods/ra/rules/structures.yaml
+++ b/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: