Fix Color Picker

stop .net clients taking out the server on drop
WindowsBase.dll added to thirdparty DLLs to work around distributions with outdated versions of Mono.
2010-08-08 18:45:05 +12:00 · 2010-08-08 18:26:55 +12:00 · 2010-08-07 16:11:18 +12:00 · 2010-08-06 21:02:46 +12:00 · 2010-08-06 20:11:49 +12:00 · 2010-08-06 14:15:53 +12:00
881 changed files with 55025 additions and 30598 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ mods/*/*.dll

 # Red Alert binary files
 *.[mM][iI][xX]
-*.[aA][uU][dD]

 # Crap generated by OpenRa
 sheet-*.png
@@ -21,13 +20,15 @@ log.txt

 #binary stuff
 /*.dll
+*.pdb
 *.mdb
-/*.exe
+*.exe
 OpenRA
 OpenRA.app

 # backup files by various editors
 *~
+*.orig
 # dependency DLLs (different for every platform!)
 cg.dll
 cgGL.dll
@@ -50,3 +51,6 @@ packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
 temp.c
 temp.o
 temp.s
+
+*.config
+*.resources
--- a/9
+++ b/9
@@ -0,0 +1,9 @@
+AUTHORS
+
+The OpenRA developers are:
+	* Chris Forbes
+	* Robert Pepperell
+	* Matthew Bowra-Dean
+	* Paul Chote
+	* Alli Witheford
+	* Joakim Lindberg
--- a/FileExtractor/FileExtractor.cs
+++ b/FileExtractor/FileExtractor.cs
@@ -0,0 +1,54 @@
+using System;
+using OpenRA.FileFormats;
+using System.IO;
+
+namespace FileExtractor
+{
+	public class FileExtractor
+	{
+		int Length = 256;
+		
+		public FileExtractor (string[] args)
+		{
+			if (args.Length != 2)
+			{
+				Console.WriteLine("usage: FileExtractor mod[,mod]* filename");
+				return;
+			}
+
+			var mods = args[0].Split(',');
+			var manifest = new Manifest(mods);
+
+			foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
+			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
+			
+			try
+			{
+				var readStream = FileSystem.Open(args[1]);
+				var writeStream = new FileStream(args[1], FileMode.OpenOrCreate, FileAccess.Write);
+				
+				WriteOutFile(readStream, writeStream);
+				
+			} 
+			catch (FileNotFoundException) 
+			{
+				Console.WriteLine(String.Format("No Such File {0}", args[1]));
+			}
+		}
+		
+		void WriteOutFile (Stream readStream, Stream writeStream)
+		{
+   			Byte[] buffer = new Byte[Length];
+   			int bytesRead = readStream.Read(buffer,0,Length);
+
+ 			while( bytesRead > 0 ) 
+    		{
+        		writeStream.Write(buffer,0,bytesRead);
+        		bytesRead = readStream.Read(buffer,0,Length);
+    		}
+    		readStream.Close();
+    		writeStream.Close();
+		}
+	}
+}
+
--- a/FileExtractor/FileExtractor.csproj
+++ b/FileExtractor/FileExtractor.csproj
@@ -1,48 +1,43 @@
-<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>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </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="AssemblyInfo.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>
-    </ProjectReference>
-  </ItemGroup>
+<?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.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{210645C7-E99E-46B6-863E-E211AE6C7D70}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>FileExtractor</RootNamespace>
+    <AssemblyName>FileExtractor</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>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRA.FileFormats</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="FileExtractor.cs" />
+  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/FileExtractor/Main.cs
+++ b/FileExtractor/Main.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace FileExtractor
+{
+	public class MainClass
+	{
+		public static void Main (string[] args)
+		{
+			new FileExtractor(args);
+		}
+	}
+}
+
--- a/145
+++ b/145
@@ -1,14 +1,22 @@
 CSC     = gmcs
 CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
 DEFINE  = DEBUG;TRACE
-PROGRAMS	=fileformats gl game ra cnc aftermath ra_ng seqed mapcvtr
+PROGRAMS	=fileformats gl game ra cnc seqed editor ralint filex tsbuild
+prefix = /usr/local
+datarootdir = $(prefix)/share
+datadir = $(datarootdir)
+bindir = $(prefix)/bin
+BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
+INSTALL_DIR = $(DESTDIR)$(datadir)/openra
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)

 COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll

 fileformats_SRCS	=	$(shell find OpenRA.FileFormats/ -iname '*.cs')
 fileformats_TARGET	=	OpenRA.FileFormats.dll
 fileformats_KIND	=	library
-fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll
+fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll thirdparty/WindowsBase.dll

 gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
 gl_TARGET			= OpenRA.Gl.dll
@@ -38,32 +46,114 @@ cnc_KIND			=	library
 cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
 cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)

-aftermath_SRCS		=	$(shell find OpenRA.Mods.Aftermath/ -iname '*.cs')
-aftermath_TARGET	=	mods/aftermath/OpenRA.Mods.Aftermath.dll
-aftermath_KIND		=	library
-aftermath_DEPS		= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
-aftermath_LIBS		= $(COMMON_LIBS) $(aftermath_DEPS)
-
-ra_ng_SRCS		=	$(shell find OpenRA.Mods.RA-NG/ -iname '*.cs')
-ra_ng_TARGET		=	mods/ra-ng/OpenRA.Mods.RA_NG.dll
-ra_ng_KIND		=	library
-ra_ng_DEPS		= $(ra_TARGET) $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
-ra_ng_LIBS		= $(COMMON_LIBS) $(ra_ng_DEPS)
-
 seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
 seqed_TARGET		= SequenceEditor.exe
 seqed_KIND			= winexe
 seqed_DEPS			= $(fileformats_TARGET)
 seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
+seqed_EXTRA			= -resource:SequenceEditor.Form1.resources

-mapcvtr_SRCS		= $(shell find MapConverter/ -iname '*.cs')
-mapcvtr_TARGET		= MapConverter.exe
-mapcvtr_KIND		= winexe
-mapcvtr_DEPS		= $(fileformats_TARGET)
-mapcvtr_LIBS		= $(COMMON_LIBS) $(mapcvtr_DEPS)
+editor_SRCS			= $(shell find OpenRA.Editor/ -iname '*.cs')
+editor_TARGET		= OpenRA.Editor.exe
+editor_KIND			= winexe
+editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
+editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources
+
+ralint_SRCS		= $(shell find RALint/ -iname '*.cs')
+ralint_TARGET	= RALint.exe
+ralint_KIND		= winexe
+ralint_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+ralint_LIBS		= $(COMMON_LIBS) $(ralint_DEPS)
+
+filex_SRCS		= $(shell find FileExtractor/ -iname '*.cs')
+filex_TARGET	= FileExtractor.exe
+filex_KIND		= winexe
+filex_DEPS		= $(fileformats_TARGET)
+filex_LIBS		= $(COMMON_LIBS) $(filex_DEPS)
+
+tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_TARGET		= TilesetBuilder.exe
+tsbuild_KIND		= winexe
+tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
+tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources

 # -platform:x86

+.SUFFIXES:
+.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex
+
+game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
+
+clean: 
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+
+distclean: clean
+
+CORE = fileformats gl game seqed
+
+install: all
+	@-echo "Installing OpenRA to $(INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
+		
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
+	@$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc
+	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/chrome $(INSTALL_DIR)/mods/cnc
+	
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
+	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/extras $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/chrome $(INSTALL_DIR)/mods/ra
+	
+	@cp -r shaders $(INSTALL_DIR)
+	@cp *.ttf $(INSTALL_DIR)
+	@cp --parents -r thirdparty/Tao $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) thirdparty/WindowsBase.dll thirdparty/WindowsBase.dll.mdb $(INSTALL_DIR)
+	
+	@echo "#!/bin/sh" > openra
+	@echo "cd "$(datadir)"/openra" >> openra
+	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=~/.openra" >> openra
+	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
+	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
+		
+	@echo "OpenRA is now installed. You will now want to download"
+	@echo "http://open-ra.org/packages/ra-packages.zip and"
+	@echo "http://open-ra.org/packages/cnc-packages.zip"
+	@echo "and extract their contents to"
+	@echo "$(INSTALL_DIR)/mods/ra/packages and "
+	@echo "$(INSTALL_DIR)/mods/cnc/packages respectively."
+	@echo "It is also advised to install the contents of $(INSTALL_DIR)/thirdparty to the Mono Global Assembly Cache \
+	with gacutil."
+
+uninstall:
+	@-rm -r $(INSTALL_DIR)
+	@-rm $(DESTDIR)$(bindir)/openra
+
+mod_ra: $(ra_TARGET) $(ralint_TARGET)
+	mono RALint.exe ra
+mod_cnc: $(cnc_TARGET) $(ralint_TARGET)
+	mono RALint.exe cnc
+mods: mod_ra mod_cnc
+
+OpenRA.Editor.Form1.resources:
+	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
+editor: OpenRA.Editor.Form1.resources $(editor_TARGET)
+ralint: $(ralint_TARGET)
+seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
+SequenceEditor.Form1.resources:
+	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
+filex: $(filex_TARGET)
+tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
+OpenRA.TilesetBuilder.Form1.resources:
+	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
+tools: editor ralint seqed filex tsbuild
+all: game tools

 define BUILD_ASSEMBLY

@@ -73,23 +163,8 @@ $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
 		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
 		-define:"$(DEFINE)" \
 		-t:"$$($(1)_KIND)" \
+		$$($(1)_EXTRA) \
 		$$($(1)_SRCS)
 endef

-
 $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
-
-
-.SUFFIXES:
-.PHONY: clean all default mods seqed mapcvtr
-
-
-clean: 
-	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb
-
-mods: $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(ra_ng_TARGET)
-seqed: $(seqed_TARGET)
-mapcvtr: $(mapcvtr_TARGET)
-all: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(ra_ng_TARGET) $(seqed_TARGET) $(mapcvtr_TARGET)
-
-.DEFAULT: all
--- a/MapConverter/AssemblyInfo.cs
+++ b/MapConverter/AssemblyInfo.cs
@@ -1,26 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes. 
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("MapConverter")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
--- a/MapConverter/Main.cs
+++ b/MapConverter/Main.cs
@@ -1,13 +0,0 @@
-using System;
-using OpenRA.FileFormats;
-
-namespace MapConverter
-{
-	class MainClass
-	{
-		public static void Main (string[] args)
-		{
-			new MapConverter(args);
-		}
-	}
-}
--- a/MapConverter/MapConverter.cs
+++ b/MapConverter/MapConverter.cs
@@ -1,405 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
-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();
-		Manifest manifest;
-
-		public MapConverter(string[] args)
-		{
-			if (args.Length != 3)
-			{
-				Console.WriteLine("usage: MapConverter mod[,mod]* input-map.ini output-map.yaml");
-				return;
-			}
-
-			var mods = args[0].Split(',');
-			manifest = new Manifest(mods);
-
-			foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
-			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
-			
-			ConvertIniMap(args[1]);
-			Map.DebugContents();
-			Save(args[2]);
-		}
-		
-		
-		static Dictionary<Pair<string,string>,Pair<string,string> > fileMapping = new Dictionary<Pair<string,string>,Pair<string,string> >()
-		{
-			{Pair.New("ra","TEMPERAT"),Pair.New("tem","temperat.col")},
-			{Pair.New("ra","SNOW"),Pair.New("sno","snow.col")},
-			{Pair.New("ra","INTERIOR"),Pair.New("int","temperat.col")},
-			{Pair.New("cnc","DESERT"),Pair.New("des","desert.col")},
-			{Pair.New("cnc","TEMPERAT"),Pair.New("tem","temperat.col")},
-			{Pair.New("cnc","WINTER"),Pair.New("win","winter.col")},
-		};
-		
-		TerrainColorSet terrainTypeColors;
-		TileSet tileset;
-		public void ConvertIniMap(string iniFile)
-		{
-			IniFile file = new IniFile(FileSystem.Open(iniFile));
-			IniSection basic = file.GetSection("Basic");
-			IniSection map = file.GetSection("Map");
-			var INIFormat = 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 = (INIFormat == 3) ? 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 (INIFormat == 3) // RA map
-			{
-				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
-				UnpackRAOverlayData(ReadPackedSection(file.GetSection("OverlayPack")));
-				ReadRATrees(file);
-				terrainTypeColors = new TerrainColorSet(fileMapping[Pair.New("ra",Map.Tileset)].Second);
-				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);
-				terrainTypeColors = new TerrainColorSet(fileMapping[Pair.New("cnc",Map.Tileset)].Second);
-				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), new int2(int.Parse(kv.Value) % MapSize, 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 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( 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(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( 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( 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( 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 );
-		}
-		
-		public void SavePreviewImage(string filepath)
-		{
-			var xs = Map.TopLeft.X;
-			var ys = Map.TopLeft.Y;
-			
-			var bitmap = new Bitmap(Map.Width, Map.Height);
-			for (var x = 0; x < Map.Width; x++)
-				for (var y = 0; y < Map.Height; y++)
-					bitmap.SetPixel(x, y, terrainTypeColors.ColorForTerrainType(tileset.GetTerrainType(Map.MapTiles[x+xs, y+ys])));
-		
-			for (var x = 0; x < Map.Width; x++)
-				for (var y = 0; y < Map.Height; y++)
-					if (Map.MapResources[x+xs, y+ys].type > 0)
-						bitmap.SetPixel(x, y, terrainTypeColors.ColorForTerrainType(TerrainType.Ore));
-				
-			bitmap.Save(filepath,ImageFormat.Png);
-		}
-		
-		public void Save(string filepath)
-		{
-			Directory.CreateDirectory(filepath);
-			
-			Map.Package = new Folder(filepath);
-			SavePreviewImage(Path.Combine(filepath,"preview.png"));
-			Map.Save(filepath);
-		}
-	}
-}
--- a/OpenRA.Editor/ActorTemplate.cs
+++ b/OpenRA.Editor/ActorTemplate.cs
@@ -0,0 +1,40 @@
+#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.Drawing;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	class ActorTemplate
+	{
+		public Bitmap Bitmap;
+		public ActorInfo Info;
+		public bool Centered;
+	}
+
+	class BrushTemplate
+	{
+		public Bitmap Bitmap;
+		public ushort N;
+	}
+
+	class ResourceTemplate
+	{
+		public Bitmap Bitmap;
+		public ResourceTypeInfo Info;
+		public int Value;
+	}
+
+	class WaypointTemplate
+	{
+	}
+}
--- a/OpenRA.Editor/Form1.Designer.cs
+++ b/OpenRA.Editor/Form1.Designer.cs
@@ -0,0 +1,412 @@
+namespace OpenRA.Editor
+{
+	partial class Form1
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+			this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.tabControl1 = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.tilePalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.actorPalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.tabPage3 = new System.Windows.Forms.TabPage();
+			this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.cCRedAlertMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.bitmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.exotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.spawnpointsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.tt = new System.Windows.Forms.ToolTip(this.components);
+			this.folderBrowser = new System.Windows.Forms.FolderBrowserDialog();
+			this.surface1 = new OpenRA.Editor.Surface();
+			this.toolStripContainer1.ContentPanel.SuspendLayout();
+			this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
+			this.toolStripContainer1.SuspendLayout();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			this.tabControl1.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			this.tabPage2.SuspendLayout();
+			this.tabPage3.SuspendLayout();
+			this.menuStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolStripContainer1
+			// 
+			// 
+			// toolStripContainer1.ContentPanel
+			// 
+			this.toolStripContainer1.ContentPanel.Controls.Add(this.splitContainer1);
+			this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(985, 681);
+			this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.toolStripContainer1.Location = new System.Drawing.Point(0, 0);
+			this.toolStripContainer1.Name = "toolStripContainer1";
+			this.toolStripContainer1.Size = new System.Drawing.Size(985, 705);
+			this.toolStripContainer1.TabIndex = 1;
+			this.toolStripContainer1.Text = "toolStripContainer1";
+			// 
+			// toolStripContainer1.TopToolStripPanel
+			// 
+			this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.menuStrip1);
+			// 
+			// splitContainer1
+			// 
+			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer1.Name = "splitContainer1";
+			// 
+			// splitContainer1.Panel1
+			// 
+			this.splitContainer1.Panel1.Controls.Add(this.tabControl1);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.Controls.Add(this.surface1);
+			this.splitContainer1.Size = new System.Drawing.Size(985, 681);
+			this.splitContainer1.SplitterDistance = 198;
+			this.splitContainer1.TabIndex = 0;
+			// 
+			// tabControl1
+			// 
+			this.tabControl1.Controls.Add(this.tabPage1);
+			this.tabControl1.Controls.Add(this.tabPage2);
+			this.tabControl1.Controls.Add(this.tabPage3);
+			this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tabControl1.Location = new System.Drawing.Point(0, 0);
+			this.tabControl1.Multiline = true;
+			this.tabControl1.Name = "tabControl1";
+			this.tabControl1.SelectedIndex = 0;
+			this.tabControl1.Size = new System.Drawing.Size(198, 681);
+			this.tabControl1.TabIndex = 0;
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(this.tilePalette);
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage1.Size = new System.Drawing.Size(190, 655);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "Templates";
+			this.tabPage1.UseVisualStyleBackColor = true;
+			// 
+			// tilePalette
+			// 
+			this.tilePalette.AutoScroll = true;
+			this.tilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+			this.tilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tilePalette.Location = new System.Drawing.Point(3, 3);
+			this.tilePalette.Name = "tilePalette";
+			this.tilePalette.Size = new System.Drawing.Size(184, 649);
+			this.tilePalette.TabIndex = 1;
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(this.actorPalette);
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage2.Size = new System.Drawing.Size(190, 655);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "Actors";
+			this.tabPage2.UseVisualStyleBackColor = true;
+			// 
+			// actorPalette
+			// 
+			this.actorPalette.AutoScroll = true;
+			this.actorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+			this.actorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.actorPalette.Location = new System.Drawing.Point(3, 3);
+			this.actorPalette.Name = "actorPalette";
+			this.actorPalette.Size = new System.Drawing.Size(184, 649);
+			this.actorPalette.TabIndex = 2;
+			// 
+			// tabPage3
+			// 
+			this.tabPage3.Controls.Add(this.resourcePalette);
+			this.tabPage3.Location = new System.Drawing.Point(4, 22);
+			this.tabPage3.Name = "tabPage3";
+			this.tabPage3.Size = new System.Drawing.Size(190, 655);
+			this.tabPage3.TabIndex = 2;
+			this.tabPage3.Text = "Resources";
+			this.tabPage3.UseVisualStyleBackColor = true;
+			// 
+			// resourcePalette
+			// 
+			this.resourcePalette.AutoScroll = true;
+			this.resourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+			this.resourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.resourcePalette.Location = new System.Drawing.Point(0, 0);
+			this.resourcePalette.Name = "resourcePalette";
+			this.resourcePalette.Size = new System.Drawing.Size(190, 655);
+			this.resourcePalette.TabIndex = 3;
+			// 
+			// menuStrip1
+			// 
+			this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None;
+			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem,
+            this.mapToolStripMenuItem});
+			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip1.Name = "menuStrip1";
+			this.menuStrip1.Size = new System.Drawing.Size(985, 24);
+			this.menuStrip1.TabIndex = 1;
+			this.menuStrip1.Text = "menuStrip1";
+			// 
+			// fileToolStripMenuItem
+			// 
+			this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.newToolStripMenuItem,
+            this.toolStripSeparator1,
+            this.openToolStripMenuItem,
+            this.saveToolStripMenuItem,
+            this.saveAsToolStripMenuItem,
+            this.toolStripSeparator2,
+            this.toolStripMenuItem1,
+            this.toolStripSeparator3,
+            this.exotToolStripMenuItem});
+			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+			this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+			this.fileToolStripMenuItem.Text = "&File";
+			// 
+			// newToolStripMenuItem
+			// 
+			this.newToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripMenuItem.Image")));
+			this.newToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia;
+			this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+			this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.newToolStripMenuItem.Text = "&New...";
+			this.newToolStripMenuItem.Click += new System.EventHandler(this.NewClicked);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
+			// 
+			// openToolStripMenuItem
+			// 
+			this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image")));
+			this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+			this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.openToolStripMenuItem.Text = "&Open...";
+			this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenClicked);
+			// 
+			// saveToolStripMenuItem
+			// 
+			this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
+			this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+			this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.saveToolStripMenuItem.Text = "&Save";
+			this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveClicked);
+			// 
+			// saveAsToolStripMenuItem
+			// 
+			this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
+			this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.saveAsToolStripMenuItem.Text = "Save &As...";
+			this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsClicked);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+			// 
+			// toolStripMenuItem1
+			// 
+			this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cCRedAlertMapToolStripMenuItem,
+            this.bitmapToolStripMenuItem});
+			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
+			this.toolStripMenuItem1.Text = "&Import";
+			// 
+			// cCRedAlertMapToolStripMenuItem
+			// 
+			this.cCRedAlertMapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cCRedAlertMapToolStripMenuItem.Image")));
+			this.cCRedAlertMapToolStripMenuItem.Name = "cCRedAlertMapToolStripMenuItem";
+			this.cCRedAlertMapToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.cCRedAlertMapToolStripMenuItem.Text = "&C&&C / Red Alert Map...";
+			this.cCRedAlertMapToolStripMenuItem.Click += new System.EventHandler(this.ImportLegacyMapClicked);
+			// 
+			// bitmapToolStripMenuItem
+			// 
+			this.bitmapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("bitmapToolStripMenuItem.Image")));
+			this.bitmapToolStripMenuItem.Name = "bitmapToolStripMenuItem";
+			this.bitmapToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.bitmapToolStripMenuItem.Text = "&Bitmap...";
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+			// 
+			// exotToolStripMenuItem
+			// 
+			this.exotToolStripMenuItem.Name = "exotToolStripMenuItem";
+			this.exotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.exotToolStripMenuItem.Text = "E&xit";
+			this.exotToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked);
+			// 
+			// mapToolStripMenuItem
+			// 
+			this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.propertiesToolStripMenuItem,
+            this.resizeToolStripMenuItem,
+            this.toolStripSeparator4,
+            this.spawnpointsToolStripMenuItem});
+			this.mapToolStripMenuItem.Name = "mapToolStripMenuItem";
+			this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+			this.mapToolStripMenuItem.Text = "&Map";
+			// 
+			// propertiesToolStripMenuItem
+			// 
+			this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image")));
+			this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
+			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.propertiesToolStripMenuItem.Text = "&Properties...";
+			this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked);
+			// 
+			// resizeToolStripMenuItem
+			// 
+			this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image")));
+			this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem";
+			this.resizeToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.resizeToolStripMenuItem.Text = "&Resize...";
+			this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked);
+			// 
+			// toolStripSeparator4
+			// 
+			this.toolStripSeparator4.Name = "toolStripSeparator4";
+			this.toolStripSeparator4.Size = new System.Drawing.Size(139, 6);
+			// 
+			// spawnpointsToolStripMenuItem
+			// 
+			this.spawnpointsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("spawnpointsToolStripMenuItem.Image")));
+			this.spawnpointsToolStripMenuItem.Name = "spawnpointsToolStripMenuItem";
+			this.spawnpointsToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.spawnpointsToolStripMenuItem.Text = "&Spawnpoints";
+			this.spawnpointsToolStripMenuItem.Click += new System.EventHandler(this.SpawnPointsClicked);
+			// 
+			// tt
+			// 
+			this.tt.ShowAlways = true;
+			// 
+			// surface1
+			// 
+			this.surface1.BackColor = System.Drawing.Color.Black;
+			this.surface1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.surface1.Location = new System.Drawing.Point(0, 0);
+			this.surface1.Name = "surface1";
+			this.surface1.Size = new System.Drawing.Size(783, 681);
+			this.surface1.TabIndex = 5;
+			this.surface1.Text = "surface1";
+			// 
+			// Form1
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(985, 705);
+			this.Controls.Add(this.toolStripContainer1);
+			this.KeyPreview = true;
+			this.MainMenuStrip = this.menuStrip1;
+			this.Name = "Form1";
+			this.Text = "OpenRA Editor";
+			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing);
+			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);
+			this.toolStripContainer1.ContentPanel.ResumeLayout(false);
+			this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false);
+			this.toolStripContainer1.TopToolStripPanel.PerformLayout();
+			this.toolStripContainer1.ResumeLayout(false);
+			this.toolStripContainer1.PerformLayout();
+			this.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			this.splitContainer1.ResumeLayout(false);
+			this.tabControl1.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage2.ResumeLayout(false);
+			this.tabPage3.ResumeLayout(false);
+			this.menuStrip1.ResumeLayout(false);
+			this.menuStrip1.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStripContainer toolStripContainer1;
+		private System.Windows.Forms.SplitContainer splitContainer1;
+		private System.Windows.Forms.ToolTip tt;
+		private System.Windows.Forms.TabControl tabControl1;
+		private System.Windows.Forms.TabPage tabPage1;
+		private System.Windows.Forms.FlowLayoutPanel tilePalette;
+		private System.Windows.Forms.TabPage tabPage2;
+		private System.Windows.Forms.FlowLayoutPanel actorPalette;
+		private System.Windows.Forms.TabPage tabPage3;
+		private System.Windows.Forms.FlowLayoutPanel resourcePalette;
+		private System.Windows.Forms.FolderBrowserDialog folderBrowser;
+		private Surface surface1;
+		private System.Windows.Forms.MenuStrip menuStrip1;
+		private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+		private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+		private System.Windows.Forms.ToolStripMenuItem exotToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+		private System.Windows.Forms.ToolStripMenuItem cCRedAlertMapToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem bitmapToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+		private System.Windows.Forms.ToolStripMenuItem mapToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem resizeToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+		private System.Windows.Forms.ToolStripMenuItem spawnpointsToolStripMenuItem;
+
+	}
+}
+
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -0,0 +1,460 @@
+#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.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	public partial class Form1 : Form
+	{
+		public Form1(string[] mods)
+		{
+			InitializeComponent();
+			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
+
+			currentMod = mods.FirstOrDefault() ?? "ra";
+
+			Text = "OpenRA Editor (mod:{0})".F(currentMod);
+
+			var manifest = new Manifest(new[] { currentMod });
+			Game.LoadModAssemblies(manifest);
+
+			FileSystem.UnmountAll();
+			foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
+			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
+
+			Rules.LoadRules(manifest, new Map());
+
+			folderBrowser.SelectedPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+				.Aggregate(Path.Combine);
+
+			surface1.AfterChange += MakeDirty;
+		}
+
+		void MakeDirty() { dirty = true; }
+
+		string loadedMapName;
+		string currentMod = "ra";
+		TileSet tileset;
+		bool dirty = false;
+
+		void LoadMap(string mapname)
+		{
+			tilePalette.Controls.Clear();
+			actorPalette.Controls.Clear();
+			resourcePalette.Controls.Clear();
+
+			loadedMapName = mapname;
+
+			var manifest = new Manifest(new[] { currentMod });
+			Game.LoadModAssemblies(manifest);
+
+			FileSystem.UnmountAll();
+			foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
+			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
+
+			// load the map
+			var map = new Map(new Folder(mapname));
+
+			// upgrade maps that have no player definitions. editor doesnt care,
+			// but this breaks the game pretty badly.
+			if (map.Players.Count == 0)
+				map.Players.Add("Neutral", new PlayerReference("Neutral",
+						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+
+			PrepareMapResources(manifest, map);
+
+			dirty = false;
+		}
+
+		void NewMap(Map map)
+		{
+			tilePalette.Controls.Clear();
+			actorPalette.Controls.Clear();
+			resourcePalette.Controls.Clear();
+
+			loadedMapName = null;
+
+			var manifest = new Manifest(new[] { currentMod });
+			Game.LoadModAssemblies(manifest);
+
+			FileSystem.UnmountAll();
+			foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
+			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
+
+			PrepareMapResources(manifest, map);
+
+			MakeDirty();
+		}
+
+		void PrepareMapResources(Manifest manifest, Map map)
+		{
+			Rules.LoadRules(manifest, map);			
+			tileset = Rules.TileSets[map.Theater];
+			tileset.LoadTiles();
+			var palette = new Palette(FileSystem.Open(tileset.Palette), true);
+
+			surface1.Bind(map, tileset, palette);
+
+			// construct the palette of tiles
+			var palettes = new[] { tilePalette, actorPalette, resourcePalette };
+			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
+
+			foreach (var t in tileset.Templates)
+			{
+				try
+				{
+					var bitmap = RenderTemplate(tileset, (ushort)t.Key, palette);
+					var ibox = new PictureBox
+					{
+						Image = bitmap,
+						Width = bitmap.Width / 2,
+						Height = bitmap.Height / 2,
+						SizeMode = PictureBoxSizeMode.StretchImage
+					};
+
+					var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
+					ibox.Click += (_, e) => surface1.SetBrush(brushTemplate);
+
+					var template = t.Value;
+					tilePalette.Controls.Add(ibox);
+
+					tt.SetToolTip(ibox,
+						"{1}:{0} ({2}x{3})".F(
+						template.Image,
+						template.Id,
+						template.Size.X,
+						template.Size.Y));
+				}
+				catch { }
+			}
+
+			var actorTemplates = new List<ActorTemplate>();
+
+			foreach (var a in Rules.Info.Keys)
+			{
+				try
+				{
+					var info = Rules.Info[a];
+					if( !info.Traits.Contains<RenderSimpleInfo>() ) continue;
+					var template = RenderActor(info, tileset, palette);
+					var ibox = new PictureBox
+					{
+						Image = template.Bitmap,
+						Width = template.Bitmap.Width / 2,
+						Height = template.Bitmap.Height / 2,
+						SizeMode = PictureBoxSizeMode.StretchImage
+					};
+
+					ibox.Click += (_, e) => surface1.SetActor(template);
+
+					actorPalette.Controls.Add(ibox);
+
+					tt.SetToolTip(ibox,
+						"{0}:{1}".F(
+						info.Name,
+						info.Category));
+
+					actorTemplates.Add(template);
+				}
+				catch { }
+			}
+
+			surface1.BindActorTemplates(actorTemplates);
+
+			var resourceTemplates = new List<ResourceTemplate>();
+
+			foreach (var a in Rules.Info["world"].Traits.WithInterface<ResourceTypeInfo>())
+			{
+				try
+				{
+					var template = RenderResourceType(a, tileset.Extensions, palette);
+					var ibox = new PictureBox
+					{
+						Image = template.Bitmap,
+						Width = template.Bitmap.Width,
+						Height = template.Bitmap.Height,
+						SizeMode = PictureBoxSizeMode.StretchImage
+					};
+
+					ibox.Click += (_, e) => surface1.SetResource(template);
+
+					resourcePalette.Controls.Add(ibox);
+
+					tt.SetToolTip(ibox,
+						"{0}:{1}cr".F(
+						template.Info.Name,
+						template.Info.ValuePerUnit));
+
+					resourceTemplates.Add(template);
+				}
+				catch { }
+			}
+
+			surface1.BindResourceTemplates(resourceTemplates);
+
+			foreach (var p in palettes) { p.Visible = true; p.ResumeLayout(); }
+		}
+
+		static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
+		{
+			var template = ts.Templates[n];
+			var tile = ts.Tiles[n];
+
+			var bitmap = new Bitmap(24 * template.Size.X, 24 * template.Size.Y);
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* q = (int*)data.Scan0.ToPointer();
+				var stride = data.Stride >> 2;
+
+				for (var u = 0; u < template.Size.X; u++)
+					for (var v = 0; v < template.Size.Y; v++)
+						if (tile.TileBitmapBytes[u + v * template.Size.X] != null)
+						{
+							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
+							for (var i = 0; i < 24; i++)
+								for (var j = 0; j < 24; j++)
+									q[(v * 24 + j) * stride + u * 24 + i] = p.GetColor(rawImage[i + 24 * j]).ToArgb();
+						}
+						else
+						{
+							for (var i = 0; i < 24; i++)
+								for (var j = 0; j < 24; j++)
+									q[(v * 24 + j) * stride + u * 24 + i] = Color.Transparent.ToArgb();
+						}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
+		{
+			var ri = info.Traits.Get<RenderSimpleInfo>();
+			string image = null;
+			if (ri.OverrideTheater != null)
+				for (int i = 0; i < ri.OverrideTheater.Length; i++)
+					if (ri.OverrideTheater[i] == tileset.Id)
+						image = ri.OverrideImage[i];
+			
+			image = image ?? ri.Image ?? info.Name;
+			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			{
+				var shp = new ShpReader(s);
+				var frame = shp[0];
+
+				var bitmap = new Bitmap(shp.Width, shp.Height);
+				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+				unsafe
+				{
+					int* q = (int*)data.Scan0.ToPointer();
+					var stride = data.Stride >> 2;
+
+					for (var i = 0; i < shp.Width; i++)
+						for (var j = 0; j < shp.Height; j++)
+							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+				}
+
+				bitmap.UnlockBits(data);
+				return new ActorTemplate { Bitmap = bitmap, Info = info, Centered = !info.Traits.Contains<BuildingInfo>() };
+			}
+		}
+
+		static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
+		{
+			var image = info.SpriteNames[0];
+			using (var s = FileSystem.OpenWithExts(image, exts))
+			{
+				var shp = new ShpReader(s);
+				var frame = shp[shp.ImageCount - 1];
+
+				var bitmap = new Bitmap(shp.Width, shp.Height);
+				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+				unsafe
+				{
+					int* q = (int*)data.Scan0.ToPointer();
+					var stride = data.Stride >> 2;
+
+					for (var i = 0; i < shp.Width; i++)
+						for (var j = 0; j < shp.Height; j++)
+							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+				}
+
+				bitmap.UnlockBits(data);
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
+			}
+		}
+
+		void ResizeClicked(object sender, EventArgs e)
+		{
+			using (var rd = new ResizeDialog())
+			{
+				rd.width.Value = surface1.Map.MapSize.X;
+				rd.height.Value = surface1.Map.MapSize.Y;
+				rd.cordonLeft.Value = surface1.Map.TopLeft.X;
+				rd.cordonTop.Value = surface1.Map.TopLeft.Y;
+				rd.cordonRight.Value = surface1.Map.BottomRight.X;
+				rd.cordonBottom.Value = surface1.Map.BottomRight.Y;
+
+				if (DialogResult.OK != rd.ShowDialog())
+					return;
+
+				surface1.Map.TopLeft = new int2((int)rd.cordonLeft.Value, (int)rd.cordonTop.Value);
+				surface1.Map.BottomRight = new int2((int)rd.cordonRight.Value, (int)rd.cordonBottom.Value);
+
+				if ((int)rd.width.Value != surface1.Map.MapSize.X || (int)rd.height.Value != surface1.Map.MapSize.Y)
+				{
+					surface1.Map.Resize((int)rd.width.Value, (int)rd.height.Value);
+					surface1.Bind(surface1.Map, surface1.TileSet, surface1.Palette);	// rebind it to invalidate all caches
+				}
+
+				surface1.Invalidate();
+			}
+		}
+		
+		void SaveClicked(object sender, EventArgs e)
+		{
+			if (loadedMapName == null)
+				SaveAsClicked(sender, e);
+			else
+			{
+				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
+				surface1.Map.Package = new Folder(loadedMapName);
+				surface1.Map.Save(loadedMapName);
+
+				dirty = false;
+			}
+		}
+
+		void SaveAsClicked(object sender, EventArgs e)
+		{
+			folderBrowser.ShowNewFolderButton = true;
+
+			if (DialogResult.OK == folderBrowser.ShowDialog())
+			{
+				loadedMapName = folderBrowser.SelectedPath;
+				SaveClicked(sender, e);
+			}
+		}
+
+		void OpenClicked(object sender, EventArgs e)
+		{
+			folderBrowser.ShowNewFolderButton = true;
+
+			if (DialogResult.OK == folderBrowser.ShowDialog())
+				LoadMap(folderBrowser.SelectedPath);
+		}
+
+		void NewClicked(object sender, EventArgs e)
+		{
+			using (var nmd = new NewMapDialog())
+			{
+				nmd.theater.Items.Clear();
+				nmd.theater.Items.AddRange(Rules.TileSets.Select(a => a.Value.Id).ToArray());
+				nmd.theater.SelectedIndex = 0;
+
+				if (DialogResult.OK == nmd.ShowDialog())
+				{
+					var map = new Map();
+
+					map.Resize((int)nmd.width.Value, (int)nmd.height.Value);
+
+					map.TopLeft = new int2((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value);
+					map.BottomRight = new int2((int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
+					map.Tileset = nmd.theater.SelectedItem as string;
+					map.Players.Add("Neutral", new PlayerReference("Neutral", Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+					NewMap(map);
+				}
+			}
+		}
+
+		void PropertiesClicked(object sender, EventArgs e)
+		{
+			using (var pd = new PropertiesDialog())
+			{
+				pd.title.Text = surface1.Map.Title;
+				pd.desc.Text = surface1.Map.Description;
+				pd.author.Text = surface1.Map.Author;
+				pd.selectable.Checked = surface1.Map.Selectable;
+
+				if (DialogResult.OK != pd.ShowDialog())
+					return;
+
+				surface1.Map.Title = pd.title.Text;
+				surface1.Map.Description = pd.desc.Text;
+				surface1.Map.Author = pd.author.Text;
+				surface1.Map.Selectable = pd.selectable.Checked;
+			}
+		}
+
+		void SpawnPointsClicked(object sender, EventArgs e) { surface1.SetWaypoint(new WaypointTemplate()); }
+		void Form1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = true; }
+		void Form1_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = false; }
+
+		void CloseClicked(object sender, EventArgs e)
+		{
+			Close();
+		}
+
+		void ImportLegacyMapClicked(object sender, EventArgs e)
+		{
+			using (var ofd = new OpenFileDialog { Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
+				if (DialogResult.OK == ofd.ShowDialog())
+				{
+					/* massive hack: we should be able to call NewMap() with the imported Map object,
+					 * but something's not right internally in it, unless loaded via the real maploader */
+
+					var savePath = Path.Combine(Path.GetTempPath(), "OpenRA.Import");
+					Directory.CreateDirectory(savePath);
+
+					var map = LegacyMapImporter.Import(ofd.FileName);
+					map.Package = new Folder(savePath);
+					map.Players.Add("Neutral", new PlayerReference("Neutral", 
+						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+					
+					map.Save(savePath);
+					LoadMap(savePath);
+					loadedMapName = null;	/* editor needs to think this hasnt been saved */
+
+					Directory.Delete(savePath, true);
+					MakeDirty();
+				}
+		}
+
+		void OnFormClosing(object sender, FormClosingEventArgs e)
+		{
+			if (!dirty) return;
+
+			switch (MessageBox.Show("The map has been modified since it was last saved. Save changes now?",
+				"Unsaved Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
+			{
+				case DialogResult.Yes: SaveClicked(null, EventArgs.Empty); break;
+				case DialogResult.No: break;
+				case DialogResult.Cancel: e.Cancel = true; break;
+			}
+		}
+	}
+}
--- a/OpenRA.Editor/Form1.resx
+++ b/OpenRA.Editor/Form1.resx
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>309, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="newToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHNSURBVDhPjZNdTxNREIb5LV54azSRxJ8gt95445XGa/8A
+        CU0MMVgIWNmgRSioGN0AapQaISAWrEaITQTkQyhL2WbbWtt1+7ll+7h7SDdBocskk3Mm58xzZt7JaWmx
+        bTdyk9/rPsz0fbYmz2JqfvSdHhJLPpxzTzMUid13F0D3k/h41V57iU+dI7/dfTqA8zKGBLUohjpurxER
+        7/24i/RkSnj/47csLsWOB27IZ1DmrlDQJrHIU8q8EbE63UrD7oVe09p243iIqEAPQGVOQJxKRJwfdgE9
+        gxO8X1wRkIWv/1Ri7A0QD5/HSrWT/HTNTgwIDapayAV0DTwXyQ0/IqwSvXU4hWQn6uwl4usPKCl9pGI+
+        F2DV6zwaX2BQjgjIiZPpHXrpJjU2di7lao2sXmLiwwYXL18/GeB/KP8HqJgH5Iwy++k/yDOrzQF3+p8d
+        AZi1A/RCleQvg81ElrHwt+aA232jLqBmWRjFKlq2wM/9HLGtFCOvPjcHdHQPCYBl1SmWTdK5IvFknu/b
+        GaIrKsEX880B7V1B6rZq5cqhaIqms7aT4cuqyuyygvR0xhvgiOao7Qjm9Byyyw7K80hj0wRGw94tOGPy
+        cs8fetoLfwGP5fd9L1vD4gAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="openToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACeklE
+        QVQ4T6WTWUiUURiG/4suurJIjUIwskQsEANDqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF
+        sEIoFInQcqHE1CwoKsXUUMnt6Z+RLMtA8OK5OZz3Oe/5OEcAhPWwpnBaodZZmqfjWmY5GSo98XJNwq9D
+        1yQIilLhFaYIMIQuxZaZJ4uy6FS1T2BUIUKdNsdPhL9pqpEp/ne18PiiE94RCjzDco0C+rs1zIzXGvkx
+        pmNuRI2+XEG9NjV5NYlXuBLP0DzcQwoQaiuUTI9VrQgvfC5irjeSqrJMKovTURcmU5KbxE15HAWyGNH5
+        e/BCtSab6a+a5ZMXxTD9cdAbsir/CG6Xyvj+qcRY2xBurss28lCfRYNOxr3KdPTqFHQlUspV17mVl0Cx
+        Mg5VdqyxjVBZks7k+3wMtYdaJdRXKVkYksJw6kreiWuD8dAXBa8j6Krx5UqwR4WgVqUwMZAJH+Tcr1bQ
+        /ki+tOnPK7wKhA5v5tvcmHnsxNsKOy6ePTohCvYKpXkSvr2RMtyWSL1OzuKgBHpClwRdwWLwNPPtHsy0
+        HGGy6RCjdfuQhllzxsUs1zBMoUiZyGh3LHe02XQ+E5v0RYqC89AZwOLzk8w+Pc5U82HG6h34Um1LR9pm
+        /N2scLAxsTEKVFlx9LQkcVebBQNJ8FKs+8KH2VZ3pp44Md7gyIjejo+a3fTKTZGE7MJ+j0Xj8lPOz4ih
+        tjyT3gfhdOQIy7TLN9Ai20hj8iZqEsxRx1hw4+oO/F13LjraW7ouC3JSo8mRXCAjNoj4y36GyXLO14VT
+        xw7gfNCO/XbW2FpZYLndjK1bTNhmarLyIa3nKxuyPwG9D9E7Fbto+QAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="saveToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACMklE
+        QVQ4T6WT3UuTcRTH9y90303QRbc1NYZrMRs86hzKsmFoIb09kqZpunxJUqxMxZYvkK1w6sTlahJOKvIF
+        TJEUMZaSlZkrWuJQU3QiGHz7nZ+wn0vrQh84Nw98Puc553wfBQDFXorDL18EQOXuXEGHaxlPHItoafbj
+        kXUW9XU/YLnnxd3yaZSWfEZR4Qfk5Y7japaHoVBwAYF9vUBd7Tq9/Oeztr4BfVIfTic95xUUuJ4tcUFl
+        xa//wv7FNRw3voJSKcN0yikEjrYFLigt+bmjgDoT/NW3hDCDG4UFMzhpbBUCW+McF1w3f9km2Aq/n/Lj
+        kORCTvYkEuJtQtDwwMcFmVfGQwR/w0MeH/ZrHZDlURgMViGorfnOBfKl0aBgJ7h35Bv2RTYj5cwbxMbW
+        C0FV5Qx6usFOCaSeH4bp7CDfNi2MZqbPps6bcD8STa8hSRYhuFU2hS43WAaAVvtvdvdVlN+Z50ulhdHM
+        GemeIByX0AmdrkIIbhRNwtkONNk2WHAC0Cdnh5TxnBnJl4t557h4Bsc4odWWCYE5b4LBQM39AO9MAgXL
+        WJhawtinOUxMz0POvY0T+g4Oq6Ps0GiKhYBiaX2I4GeTgOC0/Gp89C7AO7uMazctCNfaGdyC8GOPoY7M
+        F4KM9Hds7hU+80GdEweOSHjaNQB39xB6+kcw+HYM0QYTlJpGRDD4sKoBKlVOiCDx4oUBHk9KGIWE7kyn
+        om3Twmhm6kpF8NGITCGgn2K39QfkKu4LIHJHnwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="cCRedAlertMapToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
+        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
+        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
+        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
+        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
+        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
+        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
+        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
+        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
+        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
+        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
+        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
+        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
+        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
+        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
+        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
+        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
+        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
+        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
+        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
+        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
+        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
+        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
+        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
+        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
+        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
+        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
+        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
+        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
+        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
+        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
+        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
+        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
+        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
+        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
+        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
+        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
+        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
+        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
+        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
+        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
+        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
+        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAN5JREFUOE+FUwEOAyEI
+        8+k+7X7GoFBWmZdtISYgtS3csrXsFtvzf2Mv8/8d4Hkec2SLM+IHzJsjdwVAcxQrtl8OsDgBxPMGgKJG
+        SQkwMlI2zSCS+cuL0YCceHEDAcBbM6gTQOhDDpnBxHqVOsmgdYvmfCxk7q+JpDZN4yQOJhOAOtmslGna
+        MYE3AN2HeBEmyvhYZ44mL5rRXkijgoAZAA3nCVBzbzM5vuE8x8xmbGIzqE1LkNwHOO2RZmZOjQYTjoWF
+        g/YYr+qn2QBQSl2ofL8oC6Wb2hIOM8WD+bXOex/mMAFDkP1eQgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="bitmapToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACR0lE
+        QVQ4T6WTXUiTARSGdxkRRBdB0IUREV1EKRFEYYuQAklL8sKQfphUoJSUWJbLxAVZWqyBio5WajorM1PL
+        xExUlLQfbU5n0lygRerMP/qxOZ92vpjfCKLAi3P5Puc957xHA2gWUoo49147gWUqbSPrdjOXChrQm56S
+        lFVFvKEcXaqV2OQiohMt7Esw+6Ro5gGeWfhbff0BY9NzDI3N0f/JS6fLy7rd6f8HcNsdOI6EYD8cjK3V
+        roiLawdYu+vivwHSWcQM1THz/DQv96+ixeHlVvU71oQFAGTmP+37bdsPBf8WZ4fRFhVEXdcsBQ9srN6Z
+        pjqQhQUCAmcW29JZxA8fvaWyY5YcawdBOy6oANm2H9A3MMypDLNS7b1flJnFtnQWcVmrB2NhMytD9SpA
+        TiUA5+CYInQOjWPrH2V7RBzmijdo9x5VKr+yj6ImD9nmelZsS1UBcme/+OPIJIOfv/Gi201ZXQ/hMfFU
+        Peuktqnbd3QN+U/cXM6tYfmW8ypAQiKdh91TTE7PYHNOYKl6z916F3m+eSNjT1B4vxHjzWoFYrhRwbLN
+        51SAJOynx8vo5Ay9rimKHzu5XtJDpuU1WZY2Eg1WgrXRJOpNxKdcUyBLN6WoAInnyPh3XvW6KW/4MC9O
+        z2ki+Wo1CWklROkMCiT8wEm0kXEsCTmrAiTbDtcEpTVdZOS1oDfWk5xZ6RPeQZeUR8zxK0Qe1BO65xjr
+        t0YotXhjAEAeQ7It8ZSESUjkznIq2bYsTGYW29JZxIs2nFEdLOSdfwFwpvLxRKIY2AAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="propertiesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACCklE
+        QVQ4T6WT30tTUQDHz39QD0UQSpAPIkgPyR60AiUiyoGBL4qZjOyt0tZP9tBDk1AsXIhj93ILdd27DPPH
+        3VwrUrdK2ioJHAgVOdoPaQsarBg43L6ec+akuRsEPnw5D4fP5/vlXg4BQHaSf8LjjwdqaTA2cg+y1Ith
+        qxmi5Tas/SYWk+QRoPgmtNsLcPq7GYX8+XoTqaUL+KR2cAmDxeBgqeBv2NhWzwUFOBk4g5/zRxB3V8Es
+        38AtbzuIw/0RLMrMeyhTs2CzGdRtaOTn1dajvLkAR9VKLNvLcHmoExddzSDKzAfkcjkkEtEiOLxoQpdB
+        z+Er7ScQUg/DL5TD2bsfl5oPoKWnCZ3jehDZGeAC1hwL3uXNs55Jep7Gis/AJWxyTeVe1FXvhq5qH6oP
+        7nlw/NoxGByNIKPT77CezSEeD6Pn+jlEIiGk6X8N+F9zyfLYIZzUVUCwT0J36jy9yX83KjDq7zSADE8t
+        cGB7kpksFt76YDzbgMWVFLzBX0WCTcku8mjiTSm8lkUslcHnH2kK/+aw6k+UCJiESE+9XCApz2Gzu5Gk
+        sEVy4r6got82vRV5blVbIDyZ21rAZrPmL7w5P5s1KxQWXRFtgU15lV8ge2AbdXPY8pAuEIsXWJ6FtAVW
+        +SWSmXWssuZ4vnl+s5nNFl1hMLjP8U1bMGR/wS/+N9tf7o6eMpNtADko6xybtEXLAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="resizeToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAADLklE
+        QVQ4T3WS60/ScRjFf39CL3rR1ovurduWbbU2t7ZqdlkXt7Lrym6O1VoXcdYqQ54wKlGxABE1CzWF0nIm
+        lZcoTbyUNJFIzDJSJK+E0qy8wInvz+i2erazfd+cz3m+zw4nTS+FLOeZNim3Vp6UU5sqvf5MSZqnyjhV
+        pfKUvEx54kqp8rCkWHVQVKSJPHtbs+tUgSYiOicVAMfEqfR1dVFCGSqrX94cHQeN/aXhbyD3Zz91uf3U
+        9tFHTQ4fzVtH9BOQVdKcW2F6/eKkWA1zcxu6vUAQMmCzk/3AErLtDyFrrY035z16T3PXin8B5LfqZE6P
+        HyZzKw5FX+Yh4XtjwZKZGV3lNPIkhhojplON3Uc3S9/Q7LDfADKtKYklMsgTkwV7joixKHQr2Nq2fSET
+        5uQwqtsyjcot45R510ozV8f/2iAhsyolCNh9WIyFoRGYHbIGfYN+SVd7Nznzk8ll0FLzKxdZO3xkaOjG
+        GYUxcIIfRxSlPU4N/rn1fS8JJVlU1WCT3npggVLfAIWuHjJtNRIyjIhTPEKM7D6OSop4RcXpwZ2Wl11l
+        gHanmze/c36ioc8jyRlFjSzljxl2daI9Pwuv1Cnw9PRjZeQ1cCcSS68Fza6+IXL2fCG7w0ssmc3o2IR8
+        gbc1PQU9NUp48sNRcUyAkPBL4AIlUbLk3gEvS6YXrW6p0dx9UZ5n4gHjzBmYAAPPYwRwazeiMXYWqjcs
+        wLSVInAHRYWq0TEf9Q+NUEsg+fr9t2nF1U71leyqn+u3vPuIl2298HZ2wnxkO5q2LYOtxoKpK86D23tW
+        r+7zfCVzywAVGT/QVV2LvNDo0Eo0j3mAtbUTiRnFOJ94Axp9LfIKK5Ctq0RDmw9TQuPAsW7bHYNUYLCQ
+        JL2GRAqjtMDYwV+8wzUAWeY9eIfHYW0fxNodxyGWZeOSPBvzl27C5OXnwG0T5irmr79wgdWTNYyVJFL8
+        kAeo8wyBA/rx2jGErBIH0nXPsWmPEHcM9YgURGPS0jMTZfiXGKDfM4Y0fVOgA/UgRQWECTpExaqxUyDF
+        wuUbJjb4H0AQfxtrDqiweLMUc8LEmLEqnv9zUMzM9B1/cM83lepxTAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="spawnpointsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAABrUlE
+        QVQ4T6WTWyhDcRzHl8g1D/IkxZ4mjcgDB0U5ubbVbJLkkubJSt7w6M1eENHUENrktmzJ3HKEiSh7US5l
+        QiK5JUXpy/9f/9O2zhY59at//c/n87uc35EBkP0nAsL6Bi33E9CpeBINJElHthIkvBNKChh8YVPi1Cpn
+        Eo7ANSnJwQUMfnLEobVejZbaCnis8VRiyFSgXJ4QWOAPO5fXYJ2xo1HD48QcRSV5CfHSAn94fV0gL9Jn
+        eVWAtjgXRwPhrJ18Ngc6g2AwkzhXBJTmZ+GgN8xHwgRgPXtnZvDH5xde3j6x6BTAcxk47JFRCUnOBAWF
+        2WkQhC2xbH/49uEd59evGLfYoJAnEkGjKCCHyjqDDzw72YOpUSMmTF0w93VS2H32iLmlXSSlcuIgxT1Q
+        VTf7CAj87IjFgy2Gfk4Cu9x3sNhd0oIyXZMoID2TzPez0biyREKvK6bw6t4NxuYDCEo0ZFsBNjBStmci
+        Asb2Kmj4HAovbF5ieHpHugJeXUfhja19rGzsYai7DcemULj7Q1DEpWNkzgXTDzxo3ZYWFKlq6cVvw2eR
+        vP+uv56/AehVvkSccelEAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="folderBrowser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>182, 17</value>
+  </metadata>
+</root>
--- a/OpenRA.Editor/LegacyMapImporter.cs
+++ b/OpenRA.Editor/LegacyMapImporter.cs
@@ -0,0 +1,379 @@
+#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 OpenRA.Editor
+{
+	public class LegacyMapImporter
+	{
+		// 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();
+
+		LegacyMapImporter(string filename)
+		{
+			ConvertIniMap(filename);
+		}
+
+		public static Map Import(string filename)
+		{
+			var converter = new LegacyMapImporter(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(overlayActorMapping[raOverlayNames[o]]) 
+							{ 
+								new LocationInit( new int2(i, j) ),
+								new OwnerInit( "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(kv.Value.ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit("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(overlayActorMapping[kv.Value.ToLower()])
+						{
+							new LocationInit(cell),
+							new OwnerInit("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(kv.Value.Split(',')[0].ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit("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(parts[1].ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit(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/OpenRA.Editor/NewMapDialog.Designer.cs
+++ b/OpenRA.Editor/NewMapDialog.Designer.cs
@@ -0,0 +1,280 @@
+namespace OpenRA.Editor
+{
+	partial class NewMapDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
+			this.cordonTop = new System.Windows.Forms.NumericUpDown();
+			this.cordonRight = new System.Windows.Forms.NumericUpDown();
+			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
+			this.height = new System.Windows.Forms.NumericUpDown();
+			this.width = new System.Windows.Forms.NumericUpDown();
+			this.label4 = new System.Windows.Forms.Label();
+			this.theater = new System.Windows.Forms.ComboBox();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(229, 160);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 12;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(310, 160);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 13;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(31, 77);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(107, 13);
+			this.label3.TabIndex = 9;
+			this.label3.Text = "Cordon Right/Bottom";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(31, 51);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(86, 13);
+			this.label2.TabIndex = 11;
+			this.label2.Text = "Cordon Left/Top";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(31, 25);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 10;
+			this.label1.Text = "Size";
+			// 
+			// cordonBottom
+			// 
+			this.cordonBottom.Location = new System.Drawing.Point(280, 75);
+			this.cordonBottom.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonBottom.Name = "cordonBottom";
+			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
+			this.cordonBottom.TabIndex = 8;
+			this.cordonBottom.Value = new decimal(new int[] {
+            112,
+            0,
+            0,
+            0});
+			// 
+			// cordonTop
+			// 
+			this.cordonTop.Location = new System.Drawing.Point(280, 49);
+			this.cordonTop.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonTop.Name = "cordonTop";
+			this.cordonTop.Size = new System.Drawing.Size(105, 20);
+			this.cordonTop.TabIndex = 3;
+			this.cordonTop.Value = new decimal(new int[] {
+            16,
+            0,
+            0,
+            0});
+			// 
+			// cordonRight
+			// 
+			this.cordonRight.Location = new System.Drawing.Point(169, 75);
+			this.cordonRight.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonRight.Name = "cordonRight";
+			this.cordonRight.Size = new System.Drawing.Size(105, 20);
+			this.cordonRight.TabIndex = 5;
+			this.cordonRight.Value = new decimal(new int[] {
+            112,
+            0,
+            0,
+            0});
+			// 
+			// cordonLeft
+			// 
+			this.cordonLeft.Location = new System.Drawing.Point(169, 49);
+			this.cordonLeft.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonLeft.Name = "cordonLeft";
+			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
+			this.cordonLeft.TabIndex = 7;
+			this.cordonLeft.Value = new decimal(new int[] {
+            16,
+            0,
+            0,
+            0});
+			// 
+			// height
+			// 
+			this.height.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.height.Location = new System.Drawing.Point(280, 23);
+			this.height.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.height.Name = "height";
+			this.height.Size = new System.Drawing.Size(105, 20);
+			this.height.TabIndex = 6;
+			this.height.Value = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			// 
+			// width
+			// 
+			this.width.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.width.Location = new System.Drawing.Point(169, 23);
+			this.width.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.width.Name = "width";
+			this.width.Size = new System.Drawing.Size(105, 20);
+			this.width.TabIndex = 4;
+			this.width.Value = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(31, 124);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(44, 13);
+			this.label4.TabIndex = 14;
+			this.label4.Text = "Theater";
+			// 
+			// theater
+			// 
+			this.theater.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.theater.FormattingEnabled = true;
+			this.theater.Location = new System.Drawing.Point(169, 121);
+			this.theater.Name = "theater";
+			this.theater.Size = new System.Drawing.Size(216, 21);
+			this.theater.TabIndex = 15;
+			// 
+			// NewMapDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(418, 210);
+			this.Controls.Add(this.theater);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.cordonBottom);
+			this.Controls.Add(this.cordonTop);
+			this.Controls.Add(this.cordonRight);
+			this.Controls.Add(this.cordonLeft);
+			this.Controls.Add(this.height);
+			this.Controls.Add(this.width);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "NewMapDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "New Map";
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.NumericUpDown cordonBottom;
+		public System.Windows.Forms.NumericUpDown cordonTop;
+		public System.Windows.Forms.NumericUpDown cordonRight;
+		public System.Windows.Forms.NumericUpDown cordonLeft;
+		public System.Windows.Forms.NumericUpDown height;
+		public System.Windows.Forms.NumericUpDown width;
+		private System.Windows.Forms.Label label4;
+		public System.Windows.Forms.ComboBox theater;
+	}
+}
--- a/OpenRA.Editor/NewMapDialog.cs
+++ b/OpenRA.Editor/NewMapDialog.cs
@@ -0,0 +1,22 @@
+#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.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class NewMapDialog : Form
+	{
+		public NewMapDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}
--- a/OpenRA.Editor/NewMapDialog.resx
+++ b/OpenRA.Editor/NewMapDialog.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/OpenRA.Editor/OpenRA.Editor.csproj
+++ b/OpenRA.Editor/OpenRA.Editor.csproj
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" 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>{00038B75-405B-44F5-8691-BD2546DBE224}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA.Editor</RootNamespace>
+    <AssemblyName>OpenRA.Editor</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ActorTemplate.cs" />
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LegacyMapImporter.cs" />
+    <Compile Include="NewMapDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="NewMapDialog.Designer.cs">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="PropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PropertiesDialog.Designer.cs">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NewMapDialog.resx">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PropertiesDialog.resx">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ResizeDialog.resx">
+      <DependentUpon>ResizeDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="ResizeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ResizeDialog.Designer.cs">
+      <DependentUpon>ResizeDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Surface.cs">
+      <SubType>Component</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRA.FileFormats</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+      <Name>OpenRA.Game</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/OpenRA.Editor/Program.cs
+++ b/OpenRA.Editor/Program.cs
@@ -0,0 +1,29 @@
+#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.Globalization;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	static class Program
+	{
+		[STAThread]
+		static void Main( string[] args )
+		{
+			Application.CurrentCulture = CultureInfo.InvariantCulture;
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+			Application.Run(new Form1(args));
+		}
+	}
+}
--- a/OpenRA.Editor/Properties/AssemblyInfo.cs
+++ b/OpenRA.Editor/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenRA.Editor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("OpenRA.Editor")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("e18ea68f-f344-46c9-b026-8bda76fa91f8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/OpenRA.Editor/Properties/Resources.Designer.cs
+++ b/OpenRA.Editor/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenRA.Editor.Properties
+{
+
+
+	/// <summary>
+	///   A strongly-typed resource class, for looking up localized strings, etc.
+	/// </summary>
+	// This class was auto-generated by the StronglyTypedResourceBuilder
+	// class via a tool like ResGen or Visual Studio.
+	// To add or remove a member, edit your .ResX file then rerun ResGen
+	// with the /str option, or rebuild your VS project.
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+	internal class Resources
+	{
+
+		private static global::System.Resources.ResourceManager resourceMan;
+
+		private static global::System.Globalization.CultureInfo resourceCulture;
+
+		[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+		internal Resources()
+		{
+		}
+
+		/// <summary>
+		///   Returns the cached ResourceManager instance used by this class.
+		/// </summary>
+		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+		internal static global::System.Resources.ResourceManager ResourceManager
+		{
+			get
+			{
+				if ((resourceMan == null))
+				{
+					global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.Editor.Properties.Resources", typeof(Resources).Assembly);
+					resourceMan = temp;
+				}
+				return resourceMan;
+			}
+		}
+
+		/// <summary>
+		///   Overrides the current thread's CurrentUICulture property for all
+		///   resource lookups using this strongly typed resource class.
+		/// </summary>
+		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+		internal static global::System.Globalization.CultureInfo Culture
+		{
+			get
+			{
+				return resourceCulture;
+			}
+			set
+			{
+				resourceCulture = value;
+			}
+		}
+	}
+}
--- a/OpenRA.Editor/Properties/Resources.resx
+++ b/OpenRA.Editor/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/OpenRA.Editor/Properties/Settings.Designer.cs
+++ b/OpenRA.Editor/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenRA.Editor.Properties
+{
+
+
+	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+	internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+	{
+
+		private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+		public static Settings Default
+		{
+			get
+			{
+				return defaultInstance;
+			}
+		}
+	}
+}
--- a/OpenRA.Editor/Properties/Settings.settings
+++ b/OpenRA.Editor/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
--- a/OpenRA.Editor/PropertiesDialog.Designer.cs
+++ b/OpenRA.Editor/PropertiesDialog.Designer.cs
@@ -0,0 +1,159 @@
+namespace OpenRA.Editor
+{
+	partial class PropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.title = new System.Windows.Forms.TextBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.desc = new System.Windows.Forms.TextBox();
+			this.selectable = new System.Windows.Forms.CheckBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.author = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// button2
+			// 
+			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(196, 193);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 14;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// button1
+			// 
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(277, 193);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 15;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 50);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 16;
+			this.label1.Text = "Title";
+			// 
+			// title
+			// 
+			this.title.Location = new System.Drawing.Point(66, 47);
+			this.title.Name = "title";
+			this.title.Size = new System.Drawing.Size(286, 20);
+			this.title.TabIndex = 17;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 76);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(32, 13);
+			this.label2.TabIndex = 16;
+			this.label2.Text = "Desc";
+			// 
+			// desc
+			// 
+			this.desc.Location = new System.Drawing.Point(66, 73);
+			this.desc.Name = "desc";
+			this.desc.Size = new System.Drawing.Size(286, 20);
+			this.desc.TabIndex = 17;
+			// 
+			// selectable
+			// 
+			this.selectable.AutoSize = true;
+			this.selectable.Location = new System.Drawing.Point(118, 138);
+			this.selectable.Name = "selectable";
+			this.selectable.Size = new System.Drawing.Size(130, 17);
+			this.selectable.TabIndex = 18;
+			this.selectable.Text = "Show in Map Chooser";
+			this.selectable.UseVisualStyleBackColor = true;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 102);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(38, 13);
+			this.label3.TabIndex = 16;
+			this.label3.Text = "Author";
+			// 
+			// author
+			// 
+			this.author.Location = new System.Drawing.Point(66, 99);
+			this.author.Name = "author";
+			this.author.Size = new System.Drawing.Size(286, 20);
+			this.author.TabIndex = 17;
+			// 
+			// PropertiesDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(370, 228);
+			this.Controls.Add(this.selectable);
+			this.Controls.Add(this.author);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.desc);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.title);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "PropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "PropertiesDialog";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.TextBox title;
+		private System.Windows.Forms.Label label2;
+		public System.Windows.Forms.TextBox desc;
+		public System.Windows.Forms.CheckBox selectable;
+		private System.Windows.Forms.Label label3;
+		public System.Windows.Forms.TextBox author;
+	}
+}
--- a/OpenRA.Editor/PropertiesDialog.cs
+++ b/OpenRA.Editor/PropertiesDialog.cs
@@ -0,0 +1,22 @@
+#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.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class PropertiesDialog : Form
+	{
+		public PropertiesDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}
--- a/OpenRA.Editor/PropertiesDialog.resx
+++ b/OpenRA.Editor/PropertiesDialog.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/OpenRA.Editor/ResizeDialog.Designer.cs
+++ b/OpenRA.Editor/ResizeDialog.Designer.cs
@@ -0,0 +1,226 @@
+namespace OpenRA.Editor
+{
+	partial class ResizeDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.width = new System.Windows.Forms.NumericUpDown();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
+			this.cordonTop = new System.Windows.Forms.NumericUpDown();
+			this.cordonRight = new System.Windows.Forms.NumericUpDown();
+			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
+			this.label3 = new System.Windows.Forms.Label();
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.height = new System.Windows.Forms.NumericUpDown();
+			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// width
+			// 
+			this.width.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.width.Location = new System.Drawing.Point(161, 18);
+			this.width.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.width.Name = "width";
+			this.width.Size = new System.Drawing.Size(105, 20);
+			this.width.TabIndex = 0;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(23, 20);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Size";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(23, 46);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(86, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "Cordon Left/Top";
+			// 
+			// cordonLeft
+			// 
+			this.cordonLeft.Location = new System.Drawing.Point(161, 44);
+			this.cordonLeft.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonLeft.Name = "cordonLeft";
+			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
+			this.cordonLeft.TabIndex = 0;
+			// 
+			// cordonTop
+			// 
+			this.cordonTop.Location = new System.Drawing.Point(272, 44);
+			this.cordonTop.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonTop.Name = "cordonTop";
+			this.cordonTop.Size = new System.Drawing.Size(105, 20);
+			this.cordonTop.TabIndex = 0;
+			// 
+			// cordonRight
+			// 
+			this.cordonRight.Location = new System.Drawing.Point(161, 70);
+			this.cordonRight.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonRight.Name = "cordonRight";
+			this.cordonRight.Size = new System.Drawing.Size(105, 20);
+			this.cordonRight.TabIndex = 0;
+			// 
+			// cordonBottom
+			// 
+			this.cordonBottom.Location = new System.Drawing.Point(272, 70);
+			this.cordonBottom.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonBottom.Name = "cordonBottom";
+			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
+			this.cordonBottom.TabIndex = 0;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(23, 72);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(107, 13);
+			this.label3.TabIndex = 1;
+			this.label3.Text = "Cordon Right/Bottom";
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(302, 111);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 2;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(221, 111);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 2;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// height
+			// 
+			this.height.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.height.Location = new System.Drawing.Point(272, 18);
+			this.height.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.height.Name = "height";
+			this.height.Size = new System.Drawing.Size(105, 20);
+			this.height.TabIndex = 0;
+			// 
+			// ResizeDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(409, 146);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.cordonBottom);
+			this.Controls.Add(this.cordonTop);
+			this.Controls.Add(this.cordonRight);
+			this.Controls.Add(this.cordonLeft);
+			this.Controls.Add(this.height);
+			this.Controls.Add(this.width);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "ResizeDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Resize Map";
+			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		public System.Windows.Forms.NumericUpDown width;
+		public System.Windows.Forms.NumericUpDown cordonLeft;
+		public System.Windows.Forms.NumericUpDown cordonTop;
+		public System.Windows.Forms.NumericUpDown cordonRight;
+		public System.Windows.Forms.NumericUpDown cordonBottom;
+		public System.Windows.Forms.NumericUpDown height;
+	}
+}
--- a/OpenRA.Editor/ResizeDialog.cs
+++ b/OpenRA.Editor/ResizeDialog.cs
@@ -0,0 +1,22 @@
+#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.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class ResizeDialog : Form
+	{
+		public ResizeDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}
--- a/OpenRA.Editor/ResizeDialog.resx
+++ b/OpenRA.Editor/ResizeDialog.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/OpenRA.Editor/Surface.cs
+++ b/OpenRA.Editor/Surface.cs
@@ -0,0 +1,443 @@
+#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.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+
+namespace OpenRA.Editor
+{
+	class Surface : Control
+	{
+		public Map Map { get; private set; }
+		public TileSet TileSet { get; private set; }
+		public Palette Palette { get; private set; }
+		int2 Offset;
+
+		BrushTemplate Brush;
+		ActorTemplate Actor;
+		ResourceTemplate Resource;
+		WaypointTemplate Waypoint;
+
+		public bool IsPanning;
+		public event Action AfterChange = () => { };
+
+		Dictionary<string, ActorTemplate> ActorTemplates = new Dictionary<string, ActorTemplate>();
+		Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
+
+		public void Bind(Map m, TileSet ts, Palette p)
+		{
+			Map = m;
+			TileSet = ts;
+			Palette = p;
+			Brush = null;
+			Chunks.Clear();
+		}
+
+		public void SetBrush(BrushTemplate brush) { Actor = null; Brush = brush; Resource = null; Waypoint = null; }
+		public void SetActor(ActorTemplate actor) { Brush = null; Actor = actor; Resource = null; Waypoint = null; }
+		public void SetResource(ResourceTemplate resource) { Brush = null; Actor = null; Resource = resource; Waypoint = null; }
+		public void SetWaypoint(WaypointTemplate waypoint) { Brush = null; Actor = null; Resource = null; Waypoint = waypoint; }
+
+		public void BindActorTemplates(IEnumerable<ActorTemplate> templates)
+		{
+			ActorTemplates = templates.ToDictionary(a => a.Info.Name.ToLowerInvariant());
+		}
+
+		public void BindResourceTemplates(IEnumerable<ResourceTemplate> templates)
+		{
+			ResourceTemplates = templates.ToDictionary(a => a.Info.ResourceType);
+		}
+
+		Dictionary<int2, Bitmap> Chunks = new Dictionary<int2, Bitmap>();
+
+		public Surface()
+			: base()
+		{
+			BackColor = Color.Black;
+
+			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+			SetStyle(ControlStyles.ResizeRedraw, true);
+			UpdateStyles();
+		}
+
+		static readonly Pen CordonPen = new Pen(Color.Red);
+		int2 MousePos;
+
+		public void Scroll(int2 dx)
+		{
+			Offset -= dx;
+			Invalidate();
+		}
+		
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			var oldMousePos = MousePos;
+			MousePos = new int2(e.Location);
+
+			if (e.Button == MouseButtons.Middle || (e.Button != MouseButtons.None && IsPanning))
+				Scroll(oldMousePos - MousePos);
+			else
+			{
+				if (e.Button == MouseButtons.Right)
+					Erase();
+
+				if (e.Button == MouseButtons.Left)
+				Draw();
+
+				Invalidate();
+			}
+		}
+
+		void FloodFillWithBrush(int2 pos)
+		{
+			var queue = new Queue<int2>();
+			var replace = Map.MapTiles[pos.X, pos.Y];
+
+			queue.Enqueue(pos);
+			while (queue.Count > 0)
+			{
+				var p = queue.Dequeue();
+				if (!Map.MapTiles[p.X, p.Y].Equals(replace))
+					continue;
+
+				var a = FindEdge(p, new int2(-1, 0), replace);
+				var b = FindEdge(p, new int2(1, 0), replace);
+
+				for (var x = a.X; x <= b.X; x++)
+				{
+					Map.MapTiles[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, image = (byte)0, index = (byte)0 };
+					if (Map.MapTiles[x, p.Y - 1].Equals(replace) && Map.IsInMap(x, p.Y - 1))
+						queue.Enqueue(new int2(x, p.Y - 1));
+					if (Map.MapTiles[x, p.Y + 1].Equals(replace) && Map.IsInMap(x, p.Y + 1))
+						queue.Enqueue(new int2(x, p.Y + 1));
+				}
+			}
+
+			/* todo: optimize */
+			foreach (var ch in Chunks.Values) ch.Dispose();
+			Chunks.Clear();
+
+			AfterChange();
+		}
+
+		int2 FindEdge(int2 p, int2 d, TileReference<ushort, byte> replace)
+		{
+			for (; ; )
+			{
+				var q = p+d;
+				if (!Map.IsInMap(q)) return p;
+				if (!Map.MapTiles[q.X, q.Y].Equals(replace)) return p;
+				p = q;
+			}
+		}
+
+		void DrawWithBrush()
+		{
+			// change the bits in the map
+			var tile = TileSet.Tiles[Brush.N];
+			var template = TileSet.Templates[Brush.N];
+			var pos = GetBrushLocation();
+
+			if (ModifierKeys == Keys.Shift)
+			{
+				FloodFillWithBrush(pos);
+				return;
+			}
+
+			for (var u = 0; u < template.Size.X; u++)
+				for (var v = 0; v < template.Size.Y; v++)
+				{
+					if (Map.IsInMap(new int2(u, v) + pos))
+					{
+						var z = u + v * template.Size.X;
+						if (tile.TileBitmapBytes[z] != null)
+							Map.MapTiles[u + pos.X, v + pos.Y] =
+								new TileReference<ushort, byte>
+								{
+									type = Brush.N,
+									index = template.PickAny ? byte.MaxValue : (byte)z,
+									image = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4)*4) : (byte)z,
+								};
+
+						var ch = new int2((pos.X + u) / ChunkSize, (pos.Y + v) / ChunkSize);
+						if (Chunks.ContainsKey(ch))
+						{
+							Chunks[ch].Dispose();
+							Chunks.Remove(ch);
+						}
+					}
+				}
+
+			AfterChange();
+		}
+
+		int wpid;
+		string NextWpid()
+		{
+			for (; ; )
+			{
+				var a = "wp{0}".F(wpid++);
+				if (!Map.Waypoints.ContainsKey(a))
+					return a;
+			}
+		}
+
+		void DrawWithWaypoint()
+		{
+			var k = Map.Waypoints.FirstOrDefault(a => a.Value == GetBrushLocation());
+			if (k.Key != null) Map.Waypoints.Remove(k.Key);
+
+			Map.Waypoints.Add(NextWpid(), GetBrushLocation());
+
+			AfterChange();
+		}
+
+		void Erase()
+		{
+			Actor = null;
+			Brush = null;
+			Resource = null;
+			Waypoint = null;
+
+			var key = Map.Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
+			if (key.Key != null) Map.Actors.Remove(key.Key);
+
+			if (Map.MapResources[GetBrushLocation().X, GetBrushLocation().Y].type != 0)
+			{
+				Map.MapResources[GetBrushLocation().X, GetBrushLocation().Y] = new TileReference<byte, byte>();
+				var ch = new int2((GetBrushLocation().X) / ChunkSize, (GetBrushLocation().Y) / ChunkSize);
+				if (Chunks.ContainsKey(ch))
+				{
+					Chunks[ch].Dispose();
+					Chunks.Remove(ch);
+				}
+			}
+
+			var k = Map.Waypoints.FirstOrDefault(a => a.Value == GetBrushLocation());
+			if (k.Key != null) Map.Waypoints.Remove(k.Key);
+
+			AfterChange();
+		}
+
+		void Draw()
+		{
+			if (Brush != null) DrawWithBrush();
+			if (Actor != null) DrawWithActor();
+			if (Resource != null) DrawWithResource();
+			if (Waypoint != null) DrawWithWaypoint();
+
+			AfterChange();
+		}
+
+		int id;
+		string NextActorName()
+		{
+			for (; ; )
+			{
+				var possible = "Actor{0}".F(id++);
+				if (!Map.Actors.ContainsKey(possible)) return possible;
+			}
+		}
+
+		void DrawWithActor()
+		{
+			if (Map.Actors.Any(a => a.Value.Location() == GetBrushLocation()))
+				return;
+
+			var owner = "Neutral";
+			var id = NextActorName();
+			Map.Actors[id] = new ActorReference(Actor.Info.Name.ToLowerInvariant())
+			{
+				new LocationInit( GetBrushLocation() ),
+				new OwnerInit( owner)
+			};
+
+			AfterChange();
+		}
+
+		System.Random r = new System.Random();
+		void DrawWithResource()
+		{
+			Map.MapResources[GetBrushLocation().X, GetBrushLocation().Y]
+				= new TileReference<byte, byte>
+				{
+					type = (byte)Resource.Info.ResourceType,
+					index = (byte)r.Next(Resource.Info.SpriteNames.Length),
+					image = (byte)Resource.Value
+				};
+
+			var ch = new int2((GetBrushLocation().X) / ChunkSize, (GetBrushLocation().Y) / ChunkSize);
+			if (Chunks.ContainsKey(ch))
+			{
+				Chunks[ch].Dispose();
+				Chunks.Remove(ch);
+			}
+
+			AfterChange();
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			base.OnMouseDown(e);
+
+			if (!IsPanning)
+			{
+				if (e.Button == MouseButtons.Right) Erase();
+				if (e.Button == MouseButtons.Left) Draw();
+			}
+
+			Invalidate();
+		}
+
+		const int ChunkSize = 8;		// 8x8 chunks ==> 192x192 bitmaps.
+
+		Bitmap RenderChunk(int u, int v)
+		{
+
+			var bitmap = new Bitmap(ChunkSize * 24, ChunkSize * 24);
+			bitmap.SetPixel(0, 0, Color.Green);
+
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* p = (int*)data.Scan0.ToPointer();
+				var stride = data.Stride >> 2;
+
+				for (var i = 0; i < ChunkSize; i++)
+					for (var j = 0; j < ChunkSize; j++)
+					{
+						var tr = Map.MapTiles[u * ChunkSize + i, v * ChunkSize + j];
+						var tile = TileSet.Tiles[tr.type];
+						var index = (tr.image < tile.TileBitmapBytes.Count) ? tr.image : (byte)0;
+						var rawImage = tile.TileBitmapBytes[index];
+						for (var x = 0; x < 24; x++)
+							for (var y = 0; y < 24; y++)
+								p[(j * 24 + y) * stride + i * 24 + x] = Palette.GetColor(rawImage[x + 24 * y]).ToArgb();
+
+						if (Map.MapResources[u * ChunkSize + i, v * ChunkSize + j].type != 0)
+						{
+							var resourceImage = ResourceTemplates[Map.MapResources[u * ChunkSize + i, v * ChunkSize + j].type].Bitmap;
+							var srcdata = resourceImage.LockBits(new Rectangle(0, 0, resourceImage.Width, resourceImage.Height),
+								ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+
+							int* q = (int*)srcdata.Scan0.ToPointer();
+							var srcstride = srcdata.Stride >> 2;
+
+							for (var x = 0; x < 24; x++)
+								for (var y = 0; y < 24; y++)
+								{
+									var c = q[y * srcstride + x];
+									if ((c & 0xff000000) != 0)	/* quick & dirty, i cbf doing real alpha */
+										p[(j * 24 + y) * stride + i * 24 + x] = c;
+								}
+
+							resourceImage.UnlockBits(srcdata);
+						}
+					}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		int2 GetBrushLocation()
+		{
+			var v = MousePos - Offset;
+			return new int2(v.X / 24, v.Y / 24);
+		}
+
+		void DrawActor(System.Drawing.Graphics g, int2 p, ActorTemplate t)
+		{
+			g.DrawImage(t.Bitmap,
+					((24 * p + Offset
+					- (t.Centered
+					? new int2(t.Bitmap.Width / 2 - 12, t.Bitmap.Height / 2 - 12)
+					: int2.Zero)).ToPoint()));
+		}
+
+		void DrawActorBorder(System.Drawing.Graphics g, int2 p, ActorTemplate t)
+		{
+			var origin = (24 * p + Offset
+					- (t.Centered
+					? new int2(t.Bitmap.Width / 2 - 12, t.Bitmap.Height / 2 - 12)
+					: int2.Zero)).ToPoint();
+			g.DrawRectangle(CordonPen,
+				origin.X, origin.Y,
+				t.Bitmap.Width, t.Bitmap.Height );
+		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if (Map == null) return;
+			if (TileSet == null) return;
+
+			for( var u = 0; u < Map.MapSize.X; u += ChunkSize )
+				for (var v = 0; v < Map.MapSize.Y; v += ChunkSize)
+				{
+					var x = new int2(u/ChunkSize,v/ChunkSize);
+					if (!Chunks.ContainsKey(x)) Chunks[x] = RenderChunk(u / ChunkSize, v / ChunkSize);
+					e.Graphics.DrawImage(Chunks[x], (24 * ChunkSize * x + Offset).ToPoint());
+				}
+
+			e.Graphics.DrawRectangle(CordonPen,
+				new Rectangle(Map.XOffset * 24 + Offset.X, Map.YOffset * 24 + Offset.Y, Map.Width * 24, Map.Height * 24));
+
+			foreach (var ar in Map.Actors)
+				DrawActor(e.Graphics, ar.Value.Location(), ActorTemplates[ar.Value.Type]);
+
+			foreach (var wp in Map.Waypoints)
+				e.Graphics.DrawRectangle(Pens.LimeGreen, new Rectangle(
+					24 * wp.Value.X + Offset.X + 4,
+					24 * wp.Value.Y + Offset.Y + 4,
+					16, 16));
+
+			if (Brush != null)
+				e.Graphics.DrawImage(Brush.Bitmap,
+					(24 * GetBrushLocation() + Offset).ToPoint());
+
+			if (Actor != null)
+				DrawActor(e.Graphics, GetBrushLocation(), Actor);
+
+			if (Resource != null)
+				e.Graphics.DrawImage(Resource.Bitmap,
+					(24 * GetBrushLocation() + Offset).ToPoint());
+
+			if (Waypoint != null)
+				e.Graphics.DrawRectangle(Pens.LimeGreen, new Rectangle(
+					24 * GetBrushLocation().X + Offset.X + 4,
+					24 * GetBrushLocation().Y + Offset.Y + 4,
+					16, 16));
+
+			if (Brush == null && Actor == null && Resource == null)
+			{
+				var x = Map.Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
+				if (x.Key != null)
+					DrawActorBorder(e.Graphics, x.Value.Location(), ActorTemplates[x.Value.Type]);
+			}
+		}
+	}
+
+	static class ActorReferenceExts
+	{
+		public static int2 Location(this ActorReference ar)
+		{
+			return ar.InitDict.Get<LocationInit>().value;
+		}
+	}
+}
--- a/OpenRA.FileFormats/CompressedPackage.cs
+++ b/OpenRA.FileFormats/CompressedPackage.cs
@@ -0,0 +1,40 @@
+#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.IO.Packaging;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class CompressedPackage : IFolder
+	{
+		readonly uint[] hashes;
+		readonly Stream s;
+		readonly ZipPackage pkg;
+
+		public CompressedPackage(string filename)
+		{
+			s = FileSystem.Open(filename);
+			pkg = (ZipPackage)ZipPackage.Open(s, FileMode.Open);
+			hashes = pkg.GetParts()
+				.Select(p => PackageEntry.HashFilename(p.Uri.LocalPath)).ToArray();
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return pkg.GetPart(new Uri(filename)).GetStream(FileMode.Open);
+		}
+
+		public IEnumerable<uint> AllFileHashes() { return hashes; }
+	}
+}
--- a/OpenRA.FileFormats/ConnectedComponents.cs
+++ b/OpenRA.FileFormats/ConnectedComponents.cs
@@ -1,97 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-
-namespace OpenRA.FileFormats
-{
-	public static class ConnectedComponents
-	{
-		static readonly int2[] Neighbors 
-			= { new int2(-1, -1), new int2(0, -1), new int2(1, -1), new int2(-1, 0) };
-
-		public static int[,] Extract(Map m, Func<int, int, int> f)
-		{
-			var result = new int[m.MapSize.X, m.MapSize.Y];
-			var types = new int[m.MapSize.X, m.MapSize.Y];
-			var d = new Dictionary<int, Node>();
-			var n = 1;
-
-			for( var j = m.YOffset; j < m.YOffset + m.Height; j++ )
-				for (var i = m.XOffset; i < m.XOffset + m.Width; i++)
-				{
-					types[i, j] = f(i, j);
-
-					var k = n;
-
-					foreach (var a in Neighbors)
-						if (types[i + a.X, j + a.Y] == types[i, j])
-							k = (k == n) 
-								? result[i + a.X, j + a.Y]
-								: Union( d, k, result[i+a.X, j+a.Y] );
-
-					result[i,j] = k;
-					if (k == n) MakeSet(d, n++);
-				}
-
-			for (var j = m.YOffset; j < m.YOffset + m.Height; j++)
-				for (var i = m.XOffset; i < m.XOffset + m.Width; i++)
-					result[i, j] = Find(d, result[i, j]);
-
-			return result;
-		}
-
-		// disjoint-set forest stuff
-
-		class Node { public int a, b; public Node(int a, int b) { this.a = a; this.b = b; } }
-
-		static int MakeSet(Dictionary<int, Node> d, int x)
-		{
-			d[x] = new Node(x, 0);
-			return x;
-		}
-
-		static int Union(Dictionary<int, Node> d, int x, int y)
-		{
-			var xr = Find(d, x);
-			var yr = Find(d, y);
-			var xa = d[xr].b;
-			var ya = d[yr].b;
-
-			if (xa > ya) d[yr].a = xr;
-			else if (xa < ya) d[xr].a = yr;
-			else if (xr != yr)
-			{
-				d[yr].a = xr;
-				++d[xr].b;
-			}
-
-			return xr;
-		}
-
-		static int Find(Dictionary<int, Node> d, int x)
-		{
-			if (d[x].a == x) return x;
-			return d[x].a = Find(d, d[x].a);
-		}
-
-	}
-}
--- a/OpenRA.FileFormats/DisposableAction.cs
+++ b/OpenRA.FileFormats/DisposableAction.cs
@@ -1,45 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-
-namespace OpenRA
-{
-	public class DisposableAction : IDisposable
-	{
-		public DisposableAction(Action a) { this.a = a; }
-
-		Action a;
-		bool disposed;
-
-		public void Dispose()
-		{
-			if (disposed) return;
-			disposed = true;
-			a();
-			GC.SuppressFinalize(this);
-		}
-
-		~DisposableAction()
-		{
-			Dispose();
-		}
-	}
-}
--- a/OpenRA.FileFormats/Evaluator.cs
+++ b/OpenRA.FileFormats/Evaluator.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Exts.cs
+++ b/OpenRA.FileFormats/Exts.cs
@@ -1,28 +1,18 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.Reflection;
-using System.Linq;
 using System.IO;
