fix #1052; tidy up *Init; route initial turret facing for husks through new TurretFacingInit

OpenRA.Game/ActorInitializer.cs

@@ -17,6 +17,7 @@ namespace OpenRA
 	{
 		public readonly Actor self;
 		public World world { get { return self.World; } }
+
 		internal TypeDictionary dict;
 
 		public ActorInitializer( Actor actor, TypeDictionary dict )
@@ -25,23 +26,9 @@ namespace OpenRA
 			this.dict = dict;
 		}
 
-		public T Get<T>()
+		public T Get<T>() where T : IActorInit { return dict.Get<T>(); }
-			where T : IActorInit
+		public U Get<T,U>()	where T : IActorInit<U> { return dict.Get<T>().Value( world ); }
-		{
+		public bool Contains<T>() where T : IActorInit { return dict.Contains<T>(); }
-			return dict.Get<T>();
-		}
-
-		public U Get<T,U>()
-			where T : IActorInit<U>
-		{
-			return dict.Get<T>().Value( world );
-		}
-		
-		public bool Contains<T>()
-			where T : IActorInit
-		{
-			return dict.Contains<T>();
-		}
 	}
 	
 	public interface IActorInit {}
@@ -53,91 +40,53 @@ namespace OpenRA
 
 	public class FacingInit : IActorInit<int>
 	{
-		[FieldFromYamlKey]
+		[FieldFromYamlKey] public readonly int value = 128;
-		public readonly int value = 128;
-		
 		public FacingInit() { }
-		
+		public FacingInit( int init ) { value = init; }
-		public FacingInit( int init )
+		public int Value( World world ) { return value; }
-		{
-			value = init;
 	}
 
-		public int Value( World world )
+	public class TurretFacingInit : IActorInit<int>
 	{
-			return value;	
+		[FieldFromYamlKey] public readonly int value = 128;
-		}
+		public TurretFacingInit() { }
+		public TurretFacingInit( int init ) { value = init; }
+		public int Value( World world ) { return value; }
 	}
 
 	public class AltitudeInit : IActorInit<int>
 	{
-		[FieldFromYamlKey]
+		[FieldFromYamlKey] public readonly int value = 0;
-		public readonly int value = 0;
-		
 		public AltitudeInit() { }
-		
+		public AltitudeInit( int init ) { value = init; }
-		public AltitudeInit( int init )
+		public int Value( World world ) { return value; }
-		{
-			value = init;
-		}
-		
-		public int Value( World world )
-		{
-			return value;	
-		}
 	}
 
 	public class LocationInit : IActorInit<int2>
 	{
-		[FieldFromYamlKey]
+		[FieldFromYamlKey] public readonly int2 value = int2.Zero;
-		public readonly int2 value = int2.Zero;
-
 		public LocationInit() { }
-
+		public LocationInit( int2 init ) { value = init; }
-		public LocationInit( int2 init )
+		public int2 Value( World world ) { return value; }
-		{
-			value = init;
-		}
-
-		public int2 Value( World world )
-		{
-			return value;
-		}
 	}
 
 	public class CenterLocationInit : IActorInit<int2>
 	{
-		[FieldFromYamlKey]
+		[FieldFromYamlKey] public readonly int2 value = int2.Zero;
-		public readonly int2 value = int2.Zero;
-
 		public CenterLocationInit() { }
-
+		public CenterLocationInit( int2 init ) { value = init; }
-		public CenterLocationInit( int2 init )
+		public int2 Value( World world ) { return value; }
-		{
-			value = init;
-		}
-
-		public int2 Value( World world )
-		{
-			return value;
-		}
 	}
 
 	public class OwnerInit : IActorInit<Player>
 	{
-		[FieldFromYamlKey]
+		[FieldFromYamlKey] public readonly string PlayerName = "Neutral";
-		public readonly string PlayerName = "Neutral";
 		Player player;
 
 		public OwnerInit() { }
+		public OwnerInit( string playerName ) { this.PlayerName = playerName; }
 
-		public OwnerInit( string playerName )
+		public OwnerInit( Player player ) {
-		{
-			this.PlayerName = playerName;
-		}
-
-		public OwnerInit( Player player )
-		{
 			this.player = player;
 			this.PlayerName = player.InternalName;
 		}

OpenRA.Game/Traits/ActorStance.cs

@@ -34,19 +34,9 @@ namespace OpenRA.Traits
 
 	public class ActorStanceInit : IActorInit<ActorStance.Stance>
 	{
-		[FieldFromYamlKey]
+		[FieldFromYamlKey] public readonly ActorStance.Stance value = ActorStance.Stance.None;
-		public readonly ActorStance.Stance value = ActorStance.Stance.None;
-		
 		public ActorStanceInit() { }
-		
+		public ActorStanceInit( ActorStance.Stance init ) { value = init; }
-		public ActorStanceInit( ActorStance.Stance init )
+		public ActorStance.Stance Value( World world ) { return value; }
-		{
-			value = init;
-		}
-		
-		public ActorStance.Stance Value( World world )
-		{
-			return value;	
-		}
 	}
 }

OpenRA.Game/Traits/Health.cs

@@ -134,26 +134,14 @@ namespace OpenRA.Traits
 		}
 	}
 
