From d07db9c6a9bdda6a134fe29adf6a6e0c56f7b5ce Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 4 Jan 2015 16:17:09 +0100
Subject: [PATCH] Move Guard, CashTrickler, Explodes, SelfHealing, Sellable and
 Crushable to Mods.Common.

Extract Guardable trait from Guard into own file.
---
 .../Activities/Sell.cs                        |  3 +--
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj  |  8 +++++++
 .../Traits}/CashTrickler.cs                   |  2 +-
 .../Traits}/Crushable.cs                      |  3 +--
 .../Traits}/Explodes.cs                       |  6 ++---
 .../Traits}/Guard.cs                          | 17 ++++----------
 OpenRA.Mods.Common/Traits/Guardable.cs        | 22 +++++++++++++++++++
 .../Traits}/SelfHealing.cs                    |  3 +--
 .../Traits}/Sellable.cs                       |  5 ++---
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj          |  7 ------
 .../Scripting/Properties/GuardProperties.cs   |  2 +-
 OpenRA.Mods.RA/Traits/DemoTruck.cs            |  1 +
 12 files changed, 45 insertions(+), 34 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Activities/Sell.cs (95%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/CashTrickler.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Crushable.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Explodes.cs (94%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Guard.cs (88%)
 create mode 100644 OpenRA.Mods.Common/Traits/Guardable.cs
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/SelfHealing.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Sellable.cs (93%)

diff --git a/OpenRA.Mods.RA/Activities/Sell.cs b/OpenRA.Mods.Common/Activities/Sell.cs
old mode 100755
new mode 100644
similarity index 95%
rename from OpenRA.Mods.RA/Activities/Sell.cs
rename to OpenRA.Mods.Common/Activities/Sell.cs
index 217d570e85..4a7070c29c
--- a/OpenRA.Mods.RA/Activities/Sell.cs
+++ b/OpenRA.Mods.Common/Activities/Sell.cs
@@ -11,10 +11,9 @@
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	class Sell : Activity
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index a72cd41217..d586e6b52b 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Activities\RemoveSelf.cs" />
     <Compile Include="Activities\Repair.cs" />
     <Compile Include="Activities\RepairBuilding.cs" />
+    <Compile Include="Activities\Sell.cs" />
     <Compile Include="Activities\SimpleTeleport.cs" />
     <Compile Include="Activities\Turn.cs" />
     <Compile Include="Activities\UnloadCargo.cs" />
@@ -188,10 +189,15 @@
     <Compile Include="Traits\Buildings\FootprintUtils.cs" />
     <Compile Include="Traits\Burns.cs" />
     <Compile Include="Traits\Cargo.cs" />
+    <Compile Include="Traits\CashTrickler.cs" />
     <Compile Include="Traits\Cloak.cs" />
+    <Compile Include="Traits\Crushable.cs" />
     <Compile Include="Traits\IgnoresDisguise.cs" />
     <Compile Include="Traits\DetectCloaked.cs" />
     <Compile Include="Traits\EngineerRepair.cs" />
+    <Compile Include="Traits\Explodes.cs" />
+    <Compile Include="Traits\Guard.cs" />
+    <Compile Include="Traits\Guardable.cs" />
     <Compile Include="Traits\GainsExperience.cs" />
     <Compile Include="Traits\GivesBounty.cs" />
     <Compile Include="Traits\GivesExperience.cs" />
@@ -259,6 +265,8 @@
     <Compile Include="Traits\Render\WithShadow.cs" />
     <Compile Include="Traits\Render\WithSmoke.cs" />
     <Compile Include="Traits\Render\WithTurret.cs" />
+    <Compile Include="Traits\SelfHealing.cs" />
+    <Compile Include="Traits\Sellable.cs" />
     <Compile Include="Traits\ShakeOnDeath.cs" />
     <Compile Include="Traits\SmokeTrailWhenDamaged.cs" />
     <Compile Include="Traits\Sound\ActorLostNotification.cs" />
diff --git a/OpenRA.Mods.RA/CashTrickler.cs b/OpenRA.Mods.Common/Traits/CashTrickler.cs
similarity index 98%
rename from OpenRA.Mods.RA/CashTrickler.cs
rename to OpenRA.Mods.Common/Traits/CashTrickler.cs
index 2860de3da1..65e78d8d01 100644
--- a/OpenRA.Mods.RA/CashTrickler.cs
+++ b/OpenRA.Mods.Common/Traits/CashTrickler.cs
@@ -11,7 +11,7 @@
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Lets the actor generate cash in a set periodic time.")]
 	class CashTricklerInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Crushable.cs b/OpenRA.Mods.Common/Traits/Crushable.cs
similarity index 96%
rename from OpenRA.Mods.RA/Crushable.cs
rename to OpenRA.Mods.Common/Traits/Crushable.cs
index 266fcfe00b..9809741ee2 100644
--- a/OpenRA.Mods.RA/Crushable.cs
+++ b/OpenRA.Mods.Common/Traits/Crushable.cs
@@ -9,10 +9,9 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This actor is crushable.")]
 	class CrushableInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Explodes.cs b/OpenRA.Mods.Common/Traits/Explodes.cs
similarity index 94%
rename from OpenRA.Mods.RA/Explodes.cs
rename to OpenRA.Mods.Common/Traits/Explodes.cs
index df6f79ffbe..1010fd8c70 100644
--- a/OpenRA.Mods.RA/Explodes.cs
+++ b/OpenRA.Mods.Common/Traits/Explodes.cs
@@ -12,9 +12,9 @@ using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
-	class ExplodesInfo : ITraitInfo
+	public class ExplodesInfo : ITraitInfo
 	{
 		[WeaponReference]
 		public readonly string Weapon = "UnitExplode";
@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA
 		public object Create(ActorInitializer init) { return new Explodes(this); }
 	}
 
-	class Explodes : INotifyKilled
+	public class Explodes : INotifyKilled
 	{
 		readonly ExplodesInfo explodesInfo;
 
diff --git a/OpenRA.Mods.RA/Guard.cs b/OpenRA.Mods.Common/Traits/Guard.cs
similarity index 88%
rename from OpenRA.Mods.RA/Guard.cs
rename to OpenRA.Mods.Common/Traits/Guard.cs
index 0c555ca072..d44dd145ea 100644
--- a/OpenRA.Mods.RA/Guard.cs
+++ b/OpenRA.Mods.Common/Traits/Guard.cs
@@ -14,15 +14,14 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("The player can give this unit the order to follow and protect friendly units with the Guardable trait.")]
-	class GuardInfo : TraitInfo<Guard> { }
+	public class GuardInfo : TraitInfo<Guard> { }
 
-	class Guard : IResolveOrder, IOrderVoice
+	public class Guard : IResolveOrder, IOrderVoice
 	{
 		public void ResolveOrder(Actor self, Order order)
 		{
@@ -48,7 +47,7 @@ namespace OpenRA.Mods.RA.Traits
 		}
 	}
 
-	class GuardOrderGenerator : IOrderGenerator
+	public class GuardOrderGenerator : IOrderGenerator
 	{
 		readonly IEnumerable<Actor> subjects;
 
@@ -104,12 +103,4 @@ namespace OpenRA.Mods.RA.Traits
 					a.HasTrait<Guardable>());
 		}
 	}
