From 8a3c1e137e76a3f70e58dc325d83c079a987ec66 Mon Sep 17 00:00:00 2001
From: Bob <Bob@nameless.(none)>
Date: Fri, 2 Apr 2010 22:45:01 +1200
Subject: [PATCH] moved other chrono-related stuff into the mod dll.

---
 OpenRA.Game/OpenRA.Game.csproj                           | 3 ---
 OpenRA.Mods.Aftermath/ChronoshiftDeploy.cs               | 2 ++
 OpenRA.Mods.Aftermath/DemoTruck.cs                       | 1 +
 OpenRA.Mods.Aftermath/OpenRA.Mods.Aftermath.csproj       | 4 ++++
 .../Traits => OpenRA.Mods.RA}/Activities/Teleport.cs     | 4 +++-
 .../Traits => OpenRA.Mods.RA}/Chronoshiftable.cs         | 9 ++++++---
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                     | 3 +++
 .../SupportPowers}/ChronoshiftPaletteEffect.cs           | 3 ++-
 8 files changed, 21 insertions(+), 8 deletions(-)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Activities/Teleport.cs (92%)
 mode change 100644 => 100755
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Chronoshiftable.cs (88%)
 mode change 100644 => 100755
 rename {OpenRA.Game/Traits/World => OpenRA.Mods.RA/SupportPowers}/ChronoshiftPaletteEffect.cs (93%)
 mode change 100644 => 100755

diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index fdd0b32781..095ce962a1 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -168,7 +168,6 @@
     <Compile Include="Traits\Activities\Repair.cs" />
     <Compile Include="Traits\Activities\ReturnToBase.cs" />
     <Compile Include="Traits\Activities\Sell.cs" />
-    <Compile Include="Traits\Activities\Teleport.cs" />
     <Compile Include="Orders\IOrderGenerator.cs" />
     <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Player.cs" />
@@ -211,8 +210,6 @@
     <Compile Include="Traits\World\BuildingInfluence.cs" />
     <Compile Include="Traits\CanPowerDown.cs" />
     <Compile Include="Traits\Cargo.cs" />
-    <Compile Include="Traits\Chronoshiftable.cs" />
-    <Compile Include="Traits\World\ChronoshiftPaletteEffect.cs" />
     <Compile Include="Traits\Crate.cs" />
     <Compile Include="Traits\Explodes.cs" />
     <Compile Include="Traits\Fake.cs" />
diff --git a/OpenRA.Mods.Aftermath/ChronoshiftDeploy.cs b/OpenRA.Mods.Aftermath/ChronoshiftDeploy.cs
index 19f877afe9..6bc4eaab95 100644
--- a/OpenRA.Mods.Aftermath/ChronoshiftDeploy.cs
+++ b/OpenRA.Mods.Aftermath/ChronoshiftDeploy.cs
@@ -20,6 +20,8 @@
 
 using System.Collections.Generic;
 using OpenRA.Mods.Aftermath.Orders;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.SupportPowers;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
diff --git a/OpenRA.Mods.Aftermath/DemoTruck.cs b/OpenRA.Mods.Aftermath/DemoTruck.cs
index e094198daf..df10bcf678 100644
--- a/OpenRA.Mods.Aftermath/DemoTruck.cs
+++ b/OpenRA.Mods.Aftermath/DemoTruck.cs
@@ -20,6 +20,7 @@
 
 using OpenRA.Effects;
 using OpenRA.Traits;
