From a2e1fe3d4f3ae75d5c1b0b42342af2dd2f93fcb6 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 17 Jan 2010 09:57:58 +1300
Subject: [PATCH] minelayer works in mod dll

---
 OpenRa.Game/GameRules/NewUnitInfo.cs |  26 +++++++++++++++++++-------
 OpenRa.Game/OpenRa.Game.csproj       |   3 ---
 OpenRa.Game/Traits/Mine.cs           |   8 --------
 OpenRa.Game/Traits/MineImmune.cs     |   5 -----
 OpenRa.Game/Traits/Minelayer.cs      |   5 -----
 OpenRa.Mods.RA/Mine.cs               |   9 ++-------
 OpenRa.Mods.RA/MineImmune.cs         |   7 +++++++
 OpenRa.Mods.RA/Minelayer.cs          |  13 ++-----------
 OpenRa.Mods.RA/OpenRa.Mods.RA.csproj |   5 +++++
 mods/ra/OpenRa.Mods.RA.dll           | Bin 0 -> 9216 bytes
 10 files changed, 35 insertions(+), 46 deletions(-)
 delete mode 100644 OpenRa.Game/Traits/Mine.cs
 delete mode 100644 OpenRa.Game/Traits/MineImmune.cs
 delete mode 100644 OpenRa.Game/Traits/Minelayer.cs
 create mode 100644 OpenRa.Mods.RA/MineImmune.cs
 create mode 100644 mods/ra/OpenRa.Mods.RA.dll

diff --git a/OpenRa.Game/GameRules/NewUnitInfo.cs b/OpenRa.Game/GameRules/NewUnitInfo.cs
index 6611b48fb0..b69d5e8745 100755
--- a/OpenRa.Game/GameRules/NewUnitInfo.cs
+++ b/OpenRa.Game/GameRules/NewUnitInfo.cs
@@ -3,6 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRa.FileFormats;
 using OpenRa.Traits;
+using System.Reflection;
+using IjwFramework.Types;
+using System.IO;
 
 namespace OpenRa.GameRules
 {
@@ -49,16 +52,25 @@ namespace OpenRa.GameRules
 			return node;
 		}
 
+		// todo: use mod metadata to do this
+		static Pair<Assembly, string>[] ModAssemblies = 
+		{ 
+			Pair.New( typeof(ITraitInfo).Assembly, typeof(ITraitInfo).Namespace ),
+			Pair.New( Assembly.LoadFile(Path.GetFullPath(@"mods\ra\OpenRa.Mods.RA.dll")), "OpenRa.Mods.RA" ) 
+		};
+
 		static ITraitInfo LoadTraitInfo(string traitName, MiniYaml my)
 		{
-			var fullTypeName = typeof(ITraitInfo).Namespace + "." + traitName + "Info";
-			var info = (ITraitInfo)typeof(ITraitInfo).Assembly.CreateInstance(fullTypeName);
+			foreach (var mod in ModAssemblies)
+			{
+				var fullTypeName = mod.Second + "." + traitName + "Info";
+				var info = (ITraitInfo)mod.First.CreateInstance(fullTypeName);
+				if (info == null) continue;
+				FieldLoader.Load(info, my);
+				return info;
+			}
 
-			if (info == null)
-				throw new NotImplementedException("Missing traitinfo type `{0}`".F(fullTypeName));
-
-			FieldLoader.Load(info, my);
-			return info;
+			throw new InvalidOperationException("Cannot locate trait: {0}".F(traitName));
 		}
 	}
 }
diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index 4f3afcfc26..8e756e5a09 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -206,7 +206,6 @@
     <Compile Include="Traits\Activities\Turn.cs" />
     <Compile Include="Traits\Activities\UndeployMcv.cs" />
     <Compile Include="Traits\Activities\UnloadCargo.cs" />
-    <Compile Include="Traits\Mine.cs" />
     <Compile Include="Traits\AttackBase.cs" />
     <Compile Include="Traits\AttackFrontal.cs" />
     <Compile Include="Traits\AttackHeli.cs" />