-
-	[Desc("This unit can be guarded (followed and protected) by a Guard unit.")]
-	class GuardableInfo : TraitInfo<Guardable>
-	{
-		public readonly int Range = 2;
-	}
-
-	class Guardable { }
 }
diff --git a/OpenRA.Mods.Common/Traits/Guardable.cs b/OpenRA.Mods.Common/Traits/Guardable.cs
new file mode 100644
index 0000000000..5edbf3f038
--- /dev/null
+++ b/OpenRA.Mods.Common/Traits/Guardable.cs
@@ -0,0 +1,22 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("This unit can be guarded (followed and protected) by a Guard unit.")]
+	public class GuardableInfo : TraitInfo<Guardable>
+	{
+		public readonly int Range = 2;
+	}
+
+	public class Guardable { }
+}
diff --git a/OpenRA.Mods.RA/SelfHealing.cs b/OpenRA.Mods.Common/Traits/SelfHealing.cs
similarity index 96%
rename from OpenRA.Mods.RA/SelfHealing.cs
rename to OpenRA.Mods.Common/Traits/SelfHealing.cs
index c7d9a86bc2..84a9b9a7a4 100644
--- a/OpenRA.Mods.RA/SelfHealing.cs
+++ b/OpenRA.Mods.Common/Traits/SelfHealing.cs
@@ -10,10 +10,9 @@
 
 using System;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to actors which should be able to regenerate their health points.")]
 	class SelfHealingInfo : UpgradableTraitInfo, ITraitInfo, Requires<HealthInfo>