+using System.Linq;
+using System.Reflection;

 namespace OpenRA
 {
@@ -60,5 +50,28 @@ namespace OpenRA
 				return data;
 			}
 		}
+
+		public static void Write(this Stream s, byte[] data)
+		{
+			s.Write(data, 0, data.Length);
+		}
+
+		public static IEnumerable<string> ReadAllLines(this Stream s)
+		{
+			using (var sr = new StreamReader(s))
+				for (; ; )
+				{
+					var line = sr.ReadLine();
+					if (line == null)
+						yield break;
+					else
+						yield return line;
+				}
+		}
+
+		public static bool HasAttribute<T>(this MemberInfo mi)
+		{
+			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
+		}
 	}
 }
--- a/OpenRA.FileFormats/FieldLoader.cs
+++ b/OpenRA.FileFormats/FieldLoader.cs
@@ -1,25 +1,16 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.Drawing;
 using System.Linq;
 using System.Reflection;

@@ -27,17 +18,25 @@ namespace OpenRA.FileFormats
 {
 	public static class FieldLoader
 	{
-		public static void Load(object self, IniSection ini)
+		public static Func<string,Type,string,object> InvalidValueAction = (s,t,f) =>
 		{
-			foreach (var x in ini)
-				LoadField(self, x.Key, x.Value);
-		}
+			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s,f,t) );
+		};
+		
+		public static Action<string,Type> UnknownFieldAction = (s,f) =>
+		{
+			throw new NotImplementedException( "FieldLoader: Missing field `{0}` on `{1}`".F( s, f.Name ) );
+		};

