From 3181b055aa2361cb9b4b981a21d4eaac8b0aa5dc Mon Sep 17 00:00:00 2001
From: Bob <Bob@nameless.(none)>
Date: Sat, 10 Oct 2009 00:31:16 +1300
Subject: [PATCH] Trait-based units.    Any unit/building without sequences
 will cause a crash when built.

---
 .../OpenRa.DataStructures.csproj              |   1 +
 OpenRa.DataStructures/TypeDictionary.cs       |  38 ++
 OpenRa.Game/Actor.cs                          | 468 +++++++++++++++++-
 OpenRa.Game/Building.cs                       |  24 -
 OpenRa.Game/Controller.cs                     | 187 +++----
 OpenRa.Game/Game.cs                           | 138 +++---
 OpenRa.Game/Graphics/WorldRenderer.cs         | 202 ++++----
 OpenRa.Game/MainWindow.cs                     | 250 +++++-----
 OpenRa.Game/MoveOrder.cs                      | 118 ++---
 OpenRa.Game/OpenRa.Game.csproj                |   6 +-
 OpenRa.Game/PlayerOwned.cs                    |  25 -
 OpenRa.Game/Refinery.cs                       |  61 ---
 OpenRa.Game/Sidebar.cs                        | 447 +++++++++--------
 OpenRa.Game/Tree.cs                           |  32 --
 OpenRa.Game/Unit.cs                           | 150 ------
 OpenRa.Game/UnitMissions.cs                   | 292 +++++------
 OpenRa.Game/UnitOrderGenerator.cs             |  39 ++
 OpenRa.Game/World.cs                          |  81 +--
 18 files changed, 1377 insertions(+), 1182 deletions(-)
 create mode 100755 OpenRa.DataStructures/TypeDictionary.cs
 mode change 100644 => 100755 OpenRa.Game/Actor.cs
 delete mode 100644 OpenRa.Game/Building.cs
 delete mode 100644 OpenRa.Game/PlayerOwned.cs
 delete mode 100644 OpenRa.Game/Refinery.cs
 delete mode 100644 OpenRa.Game/Tree.cs
 delete mode 100644 OpenRa.Game/Unit.cs
 create mode 100755 OpenRa.Game/UnitOrderGenerator.cs

diff --git a/OpenRa.DataStructures/OpenRa.DataStructures.csproj b/OpenRa.DataStructures/OpenRa.DataStructures.csproj
index fc717d6726..1fd76608f7 100644
--- a/OpenRa.DataStructures/OpenRa.DataStructures.csproj
+++ b/OpenRa.DataStructures/OpenRa.DataStructures.csproj
@@ -42,6 +42,7 @@
     <Compile Include="int2.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tuple.cs" />