-	
 	public class HealthInit : IActorInit<float>
 	{
-		[FieldFromYamlKey]
+		[FieldFromYamlKey] public readonly float value = 1f;
-		public readonly float value = 1f;
-		
 		public HealthInit() { }
-		
+		public HealthInit( float init ) { value = init; }
-		public HealthInit( float init )
+		public float Value( World world ) { return value; }
-		{
-			value = init;
 	}
 
-		public float Value( World world )
-		{
-			return value;	
-		}
-	}
-	
-	
 	public static class HealthExts
 	{
 		public static bool IsDead(this Actor self)

OpenRA.Mods.RA/Husk.cs

@@ -89,19 +89,9 @@ namespace OpenRA.Mods.RA
 
 	public class HuskSpeedInit : IActorInit<int>
 	{
-		[FieldFromYamlKey]
+		[FieldFromYamlKey] public readonly int value = 0;
-		public readonly int value = 0;
-
 		public HuskSpeedInit() { }
-
+		public HuskSpeedInit( int init ) { value = init; }
-		public HuskSpeedInit( int init )
+		public int Value( World world ) { return value; }
-		{
-			value = init;
-		}
-
-		public int Value( World world )
-		{
-			return value;
-		}
 	}
 }

OpenRA.Mods.RA/LeavesHusk.cs

@@ -43,8 +43,13 @@ namespace OpenRA.Mods.RA
 					new SkipMakeAnimsInit()
 				};
 
-				if (self.HasTrait<IFacing>())
+				var facing = self.TraitOrDefault<IFacing>();
-					td.Add(new FacingInit( self.Trait<IFacing>().Facing ));
+				if (facing != null)
+					td.Add(new FacingInit( facing.Facing ));
+
+				var turreted = self.TraitOrDefault<Turreted>();
+				if (turreted != null)
+					td.Add( new TurretFacingInit(turreted.turretFacing) );
 
 				// Allows the husk to drag to its final position
 	            var mobile = self.TraitOrDefault<Mobile>();
@@ -55,11 +60,7 @@ namespace OpenRA.Mods.RA
 					.Select(ihm => ihm.HuskActor(self))
 					.FirstOrDefault(a => a != null);
 
-				var husk = w.CreateActor(huskActor ?? Info.HuskActor, td);
+				w.CreateActor(huskActor ?? Info.HuskActor, td);
-				var turreted = self.TraitOrDefault<Turreted>();
-				if (turreted != null)
-					foreach (var p in husk.TraitsImplementing<ThrowsParticle>())
-						p.InitialFacing = turreted.turretFacing;
 			});
 		}
 	}

OpenRA.Mods.RA/ThrowsParticle.cs

@@ -14,22 +14,20 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	class ThrowsParticleInfo : ITraitInfo
+	class ThrowsParticleInfo : ITraitInfo, Requires<RenderUnitInfo>
 	{
 		public readonly string Anim = null;
 		public readonly int[] Offset = new[] { 0, 0, 0, 0 };
 		public readonly int[] Spread = new[] { 0, 0 };
 		public readonly float Speed = 20;
 		public readonly string AnimKey = null;
-		public readonly bool UseTurretFacing = true;
 		public readonly float ROT = 15;
 
-		public object Create(ActorInitializer init) { return new ThrowsParticle(this); }
+		public object Create(ActorInitializer init) { return new ThrowsParticle(init, this); }
 	}
 
 	class ThrowsParticle : ITick
 	{
-		ThrowsParticleInfo info;
 		float2 pos;
 		float alt;
 
@@ -40,34 +38,29 @@ namespace OpenRA.Mods.RA
 
 		const float gravity = 1.3f;
 
-		public ThrowsParticle(ThrowsParticleInfo info) { this.info = info; }
+		public ThrowsParticle(ActorInitializer init, ThrowsParticleInfo info)
-		public float? InitialFacing = null;
-	
-		public void Tick(Actor self)
 		{
-			if (info != null)
+			var self = init.self;
-			{
-				alt = 0;
 			var ifacing = self.Trait<IFacing>();
-				pos = Combat.GetTurretPosition(self, ifacing, new Turret(info.Offset));
 			var ru = self.Trait<RenderUnit>();
 
+			alt = 0;
+			facing = Turreted.GetInitialTurretFacing( init, 0 );
+			pos = Combat.GetTurretPosition(self, ifacing, new Turret(info.Offset));
+
 			v = Game.CosmeticRandom.Gauss2D(1) * info.Spread.RelOffset();
 			dfacing = Game.CosmeticRandom.Gauss1D(2) * info.ROT;
 			va = info.Speed;
 
-				if (!info.UseTurretFacing) InitialFacing = null;
-				facing = InitialFacing ?? ifacing.Facing;
-
 			var anim = new Animation(ru.GetImage(self), () => (int)facing);
 			anim.PlayRepeating(info.Anim);
 
 			ru.anims.Add(info.AnimKey, new AnimationWithOffset(
 				anim, () => pos - new float2(0, alt), null));
-
-				info = null;
 		}
 
+		public void Tick(Actor self)
+		{
 			va -= gravity;
 			alt += va;
 

OpenRA.Mods.RA/Turreted.cs

@@ -22,17 +22,26 @@ namespace OpenRA.Mods.RA
 
 	public class Turreted : ITick, ISync
 	{
-		[Sync]
+		[Sync] public int turretFacing = 0;
-		public int turretFacing = 0;
 		public int? desiredFacing;
 		TurretedInfo info;
 		IFacing facing;
 		
+		public static int GetInitialTurretFacing(ActorInitializer init, int def)
+		{
+			if (init.Contains<TurretFacingInit>())
+				return init.Get<TurretFacingInit,int>();
+
+			if (init.Contains<FacingInit>())
+				return init.Get<FacingInit,int>();
+
+			return def;
+		}
+
 		public Turreted(ActorInitializer init, TurretedInfo info)
 		{
 			this.info = info;
-			turretFacing = info.InitialFacing;
+			turretFacing = GetInitialTurretFacing(init, info.InitialFacing);
-			turretFacing = init.Contains<FacingInit>() ? init.Get<FacingInit,int>() : info.InitialFacing;
 			facing = init.self.TraitOrDefault<IFacing>();
 		}