-		public static void Load(object self, MiniYaml my)
+		public static void Load( object self, MiniYaml my )
 		{
-			foreach (var x in my.Nodes)
+			foreach( var x in my.Nodes )
 				if (!x.Key.StartsWith("-"))
-					LoadField( self, x.Key, x.Value.Value );
+					LoadField(self, x.Key, x.Value.Value);
+
+			foreach( var field in self.GetType().GetFields())
+				if( field.HasAttribute<FieldFromYamlKeyAttribute>() )
+					field.SetValue( self, GetValue( field.Name, field.FieldType, my.Value ) );
 		}

 		public static T Load<T>(MiniYaml y) where T : new()
@@ -52,36 +51,71 @@ namespace OpenRA.FileFormats
 			foreach (var field in fields)
 			{
 				if (!my.ContainsKey(field)) continue;
-				FieldLoader.LoadField(self,field,my[field].Value);
+				LoadField(self,field,my[field].Value);
 			}
 		}
-		

 		public static void LoadField( object self, string key, string value )
 		{
 			var field = self.GetType().GetField( key.Trim() );
-			if( field == null )
-				throw new NotImplementedException( "Missing field `{0}` on `{1}`".F( key.Trim(), self.GetType().Name ) );
-			field.SetValue( self, GetValue( field.FieldType, value ) );
-		}