@@ -237,8 +236,6 @@
     <Compile Include="Traits\IronCurtain.cs" />
     <Compile Include="Traits\IronCurtainable.cs" />
     <Compile Include="Traits\LightPaletteRotator.cs" />
-    <Compile Include="Traits\MineImmune.cs" />
-    <Compile Include="Traits\Minelayer.cs" />
     <Compile Include="Traits\LimitedAmmo.cs" />
     <Compile Include="Traits\Passenger.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
diff --git a/OpenRa.Game/Traits/Mine.cs b/OpenRa.Game/Traits/Mine.cs
deleted file mode 100644
index 34188ff23f..0000000000
--- a/OpenRa.Game/Traits/Mine.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using OpenRa.Effects;
-
-namespace OpenRa.Traits
-{
-
-}
diff --git a/OpenRa.Game/Traits/MineImmune.cs b/OpenRa.Game/Traits/MineImmune.cs
deleted file mode 100644
index 79f1140290..0000000000
--- a/OpenRa.Game/Traits/MineImmune.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-namespace OpenRa.Traits
-{
-	
-}
diff --git a/OpenRa.Game/Traits/Minelayer.cs b/OpenRa.Game/Traits/Minelayer.cs
deleted file mode 100644
index 6909689b24..0000000000
--- a/OpenRa.Game/Traits/Minelayer.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Linq;
-
-namespace OpenRa.Traits
-{
-}
diff --git a/OpenRa.Mods.RA/Mine.cs b/OpenRa.Mods.RA/Mine.cs
index f38d61fc9c..e9f85bb1cf 100644
--- a/OpenRa.Mods.RA/Mine.cs
+++ b/OpenRa.Mods.RA/Mine.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using OpenRa.Traits;
 using OpenRa.Effects;
+using OpenRa.Traits;
 
 namespace OpenRa.Mods.RA
 {
@@ -54,7 +52,4 @@ namespace OpenRa.Mods.RA
 
 		public IEnumerable<int2> OccupiedCells() { yield return self.Location; }
 	}
-
-	class MineImmuneInfo : StatelessTraitInfo<MineImmune> { }
-	class MineImmune { }
 }
diff --git a/OpenRa.Mods.RA/MineImmune.cs b/OpenRa.Mods.RA/MineImmune.cs
new file mode 100644
index 0000000000..1f4b51edb3
--- /dev/null
+++ b/OpenRa.Mods.RA/MineImmune.cs
@@ -0,0 +1,7 @@
+using OpenRa.Traits;
+
+namespace OpenRa.Mods.RA
+{
+	class MineImmuneInfo : StatelessTraitInfo<MineImmune> { }
+	class MineImmune { }
+}
diff --git a/OpenRa.Mods.RA/Minelayer.cs b/OpenRa.Mods.RA/Minelayer.cs
index 6dd7a915e6..3280c3f72f 100644
--- a/OpenRa.Mods.RA/Minelayer.cs
+++ b/OpenRa.Mods.RA/Minelayer.cs
@@ -1,20 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using OpenRa.Traits;
-using OpenRa;
 
 namespace OpenRa.Mods.RA
 {
-	class MinelayerInfo : ITraitInfo
+	class MinelayerInfo : StatelessTraitInfo<Minelayer>
 	{
 		public readonly string Mine = "minv";
-
-		public object Create(Actor self)
-		{
-			return new Minelayer();
-		}
 	}
 
 	class Minelayer : IIssueOrder, IResolveOrder
diff --git a/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj b/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
index 0054171f18..88746d0e66 100644
--- a/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
+++ b/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Mine.cs" />
+    <Compile Include="MineImmune.cs" />
     <Compile Include="Minelayer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -67,4 +68,8 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <PropertyGroup>
+    <PostBuildEvent>mkdir "$(SolutionDir)mods/ra/"
+copy "$(TargetPath)" "$(SolutionDir)mods/ra/"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/mods/ra/OpenRa.Mods.RA.dll b/mods/ra/OpenRa.Mods.RA.dll
new file mode 100644
index 0000000000000000000000000000000000000000..eabdbe9fd0cdda04314a9416d3d791640fb625aa
GIT binary patch
literal 9216
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
HrwsfrF0(`M

literal 0
HcmV?d00001