+using OpenRA.Mods.RA;
 
 namespace OpenRA.Mods.Aftermath
 {
diff --git a/OpenRA.Mods.Aftermath/OpenRA.Mods.Aftermath.csproj b/OpenRA.Mods.Aftermath/OpenRA.Mods.Aftermath.csproj
index 3fe535a094..34016c798b 100644
--- a/OpenRA.Mods.Aftermath/OpenRA.Mods.Aftermath.csproj
+++ b/OpenRA.Mods.Aftermath/OpenRA.Mods.Aftermath.csproj
@@ -60,6 +60,10 @@
       <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
       <Name>OpenRA.Game</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Mods.RA\OpenRA.Mods.RA.csproj">
+      <Project>{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}</Project>
+      <Name>OpenRA.Mods.RA</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/OpenRA.Game/Traits/Activities/Teleport.cs b/OpenRA.Mods.RA/Activities/Teleport.cs
old mode 100644
new mode 100755
similarity index 92%
rename from OpenRA.Game/Traits/Activities/Teleport.cs
rename to OpenRA.Mods.RA/Activities/Teleport.cs
index b9be2715dd..883de1157f
--- a/OpenRA.Game/Traits/Activities/Teleport.cs
+++ b/OpenRA.Mods.RA/Activities/Teleport.cs
@@ -18,7 +18,9 @@
  */
 #endregion
 
-namespace OpenRA.Traits.Activities
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Activities
 {
 	public class Teleport : IActivity
 	{
diff --git a/OpenRA.Game/Traits/Chronoshiftable.cs b/OpenRA.Mods.RA/Chronoshiftable.cs
old mode 100644
new mode 100755
similarity index 88%
rename from OpenRA.Game/Traits/Chronoshiftable.cs
rename to OpenRA.Mods.RA/Chronoshiftable.cs
index ff6b84f66e..03e7a3f42a
--- a/OpenRA.Game/Traits/Chronoshiftable.cs
+++ b/OpenRA.Mods.RA/Chronoshiftable.cs
@@ -18,7 +18,10 @@
  */
 #endregion
 
-namespace OpenRA.Traits
+using OpenRA.Traits;
+using OpenRA.Mods.RA.Activities;
+
+namespace OpenRA.Mods.RA
 {
 	class ChronoshiftableInfo : ITraitInfo
 	{
@@ -48,7 +51,7 @@ namespace OpenRA.Traits
 			{
 				self.CancelActivity();
 				// Todo: need a new Teleport method that will move to the closest available cell
-				self.QueueActivity(new Activities.Teleport(chronoshiftOrigin));
+				self.QueueActivity(new Teleport(chronoshiftOrigin));
 			}
 		}
 
@@ -71,7 +74,7 @@ namespace OpenRA.Traits
 
 			// Set up the teleport
 			self.CancelActivity();
-			self.QueueActivity(new Activities.Teleport(targetLocation));
+			self.QueueActivity(new Teleport(targetLocation));
 			
 			return true;
 		}
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index b2d2dac8bc..1a3f84762a 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -51,8 +51,11 @@
     <Compile Include="Activities\Infiltrate.cs" />
     <Compile Include="Activities\LayMine.cs" />
     <Compile Include="Activities\Steal.cs" />
+    <Compile Include="Activities\Teleport.cs" />
     <Compile Include="C4Demolition.cs" />
+    <Compile Include="Chronoshiftable.cs" />
     <Compile Include="Effects\NukeLaunch.cs" />
+    <Compile Include="SupportPowers\ChronoshiftPaletteEffect.cs" />
     <Compile Include="SupportPowers\ChronoshiftPower.cs" />
     <Compile Include="Crates\ArmorUpgradeCrateAction.cs" />
     <Compile Include="Crates\ExplodeCrateAction.cs" />
diff --git a/OpenRA.Game/Traits/World/ChronoshiftPaletteEffect.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPaletteEffect.cs
old mode 100644
new mode 100755
similarity index 93%
rename from OpenRA.Game/Traits/World/ChronoshiftPaletteEffect.cs
rename to OpenRA.Mods.RA/SupportPowers/ChronoshiftPaletteEffect.cs
index 5b11313128..b76642a0ef
--- a/OpenRA.Game/Traits/World/ChronoshiftPaletteEffect.cs
+++ b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPaletteEffect.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA.SupportPowers
 {
 	class ChronoshiftPaletteEffectInfo : StatelessTraitInfo<ChronoshiftPaletteEffect> { }