-		public static object GetValue( Type fieldType, string x )
+			if( field == null )
+				UnknownFieldAction( key.Trim(), self.GetType() );
+			else if( field.HasAttribute<FieldFromYamlKeyAttribute>() )
+				return;
+			else
+				field.SetValue( self, GetValue( field.Name, field.FieldType, value ) );
+		}
+				
+		public static object GetValue( string field, Type fieldType, string x )
 		{
 			if (x != null) x = x.Trim();
 			if( fieldType == typeof( int ) )
-				return int.Parse( x );
+			{
+				int res;
+				if (int.TryParse(x,out res))
+					return res;
+				return InvalidValueAction(x,fieldType, field);
+			}
+			
+			else if( fieldType == typeof( ushort ) )
+			{
+				ushort res;
+				if (ushort.TryParse(x,out res))
+					return res;
+				return InvalidValueAction(x,fieldType, field);
+			}

 			else if (fieldType == typeof(float))
-				return float.Parse(x.Replace("%","")) * (x.Contains( '%' ) ? 0.01f : 1f);
+			{
+				float res;
+				if (float.TryParse(x.Replace("%",""), out res))
+					return res * (x.Contains( '%' ) ? 0.01f : 1f);
+				return InvalidValueAction(x,fieldType, field);
+			}

 			else if (fieldType == typeof(string))
 				return x;
-
+			
+			else if (fieldType == typeof(Color))
+			{
+				var parts = x.Split(',');
+				if (parts.Length == 3)
+					return Color.FromArgb(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]));
+				if (parts.Length == 4)
+					return Color.FromArgb(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
+				return InvalidValueAction(x,fieldType, field);
+			}
+			
 			else if (fieldType.IsEnum)