+    <Compile Include="TypeDictionary.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/OpenRa.DataStructures/TypeDictionary.cs b/OpenRa.DataStructures/TypeDictionary.cs
new file mode 100755
index 0000000000..8880755bd1
--- /dev/null
+++ b/OpenRa.DataStructures/TypeDictionary.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenRa
+{
+	public class TypeDictionary
+	{
+		Dictionary<Type, object> inner = new Dictionary<Type, object>();
+
+		public void Add<T>( T val )
+		{
+			inner.Add( typeof( T ), val );
+		}
+
+		public void Remove<T>()
+		{
+			inner.Remove( typeof( T ) );
+		}
+
+		public bool Contains<T>()
+		{
+			return inner.ContainsKey( typeof( T ) );
+		}
+
+		public T Get<T>()
+		{
+			return (T)inner[ typeof( T ) ];
+		}
+
+		public IEnumerable<T> WithInterface<T>()
+		{
+			foreach( var i in inner )
+				if( i.Value is T )
+					yield return (T)i.Value;
+		}
+	}
+}
diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs
old mode 100644
new mode 100755
index 1c1a673329..01e5bccc8c
--- a/OpenRa.Game/Actor.cs
+++ b/OpenRa.Game/Actor.cs
@@ -1,26 +1,442 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Drawing;
-using OpenRa.FileFormats;
-
-using System.Windows.Forms;
-using OpenRa.Game.Graphics;
-using IjwFramework.Types;
-
-namespace OpenRa.Game
-{
-	abstract class Actor
-	{
-		public readonly Game game;
-
-		public Player owner;
-		public abstract IEnumerable<Pair<Sprite,float2>> CurrentImages { get; }
-		public virtual void Tick(Game game, int t) { }
-
-		protected Actor(Game game)
-		{
-			this.game = game;
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using IjwFramework.Types;
+using OpenRa.FileFormats;
+using OpenRa.Game.GameRules;
+using OpenRa.Game.Graphics;
+
+namespace OpenRa.Game
+{
+	class Actor
+	{
+		public readonly TypeDictionary traits = new TypeDictionary();
+		public readonly UnitInfo.BaseInfo unitInfo;
+
+		public int2 Location;
+		public Player Owner;
+
+		public Actor( string name, int2 location, Player owner )
+		{
+			unitInfo = Rules.UnitInfo.Get( name );
+			Location = location;
+			Owner = owner;
+
+			switch( name )
+			{
+			///// vehicles /////
+			case "mcv":
+				traits.Add( new Traits.Mobile( this ) );
+				traits.Add( new Traits.RenderUnit( this, name ) );
+				traits.Add( new Traits.McvDeploy( this ) );
+				break;
+			case "mnly":
+			case "apc":
+			case "v2rl":
+			case "arty":
+				traits.Add( new Traits.Mobile( this ) );
+				traits.Add( new Traits.RenderUnit( this, name ) );
+				break;
+			case "jeep":
+			case "1tnk":
+			case "2tnk":
+			case "3tnk":
+			case "4tnk":
+			case "mrj":
+			case "mgg":
+				traits.Add( new Traits.Mobile( this ) );
+				traits.Add( new Traits.Turreted( this ) );
+				traits.Add( new Traits.RenderUnitTurreted( this, name ) );
+				break;
+			case "harv":
+				traits.Add( new Traits.Mobile( this ) );
+				traits.Add( new Traits.RenderUnit( this, name ) );
+				break;
+			///// TODO: infantry /////
+
+			///// TODO: boats /////
+
+			///// TODO: planes /////
+
+			///// buildings /////
+			case "iron":
+			case "pdox":
+			case "mslo":
+			case "atek":
+			case "stek":
+			case "weap":
+			case "fact":
+			case "proc":
+			case "silo":
+			case "hpad":
+			case "afld":
+			case "dome":
+			case "powr":
+			case "apwr":
+			case "barr":
+			case "tent":
+			case "kenn":
+			case "fix":
+			//SYRD, SPEN
+			//GAP
+			//SBAG, BRIK, FENC
+			//FACF, WEAF, SYRF, SPEF, DOMF
+			case "pbox":
+			case "hbox":
+			case "tsla":
+			case "ftur":
+				traits.Add( new Traits.Building( this ) );
+				traits.Add( new Traits.RenderBuilding( this, name ) );
+				break;
+			case "gun":
+			case "agun":
+			case "sam":
+				traits.Add( new Traits.Building( this ) );
+				traits.Add( new Traits.Turreted( this ) );
+				traits.Add( new Traits.RenderBuildingTurreted( this, name ) );
+				break;
+			default:
+				throw new NotImplementedException( "Actor traits for " + name );
+			}
+		}
+
+		public Actor( TreeReference tree, TreeCache treeRenderer, int2 mapOffset )
+		{
+			Location = new int2( tree.Location ) - mapOffset;
+			traits.Add( new Traits.Tree( treeRenderer.GetImage( tree.Image ) ) );
+		}
+
+		public void Tick( Game game, int dt )
+		{
+			foreach( var tick in traits.WithInterface<Traits.ITick>() )
+				tick.Tick( this, game, dt );
+		}
+
+		public float2 CenterLocation { get { return new float2( 12, 12 ) + 24 * (float2)Location; } }
+		public float2 SelectedSize { get { return Render().FirstOrDefault().First.size; } }
+
+		public IEnumerable<Pair<Sprite, float2>> Render()
+		{
+			return traits.WithInterface<Traits.IRender>().SelectMany( x => x.Render( this ) );
+		}
+
+		public Order Order( Game game, int2 xy )
+		{
+			return traits.WithInterface<Traits.IOrder>()
+				.Select( x => x.Order( this, game, xy ) )
+				.Where( x => x != null )
+				.FirstOrDefault();
+		}
+	}
+
+	namespace Traits
+	{
+		interface ITick
+		{
+			void Tick( Actor self, Game game, int dt );
+		}
+
+		interface IRender
+		{
+			IEnumerable<Pair<Sprite, float2>> Render( Actor self );
+		}
+
+		interface IOrder
+		{
+			Order Order( Actor self, Game game, int2 xy );
+		}
+
+		abstract class RenderSimple : IRender, ITick
+		{
+			public Animation anim;
+
+			public RenderSimple( Actor self, string unitName )
+			{
+				anim = new Animation( unitName );
+			}
+
+			public abstract IEnumerable<Pair<Sprite, float2>> Render( Actor self );
+
+			public virtual void Tick( Actor self, Game game, int dt )
+			{
+				anim.Tick( dt );
+			}
+		}
+
+		class RenderBuilding : RenderSimple
+		{
+			public RenderBuilding( Actor self, string unitName )
+				: base( self, unitName )
+			{
+				anim.PlayThen( "make", () => anim.Play( "idle" ) );
+			}
+
+			public override IEnumerable<Pair<Sprite, float2>> Render( Actor self )
+			{
+				yield return Pair.New( anim.Image, 24f * (float2)self.Location );
+			}
+		}
+
+		class RenderBuildingTurreted : RenderBuilding
+		{
+			public RenderBuildingTurreted( Actor self, string unitName )
+				: base( self, unitName )
+			{
+				anim.PlayThen( "make", () => anim.PlayFetchIndex( "idle", () => self.traits.Get<Turreted>().turretFacing ) );
+			}
+		}
+
+		class RenderUnit : RenderSimple
+		{
+			public RenderUnit( Actor self, string unitName )
+				:base( self, unitName )
+			{
+				anim.PlayFetchIndex( "idle", () => self.traits.Get<Mobile>().facing );
+			}
+
+			protected static Pair<Sprite, float2> Centered( Sprite s, float2 location )
+			{
+				var loc = location - 0.5f * s.size;
+				return Pair.New( s, loc.Round() );
+			}
+
+			public override IEnumerable<Pair<Sprite, float2>> Render( Actor self )
+			{
+				var mobile = self.traits.Get<Mobile>();
+				float fraction = ( mobile.moveFraction > 0 ) ? (float)mobile.moveFraction / mobile.moveFractionTotal : 0f;
+				var centerLocation = new float2( 12, 12 ) + 24 * float2.Lerp( mobile.fromCell, mobile.toCell, fraction );
+				yield return Centered( anim.Image, centerLocation );
+			}
+		}
+
+		class RenderUnitTurreted : RenderUnit
+		{
+			public Animation turretAnim;
+
+			public RenderUnitTurreted( Actor self, string unitName )
+				: base( self, unitName )
+			{
+				turretAnim = new Animation( unitName );
+				turretAnim.PlayFetchIndex( "turret", () => self.traits.Get<Turreted>().turretFacing );
+			}
+
+			public override IEnumerable<Pair<Sprite, float2>> Render( Actor self )
+			{
+				var mobile = self.traits.Get<Mobile>();
+				float fraction = ( mobile.moveFraction > 0 ) ? (float)mobile.moveFraction / mobile.moveFractionTotal : 0f;
+				var centerLocation = new float2( 12, 12 ) + 24 * float2.Lerp( mobile.fromCell, mobile.toCell, fraction );
+				yield return Centered( anim.Image, centerLocation );
+				yield return Centered( turretAnim.Image, centerLocation );
+			}
+
+			public override void Tick( Actor self, Game game, int dt )
+			{
+				base.Tick( self, game, dt );
+				turretAnim.Tick( dt );
+			}
+		}
+
+		class Mobile : ITick, IOrder
+		{
+			public Actor self;
+
+			public int2 fromCell, destination;
+			public int2 toCell { get { return self.Location; } }
+			public int moveFraction, moveFractionTotal;
+			public int facing;
+
+			public Mobile( Actor self )
+			{
+				this.self = self;
+				fromCell = destination = self.Location;
+			}
+
+			public bool Turn( int desiredFacing )
+			{
+				if( facing == desiredFacing )
+					return false;
+
+				int df = ( desiredFacing - facing + 32 ) % 32;
+				facing = ( facing + ( df > 16 ? 31 : 1 ) ) % 32;
+				return true;
+			}
+
+			static float2[] fvecs = Util.MakeArray<float2>( 32,
+				i => -float2.FromAngle( i / 16.0f * (float)Math.PI ) * new float2( 1f, 1.3f ) );
+
+			int GetFacing( float2 d )
+			{
+				if( float2.WithinEpsilon( d, float2.Zero, 0.001f ) )
+					return facing;
+
+				int highest = -1;
+				float highestDot = -1.0f;
+
+				for( int i = 0 ; i < fvecs.Length ; i++ )
+				{
+					float dot = float2.Dot( fvecs[ i ], d );
+					if( dot > highestDot )
+					{
+						highestDot = dot;
+						highest = i;
+					}
+				}
+
+				return highest;
+			}
+
+			public void Tick( Actor self, Game game, int dt )
+			{
+				if( fromCell != toCell )
+				{
+					if( Turn( GetFacing( toCell - fromCell ) ) )
+						return;
+
+					moveFraction += dt * ( (UnitInfo.MobileInfo)self.unitInfo ).Speed;
+				}
+				if( moveFraction < moveFractionTotal )
+					return;
+
+				moveFraction = 0;
+				moveFractionTotal = 0;
+				fromCell = toCell;
+
+				if( destination == toCell )
+					return;
+
+				List<int2> res = game.pathFinder.FindUnitPath( toCell, PathFinder.DefaultEstimator( destination ) );
+				if( res.Count != 0 )
+				{
+					self.Location = res[ res.Count - 1 ];
+
+					int2 dir = toCell - fromCell;
+					moveFractionTotal = ( dir.X != 0 && dir.Y != 0 ) ? 2500 : 2000;
+				}
+				else
+					destination = toCell;
+			}
+
+			public Order Order( Actor self, Game game, int2 xy )
+			{
+				if( xy != toCell )
+					return new MoveOrder( self, xy );
+				return null;
+			}
+		}
+
+		class McvDeploy : IOrder, ITick
+		{
+			public bool Deploying;
+
+			public McvDeploy( Actor self )
+			{
+			}
+
+			public Order Order( Actor self, Game game, int2 xy )
+			{
+				// TODO: check that there's enough space at the destination.
+				if( xy == self.Location )
+					return new DeployMcvOrder( self );
+
+				return null;
+			}
+
+			public void Tick( Actor self, Game game, int dt )
+			{
+				if( !Deploying )
+					return;
+
+				if( self.traits.Get<Mobile>().Turn( 12 ) )
+					return;
+
+				game.world.AddFrameEndTask( _ =>
+				{
+					game.world.Remove( self );
+					game.world.Add( new Actor( "fact", self.Location - new int2( 1, 1 ), self.Owner ) );
+				} );
+			}
+		}
+
+		class Turreted
+			: ITick // temporary.
+		{
+			public int turretFacing = 24;
+
+			public Turreted( Actor self )
+			{
+			}
+
+			// temporary.
+			public void Tick( Actor self, Game game, int dt )
+			{
+				turretFacing = ( turretFacing + 1 ) % 32;
+			}
+		}
+
+		class Building : ITick
+		{
+			public Building( Actor self )
+			{
+			}
+
+			bool first = true;
+			public void Tick( Actor self, Game game, int dt )
+			{
+				if( first && self.Owner == game.LocalPlayer )
+					self.Owner.TechTree.Build( self.unitInfo.Name, true );
+				first = false;
+			}
+		}
+
+		class Tree : IRender
+		{
+			Sprite Image;
+
+			public Tree( Sprite treeImage )
+			{
+				Image = treeImage;
+			}
+
+			public IEnumerable<Pair<Sprite, float2>> Render( Actor self )
+			{
+				yield return Pair.New( Image, 24 * (float2)self.Location );
+			}
+		}
+
+		//class WarFactory : Building
+		//{
+		//    Animation roof;
+
+		//    public WarFactory( int2 location, Player owner, Game game )
+		//        : base( "weap", location, owner, game )
+		//    {
+
+		//        animation.PlayThen( "make", () =>
+		//        {
+		//            roof = new Animation( "weap" );
+		//            animation.PlayRepeating( "idle" );
+		//            roof.PlayRepeating( "idle-top" );
+		//        } );
+		//    }
+
+		//    public override IEnumerable<Pair<Sprite, float2>> CurrentImages
+		//    {
+		//        get
+		//        {
+		//            return ( roof == null )
+		//                ? base.CurrentImages
+		//                : ( base.CurrentImages.Concat(
+		//                new[] { Pair.New( roof.Image, 24 * (float2)location ) } ) );
+		//        }
+		//    }
+
+		//    public override void Tick( Game game, int t )
+		//    {
+		//        base.Tick( game, t );
+		//        if( roof != null ) roof.Tick( t );
+		//    }
+		//}
+	}
+}
diff --git a/OpenRa.Game/Building.cs b/OpenRa.Game/Building.cs
deleted file mode 100644
index de524c6f96..0000000000
--- a/OpenRa.Game/Building.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenRa.Game
-{
-	class Building : PlayerOwned
-	{
-		public Building( string name, int2 location, Player owner, Game game )
-			: base( game, name, location )
-		{
-			this.owner = owner;
-
-			animation.PlayThen( "make", () => animation.PlayRepeating( "idle" ) );
-			owner.TechTree.Build( name, true );
-		}
-
-		public override void Tick( Game game, int t )
-		{
-			animation.Tick( t );
-		}
-
-	}
-}
diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs
index 8c0bf91040..39339d64eb 100644
--- a/OpenRa.Game/Controller.cs
+++ b/OpenRa.Game/Controller.cs
@@ -1,90 +1,97 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using IjwFramework.Types;
-using System.Drawing;
-
-namespace OpenRa.Game
-{
-	class Controller
-	{
-		Game game;
-
-		public IOrderGenerator orderGenerator;
-
-		public Controller(Game game)
-		{
-			this.game = game;
-		}
-
-        float2 GetWorldPos(MouseInput mi)
-        {
-            return (1 / 24.0f) * (new float2(mi.Location.X, mi.Location.Y) + game.viewport.Location);
-        }
-
-        float2? dragStart, dragEnd;
-		public void HandleMouseInput(MouseInput mi)
-		{
-            var xy = GetWorldPos(mi);
-            if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Down)
-            {
-				if (!(orderGenerator is PlaceBuilding))
-					dragStart = dragEnd = xy;
-            }
-
-            if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Move)
-                if (dragEnd != null)
-                    dragEnd = GetWorldPos(mi);
-
-            if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Up)
-            {
-				if (!(orderGenerator is PlaceBuilding))
-				{
-					if (dragStart.HasValue && !(dragStart.Value == GetWorldPos(mi)))
-						orderGenerator = FindUnit(dragStart.Value, xy); /* band-box select */
-					else
-						orderGenerator = FindUnit(xy, xy);  /* click select */
-				}
-
-                dragStart = dragEnd = null;
-            }
-
-            if (mi.Button == MouseButtons.None && mi.Event == MouseInputEvent.Move)
-            {
-                /* update the cursor to reflect the thing under us - note this 
-                 * needs to also happen when the *thing* changes, so per-frame hook */
-            }
-
-			if( mi.Button == MouseButtons.Right && mi.Event == MouseInputEvent.Down )
-				if( orderGenerator != null )
-					foreach( var order in orderGenerator.Order( game, new int2( (int)xy.X, (int)xy.Y ) ) )
-						order.Apply( game );
-		}
-
-        public Unit FindUnit(float2 a, float2 b)
-        {
-            return FindUnits(game, 24 * a, 24 * b).FirstOrDefault();
-        }
-
-        public static IEnumerable<Unit> FindUnits(Game game, float2 a, float2 b)
-        {
-            var min = new float2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y));
-            var max = new float2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y));
-
-            var rect = new RectangleF(min.X, min.Y, max.X - min.X, max.Y - min.Y);
-
-            return game.world.Actors.OfType<Unit>()
-                .Where(x => (x.owner == game.LocalPlayer) && (x.Bounds.IntersectsWith(rect)));
-        }
-
-        public Pair<float2, float2>? SelectionBox()
-        {
-            if (dragStart == null || dragEnd == null)
-                return null;
-
-            return Pair.New(24 * dragStart.Value, 24 * dragEnd.Value);
-        }
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using IjwFramework.Types;
+using System.Drawing;
+
+namespace OpenRa.Game
+{
+	class Controller
+	{
+		Game game;
+
+		public IOrderGenerator orderGenerator;
+
+		public Controller(Game game)
+		{
+			this.game = game;
+		}
+
+        float2 GetWorldPos(MouseInput mi)
+        {
+            return (1 / 24.0f) * (new float2(mi.Location.X, mi.Location.Y) + game.viewport.Location);
+        }
+
+        float2? dragStart, dragEnd;
+		public void HandleMouseInput(MouseInput mi)
+		{
+            var xy = GetWorldPos(mi);
+            if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Down)
+            {
+				if (!(orderGenerator is PlaceBuilding))
+					dragStart = dragEnd = xy;
+            }
+
+            if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Move)
+                if (dragEnd != null)
+                    dragEnd = GetWorldPos(mi);
+
+            if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Up)
+            {
+				if (!(orderGenerator is PlaceBuilding))
+				{
+					if (dragStart.HasValue && !(dragStart.Value == GetWorldPos(mi)))
+						orderGenerator = new UnitOrderGenerator( FindUnits( game, 24 * dragStart.Value, 24 * xy ) ); /* band-box select */
+					else
+						orderGenerator = new UnitOrderGenerator( FindUnits( game, 24 * xy, 24 * xy ) );  /* click select */
+				}
+
+                dragStart = dragEnd = null;
+            }
+
+            if (mi.Button == MouseButtons.None && mi.Event == MouseInputEvent.Move)
+            {
+                /* update the cursor to reflect the thing under us - note this 
+                 * needs to also happen when the *thing* changes, so per-frame hook */
+            }
+
+			if( mi.Button == MouseButtons.Right && mi.Event == MouseInputEvent.Down )
+				if( orderGenerator != null )
+					foreach( var order in orderGenerator.Order( game, new int2( (int)xy.X, (int)xy.Y ) ) )
+						order.Apply( game );
+		}
+
+        public Actor FindUnit(float2 a, float2 b)
+        {
+            return FindUnits(game, 24 * a, 24 * b).FirstOrDefault();
+        }
+
+        public static IEnumerable<Actor> FindUnits(Game game, float2 a, float2 b)
+        {
+            var min = new float2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y));
+            var max = new float2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y));
+
+            var rect = new RectangleF(min.X, min.Y, max.X - min.X, max.Y - min.Y);
+
+            return game.world.Actors
+                .Where(x => (x.Owner == game.LocalPlayer) && (UnitBounds(x).IntersectsWith(rect)));
+        }
+
+		public static RectangleF UnitBounds( Actor actor )
+		{
+			var size = actor.SelectedSize;
+			var loc = actor.CenterLocation - 0.5f * size;
+			return new System.Drawing.RectangleF( loc.X, loc.Y, size.X, size.Y );
+		}
+
+        public Pair<float2, float2>? SelectionBox()
+        {
+            if (dragStart == null || dragEnd == null)
+                return null;
+
+            return Pair.New(24 * dragStart.Value, 24 * dragEnd.Value);
+        }
+	}
+}
diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index 670fca01d1..b3ec25dce4 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -1,75 +1,63 @@
-using System;
-using System.Collections.Generic;
-using OpenRa.FileFormats;
-using System.Linq;
-
-using OpenRa.Game.Graphics;
-
-namespace OpenRa.Game
-{
-	class Game
-	{
-		public readonly World world;
-		public readonly Map map;
-		public readonly TreeCache treeCache;
-		public readonly TerrainRenderer terrain;
-		public readonly Viewport viewport;
-		public readonly PathFinder pathFinder;
-		public readonly Network network;
-		public readonly WorldRenderer worldRenderer;
-		public readonly Controller controller;
-
-		int localPlayerIndex = 2;
-
-		public readonly Dictionary<int, Player> players = new Dictionary<int, Player>();
-
-		// temporary, until we remove all the subclasses of Building
-        public Dictionary<string, Func<int2, Player, PlayerOwned>> buildingCreation;
-
-		public Player LocalPlayer { get { return players[localPlayerIndex]; } }
-
-		public Game(string mapName, Renderer renderer, int2 clientSize)
-		{
-			Rules.LoadRules();
-
-			for( int i = 0 ; i < 8 ; i++ )
-				players.Add(i, new Player(i, string.Format("Multi{0}", i), OpenRa.TechTree.Race.Soviet));
-
-			map = new Map(new IniFile(FileSystem.Open(mapName)));
-			FileSystem.Mount(new Package(map.Theater + ".mix"));
-
-			viewport = new Viewport(clientSize, map.Size, renderer);
-
-			terrain = new TerrainRenderer(renderer, map, viewport);
-			world = new World(this);
-			treeCache = new TreeCache(map);
-
-			foreach (TreeReference treeReference in map.Trees)
-				world.Add(new Tree(treeReference, treeCache, map, this));
-
-			pathFinder = new PathFinder(map, terrain.tileSet);
-
-			network = new Network();
-
-            var buildings = new[] { "fact", "powr", "apwr", "barr", "atek", "stek", "dome" };
-            buildingCreation = buildings.ToDictionary(s => s, 
-                s => (Func<int2, Player, PlayerOwned>)(
-                    (l, o) => new Building(s, l, o, this)));
-
-            buildingCreation.Add("proc", (location, owner) => new Refinery(location, owner, this));
-            buildingCreation.Add("weap", (location, owner) => new WarFactory(location, owner, this));
-            buildingCreation.Add("3tnk", (location, owner) => new TurretedUnit("3tnk", location, owner, this));
-
-			controller = new Controller(this);		// CAREFUL THERES AN UGLY HIDDEN DEPENDENCY HERE STILL
-			worldRenderer = new WorldRenderer(renderer, world);
-		}
-
-		public void Tick()
-		{
-			var stuffFromOtherPlayers = network.Tick();	// todo: actually use the orders!
-			world.Update();
-
-			viewport.DrawRegions();
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+using OpenRa.FileFormats;
+using System.Linq;
+
+using OpenRa.Game.Graphics;
+
+namespace OpenRa.Game
+{
+	class Game
+	{
+		public readonly World world;
+		public readonly Map map;
+		public readonly TreeCache treeCache;
+		public readonly TerrainRenderer terrain;
+		public readonly Viewport viewport;
+		public readonly PathFinder pathFinder;
+		public readonly Network network;
+		public readonly WorldRenderer worldRenderer;
+		public readonly Controller controller;
+
+		int localPlayerIndex = 2;
+
+		public readonly Dictionary<int, Player> players = new Dictionary<int, Player>();
+
+		public Player LocalPlayer { get { return players[localPlayerIndex]; } }
+
+		public Game(string mapName, Renderer renderer, int2 clientSize)
+		{
+			Rules.LoadRules();
+
+			for( int i = 0 ; i < 8 ; i++ )
+				players.Add(i, new Player(i, string.Format("Multi{0}", i), OpenRa.TechTree.Race.Soviet));
+
+			map = new Map(new IniFile(FileSystem.Open(mapName)));
+			FileSystem.Mount(new Package(map.Theater + ".mix"));
+
+			viewport = new Viewport(clientSize, map.Size, renderer);
+
+			terrain = new TerrainRenderer(renderer, map, viewport);
+			world = new World(this);
+			treeCache = new TreeCache(map);
+
+			foreach( TreeReference treeReference in map.Trees )
+				world.Add( new Actor( treeReference, treeCache, map.Offset ) );
+
+			pathFinder = new PathFinder(map, terrain.tileSet);
+
+			network = new Network();
+
+			controller = new Controller(this);		// CAREFUL THERES AN UGLY HIDDEN DEPENDENCY HERE STILL
+			worldRenderer = new WorldRenderer(renderer, world);
+		}
+
+		public void Tick()
+		{
+			var stuffFromOtherPlayers = network.Tick();	// todo: actually use the orders!
+			world.Update();
+
+			viewport.DrawRegions();
+		}
+	}
+}
diff --git a/OpenRa.Game/Graphics/WorldRenderer.cs b/OpenRa.Game/Graphics/WorldRenderer.cs
index 08c7f49486..8a7339a83d 100644
--- a/OpenRa.Game/Graphics/WorldRenderer.cs
+++ b/OpenRa.Game/Graphics/WorldRenderer.cs
@@ -1,101 +1,101 @@
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace OpenRa.Game.Graphics
-{
-	class WorldRenderer
-	{
-		public readonly SpriteRenderer spriteRenderer;
-        public readonly LineRenderer lineRenderer;
-		public readonly World world;
-		public readonly Region region;
-		public readonly UiOverlay uiOverlay;
-
-		public WorldRenderer(Renderer renderer, World world)
-		{
-			// TODO: this is layout policy. it belongs at a higher level than this.
-
-			region = Region.Create(world.game.viewport, DockStyle.Left,
-				world.game.viewport.Width - 128, Draw, 
-                world.game.controller.HandleMouseInput);		
-
-			world.game.viewport.AddRegion(region);
-
-			spriteRenderer = new SpriteRenderer(renderer, true);
-            lineRenderer = new LineRenderer(renderer);
-			uiOverlay = new UiOverlay(spriteRenderer, world.game);
-			this.world = world;
-		}
-
-		public void Draw()
-		{
-			var rect = new RectangleF((region.Position + world.game.viewport.Location).ToPointF(), 
-                region.Size.ToSizeF());
-
-			foreach (Actor a in world.Actors)
-			{
-				var images = a.CurrentImages;
-
-				foreach( var image in images )
-				{
-					var loc = image.Second;
-
-					if( loc.X > rect.Right || loc.X < rect.Left - image.First.bounds.Width )
-						continue;
-					if( loc.Y > rect.Bottom || loc.Y < rect.Top - image.First.bounds.Height )
-						continue;
-
-					spriteRenderer.DrawSprite( image.First, loc, ( a.owner != null ) ? a.owner.Palette : 0 );
-				}
-			}
-
-            uiOverlay.Draw();
-
-			spriteRenderer.Flush();
-
-            var selbox = world.game.controller.SelectionBox();
-            if (selbox != null)
-            {
-                var a = selbox.Value.First;
-                var b = new float2(selbox.Value.Second.X - a.X, 0);
-                var c = new float2(0, selbox.Value.Second.Y - a.Y);
-
-                lineRenderer.DrawLine(a, a + b, Color.White, Color.White);
-                lineRenderer.DrawLine(a + b, a + b + c, Color.White, Color.White);
-                lineRenderer.DrawLine(a + b + c, a + c, Color.White, Color.White);
-                lineRenderer.DrawLine(a, a + c, Color.White, Color.White);
-
-                foreach (var u in Controller.FindUnits(world.game, selbox.Value.First, selbox.Value.Second))
-                    DrawSelectionBox(u, Color.Yellow);
-            }
-
-            var selectedUnit = world.game.controller.orderGenerator as Unit;
-            if (selectedUnit != null)
-                DrawSelectionBox(selectedUnit, Color.White);
-
-            
-            lineRenderer.Flush();
-		}
-
-        void DrawSelectionBox(Unit selectedUnit, Color c)
-        {
-            var center = selectedUnit.CenterLocation;
-            var size = selectedUnit.SelectedSize;
-
-            var xy = center - 0.5f * size;
-            var XY = center + 0.5f * size;
-            var Xy = new float2(XY.X, xy.Y);
-            var xY = new float2(xy.X, XY.Y);
-
-            lineRenderer.DrawLine(xy, xy + new float2(4, 0), c, c);
-            lineRenderer.DrawLine(xy, xy + new float2(0, 4), c, c);
-            lineRenderer.DrawLine(Xy, Xy + new float2(-4, 0), c, c);
-            lineRenderer.DrawLine(Xy, Xy + new float2(0, 4), c, c);
-
-            lineRenderer.DrawLine(xY, xY + new float2(4, 0), c, c);
-            lineRenderer.DrawLine(xY, xY + new float2(0, -4), c, c);
-            lineRenderer.DrawLine(XY, XY + new float2(-4, 0), c, c);
-            lineRenderer.DrawLine(XY, XY + new float2(0, -4), c, c);
-        }
-	}
-}
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace OpenRa.Game.Graphics
+{
+	class WorldRenderer
+	{
+		public readonly SpriteRenderer spriteRenderer;
+        public readonly LineRenderer lineRenderer;
+		public readonly World world;
+		public readonly Region region;
+		public readonly UiOverlay uiOverlay;
+
+		public WorldRenderer(Renderer renderer, World world)
+		{
+			// TODO: this is layout policy. it belongs at a higher level than this.
+
+			region = Region.Create(world.game.viewport, DockStyle.Left,
+				world.game.viewport.Width - 128, Draw, 
+                world.game.controller.HandleMouseInput);		
+
+			world.game.viewport.AddRegion(region);
+
+			spriteRenderer = new SpriteRenderer(renderer, true);
+            lineRenderer = new LineRenderer(renderer);
+			uiOverlay = new UiOverlay(spriteRenderer, world.game);
+			this.world = world;
+		}
+
+		public void Draw()
+		{
+			var rect = new RectangleF((region.Position + world.game.viewport.Location).ToPointF(), 
+                region.Size.ToSizeF());
+
+			foreach (Actor a in world.Actors)
+			{
+				var images = a.Render();
+
+				foreach( var image in images )
+				{
+					var loc = image.Second;
+
+					if( loc.X > rect.Right || loc.X < rect.Left - image.First.bounds.Width )
+						continue;
+					if( loc.Y > rect.Bottom || loc.Y < rect.Top - image.First.bounds.Height )
+						continue;
+
+					spriteRenderer.DrawSprite( image.First, loc, ( a.Owner != null ) ? a.Owner.Palette : 0 );
+				}
+			}
+
+            uiOverlay.Draw();
+
+			spriteRenderer.Flush();
+
+            var selbox = world.game.controller.SelectionBox();
+            if (selbox != null)
+            {
+                var a = selbox.Value.First;
+                var b = new float2(selbox.Value.Second.X - a.X, 0);
+                var c = new float2(0, selbox.Value.Second.Y - a.Y);
+
+                lineRenderer.DrawLine(a, a + b, Color.White, Color.White);
+                lineRenderer.DrawLine(a + b, a + b + c, Color.White, Color.White);
+                lineRenderer.DrawLine(a + b + c, a + c, Color.White, Color.White);
+                lineRenderer.DrawLine(a, a + c, Color.White, Color.White);
+
+                foreach (var u in Controller.FindUnits(world.game, selbox.Value.First, selbox.Value.Second))
+                    DrawSelectionBox(u, Color.Yellow);
+            }
+
+            var selectedUnit = world.game.controller.orderGenerator as Actor;
+            if (selectedUnit != null)
+                DrawSelectionBox(selectedUnit, Color.White);
+
+            
+            lineRenderer.Flush();
+		}
+
+        void DrawSelectionBox(Actor selectedUnit, Color c)
+        {
+            var center = selectedUnit.CenterLocation;
+            var size = selectedUnit.SelectedSize;
+
+            var xy = center - 0.5f * size;
+            var XY = center + 0.5f * size;
+            var Xy = new float2(XY.X, xy.Y);
+            var xY = new float2(xy.X, XY.Y);
+
+            lineRenderer.DrawLine(xy, xy + new float2(4, 0), c, c);
+            lineRenderer.DrawLine(xy, xy + new float2(0, 4), c, c);
+            lineRenderer.DrawLine(Xy, Xy + new float2(-4, 0), c, c);
+            lineRenderer.DrawLine(Xy, Xy + new float2(0, 4), c, c);
+
+            lineRenderer.DrawLine(xY, xY + new float2(4, 0), c, c);
+            lineRenderer.DrawLine(xY, xY + new float2(0, -4), c, c);
+            lineRenderer.DrawLine(XY, XY + new float2(-4, 0), c, c);
+            lineRenderer.DrawLine(XY, XY + new float2(0, -4), c, c);
+        }
+	}
+}
diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs
index b283c771f9..4ca6ebb756 100644
--- a/OpenRa.Game/MainWindow.cs
+++ b/OpenRa.Game/MainWindow.cs
@@ -1,125 +1,125 @@
-using System.Drawing;
-using System.Windows.Forms;
-using OpenRa.FileFormats;
-using OpenRa.Game.Graphics;
-using OpenRa.TechTree;
-
-namespace OpenRa.Game
-{
-	using GRegion = OpenRa.Game.Graphics.Region;
-
-	class MainWindow : Form
-	{
-		readonly Renderer renderer;
-		
-		Game game;
-		public readonly Sidebar sidebar;
-
-		static Size GetResolution(Settings settings)
-		{
-			Size desktopResolution = Screen.PrimaryScreen.Bounds.Size;
-
-			return new Size(settings.GetValue("width", desktopResolution.Width),
-				settings.GetValue("height", desktopResolution.Height));
-		}
-
-		public MainWindow(Settings settings)
-		{
-			FileSystem.Mount(new Folder("../../../../"));
-			FileSystem.Mount(new Package("redalert.mix"));
-			FileSystem.Mount(new Package("conquer.mix"));
-			FileSystem.Mount(new Package("hires.mix"));
-
-			FormBorderStyle = FormBorderStyle.None;
-			BackColor = Color.Black;
-			StartPosition = FormStartPosition.Manual;
-			Location = Point.Empty;
-			Visible = true;
-
-			bool windowed = !settings.GetValue("fullscreen", false);
-			renderer = new Renderer(this, GetResolution(settings), windowed);
-			SheetBuilder.Initialize(renderer);
-
-			game = new Game(settings.GetValue("map", "scg11eb.ini"), renderer, new int2(ClientSize));
-
-			SequenceProvider.ForcePrecache();
-
-			game.world.Add(new Unit("mcv", new int2(5, 5), game.players[3], game));
-			game.world.Add(new Unit("mcv", new int2(7, 5), game.players[2], game));
-			game.world.Add(new Unit("mcv", new int2(9, 5), game.players[1], game));
-			game.world.Add(new TurretedUnit("jeep", new int2(9, 7), game.players[1], game));
-
-			sidebar = new Sidebar(Race.Soviet, renderer, game);
-
-			renderer.SetPalette(new HardwarePalette(renderer, game.map));
-		}
-
-		internal void Run()
-		{
-			while (Created && Visible)
-			{
-				game.Tick();
-				Application.DoEvents();
-			}
-		}
-
-		int2 lastPos;
-
-        protected override void OnMouseDown(MouseEventArgs e)
-        {
-            base.OnMouseDown(e);
-            lastPos = new int2(e.Location);
-
-            game.viewport.DispatchMouseInput(new MouseInput
-                {
-                    Button = e.Button,
-                    Event = MouseInputEvent.Down,
-                    Location = new int2(e.Location)
-                });
-        }
-
-		protected override void OnMouseMove(MouseEventArgs e)
-		{
-			base.OnMouseMove(e);
-
-			if (e.Button == MouseButtons.Middle)
-			{
-				int2 p = new int2(e.Location);
-				game.viewport.Scroll(lastPos - p);
-				lastPos = p;
-			}
-
-            game.viewport.DispatchMouseInput(new MouseInput
-            {
-                Button = e.Button,
-                Event = MouseInputEvent.Move,
-                Location = new int2(e.Location)
-            });
-
-			if (game.controller.orderGenerator != null)
-				game.controller.orderGenerator.PrepareOverlay(game, 
-					new int2(e.Location.X / 24, e.Location.Y / 24));
-		}
-
-        protected override void OnMouseUp(MouseEventArgs e)
-        {
-            base.OnMouseUp(e);
-
-            game.viewport.DispatchMouseInput(new MouseInput
-            {
-                Button = e.Button,
-                Event = MouseInputEvent.Up,
-                Location = new int2(e.Location)
-            });
-        }
-	}
-
-    struct MouseInput
-    {
-        public MouseInputEvent Event;
-        public int2 Location;
-        public MouseButtons Button;
-    }
-
-    enum MouseInputEvent { Down, Move, Up };
-}
+using System.Drawing;
+using System.Windows.Forms;
+using OpenRa.FileFormats;
+using OpenRa.Game.Graphics;
+using OpenRa.TechTree;
+
+namespace OpenRa.Game
+{
+	using GRegion = OpenRa.Game.Graphics.Region;
+
+	class MainWindow : Form
+	{
+		readonly Renderer renderer;
+		
+		Game game;
+		public readonly Sidebar sidebar;
+
+		static Size GetResolution(Settings settings)
+		{
+			Size desktopResolution = Screen.PrimaryScreen.Bounds.Size;
+
+			return new Size(settings.GetValue("width", desktopResolution.Width),
+				settings.GetValue("height", desktopResolution.Height));
+		}
+
+		public MainWindow(Settings settings)
+		{
+			FileSystem.Mount(new Folder("../../../../"));
+			FileSystem.Mount(new Package("redalert.mix"));
+			FileSystem.Mount(new Package("conquer.mix"));
+			FileSystem.Mount(new Package("hires.mix"));
+
+			FormBorderStyle = FormBorderStyle.None;
+			BackColor = Color.Black;
+			StartPosition = FormStartPosition.Manual;
+			Location = Point.Empty;
+			Visible = true;
+
+			bool windowed = !settings.GetValue("fullscreen", false);
+			renderer = new Renderer(this, GetResolution(settings), windowed);
+			SheetBuilder.Initialize(renderer);
+
+			game = new Game(settings.GetValue("map", "scg11eb.ini"), renderer, new int2(ClientSize));
+
+			SequenceProvider.ForcePrecache();
+
+			game.world.Add( new Actor( "mcv", new int2( 5, 5 ), game.players[ 3 ]) );
+			game.world.Add( new Actor( "mcv", new int2( 7, 5 ), game.players[ 2 ] ) );
+			game.world.Add( new Actor( "mcv", new int2( 9, 5 ), game.players[ 1 ] ) );
+			game.world.Add( new Actor( "jeep", new int2( 9, 7 ), game.players[ 1 ] ) );
+
+			sidebar = new Sidebar(Race.Soviet, renderer, game);
+
+			renderer.SetPalette(new HardwarePalette(renderer, game.map));
+		}
+
+		internal void Run()
+		{
+			while (Created && Visible)
+			{
+				game.Tick();
+				Application.DoEvents();
+			}
+		}
+
+		int2 lastPos;
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+            lastPos = new int2(e.Location);
+
+            game.viewport.DispatchMouseInput(new MouseInput
+                {
+                    Button = e.Button,
+                    Event = MouseInputEvent.Down,
+                    Location = new int2(e.Location)
+                });
+        }
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			if (e.Button == MouseButtons.Middle)
+			{
+				int2 p = new int2(e.Location);
+				game.viewport.Scroll(lastPos - p);
+				lastPos = p;
+			}
+
+            game.viewport.DispatchMouseInput(new MouseInput
+            {
+                Button = e.Button,
+                Event = MouseInputEvent.Move,
+                Location = new int2(e.Location)
+            });
+
+			if (game.controller.orderGenerator != null)
+				game.controller.orderGenerator.PrepareOverlay(game, 
+					new int2(e.Location.X / 24, e.Location.Y / 24));
+		}
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            game.viewport.DispatchMouseInput(new MouseInput
+            {
+                Button = e.Button,
+                Event = MouseInputEvent.Up,
+                Location = new int2(e.Location)
+            });
+        }
+	}
+
+    struct MouseInput
+    {
+        public MouseInputEvent Event;
+        public int2 Location;
+        public MouseButtons Button;
+    }
+
+    enum MouseInputEvent { Down, Move, Up };
+}
diff --git a/OpenRa.Game/MoveOrder.cs b/OpenRa.Game/MoveOrder.cs
index 80cbf96671..844522b55d 100644
--- a/OpenRa.Game/MoveOrder.cs
+++ b/OpenRa.Game/MoveOrder.cs
@@ -1,58 +1,60 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenRa.Game
-{
-	abstract class Order
-	{
-		public abstract void Apply( Game game );
-	}
-
-	class MoveOrder : Order
-	{
-		public readonly Unit Unit;
-		public readonly int2 Destination;
-
-		public MoveOrder(Unit unit, int2 destination)
-		{
-			this.Unit = unit;
-			this.Destination = destination;
-		}
-
-		public override void Apply( Game game )
-		{
-			Unit.nextOrder = UnitMissions.Move( Unit, Destination );
-		}
-	}
-
-	class DeployMcvOrder : Order
-	{
-		Unit unit;
-
-		public DeployMcvOrder( Unit unit )
-		{
-			this.unit = unit;
-		}
-
-		public override void Apply( Game game )
-		{
-			unit.nextOrder = UnitMissions.Deploy( unit );
-		}
-	}
-
-	class HarvestOrder : Order
-	{
-		Unit unit;
-
-		public HarvestOrder( Unit unit )
-		{
-			this.unit = unit;
-		}
-
-		public override void Apply( Game game )
-		{
-			unit.nextOrder = UnitMissions.Harvest( unit );
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenRa.Game
+{
+	abstract class Order
+	{
+		public abstract void Apply( Game game );
+	}
+
+	class MoveOrder : Order
+	{
+		public readonly Actor Unit;
+		public readonly int2 Destination;
+
+		public MoveOrder( Actor unit, int2 destination )
+		{
+			this.Unit = unit;
+			this.Destination = destination;
+		}
+
+		public override void Apply( Game game )
+		{
+			Unit.traits.Get<Traits.Mobile>().destination = Destination;
+		}
+	}
+
+	class DeployMcvOrder : Order
+	{
+		Actor Unit;
+
+		public DeployMcvOrder( Actor unit )
+		{
+			Unit = unit;
+		}
+
+		public override void Apply( Game game )
+		{
+			Unit.traits.Get<Traits.McvDeploy>().Deploying = true;
+			var mobile = Unit.traits.Get<Traits.Mobile>();
+			mobile.destination = mobile.toCell;
+		}
+	}
+
+	//class HarvestOrder : Order
+	//{
+	//    Unit unit;
+
+	//    public HarvestOrder( Unit unit )
+	//    {
+	//        this.unit = unit;
+	//    }
+
+	//    public override void Apply( Game game )
+	//    {
+	//        unit.nextOrder = UnitMissions.Harvest( unit );
+	//    }
+	//}
+}
diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index 15c3770857..62cf0d3fbd 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -75,7 +75,6 @@
     <Compile Include="GameRules\Rules.cs" />
     <Compile Include="GameRules\UnitInfo.cs" />
     <Compile Include="Graphics\Animation.cs" />
-    <Compile Include="Building.cs" />
     <Compile Include="Game.cs" />
     <Compile Include="Graphics\LineRenderer.cs" />
     <Compile Include="Graphics\WorldRenderer.cs" />
@@ -83,7 +82,6 @@
     <Compile Include="TechTree\Item.cs" />
     <Compile Include="Network\Packet.cs" />
     <Compile Include="Player.cs" />
-    <Compile Include="PlayerOwned.cs" />
     <Compile Include="Race.cs" />
     <Compile Include="Support\SharedResources.cs" />
     <Compile Include="Graphics\Sheet.cs" />
@@ -101,7 +99,6 @@
     </Compile>
     <Compile Include="Support\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Refinery.cs" />
     <Compile Include="Graphics\Renderer.cs" />
     <Compile Include="Support\Settings.cs" />
     <Compile Include="Sidebar.cs" />
@@ -112,15 +109,14 @@
     <Compile Include="TechTree\TechTree.cs" />
     <Compile Include="TerrainCosts.cs" />
     <Compile Include="Graphics\TerrainRenderer.cs" />
-    <Compile Include="Tree.cs" />
     <Compile Include="Graphics\TreeCache.cs" />
     <Compile Include="UiOverlay.cs" />
-    <Compile Include="Unit.cs" />
     <Compile Include="UnitMissions.cs" />
     <Compile Include="Graphics\UnitSheetBuilder.cs" />
     <Compile Include="Graphics\Util.cs" />
     <Compile Include="Graphics\Vertex.cs" />
     <Compile Include="Graphics\Viewport.cs" />
+    <Compile Include="UnitOrderGenerator.cs" />
     <Compile Include="World.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/OpenRa.Game/PlayerOwned.cs b/OpenRa.Game/PlayerOwned.cs
deleted file mode 100644
index 8c65b3866f..0000000000
--- a/OpenRa.Game/PlayerOwned.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Collections.Generic;
-using OpenRa.Game.Graphics;
-using IjwFramework.Types;
-
-namespace OpenRa.Game
-{
-	abstract class PlayerOwned : Actor
-	{
-		public Animation animation;
-		protected int2 location;
-
-		public UnitMission currentOrder = null;
-		public UnitMission nextOrder = null;
-
-		protected PlayerOwned( Game game, string name, int2 location )
-			: base( game )
-		{
-			animation = new Animation( name );
-			this.location = location;
-		}
-
-		public override IEnumerable<Pair<Sprite, float2>> CurrentImages { get { yield return Pair.New( animation.Image, 24 * (float2)location ); } }
-	}
-}
- 
\ No newline at end of file
diff --git a/OpenRa.Game/Refinery.cs b/OpenRa.Game/Refinery.cs
deleted file mode 100644
index c21facc991..0000000000
--- a/OpenRa.Game/Refinery.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using OpenRa.Game.Graphics;
-using System.Linq;
-using System.Collections.Generic;
-using IjwFramework.Types;
-
-namespace OpenRa.Game
-{
-	class Refinery : Building
-	{
-		public Refinery( int2 location, Player owner, Game game )
-			: base( "proc", location, owner, game )
-		{
-			animation.PlayThen("make", () =>
-			{
-				animation.PlayRepeating("idle");
-
-				game.world.AddFrameEndTask( _ =>
-				{
-					Unit harvester = new Unit( "harv", location + new int2( 1, 2 ), owner, game );
-					harvester.facing = 8;
-					game.world.Add(harvester);
-					game.controller.orderGenerator = harvester;
-				});
-			});
-		}
-	}
-
-    class WarFactory : Building
-    {
-        Animation roof;
-
-        public WarFactory(int2 location, Player owner, Game game)
-            : base("weap", location, owner, game)
-        {
-            
-            animation.PlayThen("make", () =>
-                {
-                    roof = new Animation("weap");
-                    animation.PlayRepeating("idle");
-                    roof.PlayRepeating("idle-top");
-                });
-        }
-
-        public override IEnumerable<Pair<Sprite,float2>> CurrentImages
-        {
-            get
-            {
-                return (roof == null)
-                    ? base.CurrentImages
-                    : (base.CurrentImages.Concat(
-                    new[] { Pair.New(roof.Image, 24 * (float2)location) }));
-            }
-        }
-
-        public override void Tick(Game game, int t)
-        {
-            base.Tick(game, t);
-            if (roof != null) roof.Tick(t);
-        }
-    }
-}
diff --git a/OpenRa.Game/Sidebar.cs b/OpenRa.Game/Sidebar.cs
index cf505ce680..c412453c8d 100644
--- a/OpenRa.Game/Sidebar.cs
+++ b/OpenRa.Game/Sidebar.cs
@@ -1,225 +1,222 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-using OpenRa.FileFormats;
-using OpenRa.Game.Graphics;
-using OpenRa.TechTree;
-using System.Linq;
-
-namespace OpenRa.Game
-{
-	using GRegion = OpenRa.Game.Graphics.Region;
-
-	class Sidebar
-	{
-		TechTree.TechTree techTree;
-
-		SpriteRenderer spriteRenderer, clockRenderer;
-		Sprite blank;
-		Game game;
-		readonly GRegion region;
-
-		public GRegion Region { get { return region; } }
-		public float Width { get { return spriteWidth * 2; } }
-
-		Dictionary<string, Sprite> sprites = new Dictionary<string,Sprite>();
-		const int spriteWidth = 64, spriteHeight = 48;
-
-		static string[] groups = new string[] { "building", "vehicle", "boat", "infantry", "plane" };
-
-		Dictionary<string, string> itemGroups = new Dictionary<string,string>();				//item->group
-		Dictionary<string, Animation> clockAnimations = new Dictionary<string,Animation>();		//group->clockAnimation
-		Dictionary<string, SidebarItem> selectedItems = new Dictionary<string,SidebarItem>();	//group->selectedItem
-		
-		List<SidebarItem> items = new List<SidebarItem>();
-		
-		public Sidebar( Race race, Renderer renderer, Game game )
-		{
-			this.techTree = game.LocalPlayer.TechTree;
-            this.techTree.BuildableItemsChanged += PopulateItemList;
-			this.game = game;
-			region = GRegion.Create(game.viewport, DockStyle.Right, 128, Paint, MouseHandler);
-			game.viewport.AddRegion( region );
-			spriteRenderer = new SpriteRenderer(renderer, false);
-			clockRenderer = new SpriteRenderer(renderer, true);
-
-			LoadSprites("buildings.txt");
-			LoadSprites("vehicles.txt");
-			LoadSprites("infantry.txt");
-
-			foreach (string s in groups)
-			{
-				clockAnimations.Add(s, new Animation("clock"));
-				clockAnimations[s].PlayRepeating("idle");
-				selectedItems.Add(s, null);
-			}
-
-			blank = SheetBuilder.Add(new Size((int)spriteWidth, (int)spriteHeight), 16);
-		}
-
-		public void Build(SidebarItem item)
-		{
-			if (item != null)
-				game.controller.orderGenerator = new PlaceBuilding(game.LocalPlayer, item.techTreeItem.tag.ToLowerInvariant());
-		}
-
-		void LoadSprites(string filename)
-		{
-			foreach (string line in Util.ReadAllLines(FileSystem.Open(filename)))
-			{
-				string key = line.Substring(0, line.IndexOf(','));
-				int secondComma = line.IndexOf(',', line.IndexOf(',') + 1);
-				string group = line.Substring(secondComma + 1, line.Length - secondComma - 1);
-				sprites.Add(key, SpriteSheetBuilder.LoadSprite(key + "icon.shp"));
-				itemGroups.Add(key, group);
-			}
-		}
-
-		void DrawSprite(Sprite s, ref float2 p)
-		{
-			spriteRenderer.DrawSprite(s, p, 0);
-			p.Y += spriteHeight;
-		}
-
-		void Fill(float height, float2 p)
-		{
-			while (p.Y < height)
-				DrawSprite(blank, ref p);
-		}
-
-		int buildPos = 0;
-		int unitPos = 0;
-
-		void PopulateItemList()
-		{
-			buildPos = 0; unitPos = 0;
-
-			items.Clear();
-
-			foreach (Item i in techTree.BuildableItems)
-			{
-				Sprite sprite;
-				if (!sprites.TryGetValue(i.tag, out sprite)) continue;
-
-				items.Add(new SidebarItem(sprite, i, i.IsStructure ? buildPos : unitPos));
-
-				if (i.IsStructure)
-					buildPos += spriteHeight;
-				else
-					unitPos += spriteHeight;
-			}
-
-			foreach (string g in groups) selectedItems[g] = null;
-		}
-
-		void Paint()
-		{
-			foreach (SidebarItem i in items)
-				i.Paint(spriteRenderer, region.Location);
-
-			Fill(region.Size.Y + region.Location.Y, new float2(region.Location.X, buildPos + region.Location.Y));
-			Fill(region.Size.Y + region.Location.Y, new float2(region.Location.X + spriteWidth, unitPos + region.Location.Y));
-
-			spriteRenderer.Flush();
-
-			foreach (var kvp in selectedItems)
-			{
-				if (kvp.Value != null)
-				{
-					clockRenderer.DrawSprite(clockAnimations[kvp.Key].Image, region.Location.ToFloat2() + kvp.Value.location, 0);
-					clockAnimations[kvp.Key].Tick(1);
-				}
-			}
-			
-			clockRenderer.Flush();
-		}
-
-		public SidebarItem GetItem(float2 point)
-		{
-			foreach (SidebarItem i in items)
-				if (i.Clicked(point))
-					return i;
-
-			return null;
-		}
-
-		void MouseHandler(MouseInput mi)
-		{
-            if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Down)
-            {
-                var point = new float2(mi.Location.X, mi.Location.Y);
-				var item = GetItem(point);
-				if (item != null)
-				{
-					string group = itemGroups[item.techTreeItem.tag];
-					if (selectedItems[group] == null)
-					{
-						selectedItems[group] = item;
-						Build(item);
-					}
-				}
-            }
-			else if( mi.Button == MouseButtons.Right && mi.Event == MouseInputEvent.Down )
-			{
-                var point = new float2(mi.Location.X, mi.Location.Y);
-				var item = GetItem(point);
-				if( item != null )
-				{
-					string group = itemGroups[ item.techTreeItem.tag ];
-					selectedItems[ group ] = null;
-				}
-			}
-		}
-	}
-
-	class PlaceBuilding : IOrderGenerator
-	{
-		public readonly Player Owner;
-		public readonly string Name;
-
-		public PlaceBuilding( Player owner, string name )
-		{
-			Owner = owner;
-			Name = name;
-		}
-
-		public IEnumerable<Order> Order( Game game, int2 xy )
-		{
-			// todo: check that space is free
-			yield return new PlaceBuildingOrder( this, xy );
-		}
-
-		public void PrepareOverlay(Game game, int2 xy)
-		{
-			game.worldRenderer.uiOverlay.SetCurrentOverlay(xy, 2, 3);
-		}
-	}
-
-	class PlaceBuildingOrder : Order
-	{
-		PlaceBuilding building;
-		int2 xy;
-
-		public PlaceBuildingOrder(PlaceBuilding building, int2 xy)
-		{
-			this.building = building;
-			this.xy = xy;
-		}
-
-		public override void Apply(Game game)
-		{
-			game.world.AddFrameEndTask(_ =>
-			{
-				Func<int2, Player, PlayerOwned> newBuilding;
-				if (game.buildingCreation.TryGetValue(building.Name, out newBuilding))
-				{
-					Log.Write("Player \"{0}\" builds {1}", building.Owner.PlayerName, building.Name);
-					game.world.Add(newBuilding(xy, building.Owner));
-				}
-				game.controller.orderGenerator = null;
-				game.worldRenderer.uiOverlay.KillOverlay();
-			});
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using OpenRa.FileFormats;
+using OpenRa.Game.Graphics;
+using OpenRa.TechTree;
+using System.Linq;
+
+namespace OpenRa.Game
+{
+	using GRegion = OpenRa.Game.Graphics.Region;
+
+	class Sidebar
+	{
+		TechTree.TechTree techTree;
+
+		SpriteRenderer spriteRenderer, clockRenderer;
+		Sprite blank;
+		Game game;
+		readonly GRegion region;
+
+		public GRegion Region { get { return region; } }
+		public float Width { get { return spriteWidth * 2; } }
+
+		Dictionary<string, Sprite> sprites = new Dictionary<string,Sprite>();
+		const int spriteWidth = 64, spriteHeight = 48;
+
+		static string[] groups = new string[] { "building", "vehicle", "boat", "infantry", "plane" };
+
+		Dictionary<string, string> itemGroups = new Dictionary<string,string>();				//item->group
+		Dictionary<string, Animation> clockAnimations = new Dictionary<string,Animation>();		//group->clockAnimation
+		Dictionary<string, SidebarItem> selectedItems = new Dictionary<string,SidebarItem>();	//group->selectedItem
+		
+		List<SidebarItem> items = new List<SidebarItem>();
+		
+		public Sidebar( Race race, Renderer renderer, Game game )
+		{
+			this.techTree = game.LocalPlayer.TechTree;
+            this.techTree.BuildableItemsChanged += PopulateItemList;
+			this.game = game;
+			region = GRegion.Create(game.viewport, DockStyle.Right, 128, Paint, MouseHandler);
+			game.viewport.AddRegion( region );
+			spriteRenderer = new SpriteRenderer(renderer, false);
+			clockRenderer = new SpriteRenderer(renderer, true);
+
+			LoadSprites("buildings.txt");
+			LoadSprites("vehicles.txt");
+			LoadSprites("infantry.txt");
+
+			foreach (string s in groups)
+			{
+				clockAnimations.Add(s, new Animation("clock"));
+				clockAnimations[s].PlayRepeating("idle");
+				selectedItems.Add(s, null);
+			}
+
+			blank = SheetBuilder.Add(new Size((int)spriteWidth, (int)spriteHeight), 16);
+		}
+
+		public void Build(SidebarItem item)
+		{
+			if (item != null)
+				game.controller.orderGenerator = new PlaceBuilding(game.LocalPlayer, item.techTreeItem.tag.ToLowerInvariant());
+		}
+
+		void LoadSprites(string filename)
+		{
+			foreach (string line in Util.ReadAllLines(FileSystem.Open(filename)))
+			{
+				string key = line.Substring(0, line.IndexOf(','));
+				int secondComma = line.IndexOf(',', line.IndexOf(',') + 1);
+				string group = line.Substring(secondComma + 1, line.Length - secondComma - 1);
+				sprites.Add(key, SpriteSheetBuilder.LoadSprite(key + "icon.shp"));
+				itemGroups.Add(key, group);
+			}
+		}
+
+		void DrawSprite(Sprite s, ref float2 p)
+		{
+			spriteRenderer.DrawSprite(s, p, 0);
+			p.Y += spriteHeight;
+		}
+
+		void Fill(float height, float2 p)
+		{
+			while (p.Y < height)
+				DrawSprite(blank, ref p);
+		}
+
+		int buildPos = 0;
+		int unitPos = 0;
+
+		void PopulateItemList()
+		{
+			buildPos = 0; unitPos = 0;
+
+			items.Clear();
+
+			foreach (Item i in techTree.BuildableItems)
+			{
+				Sprite sprite;
+				if (!sprites.TryGetValue(i.tag, out sprite)) continue;
+
+				items.Add(new SidebarItem(sprite, i, i.IsStructure ? buildPos : unitPos));
+
+				if (i.IsStructure)
+					buildPos += spriteHeight;
+				else
+					unitPos += spriteHeight;
+			}
+
+			foreach (string g in groups) selectedItems[g] = null;
+		}
+
+		void Paint()
+		{
+			foreach (SidebarItem i in items)
+				i.Paint(spriteRenderer, region.Location);
+
+			Fill(region.Size.Y + region.Location.Y, new float2(region.Location.X, buildPos + region.Location.Y));
+			Fill(region.Size.Y + region.Location.Y, new float2(region.Location.X + spriteWidth, unitPos + region.Location.Y));
+
+			spriteRenderer.Flush();
+
+			foreach (var kvp in selectedItems)
+			{
+				if (kvp.Value != null)
+				{
+					clockRenderer.DrawSprite(clockAnimations[kvp.Key].Image, region.Location.ToFloat2() + kvp.Value.location, 0);
+					clockAnimations[kvp.Key].Tick(1);
+				}
+			}
+			
+			clockRenderer.Flush();
+		}
+
+		public SidebarItem GetItem(float2 point)
+		{
+			foreach (SidebarItem i in items)
+				if (i.Clicked(point))
+					return i;
+
+			return null;
+		}
+
+		void MouseHandler(MouseInput mi)
+		{
+            if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Down)
+            {
+                var point = new float2(mi.Location.X, mi.Location.Y);
+				var item = GetItem(point);
+				if (item != null)
+				{
+					string group = itemGroups[item.techTreeItem.tag];
+					if (selectedItems[group] == null)
+					{
+						selectedItems[group] = item;
+						Build(item);
+					}
+				}
+            }
+			else if( mi.Button == MouseButtons.Right && mi.Event == MouseInputEvent.Down )
+			{
+                var point = new float2(mi.Location.X, mi.Location.Y);
+				var item = GetItem(point);
+				if( item != null )
+				{
+					string group = itemGroups[ item.techTreeItem.tag ];
+					selectedItems[ group ] = null;
+				}
+			}
+		}
+	}
+
+	class PlaceBuilding : IOrderGenerator
+	{
+		public readonly Player Owner;
+		public readonly string Name;
+
+		public PlaceBuilding( Player owner, string name )
+		{
+			Owner = owner;
+			Name = name;
+		}
+
+		public IEnumerable<Order> Order( Game game, int2 xy )
+		{
+			// todo: check that space is free
+			yield return new PlaceBuildingOrder( this, xy );
+		}
+
+		public void PrepareOverlay(Game game, int2 xy)
+		{
+			game.worldRenderer.uiOverlay.SetCurrentOverlay(xy, 2, 3);
+		}
+	}
+
+	class PlaceBuildingOrder : Order
+	{
+		PlaceBuilding building;
+		int2 xy;
+
+		public PlaceBuildingOrder(PlaceBuilding building, int2 xy)
+		{
+			this.building = building;
+			this.xy = xy;
+		}
+
+		public override void Apply(Game game)
+		{
+			game.world.AddFrameEndTask(_ =>
+			{
+				Log.Write( "Player \"{0}\" builds {1}", building.Owner.PlayerName, building.Name );
+				game.world.Add( new Actor( building.Name, xy, building.Owner ) );
+	
+				game.controller.orderGenerator = null;
+				game.worldRenderer.uiOverlay.KillOverlay();
+			});
+		}
+	}
+}
diff --git a/OpenRa.Game/Tree.cs b/OpenRa.Game/Tree.cs
deleted file mode 100644
index e295eea0e5..0000000000
--- a/OpenRa.Game/Tree.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenRa.FileFormats;
-using System.Drawing;
-using OpenRa.Game.Graphics;
-using IjwFramework.Types;
-
-namespace OpenRa.Game
-{
-	class Tree : Actor
-	{
-		int2 location;
-
-		public Tree(TreeReference r, TreeCache renderer, Map map, Game game)
-			: base( game )
-		{
-			location = new int2( r.Location ) - map.Offset;
-			currentImages = new Sprite[] { renderer.GetImage(r.Image) };
-		}
-
-		Sprite[] currentImages;
-		public override IEnumerable<Pair<Sprite, float2>> CurrentImages
-		{
-			get
-			{
-				foreach( var x in currentImages )
-					yield return Pair.New( x, 24 * (float2)location );
-			}
-		}
-	}
-}
diff --git a/OpenRa.Game/Unit.cs b/OpenRa.Game/Unit.cs
deleted file mode 100644
index 543aa0d983..0000000000
--- a/OpenRa.Game/Unit.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using IjwFramework.Types;
-using OpenRa.Game.GameRules;
-using OpenRa.Game.Graphics;
-
-namespace OpenRa.Game
-{
-	class Unit : PlayerOwned, IOrderGenerator
-	{
-		public int facing = 0;
-		public int2 fromCell;
-		public int2 toCell
-		{
-			get { return location; }
-			set { location = value; }
-		}
-
-		public int moveFraction, moveFractionTotal;
-
-		readonly float2 renderOffset;
-		public readonly UnitInfo.MobileInfo unitInfo;
-
-		public Unit( string name, int2 cell, Player owner, Game game )
-			: base( game, name, cell )
-		{
-			fromCell = toCell = cell;
-
-			this.owner = owner;
-			this.unitInfo = (UnitInfo.MobileInfo)Rules.UnitInfo.Get( name );
-
-			animation.PlayFetchIndex( "idle", () => facing );
-			renderOffset = animation.Center;
-		}
-
-		static float2[] fvecs = Util.MakeArray<float2>(32,
-			i => -float2.FromAngle(i / 16.0f * (float)Math.PI) * new float2(1f, 1.3f));
-
-		public int GetFacing( float2 d )
-		{
-			if( float2.WithinEpsilon( d, float2.Zero, 0.001f ) )
-				return facing;
-
-			int highest = -1;
-			float highestDot = -1.0f;
-
-			for( int i = 0 ; i < fvecs.Length ; i++ )
-			{
-				float dot = float2.Dot( fvecs[ i ], d );
-				if( dot > highestDot )
-				{
-					highestDot = dot;
-					highest = i;
-				}
-			}
-
-			return highest;
-		}
-
-		public override void Tick( Game game, int t )
-		{
-			animation.Tick( t );
-			if( currentOrder == null && nextOrder != null )
-			{
-				currentOrder = nextOrder;
-				nextOrder = null;
-			}
-
-			if( currentOrder != null )
-				currentOrder( t );
-		}
-
-		public override IEnumerable<Pair<Sprite, float2>> CurrentImages
-		{
-			get
-			{
-				yield return Centered( animation.Image, CenterLocation );
-			}
-		}
-
-		public float2 CenterLocation
-		{
-			get
-			{
-				float fraction = ( moveFraction > 0 ) ? (float)moveFraction / moveFractionTotal : 0f;
-				return new float2( 12, 12 ) + 24 * float2.Lerp( fromCell, toCell, fraction );
-			}
-		}
-
-		bool SupportsMission( SupportedMissions mission )
-		{
-			if( mission == SupportedMissions.Deploy )
-				return this.unitInfo.Name == "MCV";
-			if( mission == SupportedMissions.Harvest )
-				return this.unitInfo.Name == "HARV";
-			return false;
-		}
-
-		public IEnumerable<Order> Order( Game game, int2 xy )
-		{
-			if( ( fromCell == toCell || moveFraction == 0 ) && fromCell == xy )
-			{
-				if( SupportsMission( SupportedMissions.Deploy ) )
-					yield return new DeployMcvOrder( this );
-				if( SupportsMission( SupportedMissions.Harvest ) )
-					yield return new HarvestOrder( this );
-			}
-			else
-				yield return new MoveOrder( this, xy );
-		}
-
-		public void PrepareOverlay(Game game, int2 xy) { }
-
-		protected static Pair<Sprite, float2> Centered( Sprite s, float2 location )
-		{
-			var loc = location - 0.5f * s.size;
-			return Pair.New( s, loc.Round() );
-		}
-
-        public float2 SelectedSize { get { return this.CurrentImages.First().First.size; } }
-        public System.Drawing.RectangleF Bounds
-        {
-            get
-            {
-                var size = SelectedSize;
-                var loc = CenterLocation - 0.5f * size;
-                return new System.Drawing.RectangleF(loc.X, loc.Y, size.X, size.Y);
-            }
-        }
-	}
-
-	class TurretedUnit : Unit
-	{
-		Animation turretAnim;
-		int turretFacing { get { return facing; } }
-
-		public TurretedUnit( string name, int2 cell, Player owner, Game game )
-			: base( name, cell, owner, game )
-		{
-			turretAnim = new Animation( name );
-			turretAnim.PlayFetchIndex( "turret", () => turretFacing );
-		}
-
-		public override IEnumerable<Pair<Sprite, float2>> CurrentImages
-		{
-            get { return base.CurrentImages.Concat(new[] { Centered(turretAnim.Image, CenterLocation) }); }
-		}
-	}
-}
diff --git a/OpenRa.Game/UnitMissions.cs b/OpenRa.Game/UnitMissions.cs
index 64c4e62c6f..d335f68c7b 100644
--- a/OpenRa.Game/UnitMissions.cs
+++ b/OpenRa.Game/UnitMissions.cs
@@ -1,146 +1,146 @@
-using System;
-using System.Collections.Generic;
-
-namespace OpenRa.Game
-{
-	//Unit Missions:
-	//{
-	//in rules.ini:
-	//	Sleep - no-op
-	//	Harmless - no-op, and also not considered a threat
-	//	Sticky
-	//	Attack
-	//	Move
-	//	QMove
-	//	Retreat
-	//	Guard
-	//	Enter
-	//	Capture
-	//	Harvest
-	//	Area Guard
-	//	[Return] - unused
-	//	Stop
-	//	[Ambush] - unused
-	//	Hunt
-	//	Unload
-	//	Sabotage
-	//	Construction
-	//	Selling
-	//	Repair
-	//	Rescue
-	//	Missile
-	//
-	//not in original RA:
-	//	Deploy (Mcv -> Fact) [should this be construction/unload?]
-	//}
-
-	[Flags]
-	enum SupportedMissions
-	{
-		Stop = 0,
-		Harvest = 1,
-		Deploy = 2,
-	}
-
-	delegate void UnitMission( int t );
-	static class UnitMissions
-	{
-		public static UnitMission Sleep()
-		{
-			return t => { };
-		}
-
-		public static UnitMission Move( Unit unit, int2 destination )
-		{
-			return t =>
-			{
-				Game game = unit.game;
-
-				if( unit.nextOrder != null )
-					destination = unit.toCell;
-
-				if( Turn( unit, unit.GetFacing( unit.toCell - unit.fromCell ) ) )
-					return;
-
-				unit.moveFraction += t * unit.unitInfo.Speed;
-				if( unit.moveFraction < unit.moveFractionTotal )
-					return;
-
-				unit.moveFraction = 0;
-				unit.moveFractionTotal = 0;
-				unit.fromCell = unit.toCell;
-
-				if( unit.toCell == destination )
-				{
-					unit.currentOrder = null;
-					return;
-				}
-
-				List<int2> res = game.pathFinder.FindUnitPath( unit.toCell, PathFinder.DefaultEstimator( destination ) );
-				if( res.Count != 0 )
-				{
-					unit.toCell = res[ res.Count - 1 ];
-
-					int2 dir = unit.toCell - unit.fromCell;
-					unit.moveFractionTotal = ( dir.X != 0 && dir.Y != 0 ) ? 2500 : 2000;
-				}
-				else
-					destination = unit.toCell;
-			};
-		}
-
-		public static UnitMission Deploy( Unit unit )
-		{
-			return t =>
-			{
-				Game game = unit.game;
-
-				if( Turn( unit, 12 ) )
-					return;
-
-				game.world.AddFrameEndTask( _ =>
-				{
-					game.world.Remove( unit );
-					game.world.Add( new Building("fact", unit.fromCell - new int2( 1, 1 ), unit.owner, game ) );
-				} );
-				unit.currentOrder = null;
-			};
-		}
-
-
-		public static UnitMission Harvest( Unit unit )
-		{
-			UnitMission order = null;
-			order = t =>
-			{
-				// TODO: check that there's actually some ore in this cell :)
-
-				// face in one of the 8 directions
-				if( Turn( unit, ( unit.facing + 1 ) & ~3 ) )
-					return;
-
-				unit.currentOrder = _ => { };
-				if( unit.nextOrder == null )
-					unit.nextOrder = order;
-
-				string sequenceName = string.Format( "harvest{0}", unit.facing / 4 );
-				unit.animation.PlayThen( sequenceName, () =>
-				{
-					unit.currentOrder = null;
-					unit.animation.PlayFetchIndex("idle", () => unit.facing);
-				} );
-			};
-			return order;
-		}
-
-		static bool Turn( Unit unit, int desiredFacing )
-		{
-			if( unit.facing == desiredFacing )
-				return false;
-
-			int df = ( desiredFacing - unit.facing + 32 ) % 32;
-			unit.facing = ( unit.facing + ( df > 16 ? 31 : 1 ) ) % 32;
-			return true;
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+
+namespace OpenRa.Game
+{
+	//Unit Missions:
+	//{
+	//in rules.ini:
+	//	Sleep - no-op
+	//	Harmless - no-op, and also not considered a threat
+	//	Sticky
+	//	Attack
+	//	Move
+	//	QMove
+	//	Retreat
+	//	Guard
+	//	Enter
+	//	Capture
+	//	Harvest
+	//	Area Guard
+	//	[Return] - unused
+	//	Stop
+	//	[Ambush] - unused
+	//	Hunt
+	//	Unload
+	//	Sabotage
+	//	Construction
+	//	Selling
+	//	Repair
+	//	Rescue
+	//	Missile
+	//
+	//not in original RA:
+	//	Deploy (Mcv -> Fact) [should this be construction/unload?]
+	//}
+
+	[Flags]
+	enum SupportedMissions
+	{
+		Stop = 0,
+		Harvest = 1,
+		Deploy = 2,
+	}
+
+	//delegate void UnitMission( int t );
+	//static class UnitMissions
+	//{
+	//    public static UnitMission Sleep()
+	//    {
+	//        return t => { };
+	//    }
+
+	//    public static UnitMission Move( Unit unit, int2 destination )
+	//    {
+	//        return t =>
+	//        {
+	//            Game game = unit.game;
+
+	//            if( unit.nextOrder != null )
+	//                destination = unit.toCell;
+
+	//            if( Turn( unit, unit.GetFacing( unit.toCell - unit.fromCell ) ) )
+	//                return;
+
+	//            unit.moveFraction += t * unit.unitInfo.Speed;
+	//            if( unit.moveFraction < unit.moveFractionTotal )
+	//                return;
+
+	//            unit.moveFraction = 0;
+	//            unit.moveFractionTotal = 0;
+	//            unit.fromCell = unit.toCell;
+
+	//            if( unit.toCell == destination )
+	//            {
+	//                unit.currentOrder = null;
+	//                return;
+	//            }
+
+	//            List<int2> res = game.pathFinder.FindUnitPath( unit.toCell, PathFinder.DefaultEstimator( destination ) );
+	//            if( res.Count != 0 )
+	//            {
+	//                unit.toCell = res[ res.Count - 1 ];
+
+	//                int2 dir = unit.toCell - unit.fromCell;
+	//                unit.moveFractionTotal = ( dir.X != 0 && dir.Y != 0 ) ? 2500 : 2000;
+	//            }
+	//            else
+	//                destination = unit.toCell;
+	//        };
+	//    }
+
+	//    public static UnitMission Deploy( Unit unit )
+	//    {
+	//        return t =>
+	//        {
+	//            Game game = unit.game;
+
+	//            if( Turn( unit, 12 ) )
+	//                return;
+
+	//            game.world.AddFrameEndTask( _ =>
+	//            {
+	//                game.world.Remove( unit );
+	//                game.world.Add( new Building( "fact", unit.fromCell - new int2( 1, 1 ), unit.Owner, game ) );
+	//            } );
+	//            unit.currentOrder = null;
+	//        };
+	//    }
+
+
+	//    public static UnitMission Harvest( Unit unit )
+	//    {
+	//        UnitMission order = null;
+	//        order = t =>
+	//        {
+	//            // TODO: check that there's actually some ore in this cell :)
+
+	//            // face in one of the 8 directions
+	//            if( Turn( unit, ( unit.facing + 1 ) & ~3 ) )
+	//                return;
+
+	//            unit.currentOrder = _ => { };
+	//            if( unit.nextOrder == null )
+	//                unit.nextOrder = order;
+
+	//            string sequenceName = string.Format( "harvest{0}", unit.facing / 4 );
+	//            unit.animation.PlayThen( sequenceName, () =>
+	//            {
+	//                unit.currentOrder = null;
+	//                unit.animation.PlayFetchIndex( "idle", () => unit.facing );
+	//            } );
+	//        };
+	//        return order;
+	//    }
+
+	//    static bool Turn( Unit unit, int desiredFacing )
+	//    {
+	//        if( unit.facing == desiredFacing )
+	//            return false;
+
+	//        int df = ( desiredFacing - unit.facing + 32 ) % 32;
+	//        unit.facing = ( unit.facing + ( df > 16 ? 31 : 1 ) ) % 32;
+	//        return true;
+	//    }
+	//}
+}
diff --git a/OpenRa.Game/UnitOrderGenerator.cs b/OpenRa.Game/UnitOrderGenerator.cs
new file mode 100755
index 0000000000..654426172c
--- /dev/null
+++ b/OpenRa.Game/UnitOrderGenerator.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenRa.Game
+{
+	class UnitOrderGenerator : IOrderGenerator
+	{
+		public readonly List<Actor> selection;
+
+		public UnitOrderGenerator( IEnumerable<Actor> selected )
+		{
+			selection = selected.ToList();
+		}
+
+		public IEnumerable<Order> Order( Game game, int2 xy )
+		{
+			foreach( var unit in selection )
+			{
+				var ret = unit.Order( game, xy );
+				if( ret != null )
+					yield return ret;
+			}
+
+			//if( ( fromCell == toCell || moveFraction == 0 ) && fromCell == xy )
+			//{
+			//    if( SupportsMission( SupportedMissions.Deploy ) )
+			//        return new DeployMcvOrder( this );
+			//    if( SupportsMission( SupportedMissions.Harvest ) )
+			//        return new HarvestOrder( this );
+			//}
+
+			//return new MoveOrder( this, xy );
+		}
+
+		public void PrepareOverlay( Game game, int2 xy ) { }
+	}
+}
diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs
index 3a14768b2b..a3bb5c4040 100644
--- a/OpenRa.Game/World.cs
+++ b/OpenRa.Game/World.cs
@@ -1,39 +1,42 @@
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace OpenRa.Game
-{
-	class World
-	{
-		List<Actor> actors = new List<Actor>();
-		List<Action<World>> frameEndActions = new List<Action<World>>();
-
-		public readonly Game game;
-
-		public World(Game game) { this.game = game; }
-
-		public void Add(Actor a) { actors.Add(a); }
-		public void Remove( Actor a ) { actors.Remove( a ); }
-		public void AddFrameEndTask( Action<World> a ) { frameEndActions.Add( a ); }
-
-		int lastTime = Environment.TickCount;
-
-
-
-		public void Update()
-		{
-			int t = Environment.TickCount;
-			int dt = t - lastTime;
-			lastTime = t;
-
-			foreach (Actor a in actors)
-				a.Tick(game, dt);
-
-			foreach (Action<World> a in frameEndActions) a(this);
-			frameEndActions.Clear();
-		}
-
-		public IEnumerable<Actor> Actors { get { return actors; } }
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace OpenRa.Game
+{
+	class World
+	{
+		List<Actor> actors = new List<Actor>();
+		List<Action<World>> frameEndActions = new List<Action<World>>();
+
+		public readonly Game game;
+
+		public World(Game game) { this.game = game; }
+
+		public void Add(Actor a) { actors.Add(a); }
+		public void Remove( Actor a ) { actors.Remove( a ); }
+		public void AddFrameEndTask( Action<World> a ) { frameEndActions.Add( a ); }
+
+		int lastTime = Environment.TickCount + 2000;
+
+
+
+		public void Update()
+		{
+			int t = Environment.TickCount;
+			int dt = t - lastTime;
+			if( dt >= 40 )
+			{
+				lastTime += 40;
+
+				foreach( Actor a in actors )
+					a.Tick( game, 40 );
+			}
+
+			foreach (Action<World> a in frameEndActions) a(this);
+			frameEndActions.Clear();
+		}
+
+		public IEnumerable<Actor> Actors { get { return actors; } }
+	}
+}