remove standalone MapConverter

2010-08-01 18:03:03 +12:00
parent 724df5ad54
commit 8707bbd569
4 changed files with 66 additions and 527 deletions
--- a/MapConverter/Main.cs
+++ b/MapConverter/Main.cs
@@ -1,40 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 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 LICENSE.
- */
-#endregion
-
-using System;
-using OpenRA.FileFormats;
-using OpenRA;
-using System.IO;
-
-namespace MapConverter
-{
-	class MainClass
-	{
-		public static void Main (string[] args)
-		{
-			if (args.Length != 3)
-			{
-				Console.WriteLine("usage: MapConverter mod[,mod]* input-map.ini output-map.yaml");
-				return;
-			}
-
-			var mods = args[0].Split(',');
-			var inputFile = args[1];
-			var outputPath = args[2];
-
-			Game.InitializeEngineWithMods(mods);
-			var map = MapConverter.Import(inputFile);
-			
-			Directory.CreateDirectory(outputPath);
-			map.Package = new Folder(outputPath);
-			map.Save(outputPath);
-		}
-	}
-}
--- a/MapConverter/MapConverter.cs
+++ b/MapConverter/MapConverter.cs
@@ -1,354 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 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 LICENSE.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using OpenRA;
-using OpenRA.FileFormats;
-
-namespace MapConverter
-{
-	public class MapConverter
-	{
-		// Mapping from ra overlay index to type string
-		static string[] raOverlayNames =
-		{
-			"sbag", "cycl", "brik", "fenc", "wood",
-			"gold01", "gold02", "gold03", "gold04",
-			"gem01", "gem02", "gem03", "gem04",
-			"v12", "v13", "v14", "v15", "v16", "v17", "v18",
-			"fpls", "wcrate", "scrate", "barb", "sbag",
-		};
-
-		static Dictionary<string, Pair<byte, byte>> overlayResourceMapping = new Dictionary<string, Pair<byte, byte>>()
-		{
-			// RA Gems, Gold
-			{ "gold01", new Pair<byte,byte>(1,0) },
-			{ "gold02", new Pair<byte,byte>(1,1) },
-			{ "gold03", new Pair<byte,byte>(1,2) },
-			{ "gold04", new Pair<byte,byte>(1,3) },
-			
-			{ "gem01", new Pair<byte,byte>(2,0) },
-			{ "gem02", new Pair<byte,byte>(2,1) },
-			{ "gem03", new Pair<byte,byte>(2,2) },
-			{ "gem04", new Pair<byte,byte>(2,3) },
-			
-			// cnc tiberium
-			{ "ti1", new Pair<byte,byte>(1,0) },
-			{ "ti2", new Pair<byte,byte>(1,1) },
-			{ "ti3", new Pair<byte,byte>(1,2) },
-			{ "ti4", new Pair<byte,byte>(1,3) },
-			{ "ti5", new Pair<byte,byte>(1,4) },
-			{ "ti6", new Pair<byte,byte>(1,5) },
-			{ "ti7", new Pair<byte,byte>(1,6) },
-			{ "ti8", new Pair<byte,byte>(1,7) },
-			{ "ti9", new Pair<byte,byte>(1,8) },
-			{ "ti10", new Pair<byte,byte>(1,9) },
-			{ "ti11", new Pair<byte,byte>(1,10) },
-			{ "ti12", new Pair<byte,byte>(1,11) },
-		};
-
-		static Dictionary<string, string> overlayActorMapping = new Dictionary<string, string>() {
-			// Fences
-			{"sbag","sbag"},
-			{"cycl","cycl"},
-			{"brik","brik"},
-			{"fenc","fenc"},
-			{"wood","wood"},
-			
-			// Fields
-			{"v12","v12"},
-			{"v13","v13"},
-			{"v14","v14"},
-			{"v15","v15"},
-			{"v16","v16"},
-			{"v17","v17"},
-			{"v18","v18"},
-			
-			// Crates
-//			{"wcrate","crate"},
-//			{"scrate","crate"},
-		};
-
-		int MapSize;
-		int ActorCount = 0;
-		Map Map = new Map();
-
-		MapConverter(string filename)
-		{
-			ConvertIniMap(filename);
-		}
-
-		public static Map Import(string filename)
-		{
-			var converter = new MapConverter(filename);
-			return converter.Map;
-		}
-
-		enum IniMapFormat { RedAlert = 3, /* otherwise, cnc (2 variants exist, we don't care to differentiate) */ };
-
-		public void ConvertIniMap(string iniFile)
-		{
-			var file = new IniFile(FileSystem.Open(iniFile));
-			var basic = file.GetSection("Basic");
-			var map = file.GetSection("Map");
-			var legacyMapFormat = (IniMapFormat)int.Parse(basic.GetValue("NewINIFormat", "0"));
-			var XOffset = int.Parse(map.GetValue("X", "0"));
-			var YOffset = int.Parse(map.GetValue("Y", "0"));
-			var Width = int.Parse(map.GetValue("Width", "0"));
-			var Height = int.Parse(map.GetValue("Height", "0"));
-			MapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64;
-
-			Map.Title = basic.GetValue("Name", "(null)");
-			Map.Author = "Westwood Studios";
-			Map.Tileset = Truncate(map.GetValue("Theater", "TEMPERAT"), 8);
-			Map.MapSize.X = MapSize;
-			Map.MapSize.Y = MapSize;
-			Map.TopLeft = new int2(XOffset, YOffset);
-			Map.BottomRight = new int2(XOffset + Width, YOffset + Height);
-			Map.Selectable = true;
-
-			if (legacyMapFormat == IniMapFormat.RedAlert)
-			{
-				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
-				UnpackRAOverlayData(ReadPackedSection(file.GetSection("OverlayPack")));
-				ReadRATrees(file);
-				// TODO: Fixme
-				//tileset = new TileSet("tileSet.til","templates.ini",fileMapping[Pair.New("ra",Map.Tileset)].First);
-			}
-			else // CNC
-			{
-				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"));
-				ReadCncOverlay(file);
-				ReadCncTrees(file);
-
-				// TODO: Fixme
-				//tileset = new TileSet("tileSet.til","templates.ini",fileMapping[Pair.New("cnc",Map.Tileset)].First);
-			}
-
-			LoadActors(file, "STRUCTURES");
-			LoadActors(file, "UNITS");
-			LoadActors(file, "INFANTRY");
-			LoadSmudges(file, "SMUDGE");
-
-			var wp = file.GetSection("Waypoints")
-					.Where(kv => int.Parse(kv.Value) > 0)
-					.Select(kv => Pair.New(int.Parse(kv.Key),
-						LocationFromMapOffset(int.Parse(kv.Value), MapSize)))
-					.Where(a => a.First < 8)
-					.ToArray();
-
-			Map.PlayerCount = wp.Count();
-
-			foreach (var kv in wp)
-				Map.Waypoints.Add("spawn" + kv.First, kv.Second);
-		}
-
-		static int2 LocationFromMapOffset(int offset, int mapSize)
-		{
-			return new int2(offset % mapSize, offset / mapSize);
-		}
-
-		static MemoryStream ReadPackedSection(IniSection mapPackSection)
-		{
-			StringBuilder sb = new StringBuilder();
-			for (int i = 1; ; i++)
-			{
-				string line = mapPackSection.GetValue(i.ToString(), null);
-				if (line == null)
-					break;
-
-				sb.Append(line.Trim());
-			}
-
-			byte[] data = Convert.FromBase64String(sb.ToString());
-			List<byte[]> chunks = new List<byte[]>();
-			BinaryReader reader = new BinaryReader(new MemoryStream(data));
-
-			try
-			{
-				while (true)
-				{
-					uint length = reader.ReadUInt32() & 0xdfffffff;
-					byte[] dest = new byte[8192];
-					byte[] src = reader.ReadBytes((int)length);
-
-					/*int actualLength =*/
-					Format80.DecodeInto(src, dest);
-
-					chunks.Add(dest);
-				}
-			}
-			catch (EndOfStreamException) { }
-
-			MemoryStream ms = new MemoryStream();
-			foreach (byte[] chunk in chunks)
-				ms.Write(chunk, 0, chunk.Length);
-
-			ms.Position = 0;
-
-			return ms;
-		}
-
-		static byte ReadByte(Stream s)
-		{
-			int ret = s.ReadByte();
-			if (ret == -1)
-				throw new NotImplementedException();
-			return (byte)ret;
-		}
-
-		static ushort ReadWord(Stream s)
-		{
-			ushort ret = ReadByte(s);
-			ret |= (ushort)(ReadByte(s) << 8);
-
-			return ret;
-		}
-
-		void UnpackRATileData(MemoryStream ms)
-		{
-			Map.MapTiles = new TileReference<ushort, byte>[MapSize, MapSize];
-			for (int i = 0; i < MapSize; i++)
-				for (int j = 0; j < MapSize; j++)
-					Map.MapTiles[i, j] = new TileReference<ushort, byte>();
-
-			for (int j = 0; j < MapSize; j++)
-				for (int i = 0; i < MapSize; i++)
-					Map.MapTiles[i, j].type = ReadWord(ms);
-
-			for (int j = 0; j < MapSize; j++)
-				for (int i = 0; i < MapSize; i++)
-				{
-					Map.MapTiles[i, j].index = ReadByte(ms);
-					if (Map.MapTiles[i, j].type == 0xff || Map.MapTiles[i, j].type == 0xffff)
-						Map.MapTiles[i, j].index = byte.MaxValue;
-				}
-		}
-
-		void UnpackRAOverlayData(MemoryStream ms)
-		{
-			Map.MapResources = new TileReference<byte, byte>[MapSize, MapSize];
-			for (int j = 0; j < MapSize; j++)
-				for (int i = 0; i < MapSize; i++)
-				{
-					byte o = ReadByte(ms);
-					var res = Pair.New((byte)0, (byte)0);
-
-					if (o != 255 && overlayResourceMapping.ContainsKey(raOverlayNames[o]))
-						res = overlayResourceMapping[raOverlayNames[o]];
-
-					Map.MapResources[i, j] = new TileReference<byte, byte>(res.First, res.Second);
-
-					if (o != 255 && overlayActorMapping.ContainsKey(raOverlayNames[o]))
-						Map.Actors.Add("Actor" + ActorCount, new ActorReference("Actor" + ActorCount++, overlayActorMapping[raOverlayNames[o]], new int2(i, j), "Neutral"));
-				}
-		}
-
-		void ReadRATrees(IniFile file)
-		{
-			IniSection terrain = file.GetSection("TERRAIN", true);
-			if (terrain == null)
-				return;
-
-			foreach (KeyValuePair<string, string> kv in terrain)
-			{
-				var loc = int.Parse(kv.Key);
-				Map.Actors.Add("Actor" + ActorCount, new ActorReference("Actor" + ActorCount++, kv.Value.ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), "Neutral"));
-			}
-		}
-
-		void UnpackCncTileData(Stream ms)
-		{
-			Map.MapTiles = new TileReference<ushort, byte>[MapSize, MapSize];
-			for (int i = 0; i < MapSize; i++)
-				for (int j = 0; j < MapSize; j++)
-					Map.MapTiles[i, j] = new TileReference<ushort, byte>();
-
-			for (int j = 0; j < MapSize; j++)
-				for (int i = 0; i < MapSize; i++)
-				{
-					Map.MapTiles[i, j].type = ReadByte(ms);
-					Map.MapTiles[i, j].index = ReadByte(ms);
-
-					if (Map.MapTiles[i, j].type == 0xff)
-						Map.MapTiles[i, j].index = byte.MaxValue;
-				}
-		}
-
-		void ReadCncOverlay(IniFile file)
-		{
-			IniSection overlay = file.GetSection("OVERLAY", true);
-			if (overlay == null)
-				return;
-
-			Map.MapResources = new TileReference<byte, byte>[MapSize, MapSize];
-			foreach (KeyValuePair<string, string> kv in overlay)
-			{
-				var loc = int.Parse(kv.Key);
-				int2 cell = new int2(loc % MapSize, loc / MapSize);
-
-				var res = Pair.New((byte)0, (byte)0);
-				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
-					res = overlayResourceMapping[kv.Value.ToLower()];
-
-				Map.MapResources[cell.X, cell.Y] = new TileReference<byte, byte>(res.First, res.Second);
-
-				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
-					Map.Actors.Add("Actor" + ActorCount, new ActorReference("Actor" + ActorCount++, overlayActorMapping[kv.Value.ToLower()], new int2(cell.X, cell.Y), "Neutral"));
-			}
-		}
-
-		void ReadCncTrees(IniFile file)
-		{
-			IniSection terrain = file.GetSection("TERRAIN", true);
-			if (terrain == null)
-				return;
-
-			foreach (KeyValuePair<string, string> kv in terrain)
-			{
-				var loc = int.Parse(kv.Key);
-				Map.Actors.Add("Actor" + ActorCount, new ActorReference("Actor" + ActorCount++, kv.Value.Split(',')[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), "Neutral"));
-			}
-		}
-
-		void LoadActors(IniFile file, string section)
-		{
-			foreach (var s in file.GetSection(section, true))
-			{
-				//num=owner,type,health,location,facing,...
-				var parts = s.Value.Split(',');
-				var loc = int.Parse(parts[3]);
-				if (parts[0] == "")
-					parts[0] = "Neutral";
-				Map.Actors.Add("Actor" + ActorCount, new ActorReference("Actor" + ActorCount++, parts[1].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), parts[0]));
-			}
-		}
-
-		void LoadSmudges(IniFile file, string section)
-		{
-			foreach (var s in file.GetSection(section, true))
-			{
-				//loc=type,loc,depth
-				var parts = s.Value.Split(',');
-				var loc = int.Parse(parts[1]);
-				Map.Smudges.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), int.Parse(parts[2])));
-			}
-		}
-
-		static string Truncate(string s, int maxLength)
-		{
-			return s.Length <= maxLength ? s : s.Substring(0, maxLength);
-		}
-	}
-}
--- a/MapConverter/MapConverter.csproj
+++ b/MapConverter/MapConverter.csproj
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>MapConverter</RootNamespace>
-    <AssemblyName>MapConverter</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="MapConverter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
-      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRA.FileFormats</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
--- a/OpenRA.sln
+++ b/OpenRA.sln
@@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Cnc", "OpenRA.M
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Gl", "OpenRA.Gl\OpenRA.Gl.csproj", "{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapConverter", "MapConverter\MapConverter.csproj", "{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Editor", "OpenRA.Editor\OpenRA.Editor.csproj", "{00038B75-405B-44F5-8691-BD2546DBE224}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.TilesetBuilder", "OpenRA.TilesetBuilder\OpenRA.TilesetBuilder.csproj", "{56B1073B-AE14-499A-BB98-43A8DE9A39CA}"
@@ -37,77 +35,6 @@ Global
 		Release|Mixed Platforms = Release|Mixed Platforms
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{00038B75-405B-44F5-8691-BD2546DBE224}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00038B75-405B-44F5-8691-BD2546DBE224}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00038B75-405B-44F5-8691-BD2546DBE224}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{00038B75-405B-44F5-8691-BD2546DBE224}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{00038B75-405B-44F5-8691-BD2546DBE224}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00038B75-405B-44F5-8691-BD2546DBE224}.Release|Any CPU.Build.0 = Release|Any CPU
-		{00038B75-405B-44F5-8691-BD2546DBE224}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{00038B75-405B-44F5-8691-BD2546DBE224}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|x86
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|x86
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.Build.0 = Release|x86
-		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Mixed Platforms.Build.0 = Release|x86
-		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -116,6 +43,61 @@ Global
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.Build.0 = Release|x86
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Mixed Platforms.Build.0 = Release|x86
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{00038B75-405B-44F5-8691-BD2546DBE224}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00038B75-405B-44F5-8691-BD2546DBE224}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00038B75-405B-44F5-8691-BD2546DBE224}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00038B75-405B-44F5-8691-BD2546DBE224}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00038B75-405B-44F5-8691-BD2546DBE224}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00038B75-405B-44F5-8691-BD2546DBE224}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00038B75-405B-44F5-8691-BD2546DBE224}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{00038B75-405B-44F5-8691-BD2546DBE224}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{56B1073B-AE14-499A-BB98-43A8DE9A39CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F9FA4D9F-2302-470A-8A07-6E37F488C124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F9FA4D9F-2302-470A-8A07-6E37F488C124}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9FA4D9F-2302-470A-8A07-6E37F488C124}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -124,11 +106,19 @@ Global
 		{F9FA4D9F-2302-470A-8A07-6E37F488C124}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F9FA4D9F-2302-470A-8A07-6E37F488C124}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F9FA4D9F-2302-470A-8A07-6E37F488C124}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = OpenRA.Game\OpenRA.Game.csproj
+		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{210645C7-E99E-46B6-863E-E211AE6C7D70}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = OpenRA.Game\OpenRA.Game.csproj
+	EndGlobalSection
 EndGlobal