+			{
+				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
+					return InvalidValueAction(x,fieldType, field);
 				return Enum.Parse(fieldType, x, true);
-
+			}
+			
 			else if (fieldType == typeof(bool))
-				return ParseYesNo(x);
+				return ParseYesNo(x, fieldType, field);

 			else if (fieldType.IsArray)
 			{
@@ -92,7 +126,7 @@ namespace OpenRA.FileFormats

 				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
 				for (int i = 0; i < parts.Length; i++)
-					ret.SetValue(GetValue(fieldType.GetElementType(), parts[i].Trim()), i);
+					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
 				return ret;
 			}
 			else if (fieldType == typeof(int2))
@@ -100,18 +134,19 @@ namespace OpenRA.FileFormats
 				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
 			}
-			else
-				throw new InvalidOperationException("FieldLoader: don't know how to load field of type " + fieldType.ToString());
+			
+			UnknownFieldAction("[Type] {0}".F(x),fieldType);
+			return null;
 		}

-		static bool ParseYesNo( string p )
+		static object ParseYesNo( string p, System.Type fieldType, string field )
 		{
 			p = p.ToLowerInvariant();
 			if( p == "yes" ) return true;
 			if( p == "true" ) return true;
 			if( p == "no" ) return false;
 			if( p == "false" ) return false;
-			throw new InvalidOperationException();
+			return InvalidValueAction(p,fieldType, field);
 		}
 	}

@@ -119,8 +154,29 @@ namespace OpenRA.FileFormats
 	{
 		public static MiniYaml Save(object o)
 		{
-			return new MiniYaml(null, o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
-				.ToDictionary(
+			var dict = new Dictionary<string, MiniYaml>();
+			string root = null;
+
+			foreach( var f in o.GetType().GetFields( BindingFlags.Public | BindingFlags.Instance ) )
+			{
+				if( f.HasAttribute<FieldFromYamlKeyAttribute>() )
+					root = FormatValue( o, f );
+				else
+					dict.Add( f.Name, new MiniYaml( FormatValue( o, f ) ) );
+			}
+
+			return new MiniYaml( root, dict );
+		}
+		
+		public static MiniYaml SaveDifferences(object o, object from)
+		{
+			if (o.GetType() != from.GetType())
+				throw new InvalidOperationException("FieldLoader: can't diff objects of different types");
+
+			var fields = o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
+				.Where(f => FormatValue(o,f) != FormatValue(from,f));
+			
+			return new MiniYaml(null, fields.ToDictionary(
 					f => f.Name,
 					f => new MiniYaml(FormatValue(o, f))));
 		}
@@ -128,9 +184,21 @@ namespace OpenRA.FileFormats
 		public static string FormatValue(object o, FieldInfo f)
 		{
 			var v = f.GetValue(o);
+			if (v == null)
+				return "";
+
+			// Color.ToString() does the wrong thing; force it to format as an array
+			if (f.FieldType == typeof(Color))
+			{
+				var c = (Color)v;
+				return "{0},{1},{2},{3}".F(c.A,c.R,c.G,c.B);
+			}
+			
 			return f.FieldType.IsArray
 				? string.Join(",", ((Array)v).OfType<object>().Select(a => a.ToString()).ToArray())
 				: v.ToString();
 		}
 	}
+
+	public class FieldFromYamlKeyAttribute : Attribute { }
 }
--- a/OpenRA.FileFormats/FileFormats/AudLoader.cs
+++ b/OpenRA.FileFormats/FileFormats/AudLoader.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/FileFormats/Blowfish.cs
+++ b/OpenRA.FileFormats/FileFormats/Blowfish.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs
+++ b/OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/FileFormats/Format2.cs
+++ b/OpenRA.FileFormats/FileFormats/Format2.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/FileFormats/Format40.cs
+++ b/OpenRA.FileFormats/FileFormats/Format40.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/FileFormats/Format80.cs
+++ b/OpenRA.FileFormats/FileFormats/Format80.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/FileFormats/IniFile.cs
+++ b/OpenRA.FileFormats/FileFormats/IniFile.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/FileSystem.cs
+++ b/OpenRA.FileFormats/FileSystem.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -43,15 +33,23 @@ namespace OpenRA.FileFormats
 			}
 		}

+		static IFolder OpenPackage(string filename)
+		{
+			if (filename.EndsWith(".mix"))
+				return new Package(filename);
+			else if (filename.EndsWith(".zip"))
+				return new CompressedPackage(filename);
+			else
+				return new Folder(filename);
+		}
+
 		public static void Mount(string name)
 		{
 			name = name.ToLowerInvariant();
 			var optional = name.StartsWith("~");
 			if (optional) name = name.Substring(1);

-			var a = name.EndsWith(".mix")
-				? (Action)(() => FileSystem.MountInner(new Package(name)))
-				: () => FileSystem.MountInner(new Folder(name));
+			var a = (Action)(() => FileSystem.MountInner(OpenPackage(name)));

 			if (optional)
 				try { a(); }
--- a/OpenRA.FileFormats/Folder.cs
+++ b/OpenRA.FileFormats/Folder.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Graphics/Dune2ShpReader.cs
+++ b/OpenRA.FileFormats/Graphics/Dune2ShpReader.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Graphics/IGraphicsDevice.cs
+++ b/OpenRA.FileFormats/Graphics/IGraphicsDevice.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -102,4 +92,11 @@ namespace OpenRA.FileFormats.Graphics
 		public readonly T Start, End;
 		public Range( T start, T end ) { Start = start; End = end; }
 	}
+	
+	public enum WindowMode
+	{
+		Windowed,
+		Fullscreen,
+		PseudoFullscreen,
+	}
 }
--- a/OpenRA.FileFormats/Graphics/ShpReader.cs
+++ b/OpenRA.FileFormats/Graphics/ShpReader.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Graphics/Vertex.cs
+++ b/OpenRA.FileFormats/Graphics/Vertex.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/IPaletteRemap.cs
+++ b/OpenRA.FileFormats/IPaletteRemap.cs
@@ -1,29 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Drawing;
-
-namespace OpenRA.FileFormats
-{
-	public interface IPaletteRemap
-	{
-		Color GetRemappedColor(Color original, int index);
-	}
-}
--- a/OpenRA.FileFormats/Map/ActorReference.cs
+++ b/OpenRA.FileFormats/Map/ActorReference.cs
@@ -1,41 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public struct ActorReference
-	{
-		public readonly int2 Location;
-		public readonly string Name;
-		public readonly string Owner;
-		public ActorReference( string name, int2 location, string owner )
-		{
-			Name = name;
-			Location = location;
-			Owner = owner;
-		}
-		
-		public override string ToString ()
-		{
-			return string.Format("{0} {1} {2},{3}", Name, Owner, Location.X,Location.Y);
-		}
-
-	}
-}
--- a/OpenRA.FileFormats/Map/MapStub.cs
+++ b/OpenRA.FileFormats/Map/MapStub.cs
@@ -1,36 +1,26 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
+#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.Linq;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;

 namespace OpenRA.FileFormats
 {
 	public class MapStub
 	{
-		public IFolder Package;
+		public readonly IFolder Package;
 		
 		// Yaml map data
-		public string Uid;
+		public readonly string Uid;
 		public bool Selectable;

 		public string Title;
@@ -38,20 +28,18 @@ namespace OpenRA.FileFormats
 		public string Author;
 		public int PlayerCount;
 		public string Tileset;
-		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
-
+		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
+		public IEnumerable<int2> SpawnPoints { get { return Waypoints.Select(kv => kv.Value); } }
+		
 		public int2 TopLeft;
 		public int2 BottomRight;
 		public int Width { get { return BottomRight.X - TopLeft.X; } }
 		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
-		public Lazy<Bitmap> Preview;
-
+	
 		static List<string> Fields = new List<string>() {
 			"Selectable", "Title", "Description", "Author", "PlayerCount", "Tileset", "TopLeft", "BottomRight"
 		};

-		public MapStub() { }
-
 		public MapStub(IFolder package)
 		{
 			Package = package;
@@ -63,35 +51,9 @@ namespace OpenRA.FileFormats
 			{
 				string[] loc = wp.Value.Value.Split(',');
 				Waypoints.Add(wp.Key, new int2(int.Parse(loc[0]), int.Parse(loc[1])));
-			}
-			
-			Preview = Lazy.New(
-				() => { return new Bitmap(Package.GetContent("preview.png")); }
-			);
+			}

 			Uid = Package.GetContent("map.uid").ReadAllText();
 		}
-		
-		public int2 ConvertToPreview(int2 point, Rectangle container)
-		{
-			float scale = Math.Min(container.Width * 1.0f / Width, container.Height * 1.0f / Height);
-
-			var size = Math.Max(Width, Height);
-			var dw = (int)(scale * (size - Width)) / 2;
-			var dh = (int)(scale * (size - Height)) / 2;
-
-			return new int2(container.X + dw + (int)(scale*(point.X - TopLeft.X)) , container.Y + dh + (int)(scale*(point.Y - TopLeft.Y)));
-		}
-		
-		public Rectangle PreviewBounds(Rectangle container)
-		{
-			float scale = Math.Min(container.Width * 1.0f / Width, container.Height * 1.0f / Height);
-
-			var size = Math.Max(Width, Height);
-			var dw = (int)(scale * (size - Width)) / 2;
-			var dh = (int)(scale * (size - Height)) / 2;
-
-			return new Rectangle(container.X + dw, container.Y + dh, (int)(Width * scale), (int)(Height * scale));
-		}
 	}
 }
--- a/OpenRA.FileFormats/Map/PlayerReference.cs
+++ b/OpenRA.FileFormats/Map/PlayerReference.cs
@@ -0,0 +1,38 @@
+#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.Drawing;
+
+namespace OpenRA.FileFormats
+{
+	public class PlayerReference
+	{
+		public readonly string Name;
+		public readonly string Palette;
+		public readonly string Race;
+		public readonly bool OwnsWorld = false;
+		public readonly bool NonCombatant = false;
+		public readonly Color Color = Color.FromArgb(238,238,238);
+		public readonly Color Color2 = Color.FromArgb(44,28,24);
+		
+		public PlayerReference(MiniYaml my)
+		{
+			FieldLoader.Load(this, my);
+		}
+		
+		public PlayerReference(string name, string race, bool ownsworld, bool noncombatant)
+		{
+			Name = name;
+			Race = race;
+			OwnsWorld = ownsworld;
+			NonCombatant = noncombatant;
+		}
+	}
+}
--- a/OpenRA.FileFormats/Map/SmudgeReference.cs
+++ b/OpenRA.FileFormats/Map/SmudgeReference.cs
@@ -1,21 +1,11 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
+#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

 namespace OpenRA.FileFormats
--- a/OpenRA.FileFormats/Map/Terrain.cs
+++ b/OpenRA.FileFormats/Map/Terrain.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Map/TerrainColorSet.cs
+++ b/OpenRA.FileFormats/Map/TerrainColorSet.cs
@@ -1,69 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System.Drawing;
-using System;
-namespace OpenRA.FileFormats
-{
-	public class TerrainColorSet
-	{
-		public readonly Dictionary<TerrainType, Color> colors = new Dictionary<TerrainType, Color>();
-
-		string NextLine( StreamReader reader )
-		{
-			string ret;
-			do
-			{
-				ret = reader.ReadLine();
-				if( ret == null )
-					return null;
-				ret = ret.Trim();
-			}
-			while( ret.Length == 0 || ret[ 0 ] == ';' );
-			return ret;
-		}
-
-		public TerrainColorSet( string colorFile )
-		{
-			StreamReader file = new StreamReader( FileSystem.Open(colorFile) );
-
-			while( true )
-			{
-				string line = NextLine( file );
-				if( line == null )
-					break;
-				string[] kv = line.Split('=');
-				TerrainType key = (TerrainType)Enum.Parse(typeof(TerrainType),kv[0]);
-				string[] entries = kv[1].Split(',');
-				Color val = Color.FromArgb(int.Parse(entries[0]),int.Parse(entries[1]),int.Parse(entries[2]));
-				colors.Add(key,val);
-			}
-
-			file.Close();
-		}
-		
-		public Color ColorForTerrainType(TerrainType type)
-		{
-			return colors[type];	
-		}
-	}
-}
--- a/OpenRA.FileFormats/Map/TileReference.cs
+++ b/OpenRA.FileFormats/Map/TileReference.cs
@@ -1,21 +1,11 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
+#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

 namespace OpenRA.FileFormats
--- a/OpenRA.FileFormats/Map/TileSet.cs
+++ b/OpenRA.FileFormats/Map/TileSet.cs
@@ -1,94 +1,146 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.Collections.Generic;
-using System.Globalization;
+using System.Drawing;
 using System.IO;
