Merge branch 'master' of github.com:chrisforbes/OpenRA

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));

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>

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:
+	
+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:

mods/cnc/vehicles.yaml

@@ -279,7 +279,7 @@ HTNK:
 	Turreted:
 		ROT: 5
 	AttackTurreted:
-		PrimaryWeapon: 120mmAPR
+		PrimaryWeapon: 120mm
 		SecondaryWeapon: MissilePack
 		Recoil: 3
 	RenderUnitTurreted:

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

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