(gecko) Add support for custom order generators

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -18,10 +18,24 @@ namespace OpenRA.Orders
 	class UnitOrderGenerator : IOrderGenerator
 	{
 		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
+		{
+		    var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                var customOrders = custom.Order(world, xy, mi);
+
+                foreach (var o in customOrders)
+                    yield return o;
+            }
+            else
             {
                 var underCursor = world.FindUnitsAtMouse(mi.Location)
                     .Where(a => a.Info.Traits.Contains<TargetableInfo>())
-				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
+                    .OrderByDescending(
+                        a =>
+                        a.Info.Traits.Contains<SelectableInfo>()
+                            ? a.Info.Traits.Get<SelectableInfo>().Priority
+                            : int.MinValue)
                     .FirstOrDefault();
 
                 var orders = world.Selection.Actors
@@ -32,16 +46,32 @@ namespace OpenRA.Orders
                 var actorsInvolved = orders.Select(o => o.self).Distinct();
                 if (actorsInvolved.Any())
                     yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor,
-					string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray()));
+                                           string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray()))
+                        ;
 
-			foreach( var o in orders )
+                foreach (var o in orders)
-				yield return CheckSameOrder( o.iot, o.trait.IssueOrder( o.self, o.iot, o.target ) );
+                    yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target));
+            }
 		}
 
-		public void Tick( World world ) {}
+		public void Tick( World world )
+        {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.Tick(world);
+            }
+		}
 
 		public void RenderBeforeWorld( WorldRenderer wr, World world )
         {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.RenderBeforeWorld(wr, world);
+                return;
+            }
+
 			foreach (var a in world.Selection.Actors)
 				if (!a.Destroyed)
 					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
@@ -52,6 +82,13 @@ namespace OpenRA.Orders
 
 		public void RenderAfterWorld( WorldRenderer wr, World world )
         {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.RenderAfterWorld(wr, world);
+                return;
+            }
+
 			foreach (var a in world.Selection.Actors)
 				if (!a.Destroyed)
 					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
@@ -62,6 +99,12 @@ namespace OpenRA.Orders
 
 		public string GetCursor( World world, int2 xy, MouseInput mi )
         {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+               return custom.GetCursor(world, xy, mi);
+            }
+
 			var underCursor = world.FindUnitsAtMouse(mi.Location)
 				.Where(a => a.Info.Traits.Contains<TargetableInfo>())
 				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -51,7 +51,7 @@ namespace OpenRA.Traits
     }
 	public interface IOrderCursor { string CursorForOrder(Actor self, Order order); }
 	public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }
-
+    public interface ICustomUnitOrderGenerator : IOrderGenerator {};
 	public interface INotifySold { void Selling( Actor self );  void Sold( Actor self ); }
 	public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
 	public interface INotifyBuildComplete { void BuildingComplete(Actor self); }