+using System.Linq;
+using System.Reflection;

 namespace OpenRA.FileFormats
 {
+	public class TerrainTypeInfo
+	{
+		public string Type;
+		public bool Buildable = true;
+		public bool AcceptSmudge = true;
+		public bool IsWater = false;
+		public Color Color;
+
+		public TerrainTypeInfo() {}
+		public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
+		public MiniYaml Save() { return FieldSaver.Save(this); }
+	}
+	
+	public class TileTemplate
+	{
+		public ushort Id;
+		public string Image;
+		public int2 Size;
+		public bool PickAny;
+		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
+		
+		static List<string> fields = new List<string>() {"Id", "Image", "Size", "PickAny"};
+
+		public TileTemplate() {}
+		public TileTemplate(MiniYaml my)
+		{
+			FieldLoader.LoadFields(this, my.Nodes, fields);
+
+			Tiles = my.Nodes["Tiles"].Nodes.ToDictionary(
+				t => byte.Parse(t.Key),
+				t => t.Value.Value);
+		}
+		
+		public MiniYaml Save()
+		{
+			var root = new Dictionary<string, MiniYaml>();
+			foreach (var field in fields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				root.Add(field, new MiniYaml(FieldSaver.FormatValue(this, f), null));
+			}
+
+			root.Add("Tiles",
+				new MiniYaml(null, Tiles.ToDictionary(
+					p => p.Key.ToString(),
+					p => new MiniYaml(p.Value))));
+			
+			return new MiniYaml(null, root);
+		}
+	}
+	
 	public class TileSet
 	{
-		public readonly Dictionary<ushort, Terrain> tiles = new Dictionary<ushort, Terrain>();
+		public string Name;
+		public string Id;
+		public string Palette;
+		public string[] Extensions;
+		public Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
+		public Dictionary<ushort, Terrain> Tiles = new Dictionary<ushort, Terrain>();
+		public Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
+		static List<string> fields = new List<string>() {"Name", "Id", "Palette", "Extensions"};

-		public readonly Walkability Walkability;
-		public readonly Dictionary<ushort, TileTemplate> walk 
-			= new Dictionary<ushort, TileTemplate>();
-
-		string NextLine( StreamReader reader )
+		public TileSet() {}
+		public TileSet( string filepath )
 		{
-			string ret;
-			do
-			{
-				ret = reader.ReadLine();
-				if( ret == null )
-					return null;
-				ret = ret.Trim();
-			}
-			while( ret.Length == 0 || ret[ 0 ] == ';' );
-			return ret;
+			var yaml = MiniYaml.FromFile(filepath);
+			
+			// General info
+			FieldLoader.Load(this, yaml["General"]);
+
+			// TerrainTypes
+			Terrain = yaml["Terrain"].Nodes.Values
+				.Select(y => new TerrainTypeInfo(y)).ToDictionary(t => t.Type);
+
+			// Templates
+			Templates = yaml["Templates"].Nodes.Values
+				.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
 		}
-
-		public TileSet( string tilesetFile, string templatesFile, string suffix )
+		
+		public void LoadTiles()
 		{
-			Walkability = new Walkability(templatesFile);
-
-			char tileSetChar = char.ToUpperInvariant( suffix[ 0 ] );
-			StreamReader tileIdFile = new StreamReader( FileSystem.Open(tilesetFile) );
-
-			while( true )
-			{
-				string tileSetStr = NextLine( tileIdFile );
-				string countStr = NextLine( tileIdFile );
-				string startStr = NextLine( tileIdFile );
-				string pattern = NextLine( tileIdFile );
-				if( tileSetStr == null || countStr == null || startStr == null || pattern == null )
-					break;
-
-				if( tileSetStr.IndexOf( tileSetChar.ToString() ) == -1 )
-					continue;
-
-				int count = int.Parse( countStr );
-				int start = int.Parse( startStr, NumberStyles.HexNumber );
-				for( int i = 0 ; i < count ; i++ )
+			foreach (var t in Templates)
+				using( Stream s = FileSystem.OpenWithExts(t.Value.Image, Extensions) )
 				{
-					string tilename = string.Format(pattern, i + 1);
-
-					if (!walk.ContainsKey((ushort)(start + i)))
-						walk.Add((ushort)(start + i), Walkability.GetTileTemplate(tilename));
-
-					using( Stream s = FileSystem.Open( tilename + "." + suffix ) )
-					{
-						if( !tiles.ContainsKey( (ushort)( start + i ) ) )
-							tiles.Add( (ushort)( start + i ), new Terrain( s ) );
-					}
+					if( !Tiles.ContainsKey( t.Key ) )
+						Tiles.Add( t.Key, new Terrain( s ) );
 				}
-			}
-
-			tileIdFile.Close();
 		}
-
+		
+		public void Save(string filepath)
+		{			
+			var root = new Dictionary<string, MiniYaml>();
+			foreach (var field in fields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				root.Add(field, new MiniYaml(FieldSaver.FormatValue(this, f), null));
+			}
+			
+			var gen = new Dictionary<string, MiniYaml>();
+			foreach (var field in fields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				gen.Add(field, new MiniYaml(FieldSaver.FormatValue(this, f), null));
+			}
+			root.Add("General", new MiniYaml(null, gen)); 
+			
+			root.Add("Terrain",
+				new MiniYaml(null, Terrain.ToDictionary(
+					t => "TerrainType@{0}".F(t.Value.Type),
+					t => t.Value.Save())));
+			
+			root.Add("Templates",
+				new MiniYaml(null, Templates.ToDictionary(
+					t => "Template@{0}".F(t.Value.Id),
+					t => t.Value.Save())));
+			root.WriteToFile(filepath);
+		} 
+				
 		public byte[] GetBytes(TileReference<ushort,byte> r)
 		{
 			Terrain tile;
-			if( tiles.TryGetValue( r.type, out tile ) )
+			if( Tiles.TryGetValue( r.type, out tile ) )
 				return tile.TileBitmapBytes[ r.image ];
 			
 			byte[] missingTile = new byte[ 24 * 24 ];
@@ -98,12 +150,12 @@ namespace OpenRA.FileFormats
 			return missingTile;
 		}

-		public TerrainType GetTerrainType( TileReference<ushort, byte> r )
+		public string GetTerrainType(TileReference<ushort, byte> r)
 		{
-			var tt = walk[ r.type ].TerrainType;
-			TerrainType ret;
-				if( !tt.TryGetValue( r.image, out ret ) )
-				return 0;// Default zero (walkable)
+			var tt = Templates[r.type].Tiles;
+			string ret;
+			if (!tt.TryGetValue(r.image, out ret))
+				return "Clear"; // Default walkable
 			return ret;
 		}
 	}
--- a/OpenRA.FileFormats/Map/Walkability.cs
+++ b/OpenRA.FileFormats/Map/Walkability.cs
@@ -1,89 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-using System;
-namespace OpenRA.FileFormats
-{
-	public enum TerrainType : byte
-	{
-		Clear = 0,
-		Water = 1,
-		Road = 2,
-		Rock = 3,
-		Tree = 4,
-		River = 5,
-		Rough = 6,
-		Wall = 7,
-		Beach = 8,
-		Ore = 9,
-		Special = 10,
-	}
-	
-	public class TileTemplate
-	{
-		public int Index; // not valid for `interior` stuff. only used for bridges.
-		public string Name;
-		public int2 Size;
-		public string Bridge;
-		public float HP;
-		public Dictionary<int, TerrainType> TerrainType = new Dictionary<int, TerrainType>();
-	}
-	
-	public class Walkability
-	{
-		Dictionary<string, TileTemplate> templates 
-			= new Dictionary<string,TileTemplate>();
-
-		public Walkability(string templatesFile)
-		{
-			var file = new IniFile( FileSystem.Open( templatesFile ) );
-
-			foreach (var section in file.Sections)
-			{
-				var tile = new TileTemplate
-				{
-					Size = new int2(
-						int.Parse(section.GetValue("width", "0")),
-						int.Parse(section.GetValue("height", "0"))),
-					TerrainType = section
-						.Where(p => p.Key.StartsWith("tiletype"))
-						.ToDictionary(
-							p => int.Parse(p.Key.Substring(8)),
-							p => (TerrainType)Enum.Parse(typeof(TerrainType),p.Value)),
-					Name = section.GetValue("Name", null).ToLowerInvariant(),
-					Bridge = section.GetValue("bridge", null),
-					HP = float.Parse(section.GetValue("hp", "0"))
-				};
-								
-				tile.Index = -1;
-				int.TryParse(section.Name.Substring(3), out tile.Index);
-
-				templates[tile.Name] = tile;
-			}
-		}
-
-		public TileTemplate GetTileTemplate(string terrainName)
-		{
-			return templates[terrainName];
-		}
-	}
-}
--- a/OpenRA.FileFormats/MiniYaml.cs
+++ b/OpenRA.FileFormats/MiniYaml.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/OpenRA.FileFormats.csproj
+++ b/OpenRA.FileFormats/OpenRA.FileFormats.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -19,7 +19,7 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DebugType>full</DebugType>
@@ -50,10 +50,11 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
    </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="ConnectedComponents.cs" />
-    <Compile Include="DisposableAction.cs" />
    <Compile Include="Evaluator.cs" />
    <Compile Include="Exts.cs" />
    <Compile Include="FieldLoader.cs" />
@@ -61,32 +62,25 @@
    <Compile Include="Folder.cs" />
    <Compile Include="Graphics\IGraphicsDevice.cs" />
    <Compile Include="Graphics\Vertex.cs" />
-    <Compile Include="IPaletteRemap.cs" />
    <Compile Include="MiniYaml.cs" />
    <Compile Include="PackageEntry.cs" />
    <Compile Include="Package.cs" />
+    <Compile Include="PackageWriter.cs" />
    <Compile Include="Palette.cs" />
    <Compile Include="PlayerColorRemap.cs" />
+    <Compile Include="Primitives\DisposableAction.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ProtocolVersion.cs" />
    <Compile Include="Thirdparty\Random.cs" />
    <Compile Include="Session.cs" />
-    <Compile Include="ShroudPaletteRemap.cs" />
-    <Compile Include="SingleColorRemap.cs" />
    <Compile Include="Support\Log.cs" />
    <Compile Include="Support\Stopwatch.cs" />
    <Compile Include="Support\Timer.cs" />
    <Compile Include="TypeDictionary.cs" />
-    <Compile Include="Map\ActorReference.cs" />
-    <Compile Include="Map\Map.cs" />
    <Compile Include="Map\TileReference.cs" />
-    <Compile Include="Map\Walkability.cs" />
    <Compile Include="Map\Terrain.cs" />
    <Compile Include="Primitives\Cache.cs" />
    <Compile Include="Primitives\float2.cs" />
    <Compile Include="Primitives\Pair.cs" />
-    <Compile Include="Map\TerrainColorSet.cs" />
-    <Compile Include="Primitives\Tuple.cs" />
    <Compile Include="Map\TileSet.cs" />
    <Compile Include="Primitives\PriorityQueue.cs" />
    <Compile Include="Primitives\Lazy.cs" />
@@ -103,6 +97,8 @@
    <Compile Include="Primitives\int2.cs" />
    <Compile Include="Map\MapStub.cs" />
    <Compile Include="Map\SmudgeReference.cs" />
+    <Compile Include="Map\PlayerReference.cs" />
+    <Compile Include="CompressedPackage.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/OpenRA.FileFormats/Package.cs
+++ b/OpenRA.FileFormats/Package.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -78,9 +68,7 @@ namespace OpenRA.FileFormats
 			BinaryReader reader2 = new BinaryReader(ms);

 			ushort numFiles = reader2.ReadUInt16();
-			uint datasize = reader2.ReadUInt32();
-
-			Console.WriteLine("{0} files, {1} kb", numFiles, datasize >> 10);
+			reader2.ReadUInt32(); /*datasize*/

 			s.Position = headerStart;
 			reader = new BinaryReader(s);
@@ -133,7 +121,7 @@ namespace OpenRA.FileFormats
 			dataStart = s.Position;
 			return items;
 		}
-
+		
 		public Stream GetContent(uint hash)
 		{
 			PackageEntry e;
--- a/OpenRA.FileFormats/PackageEntry.cs
+++ b/OpenRA.FileFormats/PackageEntry.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -30,12 +20,27 @@ namespace OpenRA.FileFormats
 		public readonly uint Offset;
 		public readonly uint Length;

+		
+		public PackageEntry(uint hash, uint offset, uint length)
+		{
+			Hash = hash;
+			Offset = offset;
+			Length = length;
+		}
+		
 		public PackageEntry(BinaryReader r)
 		{
 			Hash = r.ReadUInt32();
 			Offset = r.ReadUInt32();
 			Length = r.ReadUInt32();
 		}
+		
+		public void Write(BinaryWriter w)
+		{
+			w.Write(Hash);
+			w.Write(Offset);
+			w.Write(Length);
+		}

 		public override string ToString()
 		{
--- a/OpenRA.FileFormats/PackageWriter.cs
+++ b/OpenRA.FileFormats/PackageWriter.cs
@@ -0,0 +1,48 @@
+#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.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public static class PackageWriter
+	{
+		public static void CreateMix(string filename, List<string> contents)
+		{
+			// Construct a list of entries for the file header
+			uint dataSize = 0;
+			var items = new List<PackageEntry>();
+			foreach (var file in contents)
+			{
+				uint length = (uint)new FileInfo(file).Length;
+				uint hash = PackageEntry.HashFilename(Path.GetFileName(file));
+				items.Add(new PackageEntry(hash, dataSize, length));
+				dataSize += length;
+			}
+
+			using (var s = File.Create(filename))
+			using (var writer = new BinaryWriter(s))
+			{
+				// Write file header
+				writer.Write((ushort)items.Count);
+				writer.Write(dataSize);
+				foreach (var item in items)
+					item.Write(writer);
+
+				writer.Flush();
+
+				// Copy file data
+				foreach (var file in contents)
+					s.Write(File.ReadAllBytes(file));
+			}
+		}
+	}
+}
--- a/OpenRA.FileFormats/Palette.cs
+++ b/OpenRA.FileFormats/Palette.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -62,4 +52,6 @@ namespace OpenRA.FileFormats
 				colors.Add(r.GetRemappedColor(p.GetColor(i), i));
 		}
 	}
+
+	public interface IPaletteRemap { Color GetRemappedColor(Color original, int index);	}
 }
--- a/OpenRA.FileFormats/PlayerColorRemap.cs
+++ b/OpenRA.FileFormats/PlayerColorRemap.cs
@@ -1,30 +1,21 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;

 namespace OpenRA.FileFormats
 {
+	// TODO: ship this out of here.
+
 	public class PlayerColorRemap : IPaletteRemap
 	{
 		Dictionary<int, Color> remapColors;
--- a/OpenRA.FileFormats/Primitives/Cache.cs
+++ b/OpenRA.FileFormats/Primitives/Cache.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Primitives/DisposableAction.cs
+++ b/OpenRA.FileFormats/Primitives/DisposableAction.cs
@@ -0,0 +1,35 @@
+#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;
+
+namespace OpenRA
+{
+	public class DisposableAction : IDisposable
+	{
+		public DisposableAction(Action a) { this.a = a; }
+
+		Action a;
+		bool disposed;
+
+		public void Dispose()
+		{
+			if (disposed) return;
+			disposed = true;
+			a();
+			GC.SuppressFinalize(this);
+		}
+
+		~DisposableAction()
+		{
+			Dispose();
+		}
+	}
+}
--- a/OpenRA.FileFormats/Primitives/Lazy.cs
+++ b/OpenRA.FileFormats/Primitives/Lazy.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Primitives/Pair.cs
+++ b/OpenRA.FileFormats/Primitives/Pair.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Primitives/PriorityQueue.cs
+++ b/OpenRA.FileFormats/Primitives/PriorityQueue.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Primitives/Set.cs
+++ b/OpenRA.FileFormats/Primitives/Set.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Primitives/Tuple.cs
+++ b/OpenRA.FileFormats/Primitives/Tuple.cs
@@ -1,39 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public class Tuple<A, B, C>
-	{
-		public A a;
-		public B b;
-		public C c;
-
-		public Tuple(A a, B b, C c) { this.a = a; this.b = b; this.c = c; }
-	}
-
-	public static class Tuple
-	{
-		public static Tuple<A, B, C> New<A, B, C>(A a, B b, C c)
-		{
-			return new Tuple<A, B, C>(a, b, c);
-		}
-	}
-}
--- a/OpenRA.FileFormats/Primitives/float2.cs
+++ b/OpenRA.FileFormats/Primitives/float2.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Primitives/int2.cs
+++ b/OpenRA.FileFormats/Primitives/int2.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/ProtocolVersion.cs
+++ b/OpenRA.FileFormats/ProtocolVersion.cs
@@ -1,28 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public static class ProtocolVersion
-	{
-		// you *must* increment this whenever you make an incompatible protocol change
-		public static readonly int Version = 4;
-	}
-}
--- a/OpenRA.FileFormats/Session.cs
+++ b/OpenRA.FileFormats/Session.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -23,6 +13,10 @@ using System.Linq;

 namespace OpenRA.FileFormats
 {
+	// todo: ship most of this back to the Game assembly;
+	// it was only in FileFormats due to the original server model,
+	// in a sep. process.
+
 	public class Session
 	{
 		public List<Client> Clients = new List<Client>();
@@ -31,14 +25,14 @@ namespace OpenRA.FileFormats
 		public enum ClientState
 		{
 			NotReady,
-			Downloading,
 			Ready
 		}

 		public class Client
 		{
 			public int Index;
-			public int PaletteIndex;
+			public System.Drawing.Color Color1;
+			public System.Drawing.Color Color2;
 			public string Country;
 			public int SpawnPoint;
 			public string Name;
@@ -49,10 +43,11 @@ namespace OpenRA.FileFormats
 		public class Global
 		{
 			public string Map;
-			public string[] Packages = {};	// filename:sha1 pairs.
 			public string[] Mods = { "ra" };	// mod names
 			public int OrderLatency = 3;
 			public int RandomSeed = 0;
+			public bool LockTeams = false;	// don't allow team changes after game start.
+			public bool AllowCheats = false;
 		}
 	}

@@ -61,7 +56,7 @@ namespace OpenRA.FileFormats
 		public readonly string[] 
 			Folders, Packages, Rules, 
 			Sequences, Chrome, Assemblies, ChromeLayout, 
-			Weapons, Voices, Terrain;
+			Weapons, Voices, Music, TileSets;
 		
 		public readonly string ShellmapUid;

@@ -80,11 +75,15 @@ namespace OpenRA.FileFormats
 			ChromeLayout = YamlList(yaml, "ChromeLayout");
 			Weapons = YamlList(yaml, "Weapons");
 			Voices = YamlList(yaml, "Voices");
-			Terrain = YamlList(yaml, "Terrain");
-			
+			Music = YamlList(yaml, "Music");
+			TileSets = YamlList(yaml, "TileSets");
+						
 			ShellmapUid = yaml["ShellmapUid"].Value;
 		}

-		static string[] YamlList(Dictionary<string, MiniYaml> ys, string key) { return ys[key].Nodes.Keys.ToArray(); }
+		static string[] YamlList(Dictionary<string, MiniYaml> ys, string key)
+		{
+			return ys.ContainsKey(key) ? ys[key].Nodes.Keys.ToArray() : new string[] { };
+		}
 	}
 }