diff --git a/OpenRA.Mods.RA/Sellable.cs b/OpenRA.Mods.Common/Traits/Sellable.cs
similarity index 93%
rename from OpenRA.Mods.RA/Sellable.cs
rename to OpenRA.Mods.Common/Traits/Sellable.cs
index 39e021afac..794b354649 100644
--- a/OpenRA.Mods.RA/Sellable.cs
+++ b/OpenRA.Mods.Common/Traits/Sellable.cs
@@ -9,11 +9,10 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Actor can be sold")]
 	public class SellableInfo : UpgradableTraitInfo, ITraitInfo
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 47bc1ee77c..9c6246e477 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -95,11 +95,9 @@
     <Compile Include="Activities\LayMines.cs" />
     <Compile Include="Activities\Leap.cs" />
     <Compile Include="Activities\RAHarvesterDockSequence.cs" />
-    <Compile Include="Activities\Sell.cs" />
     <Compile Include="Activities\Teleport.cs" />
     <Compile Include="Activities\Transform.cs" />
     <Compile Include="AI\SupportPowerDecision.cs" />
-    <Compile Include="Crushable.cs" />
     <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="Effects\TeslaZap.cs" />
@@ -116,7 +114,6 @@
     <Compile Include="ExternalCapturableBar.cs" />
     <Compile Include="Capturable.cs" />
     <Compile Include="ExternalCaptures.cs" />
-    <Compile Include="CashTrickler.cs" />
     <Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
     <Compile Include="Traits\Chronoshiftable.cs" />
     <Compile Include="CrateSpawner.cs" />
@@ -138,8 +135,6 @@
     <Compile Include="Effects\Parachute.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="EmitInfantryOnSell.cs" />
-    <Compile Include="Explodes.cs" />
-    <Compile Include="Guard.cs" />
     <Compile Include="Invulnerable.cs" />
     <Compile Include="Captures.cs" />
     <Compile Include="Lint\CheckActorReferences.cs" />
@@ -178,8 +173,6 @@
     <Compile Include="Repairable.cs" />
     <Compile Include="RepairableNear.cs" />
     <Compile Include="ScaredyCat.cs" />
-    <Compile Include="SelfHealing.cs" />
-    <Compile Include="Sellable.cs" />
     <Compile Include="SpawnMPUnits.cs" />
     <Compile Include="Disguise.cs" />
     <Compile Include="StoresResources.cs" />
diff --git a/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs
index 0078f80919..a21ca307d1 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs
@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Traits/DemoTruck.cs b/OpenRA.Mods.RA/Traits/DemoTruck.cs
index 879f3017c4..bb1e073c43 100644
--- a/OpenRA.Mods.RA/Traits/DemoTruck.cs
+++ b/OpenRA.Mods.RA/Traits/DemoTruck.cs
@@ -14,6 +14,7 @@ using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits