From 2355ad9dd14592b731eb3c13e0d7e8536fccc1fd Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Tue, 21 Jun 2016 21:17:25 +0100
Subject: [PATCH] Move carryall code to Mods.Common.

---
 .../Activities/DeliverUnit.cs                                | 5 +----
 .../Activities/PickupUnit.cs                                 | 5 +----
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                 | 5 +++++
 .../Traits/Buildings/FreeActorWithDelivery.cs                | 5 +----
 {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Traits/Carryable.cs  | 3 +--
 {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Traits/Carryall.cs   | 4 +---
 OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj                       | 5 -----
 7 files changed, 10 insertions(+), 22 deletions(-)
 rename {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Activities/DeliverUnit.cs (96%)
 rename {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Activities/PickupUnit.cs (95%)
 rename {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Traits/Buildings/FreeActorWithDelivery.cs (96%)
 rename {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Traits/Carryable.cs (98%)
 rename {OpenRA.Mods.D2k => OpenRA.Mods.Common}/Traits/Carryall.cs (98%)

diff --git a/OpenRA.Mods.D2k/Activities/DeliverUnit.cs b/OpenRA.Mods.Common/Activities/DeliverUnit.cs
similarity index 96%
rename from OpenRA.Mods.D2k/Activities/DeliverUnit.cs
rename to OpenRA.Mods.Common/Activities/DeliverUnit.cs
index a1e356437a..73d3892cd4 100644
--- a/OpenRA.Mods.D2k/Activities/DeliverUnit.cs
+++ b/OpenRA.Mods.Common/Activities/DeliverUnit.cs
@@ -10,13 +10,10 @@
 #endregion
 
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
-using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.D2k.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	public class DeliverUnit : Activity
 	{
diff --git a/OpenRA.Mods.D2k/Activities/PickupUnit.cs b/OpenRA.Mods.Common/Activities/PickupUnit.cs
similarity index 95%
rename from OpenRA.Mods.D2k/Activities/PickupUnit.cs
rename to OpenRA.Mods.Common/Activities/PickupUnit.cs
index 76fe5dee56..761c9c14f1 100644
--- a/OpenRA.Mods.D2k/Activities/PickupUnit.cs
+++ b/OpenRA.Mods.Common/Activities/PickupUnit.cs
@@ -10,13 +10,10 @@
 #endregion
 
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
-using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.D2k.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	public class PickupUnit : Activity
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 1ac291405e..d9488d42f6 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -758,6 +758,11 @@
     <Compile Include="FileFormats\MSCabCompression.cs" />
     <Compile Include="UtilityCommands\OutputActorMiniYamlCommand.cs" />
     <Compile Include="Traits\World\ScriptLobbyDropdown.cs" />
+    <Compile Include="Activities\DeliverUnit.cs" />
+    <Compile Include="Activities\PickupUnit.cs" />
+    <Compile Include="Traits\Carryable.cs" />
+    <Compile Include="Traits\Carryall.cs" />
+    <Compile Include="Traits\Buildings\FreeActorWithDelivery.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/OpenRA.Mods.D2k/Traits/Buildings/FreeActorWithDelivery.cs b/OpenRA.Mods.Common/Traits/Buildings/FreeActorWithDelivery.cs
similarity index 96%
rename from OpenRA.Mods.D2k/Traits/Buildings/FreeActorWithDelivery.cs
rename to OpenRA.Mods.Common/Traits/Buildings/FreeActorWithDelivery.cs
index 21662d34e0..2af928b87e 100644
--- a/OpenRA.Mods.D2k/Traits/Buildings/FreeActorWithDelivery.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/FreeActorWithDelivery.cs
@@ -9,14 +9,11 @@
  */
 #endregion
 
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.D2k.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Player receives a unit for free once the building is placed.",
 		"If you want more than one unit to be delivered, copy this section and assign IDs like FreeActorWithDelivery@2, ...")]
diff --git a/OpenRA.Mods.D2k/Traits/Carryable.cs b/OpenRA.Mods.Common/Traits/Carryable.cs
similarity index 98%
rename from OpenRA.Mods.D2k/Traits/Carryable.cs
rename to OpenRA.Mods.Common/Traits/Carryable.cs
index cce5f90972..5413f264fa 100644
--- a/OpenRA.Mods.D2k/Traits/Carryable.cs
+++ b/OpenRA.Mods.Common/Traits/Carryable.cs
@@ -12,10 +12,9 @@
 using System.Linq;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Can be carried by units with the trait `Carryall`.")]
 	public class CarryableInfo : ITraitInfo, Requires<UpgradeManagerInfo>
diff --git a/OpenRA.Mods.D2k/Traits/Carryall.cs b/OpenRA.Mods.Common/Traits/Carryall.cs
similarity index 98%
rename from OpenRA.Mods.D2k/Traits/Carryall.cs
rename to OpenRA.Mods.Common/Traits/Carryall.cs
index 4b43b46761..eb3d06e356 100644
--- a/OpenRA.Mods.D2k/Traits/Carryall.cs
+++ b/OpenRA.Mods.Common/Traits/Carryall.cs
@@ -13,12 +13,10 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Traits.Render;
-using OpenRA.Mods.D2k.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Automatically transports harvesters with the Carryable trait between resource fields and refineries.")]
 	public class CarryallInfo : ITraitInfo, Requires<BodyOrientationInfo>
diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
index 135b3d8f09..2fb1091836 100644
--- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
+++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
@@ -76,16 +76,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Activities\PickupUnit.cs" />
-    <Compile Include="Activities\DeliverUnit.cs" />
     <Compile Include="Activities\SwallowActor.cs" />
     <Compile Include="SpriteLoaders\R8Loader.cs" />
     <Compile Include="Traits\AttackSwallow.cs" />
-    <Compile Include="Traits\Carryall.cs" />
-    <Compile Include="Traits\Buildings\FreeActorWithDelivery.cs" />
     <Compile Include="Traits\Buildings\DamagedWithoutFoundation.cs" />
     <Compile Include="Traits\Buildings\LaysTerrain.cs" />
-    <Compile Include="Traits\Carryable.cs" />
     <Compile Include="Traits\Player\HarvesterInsurance.cs" />
     <Compile Include="Traits\Render\WithCrumbleOverlay.cs" />
     <Compile Include="Traits\Render\WithDeliveryOverlay.cs" />