--- a/OpenRA.FileFormats/ShroudPaletteRemap.cs
+++ b/OpenRA.FileFormats/ShroudPaletteRemap.cs
@@ -1,60 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Drawing;
-
-namespace OpenRA.FileFormats
-{
-	public class ShroudPaletteRemap : IPaletteRemap
-	{
-		bool isFog;
-
-		public ShroudPaletteRemap(bool isFog) { this.isFog = isFog; }
-		public Color GetRemappedColor(Color original, int index)
-		{
-			// false-color version for debug
-
-			//return new[] { 
-			//    Color.FromArgb(64,0,0,0), Color.Green, 
-			//    Color.Blue, Color.Yellow, 
-			//    Color.Green, 
-			//    Color.Red, 
-			//    Color.Purple, 
-			//    Color.Cyan}[index % 8];
-
-			if (isFog)
-				return new[] { 
-					Color.Transparent, Color.Green, 
-					Color.Blue, Color.Yellow, 
-					Color.FromArgb(128,0,0,0), 
-					Color.FromArgb(128,0,0,0), 
-					Color.FromArgb(128,0,0,0), 
-					Color.FromArgb(64,0,0,0)}[index % 8];
-			else
-				return new[] { 
-					Color.Transparent, Color.Green, 
-					Color.Blue, Color.Yellow, 
-					Color.Black, 
-					Color.FromArgb(128,0,0,0), 
-					Color.Transparent, 
-					Color.Transparent}[index % 8];
-		}
-	}
-}
--- a/OpenRA.FileFormats/SingleColorRemap.cs
+++ b/OpenRA.FileFormats/SingleColorRemap.cs
@@ -1,38 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Drawing;
-
-namespace OpenRA.FileFormats
-{
-	public class SingleColorRemap : IPaletteRemap
-	{
-		Color c;
-		public SingleColorRemap(Color c)
-		{
-			this.c = c;
-		}
-
-		public Color GetRemappedColor(Color original, int index)
-		{
-			return original.A > 0 ? c : original;
-		}
-	}
-}
--- a/OpenRA.FileFormats/Support/Log.cs
+++ b/OpenRA.FileFormats/Support/Log.cs
@@ -1,40 +1,106 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.IO;
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net;

 namespace OpenRA
 {
+	public struct ChannelInfo
+	{
+		public bool Upload;
+		public string Filename;
+		public StreamWriter Writer;
+		public bool Diff;
+	}
+
 	public static class Log
 	{
-		static StreamWriter writer = File.CreateText(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + Path.DirectorySeparatorChar + "openra.log.txt");
+		static string LogPathPrefix = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + Path.DirectorySeparatorChar;
+		static Dictionary<string, ChannelInfo> channels = new Dictionary<string,ChannelInfo>();

-		static Log()
+		public static string LogPath
 		{
-			writer.AutoFlush = true;
+			get { return LogPathPrefix; }
+			set
+			{
+				LogPathPrefix = value;				
+				if (!Directory.Exists(LogPathPrefix))
+					Directory.CreateDirectory(LogPathPrefix);
+			}
+		}
+		
+		public static void AddChannel(string channelName, string filename, bool upload, bool diff)
+		{
+			if (channels.ContainsKey(channelName)) return;
+			
+			var i = 0;
+			var f = filename;
+			while (File.Exists(LogPathPrefix + filename))
+				try 
+				{
+					StreamWriter writer = File.CreateText(LogPathPrefix + filename);
+					writer.AutoFlush = true;
+					channels.Add(channelName, new ChannelInfo() { Upload = upload, Filename = filename, Writer = writer, Diff = diff });
+					return;
+				}
+				catch (IOException) { filename = f + ".{0}".F(++i); }
+			
+			//if no logs exist, just make it
+			StreamWriter w = File.CreateText(LogPathPrefix + filename);
+			w.AutoFlush = true;
+			channels.Add(channelName, new ChannelInfo() { Upload = upload, Filename = filename, Writer = w, Diff = diff });
+			
 		}

-		public static void Write(string format, params object[] args)
+		public static void Write(string channel, string format, params object[] args)
 		{
-			writer.WriteLine(format, args);
+			ChannelInfo info;
+			if (!channels.TryGetValue(channel, out info))
+				throw new Exception("Tried logging to non-existant channel " + channel);
+
+			info.Writer.WriteLine(format, args);
+		}
+
+		public static void Upload(int gameId)
+		{
+			foreach (var kvp in channels.Where(x => x.Value.Upload))
+			{
+				kvp.Value.Writer.Close();
+				var logfile = File.OpenRead(Log.LogPathPrefix + kvp.Value.Filename);
+				byte[] fileContents = logfile.ReadAllBytes();
+				var ms = new MemoryStream();
+
+				using (var gzip = new GZipStream(ms, CompressionMode.Compress, true))
+					gzip.Write(fileContents, 0, fileContents.Length);
+
+				ms.Position = 0;
+				byte[] buffer = ms.ReadAllBytes();
+
+				WebRequest request = WebRequest.Create("http://open-ra.org/logs/upload.php");
+				request.ContentType = "application/x-gzip";
+				request.ContentLength = buffer.Length;
+				request.Method = "POST";
+				request.Headers.Add("Game-ID", gameId.ToString());
+				request.Headers.Add("Channel", kvp.Key);
+			//	request.Headers.Add("Diff", kvp.Value.Diff ? "1" : "0");
+
+				using (var requestStream = request.GetRequestStream())
+					requestStream.Write(buffer, 0, buffer.Length);
+
+				//var response = (HttpWebResponse)request.GetResponse();
+			}
 		}
 	}
 }
--- a/OpenRA.FileFormats/Support/Stopwatch.cs
+++ b/OpenRA.FileFormats/Support/Stopwatch.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.FileFormats/Support/Timer.cs
+++ b/OpenRA.FileFormats/Support/Timer.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -28,7 +18,9 @@ namespace OpenRA.Support
 		public static void Time( string message )
 		{
 			var time = sw.ElapsedTime();
-			Log.Write( message, time - lastTime );
+			var dt = time - lastTime;
+			if( dt > 0.0001 )
+				Log.Write("perf", message, dt );
 			lastTime = time;
 		}
 	}
--- a/OpenRA.FileFormats/Thirdparty/Random.cs
+++ b/OpenRA.FileFormats/Thirdparty/Random.cs
@@ -1,3 +1,13 @@
+#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;

 namespace OpenRA.Thirdparty
@@ -6,16 +16,16 @@ namespace OpenRA.Thirdparty

 	public class Random
 	{
-		int[] mt = new int[624];
+		uint[] mt = new uint[624];
 		int index = 0;

 		public Random() : this(Environment.TickCount) { }
 		
 		public Random(int seed)
 		{
-			mt[0] = seed;
-			for (var i = 1; i < mt.Length; i++)
-				mt[i] = 1812433253 * (mt[i - 1] ^ (mt[i - 1] >> 30)) + i;
+			mt[0] = (uint)seed;
+			for (var i = 1u; i < mt.Length; i++)
+				mt[i] = 1812433253u * (mt[i - 1] ^ (mt[i - 1] >> 30)) + i;
 		}

 		public int Next()
@@ -24,26 +34,29 @@ namespace OpenRA.Thirdparty

 			var y = mt[index];
 			y ^= (y >> 11);
-			y ^= (int)((y << 7) & 2636928640);
-			y ^= (int)((y << 15) & 4022730752);
+			y ^= ((y << 7) & 2636928640);
+			y ^= ((y << 15) & 4022730752);
 			y ^= y >> 18;

 			index = (index + 1) % 624;
-			return y;
+			return (int)(y % int.MaxValue);
 		}

 		public int Next(int low, int high) { return low + Next() % (high - low); }
 		public int Next(int high) { return Next() % high; }
-		public double NextDouble() { return (uint)Next() / (double)uint.MaxValue; }
+		public double NextDouble() { return Math.Abs(Next() / (double)0x7fffffff); }

 		void Generate()
 		{
-			for (var i = 0; i < mt.Length; i++)
+			unchecked
 			{
-				var y = (mt[i] & int.MinValue) | (mt[(i + 1) % 624] & int.MaxValue);
-				mt[i] = mt[(i + 397) % 624] ^ (y >> 1);
-				if ((y & 1) == 1)
-					mt[i] = (int)(mt[i] ^ 2567483615);
+				for (var i = 0u; i < mt.Length; i++)
+				{
+					var y = (mt[i] & 0x80000000) | (mt[(i + 1) % 624] & 0x7fffffff);
+					mt[i] = mt[(i + 397u) % 624u] ^ (y >> 1);
+					if ((y & 1) == 1)
+						mt[i] = (mt[i] ^ 2567483615);
+				}
 			}
 		}
 	}
