From c3af7b7122611d35a8a7ea62eb49d2e7a62a43ce Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 8 Mar 2010 20:39:24 +1300
Subject: [PATCH 1/3] CNC: added atwr

---
 mods/cnc/sequences-structures.xml |  6 ++++++
 mods/cnc/structures.yaml          | 28 ++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/mods/cnc/sequences-structures.xml b/mods/cnc/sequences-structures.xml
index 2818f5c3b7..85d83a18e4 100644
--- a/mods/cnc/sequences-structures.xml
+++ b/mods/cnc/sequences-structures.xml
@@ -170,4 +170,10 @@
     <sequence name="critical-idle" start="2" length="1" />
     <sequence name="make" start="0" length="20" src="gtwrmake" />
   </unit>
+  <unit name="atwr">
+    <sequence name="idle" start="0" length="1" />
+    <sequence name="damaged-idle" start="1" length="1" />
+    <sequence name="critical-idle" start="2" length="1" />
+    <sequence name="make" start="0" length="14" src="atwrmake" />
+  </unit>
 </sequences>
\ No newline at end of file
diff --git a/mods/cnc/structures.yaml b/mods/cnc/structures.yaml
index 7ae49fbad9..e797df7fe6 100644
--- a/mods/cnc/structures.yaml
+++ b/mods/cnc/structures.yaml
@@ -446,16 +446,36 @@ GTWR:
 		TechLevel: 2
 		Prerequisites: pyle
 		Owner: gdi
-		Cost: 400
+		Cost: 500
 		Description: Guard Tower
 		LongDesc: Basic defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
 	Building:
-		Power: -15
+		Power: -10
 		HP: 400
 		Armor: wood
 		Crewed: yes
-		Sight: 5
+		Sight: 3
 	AttackOmni:
 		PrimaryWeapon: HighV
 	AutoTarget:
-	IronCurtainable:
\ No newline at end of file
+	
+ATWR:
+	Inherits: ^Building
+	Buildable:
+		Icon: atwricnh
+		TechLevel: 4
+		Prerequisites: hq
+		Owner: gdi
+		Cost: 1000
+		Description: Advanced Guard Tower
+		LongDesc: Anti-armor defensive structure.\n  Strong vs Light Vehicles, Tanks\n  Weak vs Infantry
+	Building:
+		Power: -20
+		HP: 600
+		Armor: light
+		Crewed: yes
+		Sight: 4
+	AttackOmni:
+		PrimaryWeapon: Tomahawk
+		SecondaryWeapon: Tomahawk
+	AutoTarget:
\ No newline at end of file

From a3e869a733e614765717f0e05e87a53b72da084c Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 8 Mar 2010 20:50:56 +1300
Subject: [PATCH 2/3] added support for AttackOmnis that fire missiles (use
 direction to target as initial missile facing)

---
 OpenRA.Game/Traits/Attack/AttackBase.cs | 3 ++-
 mods/cnc/vehicles.yaml                  | 2 +-
 mods/cnc/weapons.ini                    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Game/Traits/Attack/AttackBase.cs b/OpenRA.Game/Traits/Attack/AttackBase.cs
index 8208980c8b..bebd1ee7d9 100644
--- a/OpenRA.Game/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Game/Traits/Attack/AttackBase.cs
@@ -182,7 +182,8 @@ namespace OpenRA.Traits
 				if (Rules.ProjectileInfo[weapon.Projectile].ROT != 0)
 				{
 					var fireFacing = thisLocalOffset.ElementAtOrDefault(2) + 
-						(self.traits.Contains<Turreted>() ? self.traits.Get<Turreted>().turretFacing : unit.Facing);
+						(self.traits.Contains<Turreted>() ? self.traits.Get<Turreted>().turretFacing : 
+						unit != null ? unit.Facing : Util.GetFacing( thisTarget.CenterLocation - self.CenterLocation, 0 ));
 	
 					self.World.Add(new Missile(weapon, self.Owner, self,
 						firePos, thisTarget, srcAltitude, fireFacing));
diff --git a/mods/cnc/vehicles.yaml b/mods/cnc/vehicles.yaml
index 3ab479e78f..21b96735ef 100644
--- a/mods/cnc/vehicles.yaml
+++ b/mods/cnc/vehicles.yaml
@@ -279,7 +279,7 @@ HTNK:
 	Turreted:
 		ROT: 5
 	AttackTurreted:
-		PrimaryWeapon: 120mmAPR
+		PrimaryWeapon: 120mm
 		SecondaryWeapon: MissilePack
 		Recoil: 3
 	RenderUnitTurreted:
diff --git a/mods/cnc/weapons.ini b/mods/cnc/weapons.ini
index 89fb856563..9cd4408132 100644
--- a/mods/cnc/weapons.ini
+++ b/mods/cnc/weapons.ini
@@ -14,7 +14,7 @@ Chemspray
 Grenade
 70mm
 105mm
-120mmAPR
+120mm
 TurretGun
 MissilePack
 227mm
@@ -154,7 +154,7 @@ Report=TNKFIRE4
 ;Anim=GUNFIRE
 
 ; large anti-armor cannon
-[120mmAPR]
+[120mm]
 Damage=40
 ROF=80
 Range=4.75

From 0921b2a2482d9e2c6463c4014b97f547faa435f3 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 8 Mar 2010 20:57:36 +1300
Subject: [PATCH 3/3] hack E4 so it doesnt constantly commit suicide.

---
 mods/ra/rules.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/ra/rules.ini b/mods/ra/rules.ini
index 460cf293ba..e5f1de6cd2 100644
--- a/mods/ra/rules.ini
+++ b/mods/ra/rules.ini
@@ -158,7 +158,7 @@ Warhead=Fire
 [Flamer]
 Damage=70
 ROF=50
-Range=3.5
+Range=5
 Projectile=Fireball
 Speed=12
 Warhead=Fire
@@ -662,7 +662,7 @@ SmudgeType=Crater
 
 ; napalm and fire in general
 [Fire]
-Spread=8
+Spread=4
 Wood=yes
 Verses=90%,100%,60%,25%,50%
 Explosion=3