move CYard trait and UndeployMCV activity into mod

OpenRA.Mods.RA/Activities/UndeployMcv.cs

@@ -0,0 +1,57 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Activities
+{
+	public class UndeployMcv : IActivity
+	{
+		public IActivity NextActivity { get; set; }
+		bool started;
+
+		void DoUndeploy(World w,Actor self)
+		{
+			w.Remove(self);
+			
+			var mcv = w.CreateActor("mcv", self.Location + new int2(1, 1), self.Owner);
+			mcv.traits.Get<Unit>().Facing = 96;
+		}
+
+		public IActivity Tick(Actor self)
+		{
+			if (!started)
+			{
+				var rb = self.traits.Get<RenderBuilding>();
+				rb.PlayCustomAnimBackwards(self, "make",
+					() => self.World.AddFrameEndTask(w => DoUndeploy(w,self)));
+				
+				foreach (var s in self.Info.Traits.Get<BuildingInfo>().SellSounds)
+					Sound.PlayToPlayer(self.Owner, s, self.CenterLocation);
+				
+				started = true;
+			}
+
+			return this;
+		}
+
+		public void Cancel(Actor self) {}
+	}
+}

OpenRA.Mods.RA/Chrome/PowerDownButton.cs

@@ -46,9 +46,8 @@ namespace OpenRA.Mods.RA
 		{
 			get
 			{
-				return !info.RequiresConstructionYard ||
-					Game.world.Queries.OwnedBy[Game.world.LocalPlayer]
-						.WithTrait<ConstructionYard>().Any();
+				// WTF: why are these buttons even traits?
+				return RepairOrderGenerator.PlayerIsAllowedToRepair( Game.world );
 			}
 		}
 

OpenRA.Mods.RA/ConstructionYard.cs

@@ -0,0 +1,49 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	class ConstructionYardInfo : TraitInfo<ConstructionYard> { }
+
+	public class ConstructionYard : IIssueOrder, IResolveOrder
+	{
+		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			if (mi.Button == MouseButton.Left) return null;
+
+			if (underCursor == self)
+				return new Order("Deploy", self);
+
+			return null;
+		}
+
+		public void ResolveOrder(Actor self, Order order)
+		{
+			if (order.OrderString == "Deploy")
+			{
+				self.CancelActivity();
+				self.QueueActivity(new UndeployMcv());
+			}
+		}
+	}
+}

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -67,8 +67,10 @@
     <Compile Include="Activities\Repair.cs" />
     <Compile Include="Activities\ReturnToBase.cs" />
     <Compile Include="Activities\Teleport.cs" />
+    <Compile Include="Activities\UndeployMcv.cs" />
     <Compile Include="Activities\UnloadCargo.cs" />
     <Compile Include="Activities\Wait.cs" />
+    <Compile Include="ConstructionYard.cs" />
     <Compile Include="Player\ActorGroupProxy.cs" />
     <Compile Include="Aircraft.cs" />
     <Compile Include="SupportPowers\AirstrikePower.cs" />

OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs

@@ -52,14 +52,20 @@ namespace OpenRA.Mods.RA.Orders
 
 		public void Tick( World world )
 		{
-			var hasFact = world.Queries.OwnedBy[world.LocalPlayer]
-				.WithTrait<ConstructionYard>()
-				.Any();
-				
-			if (!hasFact)
+			if( PlayerIsAllowedToRepair( world ) )
 				Game.controller.CancelInputMode();
 		}
 
+		public static bool PlayerIsAllowedToRepair( World world )
+		{
+			if( !world.WorldActor.Info.Traits.Get<RepairButtonInfo>().RequiresConstructionYard )
+				return true;
+
+			return Game.world.Queries.OwnedBy[ Game.world.LocalPlayer ]
+				.WithTrait<Production>().Where( x => x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( "Building" ) )
+				.Any();
+		}
+
 		public void Render( World world ) {}
 
 		public string GetCursor(World world, int2 xy, MouseInput mi)

OpenRA.Mods.RA/Player/ActorGroupProxy.cs

@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class ActorGroupProxyInfo : TraitInfo<ActorGroupProxy> { }