--- a/OpenRA.FileFormats/TypeDictionary.cs
+++ b/OpenRA.FileFormats/TypeDictionary.cs
@@ -1,30 +1,21 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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;
 using System.Collections.Generic;
 using System.Linq;

 namespace OpenRA.FileFormats
 {
-	public class TypeDictionary
+	public class TypeDictionary : IEnumerable
 	{
 		Dictionary<Type, object> dataSingular = new Dictionary<Type, object>();
 		Dictionary<Type, List<object>> dataMultiple = new Dictionary<Type, List<object>>();
@@ -95,7 +86,7 @@ namespace OpenRA.FileFormats
 				return new T[ 0 ];
 		}

-		public IEnumerator<object> GetEnumerator()
+		public IEnumerator GetEnumerator()
 		{
 			return WithInterface<object>().GetEnumerator();
 		}
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -1,254 +1,192 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System;
-using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-
-namespace OpenRA
-{
-	public class Actor
-	{
-		[Sync]
-		public readonly TypeDictionary traits = new TypeDictionary();
-		public readonly ActorInfo Info;
-
-		public readonly World World;
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
+
+namespace OpenRA
+{
+	public class Actor
+	{
+		[Sync]
+		public readonly TypeDictionary traits = new TypeDictionary();
+		public readonly ActorInfo Info;
+
+		public readonly World World;
 		public readonly uint ActorID;

-		[Sync]
-		public int2 Location;
-		[Sync]
-		public Player Owner;
-		[Sync]
-		public int Health;
+		public int2 Location { get { return traits.Get<IOccupySpace>().TopLeft; } }
+		[Sync]
+		public Player Owner;
+
 		IActivity currentActivity;
-
-		public Actor(World world, string name, int2 location, Player owner)
+		public Group Group;
+
+		internal Actor(World world, string name, TypeDictionary initDict )
 		{
-			World = world;
+			var init = new ActorInitializer( this, initDict );
+
+			World = world;
 			ActorID = world.NextAID();
-			Location = location;
-			CenterLocation = Traits.Util.CenterOfCell(Location);
-			Owner = owner;
-
-			if (name != null)
-			{
-				if (!Rules.Info.ContainsKey(name.ToLowerInvariant()))
-					throw new NotImplementedException("No rules definition for unit {0}".F(name.ToLowerInvariant()));
-
-				Info = Rules.Info[name.ToLowerInvariant()];
-				Health = this.GetMaxHP();
-
-				foreach (var trait in Info.TraitsInConstructOrder())
-					traits.Add(trait.Create(this));
+			if( initDict.Contains<OwnerInit>() )
+				Owner = init.Get<OwnerInit,Player>();
+
+			if (name != null)
+			{
+				if (!Rules.Info.ContainsKey(name.ToLowerInvariant()))
+					throw new NotImplementedException("No rules definition for unit {0}".F(name.ToLowerInvariant()));
+
+				Info = Rules.Info[name.ToLowerInvariant()];
+				foreach (var trait in Info.TraitsInConstructOrder())
+					traits.Add(trait.Create(init));
 			}

-			Size = Lazy.New(() =>
-			{
-				var si = Info.Traits.GetOrDefault<SelectableInfo>();
-				if (si != null && si.Bounds != null)
-					return new float2(si.Bounds[0], si.Bounds[1]);
+			if( CenterLocation == float2.Zero && traits.Contains<IOccupySpace>() )
+				CenterLocation = Traits.Util.CenterOfCell(Location);

-				// auto size from render
-				var firstSprite = traits.WithInterface<IRender>().SelectMany(x => x.Render(this)).FirstOrDefault();
-				if (firstSprite.Sprite == null) return float2.Zero;
-				return firstSprite.Sprite.size;
-			});
-		}
-
-		public void Tick()
+			Size = Lazy.New(() =>
+			{
+				var si = Info.Traits.GetOrDefault<SelectableInfo>();
+				if (si != null && si.Bounds != null)
+					return new float2(si.Bounds[0], si.Bounds[1]);
+
+				// auto size from render
+				var firstSprite = traits.WithInterface<IRender>().SelectMany(x => x.Render(this)).FirstOrDefault();
+				if (firstSprite.Sprite == null) return float2.Zero;
+				return firstSprite.Sprite.size;
+			});
+		}
+
+		public void Tick()
+		{
+			var wasIdle = currentActivity is Idle;
+			while (currentActivity != null)
+			{
+				var a = currentActivity;
+				currentActivity = a.Tick(this) ?? new Idle();
+
+				if (a == currentActivity) break;
+
+				if (currentActivity is Idle)
+				{
+					if (!wasIdle)
+						foreach (var ni in traits.WithInterface<INotifyIdle>())
+							ni.Idle(this);
+
+					break;
+				}
+			}
+		}
+
+		public bool IsIdle
+		{
+			get { return currentActivity == null || currentActivity is Idle; }
+		}
+
+		public float2 CenterLocation;
+
+        OpenRA.FileFormats.Lazy<float2> Size;
+
+		public IEnumerable<Renderable> Render()
+		{
+			var mods = traits.WithInterface<IRenderModifier>();
+			var sprites = traits.WithInterface<IRender>().SelectMany(x => x.Render(this));
+			return mods.Aggregate(sprites, (m, p) => p.ModifyRender(this, m));
+		}
+
+		public Order Order( int2 xy, MouseInput mi )
+		{
+			if (Owner != World.LocalPlayer)
+				return null;
+
+			if (!World.Map.IsInMap(xy.X, xy.Y))
+				return null;
+
+			var underCursor = World.FindUnitsAtMouse(mi.Location)
+				//.Where(a => a.Info.Traits.Contains<SelectableInfo>())
+				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
+				.FirstOrDefault();
+			
+			return traits.WithInterface<IIssueOrder>()
+				.Select( x => x.IssueOrder( this, xy, mi, underCursor ) )
+				.FirstOrDefault( x => x != null );
+		}
+
+		public RectangleF GetBounds(bool useAltitude)
+		{
+			var si = Info.Traits.GetOrDefault<SelectableInfo>();
+
+			var size = Size.Value;
+			var loc = CenterLocation - 0.5f * size;
+			
+			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
+				loc += new float2(si.Bounds[2], si.Bounds[3]);
+
+			if (useAltitude)
+			{
+				var move = traits.GetOrDefault<IMove>();
+				if (move != null) loc -= new float2(0, move.Altitude);
+			}
+
+			return new RectangleF(loc.X, loc.Y, size.X, size.Y);
+		}
+
+		public bool IsInWorld { get; set; }
+
+		public void QueueActivity( IActivity nextActivity )
+		{
+			if( currentActivity == null )
+			{
+				currentActivity = nextActivity;
+				return;
+			}
+			var act = currentActivity;
+			while( act.NextActivity != null )
+			{
+				act = act.NextActivity;
+			}
+			act.NextActivity = nextActivity;
+		}
+
+		public void CancelActivity()
+		{
+			if( currentActivity != null )
+				currentActivity.Cancel( this );
+		}
+
+		// For pathdebug, et al
+		public IActivity GetCurrentActivity()
+		{
+			return currentActivity;
+		}
+
+		public override int GetHashCode()
+		{
+			return (int)ActorID;
+		}
+
+		public override bool Equals( object obj )
+		{
+			var o = obj as Actor;
+			return ( o != null && o.ActorID == ActorID );
+		}
+
+		public override string ToString()
 		{
-			var wasIdle = currentActivity is Idle;
-			while (currentActivity != null)
-			{
-				var a = currentActivity;
-				currentActivity = a.Tick(this) ?? new Idle();
-
-				if (a == currentActivity) break;
-
-				if (currentActivity is Idle)
-				{
-					if (!wasIdle)
-						foreach (var ni in traits.WithInterface<INotifyIdle>())
-							ni.Idle(this);
-
-					break;
-				}
-			}
-		}
-
-		public bool IsIdle
-		{
-			get { return currentActivity == null || currentActivity is Idle; }
-		}
-
-		public float2 CenterLocation;
-
-		Lazy<float2> Size;
-
-		public IEnumerable<Renderable> Render()
-		{
-			var mods = traits.WithInterface<IRenderModifier>();
-			var sprites = traits.WithInterface<IRender>().SelectMany(x => x.Render(this));
-			return mods.Aggregate(sprites, (m, p) => p.ModifyRender(this, m));
-		}
-
-		public Order Order( int2 xy, MouseInput mi )
-		{
-			if (Owner != World.LocalPlayer)
-				return null;
-
-			if (!World.Map.IsInMap(xy.X, xy.Y))
-				return null;
-			
-			var underCursor = World.FindUnitsAtMouse(mi.Location).FirstOrDefault();
-
-			if (underCursor != null && !underCursor.traits.Contains<Selectable>())
-				underCursor = null;
-
-			return traits.WithInterface<IIssueOrder>()
-				.Select( x => x.IssueOrder( this, xy, mi, underCursor ) )
-				.FirstOrDefault( x => x != null );
-		}
-
-		public RectangleF GetBounds(bool useAltitude)
-		{
-			var si = Info.Traits.GetOrDefault<SelectableInfo>();
-
-			var size = Size.Value;
-			var loc = CenterLocation - 0.5f * size;
-			
-			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
-				loc += new float2(si.Bounds[2], si.Bounds[3]);
-
-			if (useAltitude)
-			{
-				var unit = traits.GetOrDefault<Unit>();
-				if (unit != null) loc -= new float2(0, unit.Altitude);
-			}
-
-			return new RectangleF(loc.X, loc.Y, size.X, size.Y);
-		}
-
-		public bool IsDead { get { return Health <= 0; } }
-		public bool IsInWorld { get; set; }
-		public bool RemoveOnDeath = true;
-
-		public DamageState GetDamageState()
-		{
-			if (Health <= 0)
-				return DamageState.Dead;
-			
-			if (Health < this.GetMaxHP() * World.Defaults.ConditionYellow)
-				return DamageState.Half;
-
-			return DamageState.Normal;
-		}
-
-		public void InflictDamage(Actor attacker, int damage, WarheadInfo warhead)
-		{
-			if (IsDead) return;		/* overkill! don't count extra hits as more kills! */
-
-			var rawDamage = damage;
-			var oldState = GetDamageState();
-
-			/* apply the damage modifiers, if we have any. */
-			var modifier = (float)traits.WithInterface<IDamageModifier>()
-				.Select(t => t.GetDamageModifier()).Product();
-
-			damage = (int)(damage * modifier);
-
-			Health -= damage;
-			if (Health <= 0)
-			{
-				Health = 0;
-
-				attacker.Owner.Kills++;
-				Owner.Deaths++;
-
-				if (RemoveOnDeath)
-					World.AddFrameEndTask(w => w.Remove(this));
-			}
-
-			var maxHP = this.GetMaxHP();
-
-			if (Health > maxHP)	Health = maxHP;
-
-			Log.Write("InflictDamage: {0} #{1} -> {2} #{3} raw={4} adj={5} hp={6} mod={7}",
-				attacker.Info.Name, attacker.ActorID, Info.Name, ActorID, rawDamage, damage, Health, modifier);
-
-			var newState = GetDamageState();
-
-			foreach (var nd in traits.WithInterface<INotifyDamage>())
-				nd.Damaged(this, new AttackInfo
-				{
-					Attacker = attacker,
-					Damage = damage,
-					DamageState = newState,
-					DamageStateChanged = newState != oldState,
-					Warhead = warhead
-				});
-		}
-
-		public void QueueActivity( IActivity nextActivity )
-		{
-			if( currentActivity == null )
-			{
-				currentActivity = nextActivity;
-				return;
-			}
-			var act = currentActivity;
-			while( act.NextActivity != null )
-			{
-				act = act.NextActivity;
-			}
-			act.NextActivity = nextActivity;
-		}
-
-		public void CancelActivity()
-		{
-			if( currentActivity != null )
-				currentActivity.Cancel( this );
-		}
-
-		// For pathdebug, et al
-		public IActivity GetCurrentActivity()
-		{
-			return currentActivity;
-		}
-
-		public override int GetHashCode()
-		{
-			return (int)ActorID;
-		}
-
-		public override bool Equals( object obj )
-		{
-			var o = obj as Actor;
-			return ( o != null && o.ActorID == ActorID );
-		}
+			return "{0} {1}{2}".F( Info.Name, ActorID, IsInWorld ? "" : " (not in world)" );
+		}
 	}
-}
+}
--- a/OpenRA.Game/ActorInitializer.cs
+++ b/OpenRA.Game/ActorInitializer.cs
@@ -0,0 +1,134 @@
+#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.Linq;
+using OpenRA.FileFormats;
+
+namespace OpenRA
+{
+	public class ActorInitializer
+	{
+		public readonly Actor self;
+		public World world { get { return self.World; } }
+		internal TypeDictionary dict;
+
+		public ActorInitializer( Actor actor, TypeDictionary dict )
+		{
+			this.self = actor;
+			this.dict = dict;
+		}
+
+		public T Get<T>()
+			where T : IActorInit
+		{
+			return dict.Get<T>();
+		}
+
+		public U Get<T,U>()
+			where T : IActorInit<U>
+		{
+			return dict.Get<T>().Value( world );
+		}
+		
+		public bool Contains<T>()
+			where T : IActorInit
+		{
+			return dict.Contains<T>();
+		}
+	}
+	
+	public interface IActorInit {}
+
+	public interface IActorInit<T> : IActorInit
+	{
+		T Value( World world );
+	}
+	
+	public class FacingInit : IActorInit<int>
+	{
+		[FieldFromYamlKey]
+		public readonly int value = 128;
+		
+		public FacingInit() { }
+		
+		public FacingInit( int init )
+		{
+			value = init;
+		}
+		
+		public int Value( World world )
+		{
+			return value;	
+		}
+	}
+	
+	public class AltitudeInit : IActorInit<int>
+	{
+		[FieldFromYamlKey]
+		public readonly int value = 0;
+		
+		public AltitudeInit() { }
+		
+		public AltitudeInit( int init )
+		{
+			value = init;
+		}
+		
+		public int Value( World world )
+		{
+			return value;	
+		}
+	}
+
+	public class LocationInit : IActorInit<int2>
+	{
+		[FieldFromYamlKey]
+		public readonly int2 value = int2.Zero;
+
+		public LocationInit() { }
+
+		public LocationInit( int2 init )
+		{
+			value = init;
+		}
+
+		public int2 Value( World world )
+		{
+			return value;
+		}
+	}
+
+	public class OwnerInit : IActorInit<Player>
+	{
+		[FieldFromYamlKey]
+		public readonly string PlayerName = "Neutral";
+		Player player;
+
+		public OwnerInit() { }
+
+		public OwnerInit( string playerName )
+		{
+			this.PlayerName = playerName;
+		}
+
+		public OwnerInit( Player player )
+		{
+			this.player = player;
+			this.PlayerName = player.InternalName;
+		}
+
+		public Player Value( World world )
+		{
+			if( player != null )
+				return player;
+			return world.players.First( x => x.Value.InternalName == PlayerName ).Value;
+		}
+	}
+}
--- a/OpenRA.Game/ActorReference.cs
+++ b/OpenRA.Game/ActorReference.cs
@@ -0,0 +1,53 @@
+#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.Collections.Generic;
+using System.Collections;
+
+namespace OpenRA.FileFormats
+{
+	public class ActorReference : IEnumerable
+	{
+		public readonly string Type;
+		public readonly TypeDictionary InitDict;
+
+		public ActorReference( string type ) : this( type, new Dictionary<string, MiniYaml>() ) { }
+
+		public ActorReference( string type, Dictionary<string, MiniYaml> inits )
+		{
+			Type = type;
+			InitDict = new TypeDictionary();
+			foreach( var i in inits )
+				InitDict.Add( LoadInit( i.Key, i.Value ) );
+		}
+
+		static IActorInit LoadInit(string traitName, MiniYaml my)
+		{
+			var info = Game.CreateObject<IActorInit>(traitName + "Init");
+			FieldLoader.Load(info, my);
+			return info;
+		}
+
+		public MiniYaml Save()
+		{
+			var ret = new MiniYaml( Type );
+			foreach( var init in InitDict )
+			{
+				var initName = init.GetType().Name;
+				ret.Nodes.Add( initName.Substring( 0, initName.Length - 4 ), FieldSaver.Save( init ) );
+			}
+			return ret;
+		}
+
+		// for initialization syntax
+		public void Add( object o ) { InitDict.Add( o ); }
+		public IEnumerator GetEnumerator() { return InitDict.GetEnumerator(); }
+	}
+}
--- a/OpenRA.Game/Chat.cs
+++ b/OpenRA.Game/Chat.cs
@@ -1,77 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using OpenRA.FileFormats;
-using OpenRA.Traits;
-
-namespace OpenRA
-{
-	class Chat
-	{
-		const int logLength = 10;
-
-		public List<Tuple<Color, string, string>> recentLines = new List<Tuple<Color, string, string>>();
-		public string typing = "";
-		public bool isChatting = true;
-
-		public void Toggle()
-		{
-			if( isChatting && typing.Length > 0 )
-				Game.IssueOrder( Order.Chat( typing ) );
-
-			typing = "";
-			if( Game.orderManager.GameStarted )
-				isChatting ^= true;
-		}
-		
-		public void Reset()
-		{
-			typing = "";
-			isChatting = false;
-			recentLines.Clear();
-		}
-
-		public void TypeChar(char c)
-		{
-			if (c == '\b' || c == 0x7f)
-			{
-				if (typing.Length > 0)
-					typing = typing.Remove(typing.Length - 1);
-			}
-			else if (!char.IsControl(c))
-				typing += c;
-		}
-
-		public void AddLine(Session.Client p, string text)
-		{
-			AddLine(Player.PlayerColors( Game.world )[p.PaletteIndex].c, p.Name, text);
-		}
-
-		public void AddLine(Color c, string from, string text)
-		{
-			recentLines.Add(Tuple.New(c, from, text));
-			var eva = Rules.Info["world"].Traits.Get<EvaAlertsInfo>();
-			Sound.Play(eva.ChatBeep);
-			while (recentLines.Count > logLength) recentLines.RemoveAt(0);
-		}
-	}
-}
--- a/OpenRA.Game/Chrome.cs
+++ b/OpenRA.Game/Chrome.cs
@@ -1,261 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-using OpenRA.Widgets;
-
-namespace OpenRA
-{
-	class Chrome : IHandleInput
-	{
-		public readonly Renderer renderer;
-		public readonly LineRenderer lineRenderer;
-
-		SpriteRenderer rgbaRenderer { get { return renderer.RgbaSpriteRenderer; } }
-		SpriteRenderer shpRenderer { get { return renderer.WorldSpriteRenderer; } }
-	
-		readonly List<Pair<RectangleF, Action<bool>>> buttons = new List<Pair<RectangleF, Action<bool>>>();
-
-		internal MapStub currentMap;
-
-		public Chrome(Renderer r, Manifest m)
-		{
-			this.renderer = r;
-			lineRenderer = new LineRenderer(renderer);
-					
-			var widgetYaml = m.ChromeLayout.Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge);
-			
-			if (rootWidget == null)
-			{
-				rootWidget = WidgetLoader.LoadWidget( widgetYaml.FirstOrDefault() );
-				rootWidget.Initialize();
-				rootWidget.InitDelegates();
-				Widget.WindowList.Push("MAINMENU_BG");
-			}
-		}
-
-		public static Widget rootWidget = null;
-		public static Widget selectedWidget;
-				
-		public void Tick(World world)
-		{
-			if (!world.GameHasStarted) return;
-			if (world.LocalPlayer == null) return;
-
-			++ticksSinceLastMove;
-			
-			rootWidget.Tick(world);
-		}
-				
-		public void Draw( World world )
-		{
-			buttons.Clear();
-			renderer.Device.DisableScissor();
-			
-			var typingArea = new Rectangle(240, Game.viewport.Height - 30, Game.viewport.Width - 420, 30);
-			var chatLogArea = new Rectangle(240, Game.viewport.Height - 500, Game.viewport.Width - 420, 500 - 40);
-			DrawChat(typingArea, chatLogArea);
-		}
-		
-		void AddUiButton(int2 pos, string text, Action<bool> a)
-		{
-			var rect = new Rectangle(pos.X - 160 / 2, pos.Y - 4, 160, 24);
-			DrawDialogBackground( rect, "dialog2");
-			DrawCentered(text, new int2(pos.X, pos.Y), Color.White);
-			rgbaRenderer.Flush();
-			AddButton(rect, a);
-		}
-
-		public void DrawMapChooser()
-		{
-			buttons.Clear();
-
-			var w = 800;
-			var h = 600;
-			var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h );
-
-			AddUiButton(new int2(r.Left + 200, r.Bottom - 40), "OK",
-				_ =>
-				{
-					Game.IssueOrder(Order.Chat("/map " + currentMap.Uid));
-					Chrome.rootWidget.CloseWindow();
-				});
-
-			AddUiButton(new int2(r.Right - 200, r.Bottom - 40), "Cancel",
-				_ =>
-				{
-					Chrome.rootWidget.CloseWindow();
-				});
-
-			var mapContainer = new Rectangle(r.Right - 280, r.Top + 30, 256, 256);
-
-			var y = r.Top + 50;
-					
-			// Don't bother showing a subset of the data
-			// This will be fixed properly when we move the map list to widgets
-			foreach (var kv in Game.AvailableMaps)
-			{
-				var map = kv.Value;
-				if (!map.Selectable)
-					continue;
-
-				var itemRect = new Rectangle(r.Left + 50, y - 2, r.Width - 340, 20);
-				if (map == currentMap)
-				{
-					rgbaRenderer.Flush();
-					DrawDialogBackground(itemRect, "dialog2");
-				}
-
-				renderer.RegularFont.DrawText(map.Title, new int2(r.Left + 60, y), Color.White);
-				rgbaRenderer.Flush();
-				var closureMap = map;
-				AddButton(itemRect, _ => { currentMap = closureMap; });
-				y += 20;
-			}
-
-			y = mapContainer.Bottom + 20;
-			DrawCentered("Title: {0}".F(currentMap.Title),
-				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
-			y += 20;
-			DrawCentered("Size: {0}x{1}".F(currentMap.Width, currentMap.Height),
-				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
-			y += 20;
-
-			var theaterInfo = Rules.Info["world"].Traits.WithInterface<TheaterInfo>().FirstOrDefault(t => t.Theater == currentMap.Tileset);
-			DrawCentered("Theater: {0}".F(theaterInfo.Name),
-				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
-			y += 20;
-			DrawCentered("Spawnpoints: {0}".F(currentMap.PlayerCount),
-				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
-
-			AddButton(r, _ => { });
-		}
-		
-
-		public void DrawWidgets(World world) { rootWidget.Draw(world); shpRenderer.Flush(); rgbaRenderer.Flush(); }
-		
-		public void DrawLobby()
-		{
-			buttons.Clear();
-
-			if( Game.LobbyInfo.GlobalSettings.Map == null )
-				currentMap = null;
-			else
-				currentMap = Game.AvailableMaps[ Game.LobbyInfo.GlobalSettings.Map ];
-			
-			var w = 800;
-			var h = 600;
-			var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h );
-
-			var typingBox = new Rectangle(r.Left + 20, r.Bottom - 47, r.Width - 40, 27);
-			var chatBox = new Rectangle(r.Left + 20, r.Bottom - 269, r.Width - 40, 220);
-
-			DrawDialogBackground(typingBox, "dialog2");
-			DrawDialogBackground(chatBox, "dialog3");
-
-			DrawChat(typingBox, chatBox);
-		}
-		
-		void AddButton(RectangleF r, Action<bool> b) { buttons.Add(Pair.New(r, b)); }
-
-		void DrawDialogBackground(Rectangle r, string collection)
-		{
-			WidgetUtils.DrawPanel(collection, r);
-		}
-
-		void DrawChat(Rectangle typingArea, Rectangle chatLogArea)
-		{
-			var chatpos = new int2(chatLogArea.X + 10, chatLogArea.Bottom - 6);
-
-			renderer.Device.EnableScissor(typingArea.Left, typingArea.Top, typingArea.Width, typingArea.Height);
-			if (Game.chat.isChatting)
-				RenderChatLine(Tuple.New(Color.White, "Chat:", Game.chat.typing), 
-					new int2(typingArea.X + 10, typingArea.Y + 6));
-
-			rgbaRenderer.Flush();
-			renderer.Device.DisableScissor();
-
-			renderer.Device.EnableScissor(chatLogArea.Left, chatLogArea.Top, chatLogArea.Width, chatLogArea.Height);
-			foreach (var line in Game.chat.recentLines.AsEnumerable().Reverse())
-			{
-				chatpos.Y -= 20;
-				RenderChatLine(line, chatpos);
-			}
-
-			rgbaRenderer.Flush();
-			renderer.Device.DisableScissor();
-		}
-
-		void RenderChatLine(Tuple<Color, string, string> line, int2 p)
-		{
-			var size = renderer.RegularFont.Measure(line.b);
-			renderer.RegularFont.DrawText(line.b, p, line.a);
-			renderer.RegularFont.DrawText(line.c, p + new int2(size.X + 10, 0), Color.White);
-		}
-
-		public int ticksSinceLastMove = 0;
-		public int2 lastMousePos;
-		public bool HandleInput(World world, MouseInput mi)
-		{
-			if (selectedWidget != null)
-				return selectedWidget.HandleInput(mi);
-				
-			if (rootWidget.HandleInput(mi))
-				return true;
-
-			if (mi.Event == MouseInputEvent.Move)
-			{
-				lastMousePos = mi.Location;
-				ticksSinceLastMove = 0;
-			}
-
-			var action = buttons.Where(a => a.First.Contains(mi.Location.ToPoint()))
-				.Select(a => a.Second).FirstOrDefault();
-
-			if (action == null)
-				return false;
-
-			if (mi.Event == MouseInputEvent.Down)
-				action(mi.Button == MouseButton.Left);
-
-			return true;
-		}
-
-		public bool HitTest(int2 mousePos)
-		{
-			if (selectedWidget != null)
-				return true;
-			
-			return rootWidget.HitTest(mousePos)
-				|| buttons.Any(a => a.First.Contains(mousePos.ToPoint()));
-		}
-
-		void DrawCentered(string text, int2 pos, Color c)
-		{
-			renderer.BoldFont.DrawText(text, pos - new int2(renderer.BoldFont.Measure(text).X / 2, 0), c);
-		}
-	}
-}
--- a/OpenRA.Game/Controller.cs
+++ b/OpenRA.Game/Controller.cs
@@ -1,168 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Orders;
-using OpenRA.Traits;
-
-namespace OpenRA
-{
-	public class Controller : IHandleInput
-	{
-		public IOrderGenerator orderGenerator = new UnitOrderGenerator();
-		public Selection selection = new Selection();
-
-		public void CancelInputMode() { orderGenerator = new UnitOrderGenerator(); }
-
-		public bool ToggleInputMode<T>() where T : IOrderGenerator, new()
-		{
-			if (orderGenerator is T)
-			{
-				CancelInputMode();
-				return false;
-			}
-			else
-			{
-				orderGenerator = new T();
-				return true;
-			}
-		}
-
-		void ApplyOrders(World world, float2 xy, MouseInput mi)
-		{
-			if (orderGenerator == null) return;
-
-			var orders = orderGenerator.Order(world, xy.ToInt2(), mi).ToArray();
-			Game.orderManager.IssueOrders( orders );
-
-			var voicedActor = orders.Select(o => o.Subject)
-				.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.traits.Contains<Unit>());
-
-			var isMove = orders.Any(o => o.OrderString == "Move");
-			var isAttack = orders.Any( o => o.OrderString == "Attack" );
-
-			if (voicedActor != null)
-			{
-				
-				if(voicedActor.traits.GetOrDefault<IMovement>().CanEnterCell(xy.ToInt2()))
-					Sound.PlayVoice(isAttack ? "Attack" : "Move", voicedActor);
-
-				if (isMove)
-					world.Add(new Effects.MoveFlash(world, Game.CellSize * xy));
-			}
-		}
-
-		float2 dragStart, dragEnd;
-		public bool HandleInput(World world, MouseInput mi)
-		{
-			var xy = Game.viewport.ViewToWorld(mi);
-
-			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down)
-			{
-				if (!(orderGenerator is PlaceBuildingOrderGenerator))
-					dragStart = dragEnd = xy;
-				ApplyOrders(world, xy, mi);
-			}
-
-			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Move)
-				dragEnd = xy;
-
-			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Up)
-			{
-				if (orderGenerator is UnitOrderGenerator)
-				{
-					var newSelection = world.SelectActorsInBox(Game.CellSize * dragStart, Game.CellSize * xy);
-					selection.Combine(world, newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
-				}
-
-				dragStart = dragEnd = xy;
-			}
-
-			if (mi.Button == MouseButton.None && mi.Event == MouseInputEvent.Move)
-				dragStart = dragEnd = xy;
-
-			if (mi.Button == MouseButton.Right && mi.Event == MouseInputEvent.Down)
-				ApplyOrders(world, xy, mi);
-
-			return true;
-		}
-
-		public Pair<float2, float2>? SelectionBox
-		{
-			get
-			{
-				if (dragStart == dragEnd) return null;
-				return Pair.New(Game.CellSize * dragStart, Game.CellSize * dragEnd);
-			}
-		}
-
-		public float2 MousePosition { get { return dragEnd; } }
-		Modifiers modifiers;
-
-		public string ChooseCursor( World world )
-		{
-			int sync = world.SyncHash();
-
-			try
-			{
-				if (!world.GameHasStarted)
-					return "default";
-
-				var mi = new MouseInput
-				{
-					Location = ( Game.CellSize * MousePosition - Game.viewport.Location ).ToInt2(),
-					Button = MouseButton.Right,
-					Modifiers = modifiers
-				};
-
-				return orderGenerator.GetCursor( world, MousePosition.ToInt2(), mi );
-			}
-			finally
-			{
-				if( sync != world.SyncHash() )
-					throw new InvalidOperationException( "Desync in Controller.ChooseCursor" );
-			}
-		}
-
-		public void SetModifiers(Modifiers mods) { modifiers = mods; }
-		public Modifiers GetModifiers() { return modifiers; }
-
-		public void GotoNextBase()
-		{
-			var bases = Game.world.Queries.OwnedBy[Game.world.LocalPlayer].WithTrait<BaseBuilding>().ToArray();
-			if (!bases.Any()) return;
-
-			var next = bases
-				.Select( b => b.Actor )
-				.SkipWhile(b => Game.controller.selection.Actors.Contains(b))
-				.Skip(1)
-				.FirstOrDefault();
-
-			if (next == null)
-				next = bases.Select(b => b.Actor).First();
-
-			Game.controller.selection.Combine(Game.world, new Actor[] { next }, false, true);
-			Game.viewport.Center(Game.controller.selection.Actors);
-		}
-	}
-}
--- a/OpenRA.Game/Cursor.cs
+++ b/OpenRA.Game/Cursor.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -29,8 +19,10 @@ namespace OpenRA
 		{
 			sequence = SequenceProvider.GetCursorSequence(cursor);
 		}
-
-		public Sprite GetSprite(int frame) { return sequence.GetSprite(frame); }
-		public int2 GetHotspot() { return sequence.Hotspot; }
+		
+		public void Draw(int frame, float2 pos)
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite(sequence.GetSprite(frame), pos - sequence.Hotspot, sequence.Palette);
+		}
 	}
 }
--- a/OpenRA.Game/Effects/Corpse.cs
+++ b/OpenRA.Game/Effects/Corpse.cs
@@ -1,50 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Collections.Generic;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Effects
-{
-	class Corpse : IEffect
-	{
-		readonly Animation anim;
-		readonly float2 pos;
-		readonly Player owner;
-
-		public Corpse(Actor fromActor, int death)
-		{
-			anim = new Animation(fromActor.traits.GetOrDefault<RenderSimple>().GetImage(fromActor));
-			anim.PlayThen("die{0}".F(death + 1),
-				() => fromActor.World.AddFrameEndTask(w => w.Remove(this)));
-
-			pos = fromActor.CenterLocation;
-			owner = fromActor.Owner;
-		}
-
-		public void Tick( World world ) { anim.Tick(); }
-
-		public IEnumerable<Renderable> Render()
-		{
-			yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, owner.Palette);
-		}
-	}
-}
--- a/OpenRA.Game/Effects/CrateEffect.cs
+++ b/OpenRA.Game/Effects/CrateEffect.cs
@@ -1,51 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Collections.Generic;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Effects
-{
-	class CrateEffect : IEffect
-	{
-		Actor a;
-		Animation anim = new Animation("crate-effects");
-		float2 doorOffset = new float2(-4,0);
-
-		public CrateEffect(Actor a, string seq)
-		{
-			this.a = a;
-			anim.PlayThen(seq,
-				() => a.World.AddFrameEndTask(w => w.Remove(this)));
-		}
-
-		public void Tick( World world )
-		{
-			anim.Tick();
-		}
-		
-		public IEnumerable<Renderable> Render()
-		{
-			yield return new Renderable(anim.Image,
-				a.CenterLocation - .5f * anim.Image.size + doorOffset, "effect");
-		}
-	}
-}
--- a/OpenRA.Game/Effects/DelayedAction.cs
+++ b/OpenRA.Game/Effects/DelayedAction.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.Game/Effects/Explosion.cs
+++ b/OpenRA.Game/Effects/Explosion.cs
@@ -1,50 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Collections.Generic;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Effects
-{
-	public class Explosion : IEffect
-	{
-		Animation anim;
-		int2 pos;
-
-		public Explosion(World world, int2 pixelPos, int style, bool isWater)
-		{
-			this.pos = pixelPos;
-			var variantSuffix = isWater ? "w" : "";
-			anim = new Animation("explosion");
-			anim.PlayThen(style.ToString() + variantSuffix,
-				() => world.AddFrameEndTask(w => w.Remove(this)));
-		}
-
-		public void Tick( World world ) { anim.Tick(); }
-
-		public IEnumerable<Renderable> Render()
-		{
-			yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "effect");
-		}
-
-		public Player Owner { get { return null; } }
-	}
-}
--- a/OpenRA.Game/Effects/FlashTarget.cs
+++ b/OpenRA.Game/Effects/FlashTarget.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -24,7 +14,7 @@ using OpenRA.Traits;

 namespace OpenRA.Effects
 {
-	class FlashTarget : IEffect
+	public class FlashTarget : IEffect
 	{
 		Actor target;
 		int remainingTicks = 4;
--- a/OpenRA.Game/Effects/IEffect.cs
+++ b/OpenRA.Game/Effects/IEffect.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

--- a/OpenRA.Game/Effects/MoveFlash.cs
+++ b/OpenRA.Game/Effects/MoveFlash.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -24,11 +14,20 @@ using OpenRA.Traits;

 namespace OpenRA.Effects
 {
-	class MoveFlash : IEffect
+	public class MoveFlash : IEffect
 	{
 		Animation anim = new Animation("moveflsh");
 		float2 pos;

+		
+		public MoveFlash( World world, int2 cell )
+		{
+			this.pos = Game.CellSize * (cell + new float2(0.5f, 0.5f));
+			anim.PlayThen( "idle", 
+				() => world.AddFrameEndTask( 
+					w => w.Remove( this ) ) );
+		}
+		
 		public MoveFlash( World world, float2 pos )
 		{
 			this.pos = pos;
--- a/OpenRA.Game/Effects/RepairIndicator.cs
+++ b/OpenRA.Game/Effects/RepairIndicator.cs
@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * 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

@@ -33,12 +23,12 @@ namespace OpenRA.Effects
 		public RepairIndicator(Actor a) 
 		{ 
 			this.a = a; anim.PlayRepeating("repair"); 
-			framesLeft =  (int)(a.World.Defaults.RepairRate * 25 * 60 / 2);
+			framesLeft =  (int)(a.Info.Traits.Get<RepairableBuildingInfo>().RepairRate * 25 * 60 / 2);
 		}

 		public void Tick( World world )
 		{
-			if (--framesLeft == 0 || a.IsDead)
+			if (--framesLeft == 0 || a.IsDead())
 				world.AddFrameEndTask(w => w.Remove(this));
 		}

--- a/Show More
+++ b/Show More