fix bogus target lines being drawn to 0,0

bandage to fix dogs not killing infantry in certain cases
use a getter for Aircraft.Location
2010-10-08 21:04:31 +13:00 · 2010-10-08 19:56:27 +13:00 · 2010-10-08 19:54:56 +13:00 · 2010-10-08 19:54:52 +13:00 · 2010-10-08 19:54:49 +13:00
4087 changed files with 102075 additions and 423513 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,16 +0,0 @@
-; Top-most http://editorconfig.org/ file
-root = true
-
-; Unix-style newlines
-[*]
-end_of_line = LF
-
-; 4-column tab indentation
-[*.cs]
-indent_style = tab
-indent_size = 4
-
-; 4-column tab indentation
-[*.yaml]
-indent_style = tab
-indent_size = 4
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,12 +0,0 @@
-# Enforce LF normalization on Windows
-*.yaml eol=lf
-*.lua eol=lf
-* text=lf
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +0,0 @@
-Thank you for your contribution to OpenRA!
-
-Please be aware that we do not have enough project maintainers to match the rate of contributions, so it may take several days before somebody is able to respond to your Pull Request.
-
-You can help speed up the review process by following a few steps:
-
-* Make sure that you have read and understand the OpenRA Coding Standard (see https://github.com/OpenRA/OpenRA/wiki/Coding-Standard).
-* Write quality commit messages (see https://chris.beams.io/posts/git-commit/).
-* Only commit changes that directly relate to your Pull Request.  Use your Git interface to unstage any unrelated changes to project files, line endings, whitespace, or other files.
-* Review the code diff view below to double check that your changes satisfy the above three points.
-* Use the `make test` and `make check` commands to check for (and fix!) any issues that are reported by our automated tests.
-* If you are changing shared mod or engine code, make sure that you have tested your changes in all four default mods.
-* Respond to review comments as soon as you reasonably can.  Reviewers will usually prioritize Pull Requests that are still fresh in their minds.  Make sure to leave a comment when you push new changes, otherwise GitHub does not automatically notify reviewers!
-* Leave a polite comment asking for reviews if a week or more has passed without feedback.
-
-If you need any help you can ask in the #openra IRC channel on freenode (most active during European evenings).
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Visual Studio
+# Visual Studio crap
 Release
 bin
 obj
@@ -7,46 +7,36 @@ obj
 *.suo
 *.user
 *.sln.cache
-*.manifest
-*.CodeAnalysisLog.xml
-*.lastcodeanalysissucceeded
-_ReSharper.*/
-/.vs
-
-# movies
-*.vqa
-
-# archives
-*.mix
-
-# binaries
 mods/*/*.dll
-mods/*/*.mdb
-mods/*/*.pdb
+
+# Red Alert binary files
+mods/*/packages/*.[mM][iI][xX]
+
+#binary stuff
 /*.dll
-/*.dll.config
-/*.so
-/*.dylib
-/*.pdb
-/*.mdb
-/*.exe
-thirdparty/download/*
-*.mmdb.gz
+*.pdb
+*.mdb
+*.exe

 # backup files by various editors
 *~
 *.orig
-\#*
-.*.sw?
+# dependency DLLs (different for every platform!)
+cg.dll
+cgGL.dll

-# Monodevelop
+/OpenRa.Gl.dll
+
+#monodevelop
 *.pidb
 *.userprefs

-# Mac OS X
+packaging/windows/*.exe
+
+# osx crap
 .DS_Store

-# XCode
+# osx build crap
 packaging/osx/launcher/build/
 packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
 packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
@@ -54,34 +44,6 @@ packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
 temp.c
 temp.o
 temp.s
-OpenRA.Launcher.Mac/build/
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
+
+*.config
 *.resources
-
-# auto-generated documentation
-DOCUMENTATION.md
-WEAPONS.md
-Lua-API.md
-Settings.md
-*.html
-openra.6
-
-# StyleCop
-*.Cache
-StyleCopViolations.xml
-
-# SublimeText
-*.sublime-project
-*.sublime-workspace
-
-# NUnit
-/TestResult.xml
-/lib/
-
-# Support directory
-/Support
-
-# IntelliJ files
-.idea
--- a/.kateproject
+++ b/.kateproject
@@ -1,9 +0,0 @@
-{
-  "name": "OpenRA"
-, "files": [ { "git": 1 } ]
-, "build": {
-  "directory": "."
-  , "build": "make all"
-  , "clean": "make clean"
-  }
-}
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,87 +0,0 @@
-# Travis-CI Build for OpenRA
-# see travis-ci.org for details
-
-language: csharp
-mono: 4.6.1
-
-# http://docs.travis-ci.com/user/migrating-from-legacy
-sudo: false
-
-cache:
-  directories:
-  - thirdparty/download
-
-addons:
-  apt:
-    packages:
-    - lua5.1
-    - nsis
-    - nsis-common
-    - dpkg
-    - markdown
-    - zlib1g-dev
-    - libbz2-dev
-    - cmake
-    - genisoimage
-    - fakeroot
-
-# Environment variables
-env:
-  secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs="
-
-# Fetch dependencies
-# Run the build script
-# Check source code with StyleCop
-# call OpenRA to check for YAML errors
-# Run the NUnit tests
-script:
- - travis_retry make all-dependencies
- - make all SDK="-sdk:4.5"
- - make check
- - make check-scripts
- - make test
- - make nunit
-
-# Automatically update the trait documentation and Lua API
-after_success:
- - test $TRAVIS_PULL_REQUEST == "false" && cd packaging && ./update-wiki.sh $TRAVIS_BRANCH; cd ..
-
-# Only watch the development branch and tagged release.
-branches:
- only:
-   - /^release-.*$/
-   - /^playtest-.*$/
-   - /^pkgtest-.*$/
-   - /^prep-.*$/
-   - bleed
-
-# Notify developers when build passed/failed.
-notifications:
-  irc:
-    template:
-      - "%{repository}#%{build_number} %{commit} %{author}: %{message} %{build_url}"
-    channels:
-      - "irc.freenode.net#openra"
-    use_notice: true
-    skip_join: true
-
-before_deploy:
- - export PATH=$PATH:$HOME/usr/bin
- - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
- - cd packaging
- - mkdir build
- - ./package-all.sh ${TRAVIS_TAG} ${PWD}/build/
-deploy:
-  provider: releases
-  api_key:
-    secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
-  file:
-    - build/OpenRA-${TRAVIS_TAG}.exe
-    - build/OpenRA-${TRAVIS_TAG}.dmg
-    - build/OpenRA-${TRAVIS_TAG}-source.tar.bz2
-    - build/openra_${DOTVERSION}_all.deb
-  skip_cleanup: true
-  on:
-    all_branches: true
-    tags: true
-    repo: OpenRA/OpenRA
--- a/190
+++ b/190
@@ -1,181 +1,9 @@
-OpenRA wouldn't be where it is today without the
-hard work of many contributors.
-
-The OpenRA developers are:
-    * Chris Forbes (chrisf)
-    * Igor Popov (ihptru)
-    * Lukas Franke (abcdefg30)
-    * Oliver Brakmann (obrakmann)
-    * Paul Chote (pchote)
-    * Reaperrr
-    * Tom Roostan (RoosterDragon)
-
-Previous developers included:
-    * Alli Witheford (alzeih)
-    * Caleb Anderson (RobotCaleb)
-    * Curtis Shmyr (hamb)
-    * Daniel Hernandez (Mancano)
-    * Matthias Mailänder (Mailaender)
-    * Megan Bowra-Dean (beedee)
-    * Mike Bundy (kehaar)
-    * Pavel Penev (penev92)
-    * Robert Pepperell (ytinasni)
-    * ScottNZ
-
-Also thanks to:
-    * Adam Valy (Tschokky)
-    * Akseli Virtanen (RAGEQUIT)
-    * Alexander Fast (mizipzor)
-    * Alexis Hunt (alercah)
-    * Allen262
-    * Andrew Aldridge (i80and)
-    * Andrew Perkins
-    * Andrew Riedi
-    * Andreas Beck (baxtor)
-    * Ang Soon Li (asl97)
-    * Arik Lirette (Angusm3)
-    * Barnaby Smith (mvi)
-    * Bellator
-    * Biofreak
-    * Braxton Williams (Buddytex)
-    * Bryan Wilbur
-    * Bugra Cuhadaroglu (BugraC)
-    * Christer Ulfsparre (Holloweye)
-    * Chris Grant (Unit158)
-    * clem
-    * Cody Brittain (Generalcamo)
-    * D2k Sardaukar
-    * D'Arcy Rush (r34ch)
-    * Daniel Derejvanik (Harisson)
-    * Danny Keary (Dan9550)
-    * David Jiménez (Rydra)
-    * David Russell (DavidARussell)
-    * DeadlySurprise
-    * Dmitri Suvorov (suvjunmd)
-    * Erasmus Schroder (rasco)
-    * Eric Bajumpaa (SteelPhase)
-    * Evgeniy Sergeev (evgeniysergeev)
-    * Fahrradkette
-    * Florian Wiesbauer (FiveAces)
-    * Frank Razenberg (zzattack)
-    * Gareth Needham (Ripley`)
-    * Glen Anderson (GlenLife)
-    * Glenn Martin Jensen (Baxxster)
-    * Gordon Martin (Happy0)
-    * Guido Lipke (LipkeGu)
-    * Gyula Zimmermann (Graion Dilach)
-    * Hervé Matysiak (Herve-M)
-    * Huw Pascoe
-    * Ian T. Jacobsen (Smilex)
-    * Imago
-    * Iran
-    * Ishan Bhargava (ishantheperson)
-    * Jacob Dufault (jacobdufault)
-    * James Dunne (jsd)
-    * James Gilbert (DSUK)
-    * Jan-Willem Buurlage (jwbuurlage)
-    * Jason (atlimit8)
-    * Jeff Harris (jeff_1amstudios)
-    * Jefri Sevkin (Arular)
-    * Jes
-    * Joakim Lindberg (booom3)
-    * John Turner (whinis)
-    * Jonas A. Lind (SoScared)
-    * Joppy Furr
-    * Kanar
-    * Kenny Hoxworth (hoxworth)
-    * Kevin Azzam (ChaoticMind)
-    * Krishnakanth Mallik
-    * Kyrre Soerensen (zypres)
-    * Lawrence Wang
-    * Lesueur Benjamin (Valkirie)
-    * Maarten Meuris (Nyerguds)
-    * Mark Olson (markolson)
-    * Markus Hartung (hartmark)
-    * Matija Hustic (matija-hustic)
-    * Matthew Gatland (mgatland)
-    * Matthew Uzzell (MUzzell)
-    * Matthijs Benschop (Nerdie)
-    * Max621
-    * Max Ugrumov (katzsmile)
-    * Michael Rätzel
-    * Michael Silber (frühstück)
-    * Michael Sztolcman (s1w_)
-    * Muh
-    * Mustafa Alperen Seki (MustaphaTR)
-    * Neil Shivkar (havok13888)
-    * Nooze
-    * Nukem
-    * Okunev Yu Dmitry (xaionaro)
-    * Olaf van der Spek
-    * Paolo Chiodi (paolochiodi)
-    * Paul Dovydaitis (pdovy)
-    * Pavlos Touboulidis (pav)
-    * Pedro Ferreira Ramos (bateramos)
-    * Peter Amrehn (jongleur1983)
-    * Pizzaoverhead
-    * Pi Delport (pjdelport)
-    * Psydev
-    * Raphael Vogt (TheRaffy, Yellow)
-    * Raymond Bedrossian (Squiggles211)
-    * Raymond Martineau (mart0258)
-    * Riderr3
-    * riiga
-    * Rikhardur Bjarni Einarsson (WolfGaming)
-    * Sascha Biedermann (bidifx)
-    * Sean Hunt (coppro)
-    * Sebastien Kerguen (xanax)
-    * Shawn Collins (UberWaffe)
-    * Simon Verbeke (Saticmotion)
-    * Taryn Hill (Phrohdoh)
-    * Teemu Nieminen (Temeez)
-    * Tim Mylemans (gecko)
-    * Tirili
-    * Tristan Keating (Kilkakon)
-    * Tristan Mühlbacher (MicroBit)
-    * UnknownProgrammer
-    * Vladimir Komarov (VrKomarov)
-    * Wuschel
-
-Using GNU FreeFont distributed under the GNU GPL
-terms.
-
-Using Simple DirectMedia Layer distributed under
-the terms of the zlib license.
-
-Using FreeType distributed under the terms of the
-FreeType License.
-
-Using OpenAL Soft distributed under the GNU LGPL.
-
-Using MaxMind GeoIP2 .NET API distributed under
-the Apache 2.0 license.
-
-Using GeoLite2 data created by MaxMind and
-distributed under the CC BY-SA 3.0 license.
-
-Using SharpFont created by Robert Rouhani and
-distributed under the MIT license.
-
-Using SDL2-CS and OpenAL-CS created by Ethan
-Lee and released under the zlib license.
-
-Using Eluant created by Chris Howie and released
-under the MIT license.
-
-Using FuzzyLogicLibrary (fuzzynet) by Dmitry
-Kaluzhny and released under the GNU GPL terms.
-
-Using Open.Nat by Lucas Ontivero, based on the work
-of Alan McGovern and Ben Motmans and distributed
-under the MIT license.
-
-Using ICSharpCode.SharpZipLib initially by Mike
-Krueger and distributed under the GNU GPL terms.
-
-Using rix0rrr.BeaconLib developed by Rico Huijbers
-distributed under MIT License.
-
-Finally, special thanks goes to the original teams
-at Westwood Studios and EA for creating the classic
-games which OpenRA aims to reimagine.
+AUTHORS
+
+The OpenRA developers are:
+	* Chris Forbes
+	* Robert Pepperell
+	* Matthew Bowra-Dean
+	* Paul Chote
+	* Alli Witheford
+	* Joakim Lindberg
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by private-messaging a project team member (users with a + in front
-of their name) via our IRC channel (#openra on freenode –
-[webchat](http://webchat.freenode.net/?channels=openra)). All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,26 +0,0 @@
-# OpenRA Contributing Guidelines
-
-## Bug reports
-
-* Have you read the [FAQ](https://github.com/OpenRA/OpenRA/wiki/FAQ)?
-* Add the appropriate log files on crashes.
-* Mention the version you have tested against.
-* Please be specific on how to reproduce the problem.
-* Do not submit duplicate issues. Search first.
-* Avoid including multiple requests/bugs into a single issue.
-
-## Patches
-
-* [Coding standard](https://github.com/OpenRA/OpenRA/wiki/Coding-Standard)
-* [Branches and Releases](https://github.com/OpenRA/OpenRA/wiki/Branches-and-Releases)
-* [Licensing](http://www.gnu.org/licenses/quick-guide-gplv3.html)
-
-Please `git rebase` to the latest revision of the bleed branch.
-
-Don't forget to add yourself to [AUTHORS](https://github.com/OpenRA/OpenRA/blob/bleed/AUTHORS).
-
-Please propose a [CHANGELOG](https://github.com/OpenRA/OpenRA/wiki/CHANGELOG) entry in the pull-request comments.
-
-While your pull-request is in review it will be helpful if you join [IRC](irc://chat.freenode.net/openra) to discuss the changes.
-
-See also the in-depth guide on [contributing](https://github.com/OpenRA/OpenRA/wiki/Contributing) to the OpenRA project.
--- a/ConvertFrom-Markdown.ps1
+++ b/ConvertFrom-Markdown.ps1
--- a/FileExtractor/FileExtractor.cs
+++ b/FileExtractor/FileExtractor.cs
@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using OpenRA.FileFormats;
+
+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);
+			FileSystem.LoadFromManifest( manifest );
+			
+			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
@@ -0,0 +1,43 @@
+<?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/mods/common/FreeSans.ttf
+++ b/mods/common/FreeSans.ttf
--- a/mods/common/FreeSansBold.ttf
+++ b/mods/common/FreeSansBold.ttf
--- a/94
+++ b/94
@@ -0,0 +1,94 @@
+HACKING
+
+There are n main sections to OpenRA: UI, Rendering, unit behaviour, ...
+
+All  units/structures/most things in the map are Actors. Actors contain a  collection of traits.
+Traits consist of an info class and a  class that does stuff
+
+Actor assembly is done via the mod's yaml files. A section  exists for each actor type, 
+and within that section we list the traits  the actor should have. 
+These get looked up in the loaded mod DLLs. Each trait can contain properties, 
+which are automatically loaded into the corresponding fields on the trait's ITraitInfo.
+
+- Traits: look at TraitInterfaces.cs
+    We've tried to make individual traits implement as self-contained a unit of functionality 
+    as possible - all cross-trait references should be in terms of an interface from 
+    TraitInterfaces.cs.
+    
+- Things an actor can be *doing* are represented as IActivity implementations. 
+    Actor has a queue of these. There's a standard set of activities in 
+    OpenRa.Game/Traits/Activities, and mods tend to define more as they need them. (RA 
+    defines various special-infantry actions as activities).
+
+- Units offer orders they can perform (given context) through traits that implement IIssueOrder. 
+  Every trait with this interface is given a chance to generate orders for the current context.
+
+- For more complex things that require modal UI (like special abilities, 
+  RA-style sell/repair buttons, etc) we have IOrderGenerator implementations. This can 
+  completely replace the normal actors-provide-orders model temporarily. IOGs wiring is 
+  provided through OpenRa.Game/Controller.cs (ToggleInputMode<T>, CancelInputMode)
+
+- Things that don't affect gameplay, or (increasingly) are just transient are implemented as 
+  IEffect, rather than real Actors. This is similar to the temp ents mechanism in many other 
+  game engines.
+
+- Most player-level or global-level game behavior is implemented as traits on special Player 
+  and World actors. These are accessible via Player.PlayerActor and World.WorldActor. This 
+  includes production queue support, ore/tiberium growth, various palette manipulation magic.
+
+- Many traits can be modified by adding an appropriate IFooModifier implementation to the unit.
+  This includes rendering, where IRenderModifier allows you to define an arbitrary transform on 
+  the Renderables emitted by the actor's IRender implementation(s). Examples are things like 
+  cloaking, invisibility to certain players, flying units with shadows, etc. Other modifiers 
+  can affect movement speed, damage taken, weapon firepower, etc.
+
+Game code is collected into "Mod" units. Mods can be added prior to starting the game. 
+Currently there is no dependancy mechanism, but provided you are doing additions or overrides 
+you can add multiple mods without problem.
+Everything is a mod  (including RA - which is loaded by default). 
+
+The contents of the mod is defined in a manifest file mod.yaml. This lists the packages 
+containing art assets (typically .mix files), yaml files defining actor defintions, 
+and ini files containing legacy information that have yet to be ported over to 
+the (relatively new) yaml system.
+
+The unit artwork itself must be defined in a Sequences file (typically Sequences.xml; 
+check mod.yaml for a list of what the mod uses); the format is self explanatory. There is 
+also the SequenceEditor tool to make this easy.
+
+Chrome artwork is similarly defined in Chrome.xml. Chrome is already mod dependent. Sortof ;) 
+mod-dependent *behavior* would be nice too, not just skinning. This is a property of the traits
+however; once we port UI into traits this will become a non-issue.
+
+Rendering
+OpenRa.Game/Chrome.cs is the user interface. 
+Three renderers (SpriteRenderer, LineRenderer, Rgba?Renderer) render most stuff. Don't forget 
+to flush the renderer (if you want to see anything).
+
+UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be 
+able to save values changed in game into settings.ini (not yet implemented)
+
+Bugs: There is a list of known bugs and features at http://red-bull.ijw.co.nz:3690/OpenRA .
+
+We also have a website at http://www.open-ra.org/ . 
+
+Our IRC channel is #openra on irc.freenode.net .
+
+As far as using git, get your own repository on github. You probably want to set up the gitbot
+to spam irc when you make commits (its nice to know). Push your changes into your git 
+repository, and it will/might :P be merged into chrisforbes/OpenRA . 
+See http://help.github.com/ for working with GitHub and see http://progit.org/ for working 
+with Git.
+
+
+
+Other things we probably want to put in here:
+    - A guide on how to add a generic unit via yaml using existing traits
+        - and then introduce some element that requires a simple trait change.
+    - how to set up a new mod (TC-style or mutator-style)
+    - VFS (OpenRa.FileFormats.FileSystem, Package, Folder classes)
+    - Trait inheritance (and the magicness of ^ActorType)
+    - Removing inherited traits (prepend `-` to the trait name)
+    - Multiple instances of a trait (`@` and all subsequent characters are ignored for 
+        the purposes of looking up the trait.
+
--- a/99
+++ b/99
@@ -0,0 +1,99 @@
+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.
+
+To run OpenRA, several files are needed from the original game disks.
+
+The required files for the Red Alert mod are:
+EITHER:
+	* conquer.mix
+	* temperat.mix
+	* interior.mix
+	* snow.mix
+	* sounds.mix
+	* allies.mix
+	* russian.mix
+OR:
+	* main.mix
+AND:
+	* redalert.mix
+
+These need to be copied into the mods/ra/packages/ directory.
+
+
+The required files for the Command and Conquer mod are:
+	* cclocal.mix
+	* speech.mix
+	* conquer.mix
+	* sounds.mix
+	* tempicnh.mix
+	* temperat.mix
+	* winter.mix
+	* desert.mix
+
+These need to be copied into the mods/cnc/packages/ directory.
+If you have a case-sensitive filesystem you must change the filenames to
+lower case.
+
+
+Red Alert and C&C have been released by EA Games as freeware. They can be
+downloaded from http://www.commandandconquer.com/classic
+Unfortunately the installer is 16-bit and so won’t run on 64-bit operating
+systems. This can be worked around by using the Red Alert Setup Manager 
+	(http://ra.afraid.org/html/downloads/utilities-3.html). 
+Make sure you apply the no-CD protection fix so all the files needed 
+are installed to the hard drive.
+
+Dependencies - Make sure you have these installed, or you'll 
+have very strange errors.
+
+
+WINDOWS:
+
+* .NET Framework >= 3.5-SP1
+	(http://www.microsoft.com/downloads/details.aspx?FamilyID=AB99342F-5D1A-413D-8319-81DA479AB0D7&displaylang=en)
+* Tao Framework >= 2.1.0
+	(http://sourceforge.net/projects/taoframework/)
+	(required libs: Tao.OpenGL, Tao.Cg, Tao.Platform.Windows)
+* OpenAL >= 1.1
+	(http://connect.creativelabs.com/openal/Downloads/oalinst.zip)
+* Cg Toolkit >= 2.2
+	(http://developer.download.nvidia.com/cg/Cg_2.2/Cg-2.2_October2009_Setup.exe)
+
+To compile OpenRA, open the OpenRA.sln solution in the main folder, 
+or build it from the command-line with MSBuild.
+
+Run the game with `OpenRA.Game.exe Game.Mods=ra` for Red Alert
+or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
+
+
+UBUNTU (substitute comparable packages for other linux distros):
+
+* mono-gmcs
+* freetype
+* libmono-corlib1.0-cil
+* libmono-winforms2.0-cil
+* libopenal1
+* libsdl1.2-dev
+* nvidia-cg-toolkit (download the latest version from
+  http://developer.nvidia.com/object/cg_download.html)
+
+OpenRA is incompatible with Compiz, please disable desktop effects when trying
+to run OpenRA or the game will crash.
+
+You will need to copy the Tao dependencies (.dll and .config) from the
+thirdparty/Tao directory into the game root, or install them permanently into
+your GAC with the following script
+
+#!/bin/sh
+gacutil -i thirdparty/Tao/Tao.Cg.dll
+gacutil -i thirdparty/Tao/Tao.OpenGl.dll
+gacutil -i thirdparty/Tao/Tao.OpenAl.dll
+gacutil -i thirdparty/Tao/Tao.Sdl.dll
+gacutil -i thirdparty/Tao/Tao.FreeType.dll
+
+To compile OpenRA, run `make' from the command line.
+Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert
+or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,75 +0,0 @@
-To run OpenRA, several files are needed from the original game disks.
-A minimal asset pack can also be downloaded and installed by the game.
-
-The following lists per-platform dependencies required to build from source.
-
-Windows
-=======
-
-* [Windows PowerShell >= 4.0](http://microsoft.com/powershell)
-* [.NET Framework >= 4.5 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
-* [SDL 2](http://www.libsdl.org/download-2.0.php) (included)
-* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included)
-* [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included)
-* [OpenAL](http://kcat.strangesoft.net/openal.html) (included)
-* [liblua 5.1](http://luabinaries.sourceforge.net/download.html) (included)
-
-You need to fetch the thirdparty dependencies and place them at the appropriate places by typing `make dependencies` in a command terminal.
-
-To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with MSBuild or use the Makefile analogue command `make all` scripted in PowerShell syntax.
-
-Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert or `OpenRA.Game.exe Game.Mod=cnc` for Tiberian Dawn.
-
-Linux
-=====
-
-Use `make dependencies` to map the native libraries to your system and fetch the remaining CLI dependencies to place them at the appropriate places.
-
-To compile OpenRA, run `make all` from the command line.
-
-Run with either `launch-game.sh` or `mono --debug OpenRA.Game.exe`.
-
-Type `sudo make install` for system wide installation. Run `make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run from the `openra` shortcut.
-
-Debian/Ubuntu
-------------
-
-* mono-devel
-* libfreetype6
-* libopenal1
-* liblua5.1-0
-* libsdl2-2.0-0
-* xdg-utils
-* zenity
-* curl
-
-openSUSE
--------
-
-```
-sudo zypper in mono-devel openal-soft freetype2 SDL2 lua51 xdg-utils zenity curl
-```
-
-Gentoo
------
-
-* dev-lang/mono
-* dev-dotnet/libgdiplus
-* media-libs/freetype:2
-* media-libs/libsdl2
-* media-libs/openal
-* virtual/jpeg
-* virtual/opengl
-* dev-lang/lua-5.1.5
-* x11-misc/xdg-utils
-* gnome-extra/zenity
-* net-misc/curl
-
-OSX
-=====
-
-Use `make dependencies` to map the native libraries to your system.
-
-To compile OpenRA, run `make` from the command line.
-
-Run with `mono --debug OpenRA.Game.exe`.
--- a/629
+++ b/629
@@ -1,267 +1,178 @@
-############################# INSTRUCTIONS #############################
-#
-# to compile, run:
-#   make [DEBUG=false]
-#
-# to check unit tests (requires NUnit version >= 2.6), run:
-#  make nunit [NUNIT_CONSOLE=<path-to/nunit[2]-console>] [NUNIT_LIBS_PATH=<path-to-libs-dir>] [NUNIT_LIBS=<nunit-libs>]
-#      Use NUNIT_CONSOLE if nunit[3|2]-console was not downloaded by `make dependencies` nor is it in bin search paths
-#      Use NUNIT_LIBS_PATH if NUnit libs are not in search paths. Include trailing /
-#      Use NUNIT_LIBS if NUnit libs have different names (such as including a prefix or suffix)
-# to check the official mods for erroneous yaml files, run:
-#   make test
-#
-# to check the official mod dlls for StyleCop violations, run:
-#   make check
-#
-# to install, run:
-#   make [prefix=/foo] [bindir=/bar/bin] install
-#
-# to install Linux startup scripts, desktop files and icons:
-#   make install-linux-shortcuts [DEBUG=false]
-#
-# to install the engine and common mod files (omitting the default mods):
-#   make install-engine
-#   make install-common-mod-files
-#
-# to uninstall, run:
-#   make uninstall
-#
-# for help, run:
-#   make help
-#
-# to start the game, run:
-#   openra
-
-
-
-############################## TOOLCHAIN ###############################
-#
-SDK         ?=
-CSC         = mcs $(SDK)
-CSFLAGS     = -nologo -warn:4 -codepage:utf8 -langversion:5 -unsafe -warnaserror
-DEFINE      = TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll
-NUNIT_LIBS_PATH :=
-NUNIT_LIBS  := $(NUNIT_LIBS_PATH)nunit.framework.dll
-
-DEBUG = true
-ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-CSFLAGS   += -debug:pdbonly -optimize+
-else
-CSFLAGS   += -debug:full -optimize-
-DEFINE    := DEBUG;$(DEFINE)
-endif
-
-
-
-######################### UTILITIES/SETTINGS ###########################
-#
-# install locations
-prefix ?= /usr/local
-datarootdir ?= $(prefix)/share
-datadir ?= $(datarootdir)
-mandir ?= $(datarootdir)/man/
-bindir ?= $(prefix)/bin
-libdir ?= $(prefix)/lib
-gameinstalldir ?= $(libdir)/openra
-
+CSC     = gmcs
+CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
+DEFINE  = DEBUG;TRACE
+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)
-DATA_INSTALL_DIR = $(DESTDIR)$(gameinstalldir)
-
-# install tools
-RM = rm
-RM_R = $(RM) -r
-RM_F = $(RM) -f
-RM_RF = $(RM) -rf
-CP = cp
-CP_R = $(CP) -r
+INSTALL_DIR = $(DESTDIR)$(datadir)/openra
 INSTALL = install
-INSTALL_DIR = $(INSTALL) -d
-INSTALL_PROGRAM = $(INSTALL) -m755
-INSTALL_DATA = $(INSTALL) -m644
+INSTALL_PROGRAM = $(INSTALL)

-# program targets
-CORE = pdefault game utility server
-VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
+COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll

-# dependencies
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Darwin)
-os-dependencies = osx-dependencies
-else
-os-dependencies = linux-dependencies
-endif
+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 thirdparty/WindowsBase.dll

+gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
+gl_TARGET			= OpenRA.Gl.dll
+gl_KIND				= library
+gl_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+gl_LIBS				= $(COMMON_LIBS) System.Windows.Forms.dll \
+						thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+						$(gl_DEPS) $(game_TARGET)

+game_SRCS			=	$(shell find OpenRA.Game/ -iname '*.cs')
+game_TARGET			= OpenRA.Game.exe
+game_KIND			= winexe
+game_DEPS			= $(fileformats_TARGET) 
+game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
+						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
+game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico

-######################## PROGRAM TARGET RULES ##########################
-#
-# Core binaries
+ra_SRCS				=	$(shell find OpenRA.Mods.RA/ -iname '*.cs')
+ra_TARGET			=	mods/ra/OpenRA.Mods.RA.dll
+ra_KIND				=	library
+ra_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+ra_LIBS				= $(COMMON_LIBS) $(ra_DEPS)

-game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
-game_TARGET = OpenRA.Game.exe
-game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll thirdparty/download/Open.Nat.dll
-PROGRAMS += game
-game: $(game_TARGET)
+cnc_SRCS			=	$(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
+cnc_TARGET			=	mods/cnc/OpenRA.Mods.Cnc.dll
+cnc_KIND			=	library
+cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
+cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)

-# Platform dlls
-pdefault_SRCS := $(shell find OpenRA.Platforms.Default/ -iname '*.cs')
-pdefault_TARGET = OpenRA.Platforms.Default.dll
-pdefault_KIND = library
-pdefault_DEPS = $(game_TARGET)
-pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll thirdparty/download/OpenAL-CS.dll $(pdefault_DEPS)
-PROGRAMS += pdefault
-platforms: $(pdefault_TARGET)
+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

-# Mods Common
-mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
-mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
-mod_common_KIND = library
-mod_common_DEPS = $(game_TARGET)
-mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS)
-PROGRAMS += mod_common
-mod_common: $(mod_common_TARGET)
+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 -resource:OpenRA.Editor.MapSelect.resources

-# NUnit testing
-test_dll_SRCS := $(shell find OpenRA.Test/ -iname '*.cs')
-test_dll_TARGET = OpenRA.Test.dll
-test_dll_KIND = library
-test_dll_DEPS = $(game_TARGET) $(mod_common_TARGET)
-test_dll_FLAGS = -warn:1
-test_dll_LIBS = $(COMMON_LIBS) $(game_TARGET) $(mod_common_TARGET) $(NUNIT_LIBS)
-PROGRAMS += test_dll
-test_dll: $(test_dll_TARGET)
+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)

-##### Official Mods #####
+filex_SRCS		= $(shell find FileExtractor/ -iname '*.cs')
+filex_TARGET	= FileExtractor.exe
+filex_KIND		= winexe
+filex_DEPS		= $(fileformats_TARGET)
+filex_LIBS		= $(COMMON_LIBS) $(filex_DEPS)

-STD_MOD_LIBS	= $(game_TARGET)
-STD_MOD_DEPS	= $(STD_MOD_LIBS)
+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

-# Command and Conquer
-mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-mod_cnc_TARGET = mods/common/OpenRA.Mods.Cnc.dll
-mod_cnc_KIND = library
-mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
-mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_cnc
-mod_cnc: $(mod_cnc_TARGET)
+# -platform:x86

-# Dune 2000
-mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
-mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
-mod_d2k_KIND = library
-mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
-mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_d2k
-mod_d2k: $(mod_d2k_TARGET)
+.SUFFIXES:
+.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex

-check-scripts:
-	@echo
-	@echo "Checking for Lua syntax errors..."
-	@luac -p $(shell find mods/*/maps/* -iname '*.lua')
-	@luac -p $(shell find lua/* -iname '*.lua')
+game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)

-check: utility stylecheck mods
-	@echo
-	@echo "Checking for explicit interface violations..."
-	@mono --debug OpenRA.Utility.exe all --check-explicit-interfaces
-	@echo
-	@echo "Checking for code style violations in OpenRA.Game..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Game
-	@echo
-	@echo "Checking for code style violations in OpenRA.Platforms.Default..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Platforms.Default
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.Common..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.Common
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.Cnc..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.Cnc
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.D2k..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.D2k
-	@echo
-	@echo "Checking for code style violations in OpenRA.Utility..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Utility
-	@echo
-	@echo "Checking for code style violations in OpenRA.Test..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Test
-	@echo
-	@echo "Checking for code style violations in OpenRA.Server..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Server
+clean: 
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources

-NUNIT_CONSOLE := $(shell test -f thirdparty/download/nunit3-console.exe && echo mono thirdparty/download/nunit3-console.exe || \
-	which nunit3-console 2>/dev/null || which nunit2-console 2>/dev/null || which nunit-console 2>/dev/null)
-nunit: test_dll
-	@echo
-	@echo "Checking unit tests..."
-	@if [ "$(NUNIT_CONSOLE)" = "" ] ; then \
-		echo 'nunit[3|2]-console not found!'; \
-		echo 'Was "make dependencies" called or is NUnit installed?'>&2; \
-		echo 'See "make help".'; \
-		exit 1; \
-	fi
-	@if $(NUNIT_CONSOLE) --help | head -n 1 | grep -E "NUnit version (1|2\.[0-5])";then \
-		echo 'NUnit version >= 2.6 required'>&2; \
-		echo 'Try "make dependencies" first to use NUnit from NuGet.'>&2; \
-		echo 'See "make help".'; \
-		exit 1; \
-	fi
-	@$(NUNIT_CONSOLE) --noresult OpenRA.Test.nunit
+distclean: clean

-test: utility mods
-	@echo
-	@echo "Testing Tiberian Sun mod MiniYAML..."
-	@mono --debug OpenRA.Utility.exe ts --check-yaml
-	@echo
-	@echo "Testing Dune 2000 mod MiniYAML..."
-	@mono --debug OpenRA.Utility.exe d2k --check-yaml
-	@echo
-	@echo "Testing Tiberian Dawn mod MiniYAML..."
-	@mono --debug OpenRA.Utility.exe cnc --check-yaml
-	@echo
-	@echo "Testing Red Alert mod MiniYAML..."
-	@mono --debug OpenRA.Utility.exe ra --check-yaml
+CORE = fileformats gl game editor

+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
+	@cp -r mods/cnc/bits $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/rules $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/sequences $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/tilesets $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/uibits $(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/bits $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/chrome $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/rules $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/tilesets $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/uibits $(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 $(INSTALL_DIR)
+	@-$(INSTALL_PROGRAM) VERSION $(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/get-dependency.php?ra-packages and"
+	@echo "http://open-ra.org/get-dependency.php?cnc-packages"
+	@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."

-##### Launchers / Utilities #####
+uninstall:
+	@-rm -r $(INSTALL_DIR)
+	@-rm $(DESTDIR)$(bindir)/openra

-utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
-utility_TARGET = OpenRA.Utility.exe
-utility_KIND = exe
-utility_DEPS = $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.SharpZipLib.dll
-PROGRAMS += utility
-utility: $(utility_TARGET)
+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

-stylecheck_SRCS := $(shell find OpenRA.StyleCheck/ -iname '*.cs')
-stylecheck_TARGET = OpenRA.StyleCheck.exe
-stylecheck_KIND = exe
-stylecheck_LIBS = thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
-PROGRAMS += stylecheck
-stylecheck: $(stylecheck_TARGET)
+OpenRA.Editor.MapSelect.resources:
+	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null

-# Dedicated server
-server_SRCS := $(shell find OpenRA.Server/ -iname '*.cs')
-server_TARGET = OpenRA.Server.exe
-server_KIND = exe
-server_DEPS = $(game_TARGET)
-server_LIBS = $(COMMON_LIBS) $(server_DEPS)
-PROGRAMS += server
-server: $(server_TARGET)
+OpenRA.Editor.Form1.resources:
+	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
+editor: OpenRA.Editor.MapSelect.resources 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

-# Patches binary headers to work around a mono bug
-fixheader.exe: packaging/fixheader.cs
-	@command -v $(CSC) >/dev/null || (echo "Mono is not installed. Please install Mono from http://www.mono-project.com/download/ before building OpenRA."; exit 1)
-	@echo CSC fixheader.exe
+fixheader: packaging/fixheader.cs
 	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)

-# Generate build rules for each target defined above in PROGRAMS
 define BUILD_ASSEMBLY

-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader
 	@echo CSC $$(@)
 	@$(CSC) $$($(1)_LIBS:%=-r:%) \
 		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
@@ -269,253 +180,7 @@ $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
 		-t:"$$($(1)_KIND)" \
 		$$($(1)_EXTRA) \
 		$$($(1)_SRCS)
-	@mono fixheader.exe $$(@) > /dev/null
-	@test `echo $$(@) | sed 's/^.*\.//'` = "dll" && chmod a-x $$(@) || ``
-	@$$($(1)_EXTRA_CMDS)
+	@mono fixheader.exe $$(@)
 endef

 $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
-
-
-
-########################## MAKE/INSTALL RULES ##########################
-#
-default: core
-
-core: dependencies game platforms mods utility server
-
-mods: mod_common mod_cnc mod_d2k
-
-all: dependencies core stylecheck
-
-clean:
-	@-$(RM_F) *.exe *.dll *.dylib *.dll.config ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
-	@-$(RM_RF) ./*/bin ./*/obj
-	@-$(RM_RF) ./thirdparty/download
-
-distclean: clean
-
-cli-dependencies:
-	@./thirdparty/fetch-thirdparty-deps.sh
-	@ $(CP_R) thirdparty/download/*.dll .
-	@ $(CP_R) thirdparty/download/*.dll.config .
-
-linux-dependencies: cli-dependencies geoip-dependencies linux-native-dependencies
-
-linux-native-dependencies:
-	@./thirdparty/configure-native-deps.sh
-
-windows-dependencies: cli-dependencies geoip-dependencies
-	@./thirdparty/fetch-thirdparty-deps-windows.sh
-
-osx-dependencies: cli-dependencies geoip-dependencies
-	@./thirdparty/fetch-thirdparty-deps-osx.sh
-	@ $(CP_R) thirdparty/download/osx/*.dylib .
-	@ $(CP_R) thirdparty/download/osx/*.dll.config .
-
-geoip-dependencies:
-	@./thirdparty/fetch-geoip-db.sh
-	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
-
-dependencies: $(os-dependencies)
-
-all-dependencies: cli-dependencies windows-dependencies osx-dependencies geoip-dependencies
-
-version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml
-	@echo "$(VERSION)" > VERSION
-	@for i in $? ; do \
-		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
-		awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp > $${i} && \
-		rm $${i}.tmp; \
-	done
-
-man-page: utility mods
-	@mono --debug OpenRA.Utility.exe all --man-page > openra.6
-
-install: default install-core
-
-install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
-
-install-engine:
-	@-echo "Installing OpenRA engine to $(DATA_INSTALL_DIR)"
-	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
-
-	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
-	@$(INSTALL_DATA) VERSION "$(DATA_INSTALL_DIR)/VERSION"
-	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
-	@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
-
-	@$(CP_R) glsl "$(DATA_INSTALL_DIR)"
-	@$(CP_R) lua "$(DATA_INSTALL_DIR)"
-	@$(CP) SDL2-CS* "$(DATA_INSTALL_DIR)"
-	@$(CP) OpenAL-CS* "$(DATA_INSTALL_DIR)"
-	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SharpFont.dll "$(DATA_INSTALL_DIR)"
-	@$(CP) SharpFont.dll.config "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) Open.Nat.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) rix0rrr.BeaconLib.dll "$(DATA_INSTALL_DIR)"
-
-install-common-mod-files:
-	@-echo "Installing OpenRA common mod files to $(DATA_INSTALL_DIR)"
-	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
-	@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
-	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
-	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
-
-install-default-mods:
-	@-echo "Installing OpenRA default mods to $(DATA_INSTALL_DIR)"
-	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
-	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
-	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
-	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
-	@$(CP_R) mods/modcontent "$(DATA_INSTALL_DIR)/mods/"
-
-install-core: install-engine install-common-mod-files install-default-mods
-	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
-
-install-linux-icons:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor "$(DESTDIR)$(datadir)/icons/"
-
-install-linux-desktop:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/ra/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-ra.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-cnc.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-d2k.desktop "$(DESTDIR)$(datadir)/applications"
-	@-$(RM) packaging/linux/openra-ra.desktop packaging/linux/openra-cnc.desktop packaging/linux/openra-d2k.desktop
-
-install-linux-mime:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
-
-	@sed 's/{MOD}/ra/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
-	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/ra/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Red Alert/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-ra-join-servers.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-ra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-cnc-join-servers.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-cnc-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Dune 2000/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-d2k-join-servers.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-d2k-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
-	@-$(RM) packaging/linux/openra-mimeinfo.xml packaging/linux/openra-ra-join-servers.desktop packaging/linux/openra-cnc-join-servers.desktop packaging/linux/openra-d2k-join-servers.desktop
-
-install-linux-appdata:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
-	@sed 's/{MOD}/ra/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Red Alert/g' | sed 's/{SCREENSHOT_RA}/ type="default"/g' | sed 's/{SCREENSHOT_CNC}//g' | sed 's/{SCREENSHOT_D2K}//g'> packaging/linux/openra-ra.appdata.xml
-	@$(INSTALL_DATA) packaging/linux/openra-ra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Tiberian Dawn/g' | sed 's/{SCREENSHOT_RA}//g' | sed 's/{SCREENSHOT_CNC}/ type="default"/g' | sed 's/{SCREENSHOT_D2K}//g'> packaging/linux/openra-cnc.appdata.xml
-	@$(INSTALL_DATA) packaging/linux/openra-cnc.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Dune 2000/g' | sed 's/{SCREENSHOT_RA}//g' | sed 's/{SCREENSHOT_CNC}//g' | sed 's/{SCREENSHOT_D2K}/ type="default"/g'> packaging/linux/openra-d2k.appdata.xml
-	@$(INSTALL_DATA) packaging/linux/openra-d2k.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
-	@-$(RM) packaging/linux/openra-ra.appdata.xml packaging/linux/openra-cnc.appdata.xml packaging/linux/openra-d2k.appdata.xml
-
-install-man-page: man-page
-	@$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man6/"
-	@$(INSTALL_DATA) openra.6 "$(DESTDIR)$(mandir)/man6/"
-
-install-linux-scripts:
-ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-	@sed 's/{DEBUG}//' packaging/linux/openra.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra.debug.in
-	@sed 's/{DEBUG}//' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
-else
-	@sed 's/{DEBUG}/--debug/' packaging/linux/openra.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra.debug.in
-	@sed 's/{DEBUG}/--debug/' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
-endif
-
-	@sed 's/{MOD}/ra/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k
-
-	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-cnc "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k "$(BIN_INSTALL_DIR)"
-	@-$(RM) packaging/linux/openra-ra packaging/linux/openra-cnc packaging/linux/openra-d2k packaging/linux/openra.debug.in
-
-	@sed 's/{MOD}/ra/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra-server
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc-server
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k-server
-
-	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra-server "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-cnc-server "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k-server "$(BIN_INSTALL_DIR)"
-	@-$(RM) packaging/linux/openra-ra-server packaging/linux/openra-cnc-server packaging/linux/openra-d2k-server packaging/linux/openra-server.debug.in
-
-uninstall:
-	@-$(RM_R) "$(DATA_INSTALL_DIR)"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-ra"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-ra-server"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-cnc"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-cnc-server"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-d2k"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-d2k-server"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
-	@-$(RM_F) "$(DESTDIR)$(mandir)/man6/openra.6"
-
-help:
-	@echo 'to compile, run:'
-	@echo '  make [DEBUG=false]'
-	@echo
-	@echo 'to check unit tests (requires NUnit version >= 2.6), run:'
-	@echo '  make nunit [NUNIT_CONSOLE=<path-to/nunit[3|2]-console>] [NUNIT_LIBS_PATH=<path-to-libs-dir>] [NUNIT_LIBS=<nunit-libs>]'
-	@echo '     Use NUNIT_CONSOLE if nunit[3|2]-console was not downloaded by `make dependencies` nor is it in bin search paths'
-	@echo '     Use NUNIT_LIBS_PATH if NUnit libs are not in search paths. Include trailing /'
-	@echo '     Use NUNIT_LIBS if NUnit libs have different names (such as including a prefix or suffix)'
-	@echo
-	@echo 'to check the official mods for erroneous yaml files, run:'
-	@echo '  make test'
-	@echo
-	@echo 'to install, run:'
-	@echo '  make [prefix=/foo] [bindir=/bar/bin] install'
-	@echo
-	@echo 'to install Linux startup scripts, desktop files and icons'
-	@echo '  make install-linux-shortcuts [DEBUG=false]'
-	@echo
-	@echo 'to uninstall, run:'
-	@echo '  make uninstall'
-	@echo
-	@echo 'to start the game, run:'
-	@echo '  openra'
-
-
-
-
-########################### MAKEFILE SETTINGS ##########################
-#
-.DEFAULT_GOAL := default
-
-.SUFFIXES:
-
-.PHONY: core package all mods clean distclean dependencies version $(PROGRAMS) nunit
--- 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,521 @@
+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.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.pmMiniMap = new System.Windows.Forms.PictureBox();
+            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.mnuExport = new System.Windows.Forms.ToolStripMenuItem();
+            this.mnuMinimapToPNG = 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.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.layersFloaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.tt = new System.Windows.Forms.ToolTip(this.components);
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.surface1 = new OpenRA.Editor.Surface();
+            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+            this.toolStripContainer1.ContentPanel.SuspendLayout();
+            this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
+            this.toolStripContainer1.SuspendLayout();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pmMiniMap)).BeginInit();
+            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, 727);
+            this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.toolStripContainer1.Location = new System.Drawing.Point(0, 0);
+            this.toolStripContainer1.Name = "toolStripContainer1";
+            this.toolStripContainer1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 22);
+            this.toolStripContainer1.Size = new System.Drawing.Size(985, 773);
+            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.splitContainer2);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.surface1);
+            this.splitContainer1.Size = new System.Drawing.Size(985, 727);
+            this.splitContainer1.SplitterDistance = 198;
+            this.splitContainer1.TabIndex = 0;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.pmMiniMap);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
+            this.splitContainer2.Size = new System.Drawing.Size(198, 727);
+            this.splitContainer2.SplitterDistance = 160;
+            this.splitContainer2.TabIndex = 1;
+            // 
+            // pmMiniMap
+            // 
+            this.pmMiniMap.BackColor = System.Drawing.Color.Black;
+            this.pmMiniMap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pmMiniMap.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pmMiniMap.Location = new System.Drawing.Point(0, 0);
+            this.pmMiniMap.Name = "pmMiniMap";
+            this.pmMiniMap.Size = new System.Drawing.Size(198, 160);
+            this.pmMiniMap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.pmMiniMap.TabIndex = 1;
+            this.pmMiniMap.TabStop = false;
+            // 
+            // 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.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
+            this.tabControl1.Multiline = true;
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.Padding = new System.Drawing.Point(6, 0);
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(198, 563);
+            this.tabControl1.TabIndex = 0;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.tilePalette);
+            this.tabPage1.Location = new System.Drawing.Point(4, 20);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(190, 539);
+            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, 533);
+            this.tilePalette.TabIndex = 1;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.actorPalette);
+            this.tabPage2.Location = new System.Drawing.Point(4, 20);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(190, 539);
+            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, 533);
+            this.actorPalette.TabIndex = 2;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.resourcePalette);
+            this.tabPage3.Location = new System.Drawing.Point(4, 20);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(190, 539);
+            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, 539);
+            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.toolsToolStripMenuItem});
+            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.mnuExport,
+            this.toolStripSeparator3,
+            this.exotToolStripMenuItem});
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 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(122, 6);
+            // 
+            // openToolStripMenuItem
+            // 
+            this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image")));
+            this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+            this.openToolStripMenuItem.Size = new System.Drawing.Size(125, 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(125, 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(125, 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(122, 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(125, 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(185, 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(185, 22);
+            this.bitmapToolStripMenuItem.Text = "&Bitmap...";
+            this.bitmapToolStripMenuItem.Visible = false;
+            // 
+            // mnuExport
+            // 
+            this.mnuExport.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.mnuMinimapToPNG});
+            this.mnuExport.Name = "mnuExport";
+            this.mnuExport.Size = new System.Drawing.Size(152, 22);
+            this.mnuExport.Text = "&Export";
+            // 
+            // mnuMinimapToPNG
+            // 
+            this.mnuMinimapToPNG.Image = ((System.Drawing.Image)(resources.GetObject("mnuMinimapToPNG.Image")));
+            this.mnuMinimapToPNG.Name = "mnuMinimapToPNG";
+            this.mnuMinimapToPNG.Size = new System.Drawing.Size(152, 22);
+            this.mnuMinimapToPNG.Text = "Minimap to PNG";
+            this.mnuMinimapToPNG.Click += new System.EventHandler(this.mnuMinimapToPNG_Click);
+            // 
+            // toolStripSeparator3
+            // 
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
+            this.toolStripSeparator3.Size = new System.Drawing.Size(122, 6);
+            // 
+            // exotToolStripMenuItem
+            // 
+            this.exotToolStripMenuItem.Name = "exotToolStripMenuItem";
+            this.exotToolStripMenuItem.Size = new System.Drawing.Size(125, 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(39, 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(135, 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(135, 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(132, 6);
+            // 
+            // spawnpointsToolStripMenuItem
+            // 
+            this.spawnpointsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("spawnpointsToolStripMenuItem.Image")));
+            this.spawnpointsToolStripMenuItem.Name = "spawnpointsToolStripMenuItem";
+            this.spawnpointsToolStripMenuItem.Size = new System.Drawing.Size(135, 22);
+            this.spawnpointsToolStripMenuItem.Text = "&Spawnpoints";
+            this.spawnpointsToolStripMenuItem.Click += new System.EventHandler(this.SpawnPointsClicked);
+            // 
+            // toolsToolStripMenuItem
+            // 
+            this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.layersFloaterToolStripMenuItem});
+            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
+            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.toolsToolStripMenuItem.Text = "Tools";
+            this.toolsToolStripMenuItem.Visible = false;
+            // 
+            // layersFloaterToolStripMenuItem
+            // 
+            this.layersFloaterToolStripMenuItem.Name = "layersFloaterToolStripMenuItem";
+            this.layersFloaterToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.layersFloaterToolStripMenuItem.Text = "Layers floater";
+            this.layersFloaterToolStripMenuItem.Click += new System.EventHandler(this.layersFloaterToolStripMenuItem_Click);
+            // 
+            // tt
+            // 
+            this.tt.ShowAlways = true;
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Location = new System.Drawing.Point(0, 751);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(985, 22);
+            this.statusStrip1.TabIndex = 2;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // 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, 727);
+            this.surface1.TabIndex = 5;
+            this.surface1.Text = "surface1";
+            this.surface1.Click += new System.EventHandler(this.OnSurfaceClicked);
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.DefaultExt = "*.png";
+            this.saveFileDialog.Filter = "PNG Image (*.png)|";
+            this.saveFileDialog.Title = "Export minimap to PNG";
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(985, 773);
+            this.Controls.Add(this.statusStrip1);
+            this.Controls.Add(this.toolStripContainer1);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.KeyPreview = true;
+            this.MainMenuStrip = this.menuStrip1;
+            this.Name = "Form1";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            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.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            this.splitContainer2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pmMiniMap)).EndInit();
+            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);
+            this.PerformLayout();
+
+		}
+
+		#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 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;
+        private System.Windows.Forms.StatusStrip statusStrip1;
+        private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem layersFloaterToolStripMenuItem;
+        private System.Windows.Forms.PictureBox pmMiniMap;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.ToolStripMenuItem mnuExport;
+        private System.Windows.Forms.ToolStripMenuItem mnuMinimapToPNG;
+        private System.Windows.Forms.SaveFileDialog saveFileDialog;
+
+	}
+}
+
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -0,0 +1,425 @@
+#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.IO;
+using System.Linq;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+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);
+
+			Game.modData = new ModData(currentMod);
+
+			Rules.LoadRules(Game.modData.Manifest, new Map());
+
+			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;
+
+			Game.modData = new ModData(currentMod);
+
+			// 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(Game.modData.Manifest, map);
+
+			dirty = false;
+		}
+
+		void NewMap(Map map)
+		{
+			tilePalette.Controls.Clear();
+			actorPalette.Controls.Clear();
+			resourcePalette.Controls.Clear();
+
+			loadedMapName = null;
+
+			Game.modData = new ModData(currentMod);
+
+			PrepareMapResources(Game.modData.Manifest, map);
+
+			MakeDirty();
+		}
+
+		// this code is insanely stupid, and mostly my fault -- chrisf
+		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 = RenderUtils.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 = RenderUtils.RenderActor(info, tileset, palette);
+					var ibox = new PictureBox
+					{
+						Image = template.Bitmap,
+						Width = 32,
+						Height = 32,
+						SizeMode = PictureBoxSizeMode.Zoom,
+						BorderStyle = BorderStyle.FixedSingle
+					};
+
+
+					ibox.Click += (_, e) => surface1.SetActor(template);
+
+					actorPalette.Controls.Add(ibox);
+
+					tt.SetToolTip(ibox,
+						"{0}".F(
+						info.Name));
+
+					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 = RenderUtils.RenderResourceType(a, tileset.Extensions, palette);
+					var ibox = new PictureBox
+					{
+						Image = template.Bitmap,
+						Width = 32,
+						Height = 32,
+						SizeMode = PictureBoxSizeMode.Zoom,
+						BorderStyle = BorderStyle.FixedSingle
+					};
+
+
+
+					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();
+			}
+			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
+		}
+
+		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)
+		{
+			using (var nms = new MapSelect())
+			{
+				nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+				.Aggregate(Path.Combine);
+
+				nms.txtNew.ReadOnly = false;
+				nms.btnOk.Text = "Save";
+				nms.txtNew.Text = "unnamed";
+				nms.txtPathOut.ReadOnly = false;
+
+				if (DialogResult.OK == nms.ShowDialog())
+				{
+					if (nms.txtNew.Text == "")
+						nms.txtNew.Text = "unnamed";
+
+					string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
+					loadedMapName = mapfoldername;
+
+					try
+					{
+						Directory.CreateDirectory(mapfoldername);
+					}
+					catch (Exception ed)
+					{
+						MessageBox.Show("Directory creation failed: {0}", ed.ToString());
+					}
+
+					SaveClicked(sender, e);
+				}
+			}
+		}
+
+		void OpenClicked(object sender, EventArgs e)
+		{
+			using (var nms = new MapSelect())
+			{
+				nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+				.Aggregate(Path.Combine);
+
+				nms.txtNew.ReadOnly = true;
+				nms.txtPathOut.ReadOnly = true;
+				nms.btnOk.Text = "Open";
+
+				if (DialogResult.OK == nms.ShowDialog())
+				{
+					string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
+					LoadMap(mapfoldername);
+				}
+			}
+		}
+
+		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(nmd.theater.SelectedItem as string);
+
+					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.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)
+		{
+			var currentDirectory = Directory.GetCurrentDirectory();
+			using (var ofd = new OpenFileDialog { Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
+				if (DialogResult.OK == ofd.ShowDialog())
+				{
+					Directory.SetCurrentDirectory( currentDirectory );
+					/* 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. " + "\r\n" + "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;
+			}
+		}
+
+		private void layersFloaterToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var pb = new PaletteBox();
+			pb.Show();
+		}
+
+		private void OnSurfaceClicked(object sender, EventArgs e)
+		{
+			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
+		}
+
+        private void mnuMinimapToPNG_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                saveFileDialog.InitialDirectory = new string[] { Environment.CurrentDirectory, "maps" }
+.Aggregate(Path.Combine);
+            
+            FileInfo file = new FileInfo(loadedMapName + ".png");
+            string name = file.Name;
+            saveFileDialog.FileName = name;
+
+            saveFileDialog.ShowDialog();
+            if (saveFileDialog.FileName == "")
+            {
+                saveFileDialog.FileName = name;
+            }
+            else
+            {
+                Bitmap png = new Bitmap(pmMiniMap.Image);
+
+                png.Save(saveFileDialog.FileName, System.Drawing.Imaging.ImageFormat.Png); 
+            }
+            
+            }
+            catch { }
+        }
+	}
+}
--- a/OpenRA.Editor/Form1.resx
+++ b/OpenRA.Editor/Form1.resx
@@ -0,0 +1,557 @@
+<?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>198, 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="mnuMinimapToPNG.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="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>307, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>76, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>45</value>
+  </metadata>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAIAMDAAAAEAIACoJQAAJgAAACAgAAABACAAqBAAAM4lAAAoAAAAMAAAAGAAAAABACAAAAAAAAAk
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAQAAAAQAAAAJQAA
+        ADcAAAA+AAAAOAAAACoAAAAYAAAACwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAUAAAApAAAAVAAAAGIBAQFNAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAASAAAAOgAA
+        AFkAAAA6AAAAMQEBAUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA
+        AAoAAAAkAAAAUQAAAHkAAACJAAAAhQAAAHMAAABTAAAAMAAAABUAAAAGAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAIAAAAkAAAAaQEBAZYCAgLaAAAAWgAAAAsAAAABAAAAAAAAAAAAAAAAAAAABwAA
+        AB8AAABMAAAAfwAAAHkAAAA8AgIAwgEBAWkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAQAAAA8AAAA9AAAAgwAAALMAAADFHRcU3QAAAMMAAACgAAAAdwAAAEUAAAAeAAAABwAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAUgAAAJgDBATpAgIG/wEAAI8AAAAYAAAABAAA
+        AAIAAAAOAAAALgAAAGIAAACVAAAApgEAAJUEBADsAwQK/wAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABYAAABPAAAAngAAAMx3YFX3jXZv/5RuY/9mT0X2GxENygcG
+        BYsAAABKAAAAGgAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAKAAAAQAAAAJMBAQHRBApN/wQK
+        U/8CAADQAQEARwAAACkAAABIAAAAeQAAAKMAAAC5AgAA1QQGJf8FC1v/AQEHrAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABwAAACEAAABcAAAApQICAtOFc2z8hnJt/5h6
+        cf+hfXL/mHty/3VkXewZExGLAAAAOQAAAAwAAAABAAAAAQAAAAIAAAAFAAAACAAAABAAAAAqAAAAYwAA
+        AKABAAC8AwAV+QUWxv8ED4P/BgcX/AEAALAAAACWAAAAsQAAAMkEBArzBAli/wMOtf8CCVD/AwIAbAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAEAAAADQAAAB1AAAAsgcE
+        BNmHcGj8mYiB/6GMhf+lkIj/moiB/5qIgP9dTUfqAgICYAAAACAAAAAGAAAABAAAAAoAAAAZAAAAKgAA
+        AEEAAABqAQEBmgEBAbkHCw7dBgcH+QEAi/8FHf//AgG0/wIABP8GFRntBiIw6wcYHf8BAET/AgR6/wMF
+        X/8DACD5AAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAFAAAAGwAA
+        AE8AAACXAAAAxQwLCuGSfHX9momC/5yLg/+cjIX/mYaA/5aGf/+MdWv/GhUSoQAAAEAAAAAXAAAAEAAA
+        AB8AAAA+AAAAZgAAAIwAAACtCQkJx0A5N+UYdqT/JsXu/wgdZ/8AAIr/Cyx0/x6Rwf8luf3/Jbv//yCd
+        3P8TYIj/FWaB/xdtjf8EDhfkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAEAAAAIAAAAKQAAAG4AAACxBwYD1HdiWPmcioL/mYiA/56Nhf+ejoX/lYV//5WGf/+Wgnv/U0M96AAA
+        AHUAAAA4AAAALwAAAEYAAABzAAAApAAAAMIkGRHhIBkT6F1WVfYqPUb/KM3//yOt5f8NN0b/J8r+/ybE
+        +P8ZfqT/G4ay/x6Tz/8hpej/IKTl/xuLwf8FExmmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAIAAAANAAAANwAAAIQAAAC+IhoW5Jt2av+Qfnf/no6G/5WHgP+vnpb/koJ7/5iG
+        f/+Zh4D/k4B6/kU4M8UAAABvAAAAagAAAIcAAACsAAAAzAMDAt+FW0z8fV5R/VtQS/2PgHn/UUhH/yKV
+        tf8z////I62//wcXX/8CBMz/AABw/w9HXv8muv3/Iq30/xh0p/8BAABfAAAABAAAAAIAAAABAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAAWAAAASAAAAJQAAADESzkz86CCd/+mlI3/rJyT/4Z5
+        cf+djIX/m4qD/5CAef9xZF7/jHx1/3BiWe0GBQSzAAAAsAAAAMQBAQDWCgUE5U83KfaCa2D/lH11/3hp
+        Y/+QgHn/noyF/xQODf8SU4X/CBuY/wUK//8BAOn/Cypv/yfC5v8luvf/IJvN/yKx+f8MKzrlAAAAIgAA
+        ABAAAAAHAAAAAwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAwAAAAqAAAAZgAAAKgAAADMVEdA+LKg
+        mP+pmZH/rp+U/4Z3b/9+cGr/joB5/4R3cf9zZ1//dmhi/4p5cv8fHRjlAAAA3AYEBOQgGhfzV0U4/pqA
+        df+wnpX/no6F/4V1bv9yZF7/ERIX/wUNzf8AAJ//AgK+/wAA8v8LJlr/K9bh/y/w//8NO0r/EEh+/ynZ
+        //8SVHj/AAAAywAAAEgAAAAnAAAAEgAAAAQAAAABAAAAAAAAAAAAAAABAAAABAAAABcAAABIAAAAjwAA
+        AMAAAADZZlxV+rSkmv+4qZ//oZGJ/419dv+QgHn/eGlh/35waP+Nf3b/emxl/5KCe/9kVEr+GxQO+Ug9
+        OP2Mf3j+loZ+/52LhP+qmpH/oZGI/15STf8ICTL/CB30/wUTzv8il4j/HYac/wgcRf8qz93/NP///xZg
+        av8AAJb/D0W8/y3h/f8TWZ7/AQBY/wYEAPABAQCJAAAAQwAAAB0AAAAIAAAAAAAAAAAAAAABAAAACQAA
+        ACgAAABoAAAArQAAANCCaV74pJSN/8i4rf+omY//koF6/4t7dP9+b2j/koB5/5uJgv+UhHz/iXlx/3Bh
+        XP9lW1f/UEM8/4F0bf+jk4r/m4qC/52Nhf+gj4f/OjIs/wgUf/8KKv//AgDw/xlhU/87////L+b//y3g
+        8P8w7v//F2N//wAAqP8BAP//E1SY/y7n//8PPn//AADr/wYWv/8GCCv/AQMEuQAAAEkAAAAWAAAAAAAA
+        AAAAAAAEAAAAEQAAADwAAACCAAAAvCUbGOKhjoT+sKCW/7ionf+Yh4D/gHBp/3hoYP+KeHH/kYF4/5+P
+        h/+Xhn//h3hx/3hoYf+XhoD/cF5V/5WEff+ejYX/nYyF/21hWv8LCQz/ChmV/wop//8IJPr/Ch/z/wcS
+        of8eiZD/Nv///zP///8jrKD/AABe/wYZ//8CAJ3/H4+m/yrT/v8IGoz/BAzS/wUWy/8GFKX/BQYm/wUG
+        BOUBAQFBAAAAAAAAAAEAAAAHAAAAHgAAAFUAAACbAAAAyUc/Ou6ejYX/pJOL/6WUjP+ejoX/iXpz/4t7
+        cv+Xh37/mId//5+Ohv+pmI//koJ5/5GBeP+cjIP/dGNb/4t7dP+bioP/iHx2/zEtKf8hHyT/KipE/yYk
+        Jv8lIiX/ISEp/xkSPP8REA7/Gnh5/zb//f86//D/IqGV/wAAlf8NMYr/Nv///xhkgf8eKzT/KDg//xca
+        Hf8lLDP/ERUd/wYHCu0BAQFxAAAAAAAAAAEAAAAMAAAAMAAAAHQAAAC0AwMD1WleWfidjYT/pZSL/5yK
+        g/+OfHX/hnly/5CBef+Pfnb/m4uA/6aTiP+di4P/moqC/5mJgf+VhX3/lIN7/5eFfv+gjof/nIqE/5iH
+        gP+djYT/kIF4/5CAeP+Le3P/hnZv/4x9df+UhX3/SD04/xA6bf8XW6z/EESi/wYMPv8y+f//JKu7/1uA
+        kv+Nx+P/kcvn/1d4jv9KVmr/LD9N/xIfKacAAAAUAAAAAAAAAAIAAAAQAAAARAAAAJMAAADGKSYj5KWV
+        jP+woJb/pZSM/4V0b/+MfXb/nYyE/5iJgf+UhHv/pI+G/6GRh/+Qf3j/lYR9/6CRiv+ZiID/mYeA/5mI
+        gf+ci4P/n46G/5iIf/+KenP/gXBo/31tZf+GdG3/iHdv/4d1b/+LhYP/WGRm/wYASP8AAP//BAmf/zHr
+        4f8jrK3/WH6O/3y71P+JxeH/jcjj/4292f9FWWj+JC86+QkPE3EAAAANAAAAAAAAAAIAAAATAAAAUAAA
+        AKIAAADNh3p0/K2dk/+snZL/no2F/4N0bf+RgXr/jXx1/5yLg/+YiID/mYiA/5ODfP+NfHX/mYiB/56M
+        hf+Yh4D/nY2E/5CBeP+Sgnr/loZ+/5qJgf+nl47/nY2E/5SEe/+PfXb/e3Rx/1Zocv9fg5L/Pml+/x4s
+        Pf8OKmv/Ip6E/xhrdf9kjqD/i8zm/4HC3P+Fwdz/iL7X/32xyv8xPkn/Hiw28wUIClcAAAAMAAAAAAAA
+        AAIAAAARAAAATQAAAKEAAADWqZqR/6STi/+ikon/b2Nd/3xqZP9wYlr/fm5n/4p5cv+OfXb/i3t0/4V1
+        bv+MfHX/loR9/5qJgf+WhX3/jn53/4h3b/+Id2//mYmA/6OSiv+hkYn/qJiP/5uNhP9zdnj/T2h6/0uO
+        rf9UlbP/Z7LP/052hv8RMD3/CSPV/woMIf+GxOD/gsbf/3+/3P+Dvdf/erDJ/3epwv9jla//HTxM6wAD
+        BEQAAAAFAAAAAAAAAAMAAAAQAAAASgAAAJ4AAADQopOK/56Mhf+gj4f/kX95/4NzbP+DdG3/fGxl/35u
+        Z/96a2P/dGZf/4R0bf+Nfnb/i3pz/5B/d/+TgXj/nY2E/5+Ohv+di4T/o5KK/6CPiP+fjof/oJGJ/2Vw
+        dv8/X3T/Y6XF/1WiyP9cosb/drzY/3e51P8JD3b/Ch/e/z1WXv9/wNr/gL3W/4C92v+GxN3/baK9/4G8
+        1P9/wuH/ETJIlwAAABQAAAACAAAAAQAAAAYAAAAXAAAAUAAAAKIAAADMjoJ5/6iYj/+qmpH/oI+H/5GB
+        ev+SgXr/lYN8/5GBev+RgXn/koF6/41+dv+Le3L/jXdt/4x6c/+XhX3/mYeA/5iHgP+ejYX/opKJ/5qK
+        gf+NfnX/a3By/zhhdv9orsv/YKvP/0uZv/9krc3/c7zZ/3u72P8sP1P/Cg8t/2qbrv9zrsf/e7TN/4W/
+        2P+FwNv/erbR/3Oiwv9pqsf/AwkOUgAAAAgAAAABAAAAAwAAAA0AAAAoAAAAZQAAAKwAAADQm4yE/7Sl
+        mv+klIv/oI+H/5iGgP+Le3T/lIN8/5ODfP+Ug33/lIJ7/5iHf/+ch3//kX54/3JjXf+Ugnz/loV+/5WE
+        ff+ai4L/jHx0/4NzbP+HhYP/R2p//1iny/+Iyeb/O3Wo/0+fwv9vvNv/eL/c/3m72P9LcH7/DAoA/4jG
+        3v93uNH/fL3X/4zD2/9/udX/f8De/4y+1/87cJDxAQIDLgAAAAcAAAAAAAAABwAAABwAAABKAAAAiQAA
+        AL4AAADap5iP/66elf+hkIj/oI+I/5SDfP+Qf3j/koB5/5KAef+aioL/lYR8/56Ohf+ci4T/mIZ//4Ry
+        bP+RgXr/momC/458df97bmX/gGRU/4l2bP9Qh6b/XqrO/2Oozf9hp8v/Ya3O/2q72v94vdz/gcbi/3y9
+        2/9nnbD/U3OB/4zN5/+Bw9z/gL7a/32zyf92sMn/iMfg/3251f8pUWjIAQEBIQAAAAIAAAAAAAAADQAA
+        ADQAAAB1AAAAsAAAAM8pIyDsrJuS/56Nhf+ejIX/k4J7/4Z1bv+Pfnf/kYF6/4d1b/+cjIP/mouD/5qI
+        gf+UhH3/i3pz/4t5cv+XhX7/koB5/2teVf94fH//dK/I/2e42P9RkL7/YrDR/1qoyf9eqsv/WqbJ/3bB
+        3v97w9//fcTh/32+3P+DxN//g8Db/4TJ4/9/v93/gbzX/3Kmv/9qqMD/i7/b/1N/p/8ZLjp9AgQEFgAA
+        AAAAAAAAAAAAGAAAAEwAAACWAAAAxickIemAcWj/loV+/4t5cv9/bmf/fW1m/3BjW/96aGL/bmBZ/31t
+        Zv+Ne3X/koF6/4x8df+FdW7/i3t0/5SCe/+Qf3j/gnFq/2trav9rtdT/bLTU/2KjyP9tt9f/X6XI/2Ow
+        zf9Zp8r/Z7DQ/3m/3v+Axd//fL3b/3/B3v+IzOb/h8nk/4rL5P+ExeP/hMXe/2qeuf92scb/oc7q/0yC
+        pv8OHihoAQEBDQAAAAAAAAAAAAAAJwAAAGMAAACqBwYG03FjXvqTgnv/bl9Y/3dnYP91Z2D/d2dg/3Bg
+        W/98bGX/gnNs/3trZP+BcGj/fGxk/3NlXv+EdG3/lIV9/6COh/+NfHX/ZF5a/0p5nP9ajar/WJO9/3K+
+        2v9/vdz/YKPG/2muzv9cqcn/ZbHR/3K72P9+wN3/hcXi/4fI5P+Jy+T/f8Dc/4fF3/+NzOX/iMbf/3m3
+        0f9nlrT/b5uz/yhVb+YFCw5KAAEBCQAAAAAAAAAAAAAAQAAAAIMAAAC7CAUF21BEPv5uYFj/hndw/4l6
+        cv+KenT/momB/5KBev+RgXr/k4F6/5mJgv+Tgnr/iHdw/4p5c/+ThH3/m4yF/6CPiP+CdXH/TnKL/0tv
+        k/8hITb/M0Zh/2OjyP90u9j/abHO/2etzf9cqMn/Z7HR/3e92f95u9j/eb7b/5PV8P+Mzeb/fsPd/3/D
+        3f+Szeb/h8Lf/3/A3v+Mu9T/RnGF/hEiMcwAAABAAAAABwAAAAAAAAAAAAAAXgAAAKQAAADMKCUj6ZmH
+        gP+ejIX/lIN8/5iHf/+YiH//mYeA/5OCe/+UhH3/hXRu/4x6dP+SgHn/mYeA/5qJgf+bioP/loV+/4h3
+        cf9bXl//bLrc/3S/4P9LdJj/KiNI/z1ehf9mr9L/d77b/1uoy/9Vo8b/bLDN/3q/3P97vdr/hMrj/5LQ
+        7P+Oz+v/iMzm/4TF3/+Gwdz/hMbh/4rO6P+Oxd7/PGyF/hocHNUCAwNeAAABEQAAAAEAAAAAAAAAdQAA
+        ALUAAADekIB7/pODev+ejob/mIeA/6iXj/+jkor/mIZ//5KAef+RgHn/jn12/5qIgf+cioP/no2F/6OR
+        iv+hkYj/iHdw/2JVTf9NfJX/YqrR/3O31/93weH/VoKj/2+y0f9ppM3/ebvb/1Kfxf9nsdD/YKPG/3G3
+        1v96vNn/gsTg/4rL5/+FyuT/gsTh/4jK5v+Fw93/d7/b/5zT7/97r8//Y6vF/zVZaNwRGx5dAAABEgAA
+        AAIAAAAAAAAAiQAAAL8jHxzoq5yR/56Nhf+hkIj/rJyT/6mZkP+qmpH/m4uD/5KBev+WhX3/kH55/5WD
+        fP+VhH3/oo+J/6iXj/+cjIP/c2Ja/3xwaP9WncX/abLS/3O62f9qtNT/d8Hd/3vD4P+MxuP/Y6bM/1up
+        yv9qtdT/ZK3M/3jA3f95wN//hMrl/4rM5/+Ky+X/hcbk/4rO6P98u9v/hMni/6zZ9f9km77/K1V37gkQ
+        FGoBAQEHAAAAAAAAAAAAAAAAAAAAngAAAMlZUEzxoI+H/6uckv+omI//oZCJ/6STi/+ikIr/nImD/5aE
+        ff+aiIH/j313/4x7dP+UhH3/m4mC/6SUi/+Ugnv/cVxO/3ymuv9KibL/dLnZ/3rB3v9fpsj/b73b/3G5
+        1v99x+P/ZLLQ/02Xwf9rtNj/fMXh/3O52P91vt3/eb7b/37A3f+HyOL/js/p/4/Q6v+Dx+T/erPX/5XL
+        5/9Jl7v+GjJBrgEBAQoAAAAAAAAAAAAAAAAAAAAAAAAApw0NDdaIeHD9kX95/6qbkf+unpX/j395/459
+        dv+pmJD/n46H/56Ohf+gkIj/kH95/4x8dv+JeXL/kIB4/5WFfP9yZmH/b36H/2aqzv9nr8//esLe/3m/
+        3v9rtdT/arbW/2iz0P9rvdr/UqbG/2q41P9gqs3/crjX/2Spzf+AyeT/f8Hd/3m+2/+Cx+H/k9Ht/4rH
+        5P+Fx+T/mc7p/2amxP8nSF36AAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqBUSEN2Ug3r9lYV8/6OT
+        iv+klIv/l4V+/4p6dP+omI//p5aO/56Ohf+WhX3/j394/3hoZP9uXFb/emtk/3NnXv9ydXn/bLXV/2Sp
+        zv92vdz/fcbh/3zE4f9xu9v/Z67Q/16kx/9QnMD/Xq/O/2Wy0f94wN3/c7jV/3q83P9encj/gsrj/33C
+        3v+CxN//jMjk/4bI4/+Lz+n/lM/q/0d+nf8sLiv3BQYHTwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAArg8P
+        DdqSgX38qZiQ/6WVjP+ci4P/lYR9/419d/+KeHH/opGJ/5WFfP91YlX/hGpX/2ZkY/9HUlj/OFVn/1eQ
+        tf9fpcj/Y6jP/3W+3f96wt7/drrX/36/3f9+x+L/bbjV/2241f9hsc7/ZrTS/2u41P92udX/h83o/4fI
+        5f97wd3/dr3a/3K72/+DxuL/hsfj/3jA3P+c0+//fLPT/2avyf5HfZLyHzI3SwAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAux0aGuGWhH39rp6V/6qbkf+Yh3//koB6/5B/ef+Rf3j/fWtk/4huXf+jrK//d7jX/2Ow
+        1v9kstb/Up3I/2Wlyv9krdD/Y6/S/2y52f9ut9b/er3Z/4PG4v99wt7/f8Xh/3jE4P91wd7/bbrW/3W9
+        2v99w97/hMnl/4jL5/+BxuD/i8/p/3m+3v+Izef/fbzc/4XK4/+s2fX/ZZ7C/y1dhOwTJzK9FxobTQAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAxzo0Muqbi4T/saKY/7Cgl/+fjYb/kIB6/49+d/+Bcmn/fGxg/3u7
+        1P9sqc3/Z6vP/2Kny/9vuNf/abfW/3O72P95w9//cLjV/3C+2v9wuNX/gsTh/33A3/9wudb/db7b/2i1
+        0v9uutf/cLzY/4HG4v+P0er/icvk/4XH4v+Ozej/itDr/43S7P+O0Ov/hcnm/3q02P+TyeX+SZu//yNH
+        XKEHBwcnCgkITAAAAAEAAAAAAAAAAAAAAAAAAAABCwsNtZKEfPicjIX/sqKY/66elP+hj4n/opGJ/5GC
+        ef+OfnP/icbj/1qdw/9ZmL//f8Xh/3fA3f91wd3/eb7d/4PL5f+EyuP/fsbg/3e+3f93vNv/gMHe/3u9
+        3P9wt9T/dbnW/2m21f9rtNP/cbnW/3693f9dh7T/Ypa8/4bH4f9zp8f/gsLf/47M6P+R0On/jtDs/5jP
+        6v9mp8X/GTJFrgAAACYCAgISAgMDEwYGBxAAAAAAAAAAAAAAAAAAAAABExMTgJCGffWdj4f/t6ee/6iX
+        jv+tnJT/pZWM/5KBc/+WtML/ZqbL/2Gkyv9xvt3/fMXh/3rB3v93vdz/g8nl/37E4P90vdn/ecDd/3nA
+        3f97vdz/d7jV/3a71/96wd7/fr/d/3G41f9zuNX/hcfk/1yMtP9Fa5n/LUd8/2yhxP9RcJj/cqPG/4nC
+        3/+MyuP/hc3n/5PO6v9Hf5//AwUFYgAAAB8AAAAHBAMDCAsLDBoEBAQHAAAAAAAAAAAAAAAAAAAADwcH
+        BzMPDg1MPTk2ro6EevKbjYT/o5SK/6GKev95vNn/aqrO/3O61/99xOP/esLe/37E3/96xd//e8Pf/3i9
+        2v9qstL/a7bT/3W+2v9wtNH/dLnV/2+20/9yvdf/eLnW/36+2/+Mzur/i9Pt/16cxP85XpP/Q1mD/2CV
+        vf9roMP/jMfi/4nF4f+DyOL/hMnm/2yfwv5lvNn/TImj2wAAABMAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAABAAAABgAAABYAAAA4FBIQlIKCgux4qsn3dKvM/H/A3f+Ky+j/i8nl/4HG
+        4v94vdz/gsLf/4TI4v90u9j/dbva/3W51v9xuNf/bbXS/3O82f99vtz/ervZ/4jK5f+T1fL/iMvn/3m8
+        3v98vt3/TnWg/1qQvP96ttf/h8jk/1aErf9qs9P/n9Tv/2ufv/8lUoL+ECQ0jwAAAAwAAAABAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAEAAAACgAAAB4OEBFRHiktejZN
+        WKdagZTVaY2i4GiRpPF+ssv/kdPv/5DV8f+Fy+f/hMPf/4bI5P9/xuP/ebzb/3m92v94vNn/fMHd/4/Q
+        6v+W1PD/l9jy/4fF4f9HcqH/aqHI/3Ot0f9Mf6v/h8Xi/3y93f8lTIL/iL/f/3Cx1P8mTG3QAAAAHwAA
+        AAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAABAAAAAwAAAAcDBAQYBQYHJQYICTsNEhVlJTM8w1Buf/9Zeo7/i87q/4PE4P+SzOn/icbj/3e4
+        1f97wt//isbi/5PR7f+b2PX/ldPp/4S72v9hmcL/ZqHI/1mMuv+Gw+D/aaPK/1CLuf9hibj/ic3n/kh4
+        qf8OGCV2AAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAFAAAADgAAADIAAAByJzlD0Xmz
+        zvx/vNn/gb/e/3W20/+Exd//k8vn/5nU7/+V0Oz/mNTw/5/a8v9xrtL/UIW0/1WBsP80YJn/h8Pi/4fN
+        6P9nmsb/SYqz/1+WsvIHCw4+AAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAQAAAAPAAAAHxAVGmwxSVajUHqN00Jkdsg8WWW2NlFewXOftfSc1PD/kc7r/4O72/9zrtH/bpzE/2OL
+        u/9Zi73/ib3d/2WSvf9oiLf/TYCr/z9phdIDBQcsAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAHAwQFFAEBARUAAAAUAAAAJQYHCFUyQkquUnmO7m+i
+        yf9oosb/cKPC/1N4rP9ZgKz/isPg/2SXwv9Yibf/OnGf/xkoSawAAAAbAAAAAQAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAA
+        AAcAAAAPAAAAGwUGB2UGBgiAIC40vHGbv/pnm8H+jcfg/1yJvf+Bt9f/T4Op+Q8bInUAAAANAAAAAQAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAALAAAAGgkLD1UfLDWMITVCrT1ced93pMf/c6bE/BMd
+        IVUAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAIAAAAFgID
+        AysUHSFgHC02gQAAAAoAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AB/gfgP
+        AAD8AD+AcA8AAPwAH8AADwAA/AAPgAAfAAD4AAAAAB8AAPgAAAAAHwAA8AAAAAA/AADwAAAAAD8AAPAA
+        AAAABwAA4AAAAAABAADgAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAIAAAAAAAAAAgAAAAAAA
+        AACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAA
+        AAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABwAAAAAAAAAP
+        AAAAAAAAAB8AAAAAAAAAHwAAAAAAAAAfAAAAAAAAAB8AAAAAAAAADgAAAAAAAAAOAAAAAAAAAAcAAAAA
+        AAAAPwAAwAAAAAA/AADwAAAAAH8AAP8AAAAA/wAA//gAAAD/AAD//wAAAP8AAP//wAAA/wAA///+AAD/
+        AAD////wAf8AAP////wB/wAAKAAAACAAAABAAAAAAQAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAABAAAAEQAAADsAAABeAAAAXwAAAEIAAAAeAAAACAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAFQAAAF8CAgKIAAAAMAAAAAMAAAAAAAAAAAAAAAQAAAAhAAAAXQAAAFMBAQB6AQEBLAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAmAAAAgwAAALwdFxTdAAAAsgAAAHcAAAAyAAAABwAA
+        AAAAAAAAAAAAAAAAAAAAAAAJAAAAUgICAsECAgb/AQAAVAAAAAQAAAAIAAAALgAAAHwAAACmAgIAwQME
+        Cv8AAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABgAAADkAAACiQTYw5Yp0bv+ObWP9WkVA5SYg
+        HJQAAAAqAAAABQAAAAEAAAACAAAABAAAABIAAABSAQEBsAQFMPwEC2f0BAQLogEAAG4AAACVAQECxgMF
+        MeoEC2L/AwIEjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAQAAAAVQAAALJIOzbrmYiB/6OO
+        h/+aiIH/fGtk9QICAmAAAAATAAAABAAAABIAAAAqAAAAVgEBAZoFBgjLBgcH+QMPxf8CAbT/BAsO9gYi
+        MOsEDDH/AgR6/wMDP/wAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACIAAACCAwICzWxd
+        V/aaiYH/nY2F/5eGgP+UgXn/Ny0nxQAAAEIAAAAgAAAARgAAAIUJBgS4FBEO2DdQXvcnyff/DkGI/xl7
+        uf8ho9f/IKHZ/x2Ox/8bhbP/DkZf4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAANwAA
+        AKEiGhbklnpx/56Ohv+ik4v/koJ7/5mHgP+TgHr+Ih0amgAAAGoAAACaAAAAzEQvJ+59XlH9dmlj/lFI
+        R/8rytr/I62//wUOlv8AAHD/G4Gu/yKt9P8MOlSvAAAABAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
+        ABUAAABXAAAAs09BOvaplIz/rZ6U/4p8dP+VhX7/f3Fq/4FybP9IQDrhAAAAxgoJB90wJh3yh29k/ZmG
+        ff+AcWr/WE9O/wscgP8FD6v/BQzN/xuAqP8iqsr/GHKm/xqDq/kAAAB3AAAAIgAAAAsAAAACAAAAAAAA
+        AAEAAAAEAAAAMAAAAI8AAADNZlxV+rannf+hkYn/j394/3hpYf+GeG//emxl/3trY/8bFA75a15Y/paG
+        fv+kk4v/oZGI/zMuQP8IHfT/FFWr/x2GnP8ZdpH/NP///wswgP8PRbz/IJ3O/wEAWP8EAwC9AAAAQwAA
+        ABMAAAAAAAAAAgAAAA0AAABUAAAAtVNGP+qqmpL/sKGX/4l5cv+Dc2z/koF5/5qJgf+IeXH/emtm/2BR
+        Sf+Wh3//nIuE/25iXf8iJmH/CSPe/wYQ8v8ff6H/M/P//y3f5P8MMm//AwfR/xlyn/8chcL/Agbf/wYS
+        l/8DBBXcAgICYgAAAAAAAAAEAAAAHgAAAHgAAADJcmZg96STi/+ikYn/iXpz/5GBeP+Yh3//pJOL/5KC
+        ef+Xh37/dGNb/5ODfP+IfHb/KSYn/yoqRP8mIyb/ISEp/xURJf8aeHn/OP/3/yKhlf8HGZD/Nv///xtI
+        W/8oOD//HiMo/xEVHf8DBQWvAAAAAAAAAAgAAAA6AAAAoRcVEt2XiH/+pZSM/49+eP+Sg3v/k4R7/6CN
+        g/+ejIP/mIeA/5qKgv+XhX7/nIqD/56Mhf+Whn7/iXlw/4h4cP+Hd2//jX95/1BRT/8MJpn/Cieh/yOo
+        s/8+laX/fLLL/4/K5f9deY//KTZD/AcMEE8AAAAAAAAACwAAAFAAAAC4h3p0/K2dk/+ejYX/int0/418
+        df+aioL/mYiA/5CAef+ZiIH/m4qD/52NhP+Rgnn/loZ+/6GQiP+djYT/koF5/3t0cf9bdoL/Pml+/xYr
+        VP8inoT/Pn2L/4vM5v+Dwtz/iL7X/1d4iv8eLDbzAwQFMgAAAAAAAAAKAAAATAAAALqml47/oZGI/4Bx
+        a/99bWb/fW1m/4R0bf+AcWr/iXly/5F/eP+VhHz/loZ+/5OCev+ejoX/oZGJ/6SVjP9tdXr/WYeg/1Wa
+        vP9vt9T/OFyE/woh2v9Teo//gcLb/4LA2/90qcP/d6/K/xc2S8EAAQEYAAAAAQAAAA8AAABQAAAAt46C
+        ef+pmZD/oI+H/5KBev+Vg3z/kYF6/5KBev+MfXT/jXdt/5KAeP+Zh4D/m4qD/6KSif+UhHv/a3By/1CI
+        of9gq8//WKPG/3O82f9UfZb/Cg8t/2+lu/97tM3/hcDa/3q20f9upsX/AwkOUgAAAAUAAAAFAAAAJwAA
+        AHcAAADFoZKK/6qakf+gj4j/koF6/5OCe/+VhH7/lYN8/5yKgv+Vgnz/h3dw/5iHgP+Pf3f/hnBk/3l+
+        gf9Tiqf/abDT/06Ru/9otdX/fcPf/2qiuf8wP0H/hMTd/36+2f+AuNH/hMTf/1uPqu4BAgIoAAAAAwAA
+        AA0AAABVAAAAsBUREd6sm5L/no2F/5OCe/+LenP/kYF6/5KBef+ai4P/l4Z//4t6c/+Rf3j/koB5/3Jt
+        av90r8j/XKTL/2Kw0f9cqcr/WqbJ/3nC3/99xOH/gMHe/4PA2/+CxOD/gbzX/26nwP+Lv9v/NlZxvgIE
+        BBYAAAAAAAAAIAAAAHwDAgLNal9Z+YJya/9+bmf/empj/3ZmYP94amP/gnFq/4d3b/+Dc2z/kIB5/5WD
+        fP9zaGL/X4qh/2Kkyf9xttb/YKTH/2GszP9msdH/e8Dd/4HB3/+GyeP/g8Xg/4nJ4/+Gxt//cKjC/4i1
+        z/8iQFOmAQEBCwAAAAAAAABAAAAAnwgFBdtfUkv/hndw/4p6c/+aiYH/koF6/5OBev+Whn7/iHdw/49/
+        eP+bjIX/kYJ9/05yi/82SGX/M0Zh/2yv0P9psc7/YqvL/2ex0f94vNn/eb7b/5DR6/9+w93/icji/4fC
+        3/+Gvtn/RnGF/gkRGYYAAAAHAAAAAAAAAGoAAADBXVJO9JuKgv+WhX7/n4+G/5mHgP+Tgnv/inly/5WD
+        ff+cioP/n46G/49+d/9lam3/Z7LX/2urzP9AU3b/X5m+/3i92/9bp8r/ZqrK/3m82v+Dx+L/jM7p/4XI
+        5P+GxeD/fsPe/4zG4f9QjKb/GCUqnAAAARIAAAABAAAAiREQD9SrnJH/oI+H/6yck/+qmpH/m4uD/5SD
+        fP+Qfnn/lYR9/6KPif+ikon/c2Ja/2mHl/9pstL/b7fX/3fB3f+ExeL/Y6bM/2Ovz/9krcz/ecDe/4TK
+        5f+KzOb/hcbk/4PF4v+EyeL/iLra/ytVd+4FCQs5AAAAAAAAAAAAAACjPDYz5JmHgP+rnJL/mIiB/6CP
+        h/+ejIX/nIuD/5B+eP+Ofnf/loV9/5CBef9wbWv/ZaPD/3e+3P9wt9b/bbrZ/3G82f9brMv/YazP/3e/
+        3P9zu9r/fMDc/4HE3/+R0Ov/icrm/4rB4P9blLH+DRohjQEBAQMAAAAAAAAAAAAAAKhVSkbtlYV8/6SU
+        i/+XhX7/mYmC/6eWjv+aioH/j394/3NiXf96a2T/c25s/2y11f9ts9X/fcbh/3fA3v9nrtD/V6DE/16v
+        zv9vudf/c7jV/2yt0v+CyuP/gMPf/4zI5P+JzOb/lM/q/zlWY/sFBgdPAAAAAAAAAAAAAAAAAAAAtVZM
+        SO2sm5P/oZGI/5SCfP+PfXf/kH53/46BeP9+kZf/Xoaa/0V5mP9gosb/Y6zR/3O82/94vNj/f8Tg/3a/
+        2/9vvNn/arfU/3W92f+Gy+f/g8fj/4HG4v9+xOH/gsLg/5LO6f9xqcv/PG2F5xsmKUwAAAAAAAAAAAAA
+        AAAAAADHa19a9bGimP+ol4//kIB6/4h4cP98bGD/dLLR/2erz/9psNH/abfW/3a/3P9wuNX/cLvY/4LE
+        4f93vdv/db7b/2u41f9wvNj/iMzm/4nL5P+KyuX/itDr/47R7P+Fyeb/h7/f/0mbv/8VJzJkCgkITAAA
+        AAEAAAAAAAAAARAQEJuXioL7taWb/6qZkP+kk4v/ko6J/3i21/9ipsv/fsXh/3jA3f9+xOH/f8bh/3zD
+        3/95vt3/fL3a/3e82v96vNr/brfV/3vA3f9gj7j/SG+c/26gwf96s9P/jsrl/4rP6v92sc//DhwliAEB
+        ARgDAwMOBgYGDQAAAAAAAAABAAAADwsLCkA9OTaulImA+aOUiv+No6r/aqrO/3i/3f96wt7/fMXf/3vD
+        3/9xuNb/a7bT/3O51v90udX/cbrV/3i51v+FxuP/i9Pt/0x9rP9DWYP/ZpvA/4zH4v+Gx+L/hMnm/2mu
+        zv9MiaPbAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAVCgkIT0NPWJVJan27Zpas33mq
+        xPB4ssz8isvn/4TJ5f99v93/e8De/3O51/95vdv/e77b/5HR7f+Q0u3/ca3Q/1yLtP9lncT/h8fj/1mR
+        uP+Uyuf/Snuh9AgSGlcAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA
+        AAMCAgIQBQYHJQoND1AlMzzDVXSH/4vO6v+LyOX/icbj/3m92v+KxuL/l9Xx/5XT6f9zqs7/ZqHI/3Co
+        zf9po8r/WYq5/4nN5/4rSGe7AAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAcAAAAuFB0ieE9zhsNonLbpXo+k32SNo+CQxeD9ldHu/4K9
+        3P9fkbz/Un6x/4jA4P9vocn/S4Wv/ypEU4wAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABQMEBRQBAQEVAAAAJRwl
+        KoJSeY7ubKLI/3Cjwv9WfKz/isPg/16Qvf86cZ//DRQlZAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAEAAAABAAAABgAAAA4DAwQ+ERcaa0BccbdWfpDWZY+092GVtvsJDxE3AAAAAQAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABQAAABYLEBJGHC02gQAAAAYAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAADwD4MD8AeAA+AAAAfgAAAH4AAAD+AAAAPAAAAAgAAAAIAAAACAAAAAgAAAAIAA
+        AACAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAAAAAAAAwAAAAMAAAAHAAAABwAAAAIAAAACAAAAD4AA
+        AA/4AAAf/4AAH//wAB///gAf///wPw==
+</value>
+  </data>
+</root>
--- a/OpenRA.Editor/LegacyMapImporter.cs
+++ b/OpenRA.Editor/LegacyMapImporter.cs
@@ -0,0 +1,470 @@
+#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;
+using OpenRA.Traits;
+using System.Drawing;
+using System.Globalization;
+
+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"},
+		};
+		
+		static Dictionary<string,Pair<Color,Color>> namedColorMapping = new Dictionary<string, Pair<Color, Color>>()
+		{
+			{"gold",Pair.New(Color.FromArgb(246,214,121),Color.FromArgb(40,32,8))},
+			{"blue",Pair.New(Color.FromArgb(226,230,246),Color.FromArgb(8,20,52))},
+			{"red",Pair.New(Color.FromArgb(255,20,0),Color.FromArgb(56,0,0))},
+			{"neutral",Pair.New(Color.FromArgb(238,238,238),Color.FromArgb(44,28,24))},
+			{"orange",Pair.New(Color.FromArgb(255,230,149),Color.FromArgb(56,0,0))},
+			{"teal",Pair.New(Color.FromArgb(93,194,165),Color.FromArgb(0,32,32))},
+			{"salmon",Pair.New(Color.FromArgb(210,153,125),Color.FromArgb(56,0,0))},
+			{"green",Pair.New(Color.FromArgb(160,240,140),Color.FromArgb(20,20,20))},
+			{"white",Pair.New(Color.FromArgb(255,255,255),Color.FromArgb(75,75,75))},
+			{"black",Pair.New(Color.FromArgb(80,80,80),Color.FromArgb(5,5,5))},
+		};
+		
+		int MapSize;
+		int ActorCount = 0;
+		Map Map = new Map();
+		List<string> Players = new List<string>();
+		
+		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);
+			}
+			else // CNC
+			{
+				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"));
+				ReadCncOverlay(file);
+				ReadCncTrees(file);
+			}
+
+			LoadActors(file, "STRUCTURES");
+			LoadActors(file, "UNITS");
+			LoadActors(file, "INFANTRY");
+			LoadSmudges(file, "SMUDGE");
+
+			foreach (var p in Players)
+				LoadPlayer(file, p, (legacyMapFormat == IniMapFormat.RedAlert));
+			
+			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)))
+					.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))
+			{
+				//Structures: num=owner,type,health,location,turret-facing,trigger
+				//Units: num=owner,type,health,location,facing,action,trigger
+				//Infantry: num=owner,type,health,location,subcell,action,facing,trigger
+				var parts = s.Value.Split(',');
+				var loc = int.Parse(parts[3]);
+				if (parts[0] == "")
+					parts[0] = "Neutral";
+				
+				
+				if (!Players.Contains(parts[0]))
+					Players.Add(parts[0]);
+				
+				var stance = ActorStance.Stance.None;
+				switch(parts[5])
+				{
+					case "Area Guard":
+					case "Guard":
+						stance = ActorStance.Stance.Guard;
+					break;
+					case "Defend Base":
+						stance = ActorStance.Stance.Defend;
+					break;
+					case "Hunt":
+					case "Rampage":
+					case "Attack Base":
+					case "Attack Units":
+					case "Attack Civil.":
+					case "Attack Tarcom":
+						stance = ActorStance.Stance.Hunt;
+					break;
+					case "Retreat":
+					case "Return":
+						stance = ActorStance.Stance.Retreat;
+					break;
+					// do we care about `Harvest' and `Sticky'?
+				}
+				
+				var actor = new ActorReference(parts[1].ToLowerInvariant())
+				{
+					new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+					new OwnerInit(parts[0]),
+					new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo)/256),
+					new FacingInit((section == "INFANTRY") ? int.Parse(parts[6]) : int.Parse(parts[4])),
+					new ActorStanceInit(stance),
+				};
+				
+				if (section == "INFANTRY")
+					actor.Add(new SubcellInit(int.Parse(parts[4])));
+				
+				Map.Actors.Add("Actor" + ActorCount++,actor);
+					
+			}
+		}
+
+		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])));
+			}
+		}
+		
+		void LoadPlayer(IniFile file, string section, bool isRA)
+		{			
+			var c = (section == "BadGuy") ? "red" :
+						(isRA) ? "blue" : "gold";
+			
+			var color = namedColorMapping[c];
+			
+			var pr = new PlayerReference
+			{
+				Name = section,
+				OwnsWorld = (section == "Neutral"),
+				NonCombatant = (section == "Neutral"),
+				Race = (isRA) ? ((section == "BadGuy") ? "soviet" : "allies") : ((section == "BadGuy") ? "nod" : "gdi"),
+				Color = color.First,
+				Color2 = color.Second,
+			};
+			
+			var Neutral = new List<string>(){"Neutral"};
+			foreach (var s in file.GetSection(section, true))
+			{
+				Console.WriteLine(s.Key);
+				switch(s.Key)
+				{
+					case "Credits":
+						pr.InitialCash = int.Parse(s.Value);
+					break;
+					case "Allies":
+						pr.Allies = s.Value.Split(',').Intersect(Players).Except(Neutral).ToArray();
+						pr.Enemies = s.Value.Split(',').SymmetricDifference(Players).Except(Neutral).ToArray();
+					break;
+				}
+			}
+			
+			Map.Players.Add(section, pr);
+		}
+
+		static string Truncate(string s, int maxLength)
+		{
+			return s.Length <= maxLength ? s : s.Substring(0, maxLength);
+		}
+	}
+}
--- a/OpenRA.Editor/MapSelect.Designer.cs
+++ b/OpenRA.Editor/MapSelect.Designer.cs
@@ -0,0 +1,375 @@
+namespace OpenRA.Editor
+{
+    partial class MapSelect
+    {
+        /// <summary>
+        /// TODO
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        /// <param name="disposing">TODO</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Код, автоматически созданный конструктором форм Windows
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        private void InitializeComponent()
+        {
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
+			this.MapList = new System.Windows.Forms.ListView();
+			this.colMapName = new System.Windows.Forms.ColumnHeader("(отсутствует)");
+			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.btnOk = new System.Windows.Forms.Button();
+			this.lblNew = new System.Windows.Forms.Label();
+			this.txtNew = new System.Windows.Forms.TextBox();
+			this.pbMinimap = new System.Windows.Forms.PictureBox();
+			this.pnlBottom = new System.Windows.Forms.Panel();
+			this.txtPathOut = new System.Windows.Forms.TextBox();
+			this.lblPathOut = new System.Windows.Forms.Label();
+			this.lblPath = new System.Windows.Forms.Label();
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.lblMapList = new System.Windows.Forms.Label();
+			this.txtDesc = new System.Windows.Forms.TextBox();
+			this.lblDesc = new System.Windows.Forms.Label();
+			this.txtTheater = new System.Windows.Forms.TextBox();
+			this.lblTheater = new System.Windows.Forms.Label();
+			this.txtAuthor = new System.Windows.Forms.TextBox();
+			this.lblAuthor = new System.Windows.Forms.Label();
+			this.txtTitle = new System.Windows.Forms.TextBox();
+			this.lblMapName = new System.Windows.Forms.Label();
+			this.lblMinimap = new System.Windows.Forms.Label();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit();
+			this.pnlBottom.SuspendLayout();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// MapList
+			// 
+			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colMapName});
+			this.MapList.FullRowSelect = true;
+			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.MapList.LargeImageList = this.MapIconsList;
+			this.MapList.Location = new System.Drawing.Point(15, 25);
+			this.MapList.MultiSelect = false;
+			this.MapList.Name = "MapList";
+			this.MapList.Size = new System.Drawing.Size(273, 294);
+			this.MapList.SmallImageList = this.MapIconsList;
+			this.MapList.StateImageList = this.MapIconsList;
+			this.MapList.TabIndex = 0;
+			this.MapList.UseCompatibleStateImageBehavior = false;
+			this.MapList.View = System.Windows.Forms.View.Details;
+			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
+			// 
+			// colMapName
+			// 
+			this.colMapName.Text = "Map name";
+			this.colMapName.Width = 240;
+			// 
+			// MapIconsList
+			// 
+			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
+			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.Location = new System.Drawing.Point(407, 35);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(75, 23);
+			this.btnCancel.TabIndex = 3;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.UseVisualStyleBackColor = true;
+			// 
+			// btnOk
+			// 
+			this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnOk.Location = new System.Drawing.Point(326, 35);
+			this.btnOk.Name = "btnOk";
+			this.btnOk.Size = new System.Drawing.Size(75, 23);
+			this.btnOk.TabIndex = 2;
+			this.btnOk.Text = "Open";
+			this.btnOk.UseVisualStyleBackColor = true;
+			// 
+			// lblNew
+			// 
+			this.lblNew.AutoSize = true;
+			this.lblNew.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblNew.Location = new System.Drawing.Point(12, 40);
+			this.lblNew.Name = "lblNew";
+			this.lblNew.Size = new System.Drawing.Size(69, 13);
+			this.lblNew.TabIndex = 3;
+			this.lblNew.Text = "Map name:";
+			// 
+			// txtNew
+			// 
+			this.txtNew.BackColor = System.Drawing.SystemColors.Window;
+			this.txtNew.Location = new System.Drawing.Point(88, 37);
+			this.txtNew.Name = "txtNew";
+			this.txtNew.ReadOnly = true;
+			this.txtNew.Size = new System.Drawing.Size(232, 20);
+			this.txtNew.TabIndex = 1;
+			// 
+			// pbMinimap
+			// 
+			this.pbMinimap.BackColor = System.Drawing.Color.Black;
+			this.pbMinimap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.pbMinimap.Location = new System.Drawing.Point(32, 25);
+			this.pbMinimap.Name = "pbMinimap";
+			this.pbMinimap.Size = new System.Drawing.Size(124, 124);
+			this.pbMinimap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.pbMinimap.TabIndex = 5;
+			this.pbMinimap.TabStop = false;
+			// 
+			// pnlBottom
+			// 
+			this.pnlBottom.Controls.Add(this.pictureBox1);
+			this.pnlBottom.Controls.Add(this.txtPathOut);
+			this.pnlBottom.Controls.Add(this.lblPathOut);
+			this.pnlBottom.Controls.Add(this.lblPath);
+			this.pnlBottom.Controls.Add(this.btnCancel);
+			this.pnlBottom.Controls.Add(this.btnOk);
+			this.pnlBottom.Controls.Add(this.txtNew);
+			this.pnlBottom.Controls.Add(this.lblNew);
+			this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.pnlBottom.Location = new System.Drawing.Point(0, 332);
+			this.pnlBottom.MaximumSize = new System.Drawing.Size(0, 70);
+			this.pnlBottom.Name = "pnlBottom";
+			this.pnlBottom.Size = new System.Drawing.Size(494, 70);
+			this.pnlBottom.TabIndex = 6;
+			// 
+			// txtPathOut
+			// 
+			this.txtPathOut.BackColor = System.Drawing.SystemColors.Window;
+			this.txtPathOut.Location = new System.Drawing.Point(55, 10);
+			this.txtPathOut.Name = "txtPathOut";
+			this.txtPathOut.ReadOnly = true;
+			this.txtPathOut.Size = new System.Drawing.Size(265, 20);
+			this.txtPathOut.TabIndex = 0;
+			this.txtPathOut.TextChanged += new System.EventHandler(this.txtPathOut_TextChanged);
+			// 
+			// lblPathOut
+			// 
+			this.lblPathOut.AutoSize = true;
+			this.lblPathOut.Location = new System.Drawing.Point(55, 13);
+			this.lblPathOut.Name = "lblPathOut";
+			this.lblPathOut.Size = new System.Drawing.Size(0, 13);
+			this.lblPathOut.TabIndex = 6;
+			// 
+			// lblPath
+			// 
+			this.lblPath.AutoSize = true;
+			this.lblPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblPath.Location = new System.Drawing.Point(12, 13);
+			this.lblPath.Name = "lblPath";
+			this.lblPath.Size = new System.Drawing.Size(37, 13);
+			this.lblPath.TabIndex = 5;
+			this.lblPath.Text = "Path:";
+			// 
+			// 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.lblMapList);
+			this.splitContainer1.Panel1.Controls.Add(this.MapList);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.Controls.Add(this.txtDesc);
+			this.splitContainer1.Panel2.Controls.Add(this.lblDesc);
+			this.splitContainer1.Panel2.Controls.Add(this.txtTheater);
+			this.splitContainer1.Panel2.Controls.Add(this.lblTheater);
+			this.splitContainer1.Panel2.Controls.Add(this.txtAuthor);
+			this.splitContainer1.Panel2.Controls.Add(this.lblAuthor);
+			this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
+			this.splitContainer1.Panel2.Controls.Add(this.lblMapName);
+			this.splitContainer1.Panel2.Controls.Add(this.lblMinimap);
+			this.splitContainer1.Panel2.Controls.Add(this.pbMinimap);
+			this.splitContainer1.Size = new System.Drawing.Size(494, 332);
+			this.splitContainer1.SplitterDistance = 300;
+			this.splitContainer1.TabIndex = 7;
+			// 
+			// lblMapList
+			// 
+			this.lblMapList.AutoSize = true;
+			this.lblMapList.Location = new System.Drawing.Point(12, 9);
+			this.lblMapList.Name = "lblMapList";
+			this.lblMapList.Size = new System.Drawing.Size(81, 13);
+			this.lblMapList.TabIndex = 1;
+			this.lblMapList.Text = "Available maps:";
+			// 
+			// txtDesc
+			// 
+			this.txtDesc.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtDesc.Location = new System.Drawing.Point(16, 289);
+			this.txtDesc.Name = "txtDesc";
+			this.txtDesc.ReadOnly = true;
+			this.txtDesc.Size = new System.Drawing.Size(162, 20);
+			this.txtDesc.TabIndex = 14;
+			// 
+			// lblDesc
+			// 
+			this.lblDesc.AutoSize = true;
+			this.lblDesc.Location = new System.Drawing.Point(13, 273);
+			this.lblDesc.Name = "lblDesc";
+			this.lblDesc.Size = new System.Drawing.Size(63, 13);
+			this.lblDesc.TabIndex = 13;
+			this.lblDesc.Text = "Description:";
+			// 
+			// txtTheater
+			// 
+			this.txtTheater.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtTheater.Location = new System.Drawing.Point(16, 252);
+			this.txtTheater.Name = "txtTheater";
+			this.txtTheater.ReadOnly = true;
+			this.txtTheater.Size = new System.Drawing.Size(162, 20);
+			this.txtTheater.TabIndex = 12;
+			// 
+			// lblTheater
+			// 
+			this.lblTheater.AutoSize = true;
+			this.lblTheater.Location = new System.Drawing.Point(13, 236);
+			this.lblTheater.Name = "lblTheater";
+			this.lblTheater.Size = new System.Drawing.Size(47, 13);
+			this.lblTheater.TabIndex = 11;
+			this.lblTheater.Text = "Theater:";
+			// 
+			// txtAuthor
+			// 
+			this.txtAuthor.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtAuthor.Location = new System.Drawing.Point(16, 214);
+			this.txtAuthor.Name = "txtAuthor";
+			this.txtAuthor.ReadOnly = true;
+			this.txtAuthor.Size = new System.Drawing.Size(162, 20);
+			this.txtAuthor.TabIndex = 10;
+			// 
+			// lblAuthor
+			// 
+			this.lblAuthor.AutoSize = true;
+			this.lblAuthor.Location = new System.Drawing.Point(13, 198);
+			this.lblAuthor.Name = "lblAuthor";
+			this.lblAuthor.Size = new System.Drawing.Size(41, 13);
+			this.lblAuthor.TabIndex = 9;
+			this.lblAuthor.Text = "Author:";
+			// 
+			// txtTitle
+			// 
+			this.txtTitle.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtTitle.Location = new System.Drawing.Point(16, 177);
+			this.txtTitle.Name = "txtTitle";
+			this.txtTitle.ReadOnly = true;
+			this.txtTitle.Size = new System.Drawing.Size(162, 20);
+			this.txtTitle.TabIndex = 8;
+			// 
+			// lblMapName
+			// 
+			this.lblMapName.AutoSize = true;
+			this.lblMapName.Location = new System.Drawing.Point(13, 161);
+			this.lblMapName.Name = "lblMapName";
+			this.lblMapName.Size = new System.Drawing.Size(30, 13);
+			this.lblMapName.TabIndex = 7;
+			this.lblMapName.Text = "Title:";
+			// 
+			// lblMinimap
+			// 
+			this.lblMinimap.AutoSize = true;
+			this.lblMinimap.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblMinimap.Location = new System.Drawing.Point(29, 9);
+			this.lblMinimap.Name = "lblMinimap";
+			this.lblMinimap.Size = new System.Drawing.Size(71, 13);
+			this.lblMinimap.TabIndex = 6;
+			this.lblMinimap.Text = "Map preview:";
+			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
+			this.pictureBox1.TabIndex = 7;
+			this.pictureBox1.TabStop = false;
+			this.pictureBox1.Visible = false;
+			// 
+			// MapSelect
+			// 
+			this.AcceptButton = this.btnOk;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.btnCancel;
+			this.ClientSize = new System.Drawing.Size(494, 402);
+			this.Controls.Add(this.splitContainer1);
+			this.Controls.Add(this.pnlBottom);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MapSelect";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Select map";
+			this.Load += new System.EventHandler(this.MapSelect_Load);
+			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).EndInit();
+			this.pnlBottom.ResumeLayout(false);
+			this.pnlBottom.PerformLayout();
+			this.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel1.PerformLayout();
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			this.splitContainer1.Panel2.PerformLayout();
+			this.splitContainer1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+			this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public System.Windows.Forms.ListView MapList;
+        public System.Windows.Forms.Button btnCancel;
+        public System.Windows.Forms.Button btnOk;
+        public System.Windows.Forms.Label lblNew;
+        public System.Windows.Forms.TextBox txtNew;
+        public System.Windows.Forms.ColumnHeader colMapName;
+        public System.Windows.Forms.ImageList MapIconsList;
+        public System.Windows.Forms.PictureBox pbMinimap;
+        public System.Windows.Forms.Panel pnlBottom;
+        public System.Windows.Forms.SplitContainer splitContainer1;
+        public System.Windows.Forms.Label lblMinimap;
+        public System.Windows.Forms.TextBox txtTheater;
+        public System.Windows.Forms.Label lblTheater;
+        public System.Windows.Forms.TextBox txtAuthor;
+        public System.Windows.Forms.Label lblAuthor;
+        public System.Windows.Forms.TextBox txtTitle;
+        public System.Windows.Forms.Label lblMapName;
+        public System.Windows.Forms.TextBox txtDesc;
+        public System.Windows.Forms.Label lblDesc;
+        public System.Windows.Forms.Label lblMapList;
+        public System.Windows.Forms.Label lblPathOut;
+        public System.Windows.Forms.Label lblPath;
+        public System.Windows.Forms.TextBox txtPathOut;
+		private System.Windows.Forms.PictureBox pictureBox1;
+    }
+}
--- a/OpenRA.Editor/MapSelect.cs
+++ b/OpenRA.Editor/MapSelect.cs
@@ -0,0 +1,66 @@
+using System;
+using System.IO;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+
+namespace OpenRA.Editor
+{
+    public partial class MapSelect : Form
+    {
+        public string MapFolderPath;
+
+        public MapSelect()
+        {
+            InitializeComponent();
+			MapIconsList.Images.Add(pictureBox1.Image);
+        }
+
+        void MapSelect_Load(object sender, EventArgs e)
+        {
+            DirectoryInfo directory = new DirectoryInfo(MapFolderPath);
+            DirectoryInfo[] directories = directory.GetDirectories();
+            MapList.Items.Clear();
+            txtPathOut.Text = MapFolderPath;
+            foreach (DirectoryInfo subDirectory in directories)
+            {
+                ListViewItem map1 = new ListViewItem(subDirectory.Name);
+                map1.ImageIndex = 0;
+                MapList.Items.Add(map1);
+            }
+            
+			// hack
+			if (txtNew.Text != "unnamed")
+                MapList.Items[0].Selected = true;
+        }
+
+        void MapList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (MapList.SelectedItems.Count == 1)
+            {
+                txtNew.Text = MapList.SelectedItems[0].Text;
+                var map = new Map(new Folder(Path.Combine(MapFolderPath, MapList.SelectedItems[0].Text)));
+                txtTitle.Text = map.Title;
+                txtAuthor.Text = map.Author;
+                txtTheater.Text = map.Theater;
+                txtDesc.Text = map.Description;
+				pbMinimap.Image = null;
+                try
+                {
+					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
+                }
+                catch (Exception ed)
+                {
+                    Console.WriteLine("No map preview image found: {0}", ed.ToString());
+                }
+                finally { }
+            }
+        }
+
+        void txtPathOut_TextChanged(object sender, EventArgs e)
+        {
+            MapFolderPath = txtPathOut.Text;
+        }
+
+    }
+}
--- a/OpenRA.Editor/MapSelect.resx
+++ b/OpenRA.Editor/MapSelect.resx
@@ -0,0 +1,177 @@
+<?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="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
+        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
+        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
+        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
+        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
+        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
+        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
+        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
+        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
+        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
+        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
+        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
+        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
+        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
+        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
+        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
+        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
+        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
+        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
+        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
+        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
+        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
+        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
+        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
+        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
+        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
+        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
+        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
+        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
+        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
+        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
+        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
+        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
+        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
+        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
+        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
+        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
+        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
+        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
+        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
+        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
+        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
+        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
+        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
+        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
+        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
+        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
+        ga8AAAAASUVORK5CYII=
+</value>
+  </data>
+</root>
--- a/OpenRA.Editor/NewMapDialog.Designer.cs
+++ b/OpenRA.Editor/NewMapDialog.Designer.cs
@@ -0,0 +1,286 @@
+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 = 7;
+			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 = 8;
+			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 = 5;
+			this.cordonBottom.Value = new decimal(new int[] {
+            112,
+            0,
+            0,
+            0});
+			this.cordonBottom.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// 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});
+			this.cordonTop.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// 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 = 4;
+			this.cordonRight.Value = new decimal(new int[] {
+            112,
+            0,
+            0,
+            0});
+			this.cordonRight.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// 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 = 2;
+			this.cordonLeft.Value = new decimal(new int[] {
+            16,
+            0,
+            0,
+            0});
+			this.cordonLeft.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// 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 = 1;
+			this.height.Value = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			this.height.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// 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 = 0;
+			this.width.Value = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			this.width.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// 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 = 6;
+			// 
+			// 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,27 @@
+#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();
+		}
+
+		private void SelectText(object sender, System.EventArgs e)
+		{
+			(sender as NumericUpDown).Select(0, (sender as NumericUpDown).ToString().Length);
+		}
+	}
+}
--- 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.Icon.ico
+++ b/OpenRA.Editor/OpenRA.Editor.Icon.ico
--- a/OpenRA.Editor/OpenRA.Editor.csproj
+++ b/OpenRA.Editor/OpenRA.Editor.csproj
@@ -0,0 +1,160 @@
+<?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>
+    <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
+    <StartupObject>
+    </StartupObject>
+  </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>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </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="MapSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MapSelect.Designer.cs">
+      <DependentUpon>MapSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NewMapDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="NewMapDialog.Designer.cs">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="PaletteBox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PaletteBox.Designer.cs">
+      <DependentUpon>PaletteBox.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="MapSelect.resx">
+      <DependentUpon>MapSelect.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NewMapDialog.resx">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PaletteBox.resx">
+      <DependentUpon>PaletteBox.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="RenderUtils.cs" />
+    <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>
+  <ItemGroup>
+    <Content Include="OpenRA.Editor.Icon.ico" />
+  </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/PaletteBox.Designer.cs
+++ b/OpenRA.Editor/PaletteBox.Designer.cs
@@ -0,0 +1,165 @@
+namespace OpenRA.Editor
+{
+    partial class PaletteBox
+    {
+        /// <summary>
+        /// Требуется переменная конструктора.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Освободить все используемые ресурсы.
+        /// </summary>
+        /// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Код, автоматически созданный конструктором форм Windows
+
+        /// <summary>
+        /// Обязательный метод для поддержки конструктора - не изменяйте
+        /// содержимое данного метода при помощи редактора кода.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.LayerBox = new System.Windows.Forms.ComboBox();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.pbtilePalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.pbactorPalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.pbresourcePalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            this.tabPage3.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // LayerBox
+            // 
+            this.LayerBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.LayerBox.FormattingEnabled = true;
+            this.LayerBox.Location = new System.Drawing.Point(0, 0);
+            this.LayerBox.Name = "LayerBox";
+            this.LayerBox.Size = new System.Drawing.Size(194, 21);
+            this.LayerBox.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, 21);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
+            this.tabControl1.Multiline = true;
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(194, 357);
+            this.tabControl1.TabIndex = 1;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.pbtilePalette);
+            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(186, 331);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "Templates";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // pbtilePalette
+            // 
+            this.pbtilePalette.AutoScroll = true;
+            this.pbtilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbtilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbtilePalette.Location = new System.Drawing.Point(3, 3);
+            this.pbtilePalette.Name = "pbtilePalette";
+            this.pbtilePalette.Size = new System.Drawing.Size(180, 325);
+            this.pbtilePalette.TabIndex = 1;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.pbactorPalette);
+            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(186, 331);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "Actors";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // pbactorPalette
+            // 
+            this.pbactorPalette.AutoScroll = true;
+            this.pbactorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbactorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbactorPalette.Location = new System.Drawing.Point(3, 3);
+            this.pbactorPalette.Name = "pbactorPalette";
+            this.pbactorPalette.Size = new System.Drawing.Size(180, 325);
+            this.pbactorPalette.TabIndex = 2;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.pbresourcePalette);
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(186, 331);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "Resources";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // pbresourcePalette
+            // 
+            this.pbresourcePalette.AutoScroll = true;
+            this.pbresourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbresourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbresourcePalette.Location = new System.Drawing.Point(0, 0);
+            this.pbresourcePalette.Name = "pbresourcePalette";
+            this.pbresourcePalette.Size = new System.Drawing.Size(186, 331);
+            this.pbresourcePalette.TabIndex = 3;
+            // 
+            // PaletteBox
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(194, 378);
+            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.LayerBox);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "PaletteBox";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Palette Box";
+            this.TopMost = true;
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            this.tabPage3.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public System.Windows.Forms.ComboBox LayerBox;
+        public System.Windows.Forms.TabControl tabControl1;
+        public System.Windows.Forms.TabPage tabPage1;
+        public System.Windows.Forms.FlowLayoutPanel pbtilePalette;
+        public System.Windows.Forms.TabPage tabPage2;
+        public System.Windows.Forms.FlowLayoutPanel pbactorPalette;
+        public System.Windows.Forms.TabPage tabPage3;
+        public System.Windows.Forms.FlowLayoutPanel pbresourcePalette;
+
+    }
+}
--- a/OpenRA.Editor/PaletteBox.cs
+++ b/OpenRA.Editor/PaletteBox.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+    public partial class PaletteBox : Form
+    {
+        public PaletteBox()
+        {
+            InitializeComponent();
+        }
+    }
+}
--- a/OpenRA.Editor/PaletteBox.resx
+++ b/OpenRA.Editor/PaletteBox.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/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/RenderUtils.cs
+++ b/OpenRA.Editor/RenderUtils.cs
@@ -0,0 +1,136 @@
+#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 System.Drawing.Imaging;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	static class RenderUtils
+	{
+		public static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
+		{
+			var template = ts.Templates[n];
+			var tile = ts.Tiles[n];
+
+			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * 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 < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = p.GetColor(rawImage[i + ts.TileSize * j]).ToArgb();
+						}
+						else
+						{
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = Color.Transparent.ToArgb();
+						}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		static Bitmap RenderShp(ShpReader shp, Palette p)
+		{
+			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 stride2 = data.Stride >> 2;
+
+				for (var i = 0; i < shp.Width; i++)
+					for (var j = 0; j < shp.Height; j++)
+						q[j * stride2 + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		public 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 bitmap = RenderShp(shp, p);
+
+				try
+				{
+					using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
+					{
+						var shp2 = new ShpReader(s2);
+						var roofBitmap = RenderShp(shp2, p);
+
+						using (var g = System.Drawing.Graphics.FromImage(bitmap))
+							g.DrawImage(roofBitmap, 0, 0);
+					}
+				}
+				catch { }
+
+				return new ActorTemplate { Bitmap = bitmap, Info = info, Centered = !info.Traits.Contains<BuildingInfo>() };
+			}
+		}
+
+		public 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 };
+			}
+		}
+	}
+}
--- 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,517 @@
+#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;
+
+		float Zoom = 1.0f;
+
+		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 OnMouseWheel(MouseEventArgs e)
+		{
+			base.OnMouseWheel(e);
+
+			Zoom *= e.Delta > 0 ? 4.0f / 3.0f : .75f;
+
+			Invalidate();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			this.Parent.Focus();
+
+			Invalidate();
+		}
+
+		protected override void OnMouseEnter(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			this.Focus();
+
+			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()
+		{
+			// Crash preventing
+			var BrushLocation = GetBrushLocation();
+
+			if (Map == null || BrushLocation.X >= Map.MapSize.X ||
+				BrushLocation.Y >= Map.MapSize.Y ||
+				BrushLocation.X < 0 ||
+				BrushLocation.Y < 0)
+				return;
+
+			Actor = null;
+			Brush = null;
+			Resource = null;
+			Waypoint = null;
+
+			var key = Map.Actors.FirstOrDefault(a => a.Value.Location() == BrushLocation);
+			if (key.Key != null) Map.Actors.Remove(key.Key);
+
+			if (Map.MapResources[BrushLocation.X, BrushLocation.Y].type != 0)
+			{
+				Map.MapResources[BrushLocation.X, BrushLocation.Y] = new TileReference<byte, byte>();
+				var ch = new int2((BrushLocation.X) / ChunkSize, (BrushLocation.Y) / ChunkSize);
+				if (Chunks.ContainsKey(ch))
+				{
+					Chunks[ch].Dispose();
+					Chunks.Remove(ch);
+				}
+			}
+
+			var k = Map.Waypoints.FirstOrDefault(a => a.Value == BrushLocation);
+			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 * TileSet.TileSize, ChunkSize * TileSet.TileSize);
+			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 < TileSet.TileSize; x++)
+							for (var y = 0; y < TileSet.TileSize; y++)
+								p[(j * TileSet.TileSize + y) * stride + i * TileSet.TileSize + x] = Palette.GetColor(rawImage[x + TileSet.TileSize * 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 < TileSet.TileSize; x++)
+								for (var y = 0; y < TileSet.TileSize; y++)
+								{
+									var c = q[y * srcstride + x];
+									if ((c & 0xff000000) != 0)	/* quick & dirty, i cbf doing real alpha */
+										p[(j * TileSet.TileSize + y) * stride + i * TileSet.TileSize + x] = c;
+								}
+
+							resourceImage.UnlockBits(srcdata);
+						}
+					}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		int2 GetBrushLocation()
+		{
+			var vX = (int)Math.Floor((MousePos.X - Offset.X) / Zoom);
+			var vY = (int)Math.Floor((MousePos.Y - Offset.Y) / Zoom);
+			return new int2(vX / TileSet.TileSize, vY / TileSet.TileSize);
+		}
+
+		void DrawActor(System.Drawing.Graphics g, int2 p, ActorTemplate t)
+		{
+			float OffsetX = t.Centered ? t.Bitmap.Width / 2 - TileSet.TileSize/2 : 0;
+			float DrawX = TileSet.TileSize * p.X * Zoom + Offset.X - OffsetX;
+
+			float OffsetY = t.Centered ? t.Bitmap.Height / 2 - TileSet.TileSize/2 : 0;
+			float DrawY = TileSet.TileSize * p.Y * Zoom + Offset.Y - OffsetY;
+
+			float width = t.Bitmap.Width * Zoom;
+			float height = t.Bitmap.Height * Zoom;
+			RectangleF sourceRect = new RectangleF(0, 0, t.Bitmap.Width, t.Bitmap.Height);
+			RectangleF destRect = new RectangleF(DrawX, DrawY, width, height);
+			g.DrawImage(t.Bitmap, destRect, sourceRect, GraphicsUnit.Pixel);
+		}
+
+		void DrawImage(System.Drawing.Graphics g, Bitmap bmp, int2 location)
+		{
+			float OffsetX = bmp.Width / 2 - TileSet.TileSize / 2;
+			float DrawX = TileSet.TileSize * location.X * Zoom + Offset.X - OffsetX;
+
+			float OffsetY = bmp.Height / 2 - TileSet.TileSize / 2;
+			float DrawY = TileSet.TileSize * location.Y * Zoom + Offset.Y - OffsetY;
+
+			float width = bmp.Width * Zoom;
+			float height = bmp.Height * Zoom;
+			RectangleF sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
+			RectangleF destRect = new RectangleF(DrawX, DrawY, width, height);
+			g.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
+		}
+
+		void DrawActorBorder(System.Drawing.Graphics g, int2 p, ActorTemplate t)
+		{
+			float OffsetX = t.Centered ? t.Bitmap.Width / 2 - TileSet.TileSize / 2 : 0;
+			float DrawX = TileSet.TileSize * p.X * Zoom + Offset.X - OffsetX;
+
+			float OffsetY = t.Centered ? t.Bitmap.Height / 2 - TileSet.TileSize / 2 : 0;
+			float DrawY = TileSet.TileSize * p.Y * Zoom + Offset.Y - OffsetY;
+
+			g.DrawRectangle(CordonPen,
+				DrawX, DrawY,
+				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);
+		}
+
+		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);
+
+					Bitmap bmp = Chunks[x];
+
+					float DrawX = TileSet.TileSize* 1f * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
+					float DrawY = TileSet.TileSize * 1f * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
+					RectangleF sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
+					RectangleF destRect = new RectangleF(DrawX, DrawY, bmp.Width * Zoom, bmp.Height * Zoom);
+					e.Graphics.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
+				}
+
+			e.Graphics.DrawRectangle(CordonPen,
+				Map.XOffset * TileSet.TileSize * Zoom + Offset.X,
+				Map.YOffset * TileSet.TileSize * Zoom + Offset.Y,
+				Map.Width * TileSet.TileSize * Zoom,
+				Map.Height * TileSet.TileSize * Zoom);
+
+			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,
+					TileSet.TileSize * wp.Value.X * Zoom + Offset.X + 4,
+					TileSet.TileSize * wp.Value.Y * Zoom + Offset.Y + 4,
+					(TileSet.TileSize - 8) * Zoom, (TileSet.TileSize - 8) * Zoom);
+
+			if (Brush != null)
+				e.Graphics.DrawImage(Brush.Bitmap,
+					TileSet.TileSize * GetBrushLocation().X * Zoom + Offset.X,
+					TileSet.TileSize * GetBrushLocation().Y * Zoom + Offset.Y,
+					Brush.Bitmap.Width * Zoom,
+					Brush.Bitmap.Height * Zoom);
+
+			if (Actor != null)
+				DrawActor(e.Graphics, GetBrushLocation(), Actor);
+
+			if (Resource != null)
+				DrawImage(e.Graphics, Resource.Bitmap, GetBrushLocation());
+
+			if (Waypoint != null)
+				e.Graphics.DrawRectangle(Pens.LimeGreen,
+					TileSet.TileSize * GetBrushLocation().X * Zoom + Offset.X + 4,
+					TileSet.TileSize * GetBrushLocation().Y * Zoom + Offset.Y + 4,
+					(TileSet.TileSize - 8) * Zoom, (TileSet.TileSize - 8) * Zoom);
+
+			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,45 @@
+#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; }
+		
+		public bool Exists(string filename)
+		{
+			return hashes.Contains(PackageEntry.HashFilename(filename));
+		}
+	}
+}
--- a/OpenRA.Game/Support/Evaluator.cs
+++ b/OpenRA.Game/Support/Evaluator.cs
@@ -1,109 +1,107 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA.Support
-{
-	public static class Evaluator
-	{
-		public static int Evaluate(string expr)
-		{
-			return Evaluate(expr, new Dictionary<string, int>());
-		}
-
-		public static int Evaluate(string expr, Dictionary<string, int> syms)
-		{
-			var toks = Tokens(expr, "+-*/()");
-			var postfix = ToPostfix(toks, syms);
-
-			var s = new Stack<int>();
-
-			foreach (var t in postfix)
-			{
-				switch (t[0])
-				{
-					case '+': ApplyBinop(s, (x, y) => y + x); break;
-					case '-': ApplyBinop(s, (x, y) => y - x); break;
-					case '*': ApplyBinop(s, (x, y) => y * x); break;
-					case '/': ApplyBinop(s, (x, y) => y / x); break;
-					default: s.Push(Exts.ParseIntegerInvariant(t)); break;
-				}
-			}
-
-			return s.Pop();
-		}
-
-		static void ApplyBinop(Stack<int> s, Func<int, int, int> f)
-		{
-			var x = s.Pop();
-			var y = s.Pop();
-			s.Push(f(x, y));
-		}
-
-		static IEnumerable<string> ToPostfix(IEnumerable<string> toks, Dictionary<string, int> syms)
-		{
-			var s = new Stack<string>();
-			foreach (var t in toks)
-			{
-				if (t[0] == '(') s.Push(t);
-				else if (t[0] == ')')
-				{
-					var temp = "";
-					while ((temp = s.Pop()) != "(") yield return temp;
-				}
-				else if (char.IsNumber(t[0])) yield return t;
-				else if (char.IsLetter(t[0]))
-				{
-					if (!syms.ContainsKey(t))
-						throw new InvalidOperationException("Substitution `{0}` undefined".F(t));
-
-					yield return syms[t].ToString();
-				}
-				else
-				{
-					while (s.Count > 0 && Prec[t] <= Prec[s.Peek()]) yield return s.Pop();
-					s.Push(t);
-				}
-			}
-
-			while (s.Count > 0) yield return s.Pop();
-		}
-
-		static readonly Dictionary<string, int> Prec
-			= new Dictionary<string, int> { { "+", 0 }, { "-", 0 }, { "*", 1 }, { "/", 1 }, { "(", -1 } };
-
-		static IEnumerable<string> Tokens(string expr, string ops)
-		{
-			var s = "";
-			foreach (var c in expr)
-			{
-				if (char.IsWhiteSpace(c))
-				{
-					if (s != "") yield return s;
-					s = "";
-				}
-				else if (ops.Contains(c))
-				{
-					if (s != "") yield return s;
-					s = "";
-					yield return "" + c;
-				}
-				else
-					s += c;
-			}
-
-			if (s != "") yield return s;
-		}
-	}
-}
+#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;
+
+namespace OpenRA.FileFormats
+{
+	public static class Evaluator
+	{
+		public static int Evaluate(string expr)
+		{
+			return Evaluate(expr, new Dictionary<string, int>());
+		}
+
+		public static int Evaluate(string expr, Dictionary<string, int> syms)
+		{
+			var toks = Tokens(expr, "+-*/()");
+			var postfix = ToPostfix(toks, syms);
+
+			var s = new Stack<int>();
+
+			foreach (var t in postfix)
+			{
+				switch (t[0])
+				{
+					case '+': ApplyBinop(s, (x, y) => y + x); break;
+					case '-': ApplyBinop(s, (x, y) => y - x); break;
+					case '*': ApplyBinop(s, (x, y) => y * x); break;
+					case '/': ApplyBinop(s, (x, y) => y / x); break;
+					default: s.Push(int.Parse(t)); break;
+				}
+			}
+			return s.Pop();
+		}
+
+		static void ApplyBinop( Stack<int> s, Func<int,int,int> f )
+		{
+			var x = s.Pop();
+			var y = s.Pop();
+			s.Push( f(x,y) );
+		}
+
+		static IEnumerable<string> ToPostfix(IEnumerable<string> toks, Dictionary<string, int> syms)
+		{
+			var s = new Stack<string>();
+			foreach (var t in toks)
+			{
+				if (t[0] == '(') s.Push(t);
+				else if (t[0] == ')')
+				{
+					var temp = "";
+					while ((temp = s.Pop()) != "(") yield return temp;
+				}
+				else if (char.IsNumber(t[0])) yield return t;
+				else if (char.IsLetter(t[0])) 
+				{
+					if (!syms.ContainsKey(t))
+						throw new InvalidOperationException("Substitution `{0}` undefined".F(t));
+					    
+					yield return syms[t].ToString();;
+				}
+				else
+				{
+					while (s.Count > 0 && Prec[t] <= Prec[s.Peek()]) yield return s.Pop();
+					s.Push(t);
+				}
+			}
+			
+			while (s.Count > 0) yield return s.Pop();
+		}
+
+		static readonly Dictionary<string, int> Prec
+			= new Dictionary<string, int> { { "+", 0 }, { "-", 0 }, { "*", 1 }, { "/", 1 }, { "(", -1 } };
+
+		static IEnumerable<string> Tokens(string expr, string ops)
+		{
+			var s = "";
+			foreach (var c in expr)
+			{
+				if (char.IsWhiteSpace(c))
+				{
+					if (s != "") yield return s;
+					s = "";
+				}
+				else if (ops.Contains(c))
+				{
+					if (s != "") yield return s;
+					s = "";
+					yield return "" + c;
+				}
+				else
+					s += c;
+			}
+
+			if (s != "") yield return s;
+		}
+	}
+}
--- a/OpenRA.FileFormats/Exts.cs
+++ b/OpenRA.FileFormats/Exts.cs
@@ -0,0 +1,99 @@
+#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.Reflection;
+
+namespace OpenRA
+{
+	public static class Exts
+	{
+		public static string F(this string fmt, params object[] args)
+		{
+			return string.Format(fmt, args);
+		}
+
+		public static void Do<T>( this IEnumerable<T> e, Action<T> fn )
+		{
+			foreach( var ee in e )
+				fn( ee );
+		}
+
+		public static IEnumerable<string> GetNamespaces(this Assembly a)
+		{
+			return a.GetTypes().Select(t => t.Namespace).Distinct().Where(n => n != null);
+		}
+
+		public static string ReadAllText(this Stream s)
+		{
+			using (s)
+			using (var sr = new StreamReader(s))
+				return sr.ReadToEnd();
+		}
+
+		public static byte[] ReadAllBytes(this Stream s)
+		{
+			using (s)
+			{
+				var data = new byte[s.Length - s.Position];
+				s.Read(data, 0, data.Length);
+				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;
+		}
+
+		public static T[] GetCustomAttributes<T>( this MemberInfo mi, bool inherit )
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes( typeof( T ), inherit );
+		}
+
+		public static T[] GetCustomAttributes<T>( this ParameterInfo mi )
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes( typeof( T ), true );
+		}
+
+		public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
+		{
+			if (val.CompareTo(min) < 0)
+				return min;
+			else if (val.CompareTo(max) > 0)
+				return max;
+			else
+				return val;
+		}
+	}
+}
--- a/OpenRA.FileFormats/FieldLoader.cs
+++ b/OpenRA.FileFormats/FieldLoader.cs
@@ -0,0 +1,280 @@
+#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.Linq;
+using System.Reflection;
+using System.Globalization;
+
+namespace OpenRA.FileFormats
+{
+	public static class FieldLoader
+	{
+		public static Func<string,Type,string,object> InvalidValueAction = (s,t,f) =>
+		{
+			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 )
+		{
+			var loadDict = typeLoadInfo[ self.GetType() ];
+
+			foreach( var kv in loadDict )
+			{
+				object val;
+				if( kv.Value != null )
+					val = kv.Value( kv.Key.Name, kv.Key.FieldType, my );
+				else if( !TryGetValueFromYaml( kv.Key.Name, kv.Key.FieldType, my, out val ) )
+					continue;
+
+				kv.Key.SetValue( self, val );
+			}
+		}
+
+		static bool TryGetValueFromYaml( string fieldName, Type fieldType, MiniYaml yaml, out object ret )
+		{
+			ret = null;
+			var n = yaml.Nodes.Where( x=>x.Key == fieldName ).ToList();
+			if( n.Count == 0 )
+				return false;
+			if( n.Count == 1 && n[ 0 ].Value.Nodes.Count == 0 )
+			{
+				ret = GetValue( fieldName, fieldType, n[ 0 ].Value.Value );
+				return true;
+			}
+			throw new InvalidOperationException( "TryGetValueFromYaml: unable to load field {0} (of type {1})".F( fieldName, fieldType ) );
+		}
+
+		public static T Load<T>(MiniYaml y) where T : new()
+		{
+			var t = new T();
+			Load(t, y);
+			return t;
+		}
+
+		public static void LoadField( object self, string key, string value )
+		{
+			var field = self.GetType().GetField( key.Trim() );
+
+			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 ) )
+			{
+				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))
+			{
+				float res;
+				if (float.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, 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]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255));
+				if (parts.Length == 4)
+					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255), int.Parse(parts[3]).Clamp(0, 255));
+				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, fieldType, field);
+
+			else if (fieldType.IsArray)
+			{
+				if (x == null)
+					return Array.CreateInstance(fieldType.GetElementType(), 0);
+
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
+				for (int i = 0; i < parts.Length; i++)
+					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
+				return ret;
+			}
+			else if (fieldType == typeof(int2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
+			}
+			else if (fieldType == typeof(float2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				float xx = 0;
+				float yy = 0;
+				float res;
+				if (float.TryParse(parts[0].Replace("%",""), out res))
+					xx = res * (parts[0].Contains( '%' ) ? 0.01f : 1f);
+				if (float.TryParse(parts[1].Replace("%",""), out res))
+					yy = res * (parts[1].Contains( '%' ) ? 0.01f : 1f);
+				return new float2(xx,yy);
+			}
+
+			UnknownFieldAction("[Type] {0}".F(x),fieldType);
+			return null;
+		}
+
+		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;
+			return InvalidValueAction(p,fieldType, field);
+		}
+
+		static Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>> typeLoadInfo = new Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>>( GetTypeLoadInfo );
+
+		static Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>> GetTypeLoadInfo( Type type )
+		{
+			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
+
+			foreach( var ff in type.GetFields() )
+			{
+				var field = ff;
+				var load = field.GetCustomAttributes<LoadAttribute>( false );
+				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>( false );
+				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>( false );
+				if( loadUsing.Length != 0 )
+					ret[ field ] = ( _1, fieldType, yaml ) => loadUsing[ 0 ].LoaderFunc( field )( yaml );
+				else if( fromYamlKey.Length != 0 )
+					ret[ field ] = ( f, ft, yaml ) => GetValue( f, ft, yaml.Value );
+				else if( load.Length != 0 )
+					ret[ field ] = null;
+			}
+
+			if( ret.Count == 0 )
+				foreach( var f in type.GetFields() )
+					ret.Add( f, null );
+
+			return ret;
+		}
+
+		[AttributeUsage( AttributeTargets.Field )]
+		public class LoadAttribute : Attribute { }
+
+		[AttributeUsage( AttributeTargets.Field )]
+		public class LoadUsingAttribute : Attribute
+		{
+			Func<MiniYaml, object> loaderFuncCache;
+			public readonly string Loader;
+
+			public LoadUsingAttribute( string loader )
+			{
+				Loader = loader;
+			}
+
+			internal Func<MiniYaml, object> LoaderFunc( FieldInfo field )
+			{
+				const BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
+				if( loaderFuncCache == null )
+					loaderFuncCache = (Func<MiniYaml, object>)Delegate.CreateDelegate( typeof( Func<MiniYaml, object> ), field.DeclaringType.GetMethod( Loader, bf ) );
+				return loaderFuncCache;
+			}
+		}
+	}
+
+	public static class FieldSaver
+	{
+		public static MiniYaml Save(object o)
+		{
+			var nodes = new List<MiniYamlNode>();
+			string root = null;
+
+			foreach( var f in o.GetType().GetFields( BindingFlags.Public | BindingFlags.Instance ) )
+			{
+				if( f.HasAttribute<FieldFromYamlKeyAttribute>() )
+					root = FormatValue( o, f );
+				else
+					nodes.Add( new MiniYamlNode( f.Name, FormatValue( o, f ) ) );
+			}
+
+			return new MiniYaml( root, nodes );
+		}
+
+		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.Select( f => new MiniYamlNode(
+					f.Name,
+					FormatValue( o, f ) ) ).ToList() );
+		}
+
+		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(((int)c.A).Clamp(0, 255),
+					((int)c.R).Clamp(0, 255),
+					((int)c.G).Clamp(0, 255),
+					((int)c.B).Clamp(0, 255));
+			}
+
+			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
@@ -0,0 +1,155 @@
+#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.IO;
+
+namespace OpenRA.FileFormats
+{
+	[Flags]
+	enum SoundFlags
+	{
+		Stereo = 0x1,
+		_16Bit = 0x2,
+	}
+
+	enum SoundFormat
+	{
+		WestwoodCompressed = 1,
+		ImaAdpcm = 99,
+	}
+
+	struct Chunk
+	{
+		public int CompressedSize;
+		public int OutputSize;
+
+		public static Chunk Read(BinaryReader r)
+		{
+			Chunk c;
+			c.CompressedSize = r.ReadUInt16();
+			c.OutputSize = r.ReadUInt16();
+			if (0xdeaf != r.ReadUInt32())
+				throw new InvalidDataException("Chunk header is bogus");
+			return c;
+		}
+	}
+
+	public static class AudLoader
+	{
+		static int[] IndexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
+		static int[] StepTable = {
+									7,     8,     9,     10,    11,    12,     13,    14,    16,
+									17,    19,    21,    23,    25,    28,     31,    34,    37,
+									41,    45,    50,    55,    60,    66,     73,    80,    88,
+									97,    107,   118,   130,   143,   157,    173,   190,   209,
+									230,   253,   279,   307,   337,   371,    408,   449,   494,
+									544,   598,   658,   724,   796,   876,    963,   1060,  1166,
+									1282,  1411,  1552,  1707,  1878,  2066,   2272,  2499,  2749,
+									3024,  3327,  3660,  4026,  4428,  4871,   5358,  5894,  6484,
+									7132,  7845,  8630,  9493,  10442, 11487,  12635, 13899, 15289,
+									16818, 18500, 20350, 22385, 24623, 27086,  29794, 32767 };
+
+		static short DecodeSample(byte b, ref int index, ref int current)
+		{
+			var sb = (b & 8) != 0;
+			b &= 7;
+
+			var delta = (StepTable[index] * b) / 4 + StepTable[index] / 8;
+			if (sb) delta = -delta;
+
+			current += delta;
+			if (current > short.MaxValue) current = short.MaxValue;
+			if (current < short.MinValue) current = short.MinValue;
+
+			index += IndexAdjust[b];
+			if (index < 0) index = 0;
+			if (index > 88) index = 88;
+
+			return (short)current;
+		}
+
+		public static byte[] LoadSound(byte[] raw, ref int index)
+		{
+			var br = new BinaryReader(new MemoryStream(raw));
+			var dataSize = raw.Length;
+			var outputSize = raw.Length * 4;
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var currentSample = 0;
+
+			while (dataSize-- > 0)
+			{
+				var b = br.ReadByte();
+
+				var t = DecodeSample(b, ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+
+				t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+			}
+
+			return output;
+		}
+
+		public static float SoundLength(Stream s)
+		{
+			var br = new BinaryReader(s);
+			var sampleRate = br.ReadUInt16();
+			/*var dataSize = */ br.ReadInt32();
+			var outputSize = br.ReadInt32();
+			var flags = (SoundFlags) br.ReadByte();
+			
+			var samples = outputSize;
+			if (0 != (flags & SoundFlags.Stereo)) samples /= 2;
+			if (0 != (flags & SoundFlags._16Bit)) samples /= 2;
+			return samples / sampleRate;
+		}
+		
+		public static byte[] LoadSound(Stream s)
+		{
+			var br = new BinaryReader(s);
+			/*var sampleRate =*/ br.ReadUInt16();
+			var dataSize = br.ReadInt32();
+			var outputSize = br.ReadInt32();
+			/*var flags = (SoundFlags)*/ br.ReadByte();
+			/*var format = (SoundFormat)*/ br.ReadByte();
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var index = 0;
+			var currentSample = 0;
+
+			while (dataSize > 0)
+			{
+				var chunk = Chunk.Read(br);
+				for (int n = 0; n < chunk.CompressedSize; n++)
+				{
+					var b = br.ReadByte();
+
+					var t = DecodeSample(b, ref index, ref currentSample);
+					output[offset++] = (byte)t;
+					output[offset++] = (byte)(t >> 8);
+		
+					t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+					output[offset++] = (byte)t;
+					output[offset++] = (byte)(t >> 8);
+				}
+
+				dataSize -= 8 + chunk.CompressedSize;
+			}
+
+			return output;
+		}
+	}
+}
--- a/OpenRA.FileFormats/FileFormats/Blowfish.cs
+++ b/OpenRA.FileFormats/FileFormats/Blowfish.cs
@@ -1,408 +1,406 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-namespace OpenRA.Mods.Cnc.FileFormats
-{
-	class Blowfish
-	{
-		public Blowfish(byte[] key)
-		{
-			for (int i = 0, j = 0; i < 18; ++i)
-			{
-				uint a = key[j++ % key.Length];
-				uint b = key[j++ % key.Length];
-				uint c = key[j++ % key.Length];
-				uint d = key[j++ % key.Length];
-
-				lookupMfromP[i] ^= a << 24 | b << 16 | c << 8 | d;
-			}
-
-			uint l = 0, r = 0;
-
-			for (var i = 0; i < 18;)
-			{
-				Encrypt(ref l, ref r);
-				lookupMfromP[i++] = l;
-				lookupMfromP[i++] = r;
-			}
-
-			for (var i = 0; i < 4; ++i)
-				for (var j = 0; j < 256;)
-				{
-					Encrypt(ref l, ref r);
-					lookupMfromS[i, j++] = l;
-					lookupMfromS[i, j++] = r;
-				}
-		}
-
-		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
-		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
-
-		delegate void CipherFunc(ref uint a, ref uint b);
-
-		static uint[] RunCipher(uint[] data, CipherFunc f)
-		{
-			var result = new uint[data.Length];
-
-			var size = data.Length / 2;
-			var i = 0;
-			while (size-- > 0)
-			{
-				var a = SwapBytes(data[i]);
-				var b = SwapBytes(data[i + 1]);
-
-				f(ref a, ref b);
-
-				result[i++] = SwapBytes(a);
-				result[i++] = SwapBytes(b);
-			}
-
-			return result;
-		}
-
-		void Encrypt(ref uint a, ref uint b)
-		{
-			uint tempA = a, tempB = b;
-			tempA ^= lookupMfromP[0];
-
-			var x = false;
-			for (var i = 1; i <= 16; i++, x ^= true)
-			{
-				if (x)
-					Round(ref tempA, tempB, i);
-				else
-					Round(ref tempB, tempA, i);
-			}
-
-			tempB ^= lookupMfromP[17];
-
-			a = tempB;
-			b = tempA;
-		}
-
-		void Decrypt(ref uint a, ref uint b)
-		{
-			uint tempA = a, tempB = b;
-			tempA ^= lookupMfromP[17];
-
-			var x = false;
-			for (var i = 16; i >= 1; i--, x ^= true)
-			{
-				if (x)
-					Round(ref tempA, tempB, i);
-				else
-					Round(ref tempB, tempA, i);
-			}
-
-			tempB ^= lookupMfromP[0];
-
-			a = tempB;
-			b = tempA;
-		}
-
-		uint S(uint x, int i)
-		{
-			return lookupMfromS[i, (x >> ((3 - i) << 3)) & 0xff];
-		}
-
-		uint ConvertBFtoF(uint x)
-		{
-			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
-		}
-
-		void Round(ref uint a, uint b, int n)
-		{
-			a ^= ConvertBFtoF(b) ^ lookupMfromP[n];
-		}
-
-		static uint SwapBytes(uint i)
-		{
-			i = (i << 16) | (i >> 16);
-			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);
-			return i;
-		}
-
-		uint[] lookupMfromP = new uint[] {
-			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-			0x9216d5d9, 0x8979fb1b
-		};
-
-		uint[,] lookupMfromS = new uint[,] {
-			{
-				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-				0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-			},
-			{
-				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-				0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-			},
-			{
-				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-				0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-			},
-			{
-				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-			}
-		};
-	}
-}
+#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
+{
+	class Blowfish
+	{
+		public Blowfish(byte[] key)
+		{
+			for (int i = 0, j = 0; i < 18; ++i)
+			{
+				uint a = key[j++ % key.Length];
+				uint b = key[j++ % key.Length];
+				uint c = key[j++ % key.Length];
+				uint d = key[j++ % key.Length];
+
+				m_p[i] ^= a << 24 | b << 16 | c << 8 | d;
+			}
+
+			uint l = 0, r = 0;
+
+			for (int i = 0; i < 18; )
+			{
+				Encrypt(ref l, ref r);
+				m_p[i++] = l;
+				m_p[i++] = r;
+			}
+
+			for (int i = 0; i < 4; ++i)
+				for (int j = 0; j < 256; )
+				{
+					Encrypt(ref l, ref r);
+					m_s[i, j++] = l;
+					m_s[i, j++] = r;
+				}
+		}
+
+		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
+		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
+
+		delegate void CipherFunc( ref uint a, ref uint b );
+
+		uint[] RunCipher(uint[] data, CipherFunc f)
+		{
+			uint[] result = new uint[data.Length];
+
+			int size = data.Length / 2;
+			int i = 0;
+			while (size-- > 0)
+			{
+				uint a = SwapBytes(data[i]);
+				uint b = SwapBytes(data[i+1]);
+
+				f(ref a, ref b);
+
+				result[i++] = SwapBytes(a);
+				result[i++] = SwapBytes(b);
+			}
+
+			return result;
+		}
+
+		void Encrypt(ref uint a, ref uint b)
+		{
+			uint _a = a, _b = b;
+			_a ^= m_p[0];
+
+			bool x = false;
+			for( int i = 1; i <= 16; i++, x ^= true)
+			{
+				if (x)
+					Round(ref _a, _b, i);
+				else
+					Round(ref _b, _a, i);
+			}
+			_b ^= m_p[17];
+
+			a = _b;
+			b = _a;
+		}
+
+		void Decrypt(ref uint a, ref uint b)
+		{
+			uint _a = a, _b = b;
+			_a ^= m_p[17];
+
+			bool x = false;
+			for (int i = 16; i >= 1; i--, x ^= true)
+			{
+				if (x)
+					Round(ref _a, _b, i);
+				else
+					Round(ref _b, _a, i);
+			}
+			_b ^= m_p[0];
+
+			a = _b;
+			b = _a;
+		}
+
+		uint S(uint x, int i)
+		{
+			return m_s[i, (x >> ((3 - i) << 3)) & 0xff];
+		}
+
+		uint bf_f(uint x)
+		{
+			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
+		}
+
+		void Round(ref uint a, uint b, int n)
+		{
+			a ^= bf_f(b) ^ m_p[n];
+		}
+
+		uint SwapBytes(uint i)
+		{
+			i = (i << 16) | (i >> 16);
+			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);
+			return i;
+		}
+
+		uint[] m_p = new uint[] {
+			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+			0x9216d5d9, 0x8979fb1b
+		};
+
+		uint[,] m_s = new uint[,] {
+			{
+				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+				0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+			},
+			{
+				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+				0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+			},
+			{
+				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+				0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+			},
+			{
+				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+			}
+
+		};
+	}
+}
--- a/OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs
+++ b/OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs
@@ -0,0 +1,528 @@
+#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.Linq;
+
+namespace OpenRA.FileFormats
+{
+    /* possibly the fugliest C# i've ever seen. */
+
+    class BlowfishKeyProvider
+    {
+        const string pubkeyStr = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
+
+        static sbyte[] char2num = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
+    -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+    -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+
+        class PublicKey
+        {
+            public uint[] key1 = new uint[64];
+            public uint[] key2 = new uint[64];
+            public uint len;
+        }
+        PublicKey pubkey = new PublicKey();
+
+        uint[] glob1 = new uint[64];
+        uint glob1_bitlen, glob1_len_x2;
+        uint[] glob2 = new uint[130];
+        uint[] glob1_hi = new uint[4];
+        uint[] glob1_hi_inv = new uint[4];
+        uint glob1_hi_bitlen;
+        uint glob1_hi_inv_lo, glob1_hi_inv_hi;
+
+        void init_bignum(uint[] n, uint val, uint len)
+        {
+            for (int i = 0; i < len; i++) n[i] = 0;
+            n[0] = val;
+        }
+
+        void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
+        {
+            byte sign;
+
+            if ((key[0] & 0x80) != 0) sign = 0xff;
+            else sign = 0;
+
+            unsafe
+            {
+                fixed (uint* _pn = &n[0])
+                {
+                    byte* pn = (byte*)_pn;
+                    uint i = blen * 4;
+                    for (; i > klen; i--) pn[i - 1] = (byte)sign;
+                    for (; i > 0; i--) pn[i - 1] = key[klen - i];
+                }
+            }
+        }
+
+        void key_to_bignum(uint[] n, byte[] key, uint len)
+        {
+            uint keylen;
+            int i;
+
+            int j = 0;
+
+            if (key[j] != 2) return;
+            j++;
+
+            if ((key[j] & 0x80) != 0)
+            {
+                keylen = 0;
+                for (i = 0; i < (key[j] & 0x7f); i++) keylen = (keylen << 8) | key[j + i + 1];
+                j += (key[j] & 0x7f) + 1;
+            }
+            else
+            {
+                keylen = key[j];
+                j++;
+            }
+            if (keylen <= len * 4)
+                move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
+        }
+
+        uint len_bignum(uint[] n, uint len)
+        {
+            uint i;
+            i = len - 1;
+            while ((i >= 0) && (n[i] == 0)) i--;
+            return i + 1;
+        }
+
+        uint bitlen_bignum(uint[] n, uint len)
+        {
+            uint ddlen, bitlen, mask;
+            ddlen = len_bignum(n, len);
+            if (ddlen == 0) return 0;
+            bitlen = ddlen * 32;
+            mask = 0x80000000;
+            while ((mask & n[ddlen - 1]) == 0)
+            {
+                mask >>= 1;
+                bitlen--;
+            }
+            return bitlen;
+        }
+
+        void init_pubkey()
+        {
+            int i = 0;
+            uint i2, tmp;
+            byte[] keytmp = new byte[256];
+
+            init_bignum(pubkey.key2, 0x10001, 64);
+
+            i2 = 0;
+            while (i < pubkeyStr.Length)
+            {
+                tmp = (uint)char2num[pubkeyStr[i++]];
+                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+                keytmp[i2++] = (byte)((tmp >> 16) & 0xff);
+                keytmp[i2++] = (byte)((tmp >> 8) & 0xff);
+                keytmp[i2++] = (byte)(tmp & 0xff);
+            }
+
+            key_to_bignum(pubkey.key1, keytmp, 64);
+            pubkey.len = bitlen_bignum(pubkey.key1, 64) - 1;
+        }
+
+        uint len_predata()
+        {
+            uint a = (pubkey.len - 1) / 8;
+            return (55 / a + 1) * (a + 1);
+        }
+
+        int cmp_bignum(uint[] n1, uint[] n2, uint len)
+        {
+
+            while (len > 0)
+            {
+                --len;
+                if (n1[len] < n2[len]) return -1;
+                if (n1[len] > n2[len]) return 1;
+            }
+            return 0;
+        }
+
+        void mov_bignum(uint[] dest, uint[] src, uint len)
+        {
+            Array.Copy(src, dest, len);
+        }
+
+        void shr_bignum(uint[] n, int bits, int len)
+        {
+            int i; int i2 = bits / 32;
+
+            if (i2 > 0)
+            {
+                for (i = 0; i < len - i2; i++) n[i] = n[i + i2];
+                for (; i < len; i++) n[i] = 0;
+                bits = bits % 32;
+            }
+            if (bits == 0) return;
+            for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 -
+          bits));
+            n[i] = n[i] >> bits;
+        }
+
+        void shl_bignum(uint[] n, int bits, int len)
+        {
+            int i, i2;
+
+            i2 = bits / 32;
+            if (i2 > 0)
+            {
+                for (i = len - 1; i > i2; i--) n[i] = n[i - i2];
+                for (; i > 0; i--) n[i] = 0;
+                bits = bits % 32;
+            }
+            if (bits == 0) return;
+            for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 -
+          bits));
+            n[0] <<= bits;
+        }
+
+        uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
+        {
+            uint i1, i2;
+
+            len += len;
+            unsafe
+            {
+                fixed (uint* _ps1 = &src1[0])
+                fixed (uint* _ps2 = &src2[0])
+                fixed (uint* _pd = &dest[0])
+                {
+                    ushort* ps1 = (ushort*)_ps1;
+                    ushort* ps2 = (ushort*)_ps2;
+                    ushort* pd = (ushort*)_pd;
+
+                    while (--len != -1)
+                    {
+                        i1 = *ps1++;
+                        i2 = *ps2++;
+                        *pd++ = (ushort)(i1 - i2 - carry);
+                        if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
+                    }
+                }
+            }
+            return carry;
+        }
+
+        unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
+        {
+            uint i1, i2;
+
+            len += len;
+
+            ushort* ps1 = (ushort*)src1;
+            ushort* ps2 = (ushort*)src2;
+            ushort* pd = (ushort*)dest;
+
+            while (--len != -1)
+            {
+                i1 = *ps1++;
+                i2 = *ps2++;
+                *pd++ = (ushort)(i1 - i2 - carry);
+                if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
+
+            }
+            return carry;
+        }
+
+        void inv_bignum(uint[] n1, uint[] n2, uint len)
+        {
+            uint[] n_tmp = new uint[64];
+            uint n2_bytelen, bit;
+            int n2_bitlen;
+
+            int j = 0;
+
+            init_bignum(n_tmp, 0, len);
+            init_bignum(n1, 0, len);
+            n2_bitlen = (int)bitlen_bignum(n2, len);
+            bit = ((uint)1) << (n2_bitlen % 32);
+            j = ((n2_bitlen + 32) / 32) - 1;
+            n2_bytelen = (uint)((n2_bitlen - 1) / 32) * 4;
+            n_tmp[n2_bytelen / 4] |= ((uint)1) << ((n2_bitlen - 1) & 0x1f);
+
+            while (n2_bitlen > 0)
+            {
+                n2_bitlen--;
+                shl_bignum(n_tmp, 1, (int)len);
+                if (cmp_bignum(n_tmp, n2, len) != -1)
+                {
+                    sub_bignum(n_tmp, n_tmp, n2, 0, (int)len);
+                    n1[j] |= bit;
+                }
+                bit >>= 1;
+                if (bit == 0)
+                {
+                    j--;
+                    bit = 0x80000000;
+                }
+            }
+            init_bignum(n_tmp, 0, len);
+        }
+
+        void inc_bignum(uint[] n, uint len)
+        {
+            int i = 0;
+            while ((++n[i] == 0) && (--len > 0)) i++;
+        }
+
+        void init_two_dw(uint[] n, uint len)
+        {
+            mov_bignum(glob1, n, len);
+            glob1_bitlen = bitlen_bignum(glob1, len);
+            glob1_len_x2 = (glob1_bitlen + 15) / 16;
+            mov_bignum(glob1_hi, glob1.Skip((int)len_bignum(glob1, len) - 2).ToArray(), 2);
+            glob1_hi_bitlen = bitlen_bignum(glob1_hi, 2) - 32;
+            shr_bignum(glob1_hi, (int)glob1_hi_bitlen, 2);
+            inv_bignum(glob1_hi_inv, glob1_hi, 2);
+            shr_bignum(glob1_hi_inv, 1, 2);
+            glob1_hi_bitlen = (glob1_hi_bitlen + 15) % 16 + 1;
+            inc_bignum(glob1_hi_inv, 2);
+            if (bitlen_bignum(glob1_hi_inv, 2) > 32)
+            {
+                shr_bignum(glob1_hi_inv, 1, 2);
+                glob1_hi_bitlen--;
+            }
+            glob1_hi_inv_lo = (ushort)glob1_hi_inv[0];
+            glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
+        }
+
+        unsafe void mul_bignum_word(ushort *pn1, uint[] n2, uint mul, uint len)
+        {
+            uint i, tmp;
+            unsafe
+            {
+                fixed (uint* _pn2 = &n2[0])
+                {
+                    ushort* pn2 = (ushort*)_pn2;
+
+                    tmp = 0;
+                    for (i = 0; i < len; i++)
+                    {
+                        tmp = mul * (*pn2) + (*pn1) + tmp;
+                        *pn1 = (ushort)tmp;
+                        pn1++;
+                        pn2++;
+                        tmp >>= 16;
+                    }
+                    *pn1 += (ushort)tmp;
+                }
+            }
+        }
+
+        void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
+        {
+          uint i;
+
+          unsafe
+          {
+              fixed( uint * _psrc2 = &src2[0] )
+              fixed(uint* _pdest = &dest[0])
+              {
+                  ushort* psrc2 = (ushort*)_psrc2;
+                  ushort* pdest = (ushort*)_pdest;
+
+                  init_bignum(dest, 0, len * 2);
+                  for (i = 0; i < len * 2; i++)
+                      mul_bignum_word(pdest++, src1, *psrc2++, len * 2);
+              }
+          }
+        }
+
+        void not_bignum(uint[] n, uint len)
+        {
+          uint i;
+          for (i = 0; i < len; i++) n[i] = ~n[i];
+        }
+
+        void neg_bignum(uint[] n, uint len)
+        {
+          not_bignum(n, len);
+          inc_bignum(n, len);
+        }
+
+        unsafe uint get_mulword(uint* n)
+        {
+            ushort* wn = (ushort*)n;
+            uint i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
+                 + (((*(wn - 2) ^ 0xffff) * glob1_hi_inv_hi + glob1_hi_inv_hi) >> 1) + 1)
+                 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_hi) >> 1) +
+                 (((*wn ^ 0xffff) * glob1_hi_inv_lo) >> 1) + 1) >> 14) + glob1_hi_inv_hi
+                 * (*wn ^ 0xffff) * 2) >> (int)glob1_hi_bitlen);
+            if (i > 0xffff) i = 0xffff;
+            return i & 0xffff;
+        }
+
+        void dec_bignum(uint[] n, uint len)
+        {
+            int i = 0;
+            while ((--n[i] == 0xffffffff) && (--len > 0)) 
+                i++;
+        }
+
+        void calc_a_bignum(uint[] n1, uint[] n2, uint[] n3, uint len)
+        {
+            uint g2_len_x2, len_diff;
+            unsafe
+            {
+                fixed( uint* g1 = &glob1[0])
+                fixed (uint* g2 = &glob2[0])
+                {
+                    mul_bignum(glob2, n2, n3, len);
+                    glob2[len * 2] = 0;
+                    g2_len_x2 = len_bignum(glob2, len * 2 + 1) * 2;
+                    if (g2_len_x2 >= glob1_len_x2)
+                    {
+                        inc_bignum(glob2, len * 2 + 1);
+                        neg_bignum(glob2, len * 2 + 1);
+                        len_diff = g2_len_x2 + 1 - glob1_len_x2;
+                        ushort* esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
+                        ushort* edi = ((ushort*)g2) + (g2_len_x2 + 1);
+                        for (; len_diff != 0; len_diff--)
+                        {
+                            edi--;
+                            uint tmp = get_mulword((uint*)edi);
+                            esi--;
+                            if (tmp > 0)
+                            {
+                                mul_bignum_word(esi, glob1, tmp, 2 * len);
+                                if ((*edi & 0x8000) == 0)
+                                {
+                                    if (0 != sub_bignum((uint*)esi, (uint*)esi, g1, 0, (int)len)) (*edi)--;
+                                }
+                            }
+                        }
+                        neg_bignum(glob2, len);
+                        dec_bignum(glob2, len);
+                    }
+                    mov_bignum(n1, glob2, len);
+                }
+            }
+        }
+
+        void clear_tmp_vars(uint len)
+        {
+            init_bignum(glob1, 0, len);
+            init_bignum(glob2, 0, len);
+            init_bignum(glob1_hi_inv, 0, 4);
+            init_bignum(glob1_hi, 0, 4);
+            glob1_bitlen = 0;
+            glob1_hi_bitlen = 0;
+            glob1_len_x2 = 0;
+            glob1_hi_inv_lo = 0;
+            glob1_hi_inv_hi = 0;
+        }
+
+        void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
+        {
+            uint[] n_tmp = new uint[64];
+            uint n3_len, n4_len;
+            int n3_bitlen;
+            uint bit_mask;
+
+            unsafe
+            {
+                fixed (uint* _pn3 = &n3[0])
+                {
+                    uint* pn3 = _pn3;
+
+                    init_bignum(n1, 1, len);
+                    n4_len = len_bignum(n4, len);
+                    init_two_dw(n4, n4_len);
+                    n3_bitlen = (int)bitlen_bignum(n3, n4_len);
+                    n3_len = (uint)((n3_bitlen + 31) / 32);
+                    bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
+                    pn3 += n3_len - 1;
+                    n3_bitlen--;
+                    mov_bignum(n1, n2, n4_len);
+                    while (--n3_bitlen != -1)
+                    {
+                        if (bit_mask == 0)
+                        {
+                            bit_mask = 0x80000000;
+                            pn3--;
+                        }
+                        calc_a_bignum(n_tmp, n1, n1, n4_len);
+                        if ((*pn3 & bit_mask) != 0)
+                            calc_a_bignum(n1, n_tmp, n2, n4_len);
+                        else
+                            mov_bignum(n1, n_tmp, n4_len);
+                        bit_mask >>= 1;
+                    }
+                    init_bignum(n_tmp, 0, n4_len);
+                    clear_tmp_vars(len);
+                }
+            }
+        }
+
+        unsafe void memcpy(byte* dest, byte* src, int len)
+        {
+            while (len-- != 0) *dest++ = *src++;
+        }
+
+        unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
+        {
+            uint[] n2 = new uint[64];
+            uint[] n3 = new uint[64];
+
+            uint a = (pubkey.len - 1) / 8;
+            while (a + 1 <= pre_len) 
+            {
+                init_bignum(n2, 0, 64);
+                fixed( uint * pn2 = &n2[0] )
+                    memcpy((byte *)pn2, pre, (int)a + 1);
+                calc_a_key(n3, n2, pubkey.key2, pubkey.key1, 64);
+
+                fixed( uint * pn3 = &n3[0] )
+                    memcpy(buf, (byte *)pn3, (int)a);
+
+                pre_len -= a + 1;
+                pre += a + 1;
+                buf += a;
+            }
+        }
+
+        public byte[] DecryptKey(byte[] src)
+        {
+            init_pubkey();
+            byte[] dest = new byte[256];
+
+            unsafe
+            {
+                fixed (byte* pdest = &dest[0])
+                fixed (byte* psrc = &src[0])
+                    process_predata(psrc, len_predata(), pdest);
+            }
+            return dest.Take(56).ToArray();
+        }
+    }
+}
--- a/OpenRA.FileFormats/FileFormats/Format2.cs
+++ b/OpenRA.FileFormats/FileFormats/Format2.cs
@@ -0,0 +1,36 @@
+#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
+{
+	public static class Format2
+	{
+		public static int DecodeInto(byte[] src, byte[] dest)
+		{
+			FastByteReader r = new FastByteReader(src);
+
+			int i = 0;
+			while (!r.Done())
+			{
+				byte cmd = r.ReadByte();
+				if (cmd == 0)
+				{
+					byte count = r.ReadByte();
+					while (count-- > 0)
+						dest[i++] = 0;
+				}
+				else
+					dest[i++] = cmd;
+			}
+
+			return i;
+		}
+	}
+}
--- a/OpenRA.FileFormats/FileFormats/Format40.cs
+++ b/OpenRA.FileFormats/FileFormats/Format40.cs
@@ -0,0 +1,78 @@
+#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
+{
+	public static class Format40
+	{
+		public static int DecodeInto( byte[] src, byte[] dest )
+		{
+            var ctx = new FastByteReader(src);
+			int destIndex = 0;
+
+			while( true )
+			{
+                byte i = ctx.ReadByte();
+				if( ( i & 0x80 ) == 0 )
+				{
+					int count = i & 0x7F;
+					if( count == 0 )
+					{
+						// case 6
+                        count = ctx.ReadByte();
+                        byte value = ctx.ReadByte();
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] ^= value;
+					}
+					else
+					{
+						// case 5
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+                            dest[destIndex] ^= ctx.ReadByte();
+					}
+				}
+				else
+				{
+					int count = i & 0x7F;
+					if( count == 0 )
+					{
+                        count = ctx.ReadWord();
+						if( count == 0 )
+							return destIndex;
+
+						if( ( count & 0x8000 ) == 0 )
+						{
+							// case 2
+							destIndex += ( count & 0x7FFF );
+						}
+						else if( ( count & 0x4000 ) == 0 )
+						{
+							// case 3
+							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
+                                dest[destIndex] ^= ctx.ReadByte();
+						}
+						else
+						{
+							// case 4
+                            byte value = ctx.ReadByte();
+							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
+								dest[ destIndex ] ^= value;
+						}
+					}
+					else
+					{
+						// case 1
+						destIndex += count;
+					}
+				}
+			}
+		}
+	}
+}
--- a/OpenRA.FileFormats/FileFormats/Format80.cs
+++ b/OpenRA.FileFormats/FileFormats/Format80.cs
@@ -0,0 +1,125 @@
+#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.FileFormats
+{
+    class FastByteReader
+    {
+        readonly byte[] src;
+        int offset = 0;
+
+        public FastByteReader(byte[] src)
+        {
+            this.src = src;
+        }
+
+        public bool Done() { return offset >= src.Length; }
+        public byte ReadByte() { return src[offset++]; }
+        public int ReadWord()
+        {
+            int x = ReadByte();
+            return x | (ReadByte() << 8);
+        }
+
+        public void CopyTo(byte[] dest, int offset, int count)
+        {
+            Array.Copy(src, this.offset, dest, offset, count);
+            this.offset += count;
+        }
+    }
+
+	public static class Format80
+	{
+		static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count )
+		{
+			if( srcIndex > destIndex )
+				throw new NotImplementedException( string.Format( "srcIndex > destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+			if( destIndex - srcIndex == 1 )
+			{
+				for( int i = 0 ; i < count ; i++ )
+					dest[ destIndex + i ] = dest[ destIndex - 1 ];
+			}
+			else
+			{
+				for( int i = 0 ; i < count ; i++ )
+					dest[ destIndex + i ] = dest[ srcIndex + i ];
+			}
+		}
+
+		public static int DecodeInto( byte[] src, byte[] dest )
+		{
+            var ctx = new FastByteReader(src);
+			int destIndex = 0;
+
+			while( true )
+			{
+                byte i = ctx.ReadByte();
+				if( ( i & 0x80 ) == 0 )
+				{
+					// case 2
+                    byte secondByte = ctx.ReadByte();
+					int count = ( ( i & 0x70 ) >> 4 ) + 3;
+					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
+
+					ReplicatePrevious( dest, destIndex, destIndex - rpos, count );
+					destIndex += count;
+				}
+				else if( ( i & 0x40 ) == 0 )
+				{
+					// case 1
+					int count = i & 0x3F;
+					if( count == 0 )
+						return destIndex;
+
+					ctx.CopyTo( dest, destIndex, count );
+					destIndex += count;
+				}
+				else
+				{
+					int count3 = i & 0x3F;
+					if( count3 == 0x3E )
+					{
+						// case 4
+                        int count = ctx.ReadWord();
+                        byte color = ctx.ReadByte();
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = color;
+					}
+					else if( count3 == 0x3F )
+					{
+						// case 5
+                        int count = ctx.ReadWord();
+                        int srcIndex = ctx.ReadWord();
+						if( srcIndex >= destIndex )
+							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = dest[ srcIndex++ ];
+					}
+					else
+					{
+						// case 3
+						int count = count3 + 3;
+                        int srcIndex = ctx.ReadWord();
+						if( srcIndex >= destIndex )
+							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = dest[ srcIndex++ ];
+					}
+				}
+			}
+		}
+	}
+}
--- a/OpenRA.FileFormats/FileFormats/IniFile.cs
+++ b/OpenRA.FileFormats/FileFormats/IniFile.cs
@@ -0,0 +1,151 @@
+#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;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace OpenRA.FileFormats
+{
+	public class IniFile
+	{
+		Dictionary<string, IniSection> sections = new Dictionary<string, IniSection>();
+
+		public IniFile( Stream s )
+		{
+			Load( s );
+		}
+
+		public IniFile( params Stream[] streams )
+		{
+			foreach( var s in streams )
+				Load( s );
+		}
+
+		public void Load( Stream s )
+		{
+			StreamReader reader = new StreamReader( s );
+			IniSection currentSection = null;
+
+			while( !reader.EndOfStream )
+			{
+				string line = reader.ReadLine();
+
+				if( line.Length == 0 ) continue;
+
+				switch( line[ 0 ] )
+				{
+				case ';': break;
+				case '[': currentSection = ProcessSection( line ); break;
+				default: ProcessEntry( line, currentSection ); break;
+				}
+			}
+		}
+
+		Regex sectionPattern = new Regex( @"^\[([^]]*)\]" );
+
+		IniSection ProcessSection( string line )
+		{
+			Match m = sectionPattern.Match( line );
+			if( m == null || !m.Success )
+				return null;
+			string sectionName = m.Groups[ 1 ].Value.ToLowerInvariant();
+
+			IniSection ret;
+			if( !sections.TryGetValue( sectionName, out ret ) )
+				sections.Add( sectionName, ret = new IniSection( sectionName ) );
+			return ret;
+		}
+
+		bool ProcessEntry( string line, IniSection currentSection )
+		{
+			int comment = line.IndexOf( ';' );
+			if( comment >= 0 )
+				line = line.Substring( 0, comment );
+
+			line = line.Trim();
+			if( line.Length == 0 )
+				return false;
+
+			var key = line;
+			var value = "";
+			int eq = line.IndexOf( '=' );
+			if( eq >= 0 )
+			{
+				key = line.Substring( 0, eq );
+				value = line.Substring( eq + 1, line.Length - eq - 1 );
+			}
+
+			if( currentSection == null )
+				throw new InvalidOperationException( "No current INI section" );
+
+			if( !currentSection.Contains( key ) )
+				currentSection.Add( key, value );
+			return true;
+		}
+
+		public IniSection GetSection( string s )
+		{
+			return GetSection( s, false );
+		}
+
+		public IniSection GetSection( string s, bool allowFail )
+		{
+			IniSection section;
+			if( sections.TryGetValue( s.ToLowerInvariant(), out section ) )
+				return section;
+
+			if( allowFail )
+				return new IniSection( s );
+			throw new InvalidOperationException( "Section does not exist in map or rules: " + s );
+		}
+
+		public IEnumerable<IniSection> Sections { get { return sections.Values; } }
+	}
+
+	public class IniSection : IEnumerable<KeyValuePair<string, string>>
+	{
+		public string Name { get; private set; }
+		Dictionary<string, string> values = new Dictionary<string, string>();
+
+		public IniSection( string name )
+		{
+			Name = name;
+		}
+
+		public void Add( string key, string value )
+		{
+			values[key] = value;
+		}
+
+		public bool Contains( string key )
+		{
+			return values.ContainsKey( key );
+		}
+
+		public string GetValue( string key, string defaultValue )
+		{
+			string s;
+			return values.TryGetValue( key, out s ) ? s : defaultValue;
+		}
+
+		public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+		{
+			return values.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}
--- a/OpenRA.FileFormats/FileSystem.cs
+++ b/OpenRA.FileFormats/FileSystem.cs
@@ -0,0 +1,159 @@
+#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.Reflection;
+
+namespace OpenRA.FileFormats
+{
+	public static class FileSystem
+	{
+		static List<IFolder> mountedFolders = new List<IFolder>();
+
+		static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
+
+		static void MountInner(IFolder folder)
+		{
+			mountedFolders.Add(folder);
+
+			foreach( var hash in folder.AllFileHashes() )
+			{
+				var l = allFiles[hash];
+				if( !l.Contains( folder ) )
+					l.Add( folder );
+			}
+		}
+
+		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 = (Action)(() => FileSystem.MountInner(OpenPackage(name)));
+
+			if (optional)
+				try { a(); }
+				catch { }
+			else
+				a();
+		}
+
+		public static void UnmountAll()
+		{
+			mountedFolders.Clear();
+			allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
+		}
+
+		public static void LoadFromManifest( Manifest manifest )
+		{
+			UnmountAll();
+			foreach (var dir in manifest.Folders) Mount(dir);
+			foreach (var pkg in manifest.Packages) Mount(pkg);
+		}
+
+		static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
+		{
+			foreach( var folder in index[ PackageEntry.HashFilename( filename ) ] )
+				if (folder.Exists(filename))
+					return folder.GetContent(filename);
+			return null;
+		}
+
+		public static Stream Open(string filename)
+		{
+			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
+			{
+				var ret = GetFromCache( allFiles, filename );
+				if( ret != null )
+					return ret;
+			}
+
+			foreach( IFolder folder in mountedFolders )
+			{
+				if (folder.Exists(filename))
+					return folder.GetContent(filename);
+			}
+
+			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+		}
+
+		public static Stream OpenWithExts( string filename, params string[] exts )
+		{
+			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
+			{
+				foreach( var ext in exts )
+				{
+					var s = GetFromCache( allFiles, filename + ext );
+					if( s != null )
+						return s;
+				}
+			}
+
+			foreach( var ext in exts )
+			{
+				foreach( IFolder folder in mountedFolders )
+					if (folder.Exists(filename + ext))
+						return folder.GetContent( filename + ext );
+			}
+
+			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+		}
+
+		public static bool Exists(string filename)
+		{
+			foreach (var folder in mountedFolders)
+				if (folder.Exists(filename))
+				    return true;
+			return false;
+		}
+
+		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
+
+		public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
+		{
+			foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+			{
+				if (assembly.FullName == e.Name)
+					return assembly;
+			}
+
+			string[] frags = e.Name.Split(',');
+			var filename = frags[0] + ".dll";
+			Assembly a;
+			if (assemblyCache.TryGetValue(filename, out a))
+				return a;
+
+			if (FileSystem.Exists(filename))
+				using (Stream s = FileSystem.Open(filename))
+				{
+					byte[] buf = new byte[s.Length];
+					s.Read(buf, 0, buf.Length);
+					a = Assembly.Load(buf);
+					assemblyCache.Add(filename, a);
+					return a;
+				}
+			
+			return null;
+		}
+	}
+}
--- a/OpenRA.FileFormats/Folder.cs
+++ b/OpenRA.FileFormats/Folder.cs
@@ -0,0 +1,39 @@
+#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 class Folder : IFolder
+	{
+		readonly string path;
+
+		public Folder(string path) { this.path = path; }
+
+		public Stream GetContent(string filename)
+		{
+			try { return File.OpenRead( Path.Combine( path, filename ) ); }
+			catch { return null; }
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
+				yield return PackageEntry.HashFilename( filename );
+		}
+		
+		public bool Exists(string filename)
+		{
+			return File.Exists(Path.Combine(path,filename));
+		}
+	}
+}
--- a/OpenRA.FileFormats/Graphics/Dune2ShpReader.cs
+++ b/OpenRA.FileFormats/Graphics/Dune2ShpReader.cs
@@ -0,0 +1,146 @@
+#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;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public enum Dune2ImageFlags : int
+	{
+		F80_F2 = 0,
+		F2 = 2,
+		L16_F80_F2_1 = 1,
+		L16_F80_F2_2 = 3,
+		Ln_F80_F2 = 5
+	}
+
+	public class Dune2ImageHeader
+	{
+		public readonly Dune2ImageFlags Flags;
+		public readonly int Width;
+		public readonly int Height;
+		public readonly int Slices;
+		public readonly int FileSize;
+		public readonly int DataSize;
+
+		public readonly byte[] LookupTable;
+		public byte[] Image;
+
+		public Dune2ImageHeader(BinaryReader reader)
+		{
+			Flags = (Dune2ImageFlags)reader.ReadUInt16();
+			Slices = reader.ReadByte();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadByte();
+			FileSize = reader.ReadUInt16();
+			DataSize = reader.ReadUInt16();
+
+			if (Flags == Dune2ImageFlags.L16_F80_F2_1 ||
+				Flags == Dune2ImageFlags.L16_F80_F2_2 ||
+				Flags == Dune2ImageFlags.Ln_F80_F2)
+			{
+				int n = Flags == Dune2ImageFlags.Ln_F80_F2 ? reader.ReadByte() : (byte)16;
+				LookupTable = new byte[n];
+				for (int i = 0; i < n; i++)
+					LookupTable[i] = reader.ReadByte();
+			}
+			else
+			{
+				LookupTable = new byte[256];
+				for (int i = 0; i < 256; i++)
+					LookupTable[i] = (byte)i;
+				LookupTable[1] = 0x7f;
+				LookupTable[2] = 0x7e;
+				LookupTable[3] = 0x7d;
+				LookupTable[4] = 0x7c;
+			}
+		}
+
+		public Size Size
+		{
+			get { return new Size(Width, Height); }
+		}
+	}
+
+	public class Dune2ShpReader : IEnumerable<Dune2ImageHeader>
+	{
+		public readonly int ImageCount;
+
+		List<Dune2ImageHeader> headers = new List<Dune2ImageHeader>();
+
+		public Dune2ShpReader(Stream stream)
+		{
+			BinaryReader reader = new BinaryReader(stream);
+
+			ImageCount = reader.ReadUInt16();
+			
+			//Last offset is pointer to end of file.
+			uint[] offsets = new uint[ImageCount + 1];
+
+			uint temp = reader.ReadUInt32();
+
+			//If fourth byte in file is non-zero, the offsets are two bytes each.
+			bool twoByteOffsets = (temp & 0xFF0000) > 0; 
+			if (twoByteOffsets)
+			{
+				offsets[0] = ((temp & 0xFFFF0000) >> 16) + 2; //Offset does not account for image count bytes
+				offsets[1] = (temp & 0xFFFF) + 2;
+			}
+			else
+				offsets[0] = temp + 2;
+
+			for (int i = twoByteOffsets ? 2 : 1; i < ImageCount + 1; i++)
+				offsets[i] = (twoByteOffsets ? reader.ReadUInt16() : reader.ReadUInt32()) + 2;
+
+			for (int i = 0; i < ImageCount; i++)
+			{
+				reader.BaseStream.Seek(offsets[i], SeekOrigin.Begin);
+				Dune2ImageHeader header = new Dune2ImageHeader(reader);
+				byte[] imgData = reader.ReadBytes(header.FileSize);
+				header.Image = new byte[header.Height * header.Width];
+
+				//Decode image data
+				if (header.Flags != Dune2ImageFlags.F2)
+				{
+					byte[] tempData = new byte[header.DataSize];
+					Format80.DecodeInto(imgData, tempData);
+					Format2.DecodeInto(tempData, header.Image);
+				}
+				else
+					Format2.DecodeInto(imgData, header.Image);
+
+				//Lookup values in lookup table
+				if (header.LookupTable != null)
+					for (int j = 0; j < header.Image.Length; j++)
+						header.Image[j] = header.LookupTable[header.Image[j]];
+
+				headers.Add(header);
+			}
+		}
+
+		public Dune2ImageHeader this[int index]
+		{
+			get { return headers[index]; }
+		}
+	
+		public IEnumerator<Dune2ImageHeader> GetEnumerator()
+		{
+			return headers.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}
--- a/OpenRA.FileFormats/Graphics/IGraphicsDevice.cs
+++ b/OpenRA.FileFormats/Graphics/IGraphicsDevice.cs
@@ -0,0 +1,98 @@
+#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.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	[AttributeUsage( AttributeTargets.Assembly )]
+	public class RendererAttribute : Attribute
+	{
+		public readonly Type Type;
+
+		public RendererAttribute( Type graphicsDeviceType )
+		{
+			if( !typeof( IGraphicsDevice ).IsAssignableFrom( graphicsDeviceType ) )
+				throw new InvalidOperationException( "Incorrect type in RendererAttribute" );
+			Type = graphicsDeviceType;
+		}
+	}
+
+	public interface IGraphicsDevice
+	{
+		IVertexBuffer<Vertex> CreateVertexBuffer( int length );
+		IIndexBuffer CreateIndexBuffer( int length );
+		ITexture CreateTexture( Bitmap bitmap );
+		ITexture CreateTexture();
+		IShader CreateShader( Stream stream );
+
+		Size WindowSize { get; }
+
+		void Begin();
+		void End();
+		void Clear( Color color );
+		void Present();
+
+		void DrawIndexedPrimitives( PrimitiveType type, Range<int> vertexRange, Range<int> indexRange );
+		void DrawIndexedPrimitives( PrimitiveType type, int vertexPool, int numPrimitives );
+
+		void EnableScissor( int left, int top, int width, int height );
+		void DisableScissor();
+	}
+
+	public interface IVertexBuffer<T>
+	{
+		void Bind();
+		void SetData( T[] vertices, int length );
+	}
+
+	public interface IIndexBuffer
+	{
+		void Bind();
+		void SetData( ushort[] indices, int length );
+	}
+
+	public interface IShader
+	{
+		void SetValue( string name, float x, float y );
+		void SetValue( string param, ITexture texture );
+		void Commit();
+		void Render( Action a );
+	}
+
+	public interface ITexture
+	{
+		void SetData(Bitmap bitmap);
+		void SetData(uint[,] colors);
+		void SetData(byte[] colors, int width, int height);
+	}
+
+    public enum PrimitiveType
+    {
+        PointList, 
+        LineList, 
+        TriangleList,
+    }
+
+	public struct Range<T>
+	{
+		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
@@ -0,0 +1,167 @@
+#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;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class ImageHeader
+	{
+		public uint Offset;
+		public Format Format;
+
+		public uint RefOffset;
+		public Format RefFormat;
+		public ImageHeader RefImage;
+
+		public byte[] Image;
+
+		public ImageHeader( BinaryReader reader )
+		{
+			Offset = reader.ReadUInt32();
+			Format = (Format)( Offset >> 24 );
+			Offset &= 0xFFFFFF;
+
+			RefOffset = reader.ReadUInt16();
+			RefFormat = (Format)reader.ReadUInt16();
+		}
+	}
+
+	public enum Format
+	{
+		Format20 = 0x20,
+		Format40 = 0x40,
+		Format80 = 0x80,
+	}
+
+	public class ShpReader : IEnumerable<ImageHeader>
+	{
+		public readonly int ImageCount;
+		public readonly ushort Width;
+		public readonly ushort Height;
+
+		public Size Size { get { return new Size(Width, Height); } }
+
+		private readonly List<ImageHeader> headers = new List<ImageHeader>();
+
+		int recurseDepth = 0;
+
+		public ShpReader( Stream stream )
+		{
+			BinaryReader reader = new BinaryReader( stream );
+
+			ImageCount = reader.ReadUInt16();
+			reader.ReadUInt16();
+			reader.ReadUInt16();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadUInt16();
+			reader.ReadUInt32();
+
+			for( int i = 0 ; i < ImageCount ; i++ )
+				headers.Add( new ImageHeader( reader ) );
+
+			new ImageHeader( reader ); // end-of-file header
+			new ImageHeader( reader ); // all-zeroes header
+
+			Dictionary<uint, ImageHeader> offsets = new Dictionary<uint, ImageHeader>();
+			foreach( ImageHeader h in headers )
+				offsets.Add( h.Offset, h );
+
+			for( int i = 0 ; i < ImageCount ; i++ )
+			{
+				ImageHeader h = headers[ i ];
+				if( h.Format == Format.Format20 )
+					h.RefImage = headers[ i - 1 ];
+
+				else if( h.Format == Format.Format40 )
+				{
+					if( !offsets.TryGetValue( h.RefOffset, out h.RefImage ) )
+						throw new InvalidDataException( string.Format( "Reference doesnt point to image data {0}->{1}", h.Offset, h.RefOffset ) );
+				}
+			}
+
+			foreach( ImageHeader h in headers )
+				Decompress( stream, h );
+		}
+
+		public ImageHeader this[ int index ]
+		{
+			get { return headers[ index ]; }
+		}
+
+		void Decompress( Stream stream, ImageHeader h )
+		{
+			if( recurseDepth > ImageCount )
+				throw new InvalidDataException( "Format20/40 headers contain infinite loop" );
+
+			switch( h.Format )
+			{
+				case Format.Format20:
+				case Format.Format40:
+					{
+						if( h.RefImage.Image == null )
+						{
+							++recurseDepth;
+							Decompress( stream, h.RefImage );
+							--recurseDepth;
+						}
+
+						h.Image = CopyImageData( h.RefImage.Image );
+						Format40.DecodeInto(ReadCompressedData(stream, h), h.Image);
+						break;
+					}
+				case Format.Format80:
+					{
+						byte[] imageBytes = new byte[ Width * Height ];
+						Format80.DecodeInto( ReadCompressedData( stream, h ), imageBytes );
+						h.Image = imageBytes;
+						break;
+					}
+				default:
+					throw new InvalidDataException();
+			}
+		}
+
+		static byte[] ReadCompressedData( Stream stream, ImageHeader h )
+		{
+			stream.Position = h.Offset;
+			// Actually, far too big. There's no length field with the correct length though :(
+			int compressedLength = (int)( stream.Length - stream.Position );
+
+			byte[] compressedBytes = new byte[ compressedLength ];
+			stream.Read( compressedBytes, 0, compressedLength );
+
+			//MemoryStream ms = new MemoryStream( compressedBytes );
+			return compressedBytes;
+		}
+
+		private byte[] CopyImageData( byte[] baseImage )
+		{
+			byte[] imageData = new byte[ Width * Height ];
+			for( int i = 0 ; i < Width * Height ; i++ )
+				imageData[ i ] = baseImage[ i ];
+
+			return imageData;
+		}
+
+		public IEnumerator<ImageHeader> GetEnumerator()
+		{
+			return headers.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}
--- a/OpenRA.FileFormats/Graphics/Vertex.cs
+++ b/OpenRA.FileFormats/Graphics/Vertex.cs
@@ -0,0 +1,28 @@
+#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.Runtime.InteropServices;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	[StructLayout(LayoutKind.Sequential)]
+	public struct Vertex
+	{
+		public float x, y, z, u, v;
+		public float p, c;
+
+		public Vertex(float2 xy, float2 uv, float2 pc)
+		{
+			this.x = xy.X; this.y = xy.Y; this.z = 0;
+			this.u = uv.X; this.v = uv.Y;
+			this.p = pc.X; this.c = pc.Y;
+		}
+	}
+}
--- a/OpenRA.FileFormats/Graphics/VqaReader.cs
+++ b/OpenRA.FileFormats/Graphics/VqaReader.cs
@@ -0,0 +1,294 @@
+#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.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class VqaReader
+	{
+		public readonly ushort Frames;
+		public readonly byte Framerate;
+		public readonly ushort Width;
+		public readonly ushort Height;
+		
+		Stream stream;
+		int currentFrame;
+		ushort numColors;
+		ushort blockWidth;
+		ushort blockHeight;
+		byte cbParts;
+		int2 blocks;
+		UInt32[] offsets;
+		uint[] palette;
+
+		// Stores a list of subpixels, referenced by the VPTZ chunk
+		byte[] cbf;
+		byte[] cbp;			
+		int cbChunk = 0;
+		int cbOffset = 0;
+		
+		// Top half contains block info, bottom half contains references to cbf array
+		byte[] origData;
+		
+		// Final frame output
+		uint[,] frameData;
+		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
+
+		public byte[] AudioData { get { return audioData; } }
+		public int CurrentFrame { get { return currentFrame; } }
+		
+		public VqaReader( Stream stream )
+		{
+			this.stream = stream;
+			BinaryReader reader = new BinaryReader( stream );
+			
+			// Decode FORM chunk
+			if (new String(reader.ReadChars(4)) != "FORM")
+				throw new InvalidDataException("Invalid vqa (invalid FORM section)");
+			/*var length = */ reader.ReadUInt32();
+			
+			if (new String(reader.ReadChars(8)) != "WVQAVQHD")
+				throw new InvalidDataException("Invalid vqa (not WVQAVQHD)");
+			/* var length = */reader.ReadUInt32();
+			
+			/*var version = */reader.ReadUInt16();
+			/*var flags = */reader.ReadUInt16();
+			Frames = reader.ReadUInt16();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadUInt16();
+			
+			blockWidth = reader.ReadByte();
+			blockHeight = reader.ReadByte();
+			Framerate = reader.ReadByte();
+			cbParts = reader.ReadByte();
+			blocks = new int2(Width / blockWidth, Height / blockHeight);
+			
+			numColors = reader.ReadUInt16();
+			/*var maxBlocks = */reader.ReadUInt16();
+			/*var unknown1 = */reader.ReadUInt16();
+			/*var unknown2 = */reader.ReadUInt32();
+			
+			// Audio
+			/*var freq = */reader.ReadUInt16();
+			/*var channels = */reader.ReadByte();
+			/*var bits = */reader.ReadByte();
+			/*var unknown3 = */reader.ReadChars(14);
+			
+			
+			var frameSize = NextPowerOf2(Math.Max(Width,Height));
+			cbf = new byte[Width*Height];
+			cbp = new byte[Width*Height];
+			palette = new uint[numColors];
+			origData = new byte[2*blocks.X*blocks.Y];
+			frameData = new uint[frameSize,frameSize];
+			
+			var type = new String(reader.ReadChars(4));
+			if (type != "FINF")
+			{
+				reader.ReadBytes(27);
+				type = new String(reader.ReadChars(4));
+			}
+			
+			/*var length = */reader.ReadUInt16();
+			/*var unknown4 = */reader.ReadUInt16();
+			
+			// Frame offsets
+			offsets = new UInt32[Frames];
+			for (int i = 0; i < Frames; i++)
+			{
+				offsets[i] = reader.ReadUInt32();
+				if (offsets[i] > 0x40000000) offsets[i] -= 0x40000000;
+				offsets[i] <<= 1;
+			}
+
+			CollectAudioData();
+			
+			Reset();
+		}
+
+		public void Reset()
+		{
+			currentFrame = cbOffset = cbChunk = 0;
+			LoadFrame();
+		}
+		
+		void CollectAudioData()
+		{
+			var ms = new MemoryStream();
+			var adpcmIndex = 0;
+
+			bool compressed = false;
+			for (var i = 0; i < Frames; i++)
+			{
+				stream.Seek(offsets[i], SeekOrigin.Begin);
+				BinaryReader reader = new BinaryReader(stream);
+				var end = (i < Frames - 1) ? offsets[i + 1] : stream.Length;
+
+				while (reader.BaseStream.Position < end)
+				{
+					var type = new String(reader.ReadChars(4));
+					var length = int2.Swap(reader.ReadUInt32());
+
+					switch (type)
+					{
+						case "SND0":
+						case "SND2":
+							var rawAudio = reader.ReadBytes((int)length);
+							ms.Write(rawAudio);
+							compressed = (type == "SND2");
+							break;
+						default:
+							reader.ReadBytes((int)length);
+							break;
+					}
+
+					if (reader.PeekChar() == 0) reader.ReadByte();
+				}
+			}
+
+			audioData = (compressed) ? AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex) : ms.ToArray();
+		}
+
+		public void AdvanceFrame()
+		{
+			currentFrame++;
+			LoadFrame();
+		}
+		
+		void LoadFrame()
+		{			
+			if (currentFrame >= Frames)
+				return;
+			
+			// Seek to the start of the frame
+			stream.Seek(offsets[currentFrame], SeekOrigin.Begin);
+			BinaryReader reader = new BinaryReader(stream);
+			var end = (currentFrame < Frames - 1) ? offsets[currentFrame+1] : stream.Length;
+	
+			while(reader.BaseStream.Position < end)
+			{
+				var type = new String(reader.ReadChars(4));
+				var length = int2.Swap(reader.ReadUInt32());
+
+				switch(type)
+				{
+					case "VQFR":
+						DecodeVQFR(reader);
+					break;
+					default:
+						// Don't parse sound here.
+						reader.ReadBytes((int)length);
+						break;
+				}
+				
+				// Chunks are aligned on even bytes; advance by a byte if the next one is null
+				if (reader.PeekChar() == 0) reader.ReadByte();
+			}
+		}
+		
+		// VQA Frame
+		public void DecodeVQFR(BinaryReader reader)
+		{			
+			while(true)
+			{				
+				// Chunks are aligned on even bytes; may be padded with a single null
+				if (reader.PeekChar() == 0) reader.ReadByte();
+				var type = new String(reader.ReadChars(4));
+				int subchunkLength = (int)int2.Swap(reader.ReadUInt32());
+
+				switch(type)
+				{
+					// Full frame-modifier
+					case "CBFZ":
+						Format80.DecodeInto( reader.ReadBytes(subchunkLength), cbf );
+					break;
+					case "CBF0":
+						cbf = reader.ReadBytes(subchunkLength);
+					break;
+					
+					// frame-modifier chunk
+					case "CBP0":	
+					case "CBPZ":
+						// Partial buffer is full; dump and recreate
+						if (cbChunk == cbParts)
+						{
+							if (type == "CBP0")
+								cbf = (byte[])cbp.Clone();
+							else
+								Format80.DecodeInto( cbp, cbf );
+							
+							cbOffset = cbChunk = 0;
+						}
+						
+						var bytes = reader.ReadBytes(subchunkLength);
+						bytes.CopyTo(cbp,cbOffset);
+						cbOffset += subchunkLength;
+						cbChunk++;
+					break;
+					
+					// Palette
+					case "CPL0":
+						for (int i = 0; i < numColors; i++)
+						{
+							byte r = (byte)(reader.ReadByte() << 2);
+							byte g = (byte)(reader.ReadByte() << 2);
+							byte b = (byte)(reader.ReadByte() << 2);
+							palette[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
+						}
+					break;
+					
+					// Frame data
+					case "VPTZ":
+						Format80.DecodeInto( reader.ReadBytes(subchunkLength), origData );
+						// This is the last subchunk
+						return;
+					default:
+						throw new InvalidDataException("Unknown sub-chunk {0}".F(type));
+				}
+			}
+		}
+		
+		int cachedFrame = -1;
+		public uint[,] FrameData	{ get
+		{
+			if (cachedFrame != currentFrame)
+			{
+				cachedFrame = currentFrame;
+				for (var y = 0; y < blocks.Y; y++)
+					for (var x = 0; x < blocks.X; x++)
+					{
+						var px = origData[x + y*blocks.X];
+						var mod = origData[x + (y + blocks.Y)*blocks.X];
+						for (var j = 0; j < blockHeight; j++)
+							for (var i = 0; i < blockWidth; i++)
+							{
+								var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
+								byte color = (mod == 0x0f) ? px : cbf[cbfi];
+								frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
+							}
+					}
+			}
+			return frameData;
+		}}
+		
+		int NextPowerOf2(int v)
+		{
+			--v;
+			v |= v >> 1;
+			v |= v >> 2;
+			v |= v >> 4;
+			v |= v >> 8;
+			++v;
+			return v;
+		}
+	}
+}
--- a/OpenRA.FileFormats/Manifest.cs
+++ b/OpenRA.FileFormats/Manifest.cs
@@ -0,0 +1,65 @@
+#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.Linq;
+
+namespace OpenRA.FileFormats
+{
+	/* describes what is to be loaded in order to run a set of mods */
+
+	public class Manifest
+	{
+		public readonly string[]
+			Folders, Packages, Rules,
+			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
+			Weapons, Voices, Music, Movies, TileSets;
+
+		public readonly string ShellmapUid, LoadScreen;
+		public readonly int TileSize = 24;
+
+		public Manifest(string[] mods)
+		{
+			var yaml = mods
+				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
+				.Aggregate(MiniYaml.Merge);
+			
+			// Todo: Use fieldloader
+			Folders = YamlList(yaml, "Folders");
+			Packages = YamlList(yaml, "Packages");
+			Rules = YamlList(yaml, "Rules");
+			Sequences = YamlList(yaml, "Sequences");
+			Cursors = YamlList(yaml, "Cursors");
+			Chrome = YamlList(yaml, "Chrome");
+			Assemblies = YamlList(yaml, "Assemblies");
+			ChromeLayout = YamlList(yaml, "ChromeLayout");
+			Weapons = YamlList(yaml, "Weapons");
+			Voices = YamlList(yaml, "Voices");
+			Music = YamlList(yaml, "Music");
+			Movies = YamlList(yaml, "Movies");
+			TileSets = YamlList(yaml, "TileSets");
+
+			ShellmapUid = yaml.First( x => x.Key == "ShellmapUid" ).Value.Value;
+			LoadScreen = yaml.First( x => x.Key == "LoadScreen" ).Value.Value;
+			
+			if (yaml.FirstOrDefault( x => x.Key == "TileSize" ) != null)
+				TileSize = int.Parse(yaml.First( x => x.Key == "TileSize" ).Value.Value);
+		}
+
+		static string[] YamlList(List<MiniYamlNode> ys, string key)
+		{
+			var y = ys.FirstOrDefault( x => x.Key == key );
+			if( y == null )
+				return new string[ 0 ];
+
+			return y.Value.NodesDict.Keys.ToArray();
+		}
+	}
+}
--- a/OpenRA.FileFormats/Map/MapStub.cs
+++ b/OpenRA.FileFormats/Map/MapStub.cs
@@ -0,0 +1,61 @@
+#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.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class MapStub
+	{
+		public readonly IFolder Package;
+		
+		// Yaml map data
+		public readonly string Uid;
+		[FieldLoader.Load] public bool Selectable;
+
+		[FieldLoader.Load] public string Title;
+		[FieldLoader.Load] public string Description;
+		[FieldLoader.Load] public string Author;
+		[FieldLoader.Load] public int PlayerCount;
+		[FieldLoader.Load] public string Tileset;
+
+		[FieldLoader.LoadUsing( "LoadWaypoints" )]
+		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
+		public IEnumerable<int2> SpawnPoints { get { return Waypoints.Select(kv => kv.Value); } }
+		
+		[FieldLoader.Load] public int2 TopLeft;
+		[FieldLoader.Load] public int2 BottomRight;
+		public int Width { get { return BottomRight.X - TopLeft.X; } }
+		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
+	
+		public MapStub(IFolder package)
+		{
+			Package = package;
+			var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
+			FieldLoader.Load( this, new MiniYaml( null, yaml ) );
+			
+			Uid = Package.GetContent("map.uid").ReadAllText();
+		}
+
+		static object LoadWaypoints( MiniYaml y )
+		{
+			var ret = new Dictionary<string, int2>();
+			foreach( var wp in y.NodesDict[ "Waypoints" ].NodesDict )
+			{
+				string[] loc = wp.Value.Value.Split( ',' );
+				ret.Add( wp.Key, new int2( int.Parse( loc[ 0 ] ), int.Parse( loc[ 1 ] ) ) );
+			}
+			return ret;
+		}
+	}
+}
--- a/OpenRA.FileFormats/Map/PlayerReference.cs
+++ b/OpenRA.FileFormats/Map/PlayerReference.cs
@@ -0,0 +1,45 @@
+#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 string Name;
+		public string Palette;
+		public string Race;
+		public bool OwnsWorld = false;
+		public bool NonCombatant = false;
+		public bool Playable = false;
+		public bool DefaultStartingUnits = false;
+		public Color Color = Color.FromArgb(238,238,238);
+		public Color Color2 = Color.FromArgb(44,28,24);
+		
+		public int InitialCash = 0;
+		public string[] Allies = {};
+		public string[] Enemies = {};
+		
+		public PlayerReference() {}
+		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
@@ -0,0 +1,31 @@
+#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
+{
+	public struct SmudgeReference
+	{
+		public readonly string Type;
+		public readonly int2 Location;
+		public readonly int Depth;
+		public SmudgeReference( string type, int2 location, int depth )
+		{
+			Type = type;
+			Location = location;
+			Depth = depth;
+		}
+		
+		public override string ToString ()
+		{
+			return string.Format("{0} {1},{2} {3}", Type, Location.X,Location.Y, Depth);
+		}
+
+	}
+}
--- a/OpenRA.FileFormats/Map/Terrain.cs
+++ b/OpenRA.FileFormats/Map/Terrain.cs
@@ -0,0 +1,76 @@
+#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 class Terrain
+	{
+		public readonly List<byte[]> TileBitmapBytes = new List<byte[]>();
+
+		public Terrain( Stream stream, int size )
+		{		
+			// Try loading as a cnc .tem
+			BinaryReader reader = new BinaryReader( stream );
+			int Width = reader.ReadUInt16();
+			int Height = reader.ReadUInt16();
+			
+			if( Width != size || Height != size )
+				throw new InvalidDataException( "{0}x{1} != {2}x{2}".F(Width, Height, size ) );
+			
+			/*NumTiles = */reader.ReadUInt16();
+			/*Zero1 = */reader.ReadUInt16();			
+			/*uint Size = */reader.ReadUInt32();
+			uint ImgStart = reader.ReadUInt32();
+			/*Zero2 = */reader.ReadUInt32();
+			
+			int IndexEnd, IndexStart;
+			if (reader.ReadUInt16() == 65535) // ID1 = FFFFh for cnc
+			{
+				/*ID2 = */reader.ReadUInt16();	
+				IndexEnd = reader.ReadInt32();
+				IndexStart = reader.ReadInt32();
+			}
+			else // Load as a ra .tem
+			{
+				stream.Position = 0;	
+				reader = new BinaryReader( stream );
+				Width = reader.ReadUInt16();
+				Height = reader.ReadUInt16();
+				
+				/*NumTiles = */reader.ReadUInt16();
+				reader.ReadUInt16();
+				/*XDim = */reader.ReadUInt16();
+				/*YDim = */reader.ReadUInt16();
+				/*uint FileSize = */reader.ReadUInt32();
+				ImgStart = reader.ReadUInt32();
+				reader.ReadUInt32();
+				reader.ReadUInt32();
+				IndexEnd = reader.ReadInt32();
+				reader.ReadUInt32();
+				IndexStart = reader.ReadInt32();		
+			}
+			stream.Position = IndexStart;
+
+			foreach( byte b in new BinaryReader(stream).ReadBytes(IndexEnd - IndexStart) )
+			{
+				if (b != 255)
+				{
+					stream.Position = ImgStart + b * size * size;
+					TileBitmapBytes.Add(new BinaryReader(stream).ReadBytes(size * size));
+				}
+				else
+					TileBitmapBytes.Add(null);
+			}
+		}
+	}
+}
--- a/OpenRA.FileFormats/Map/TileReference.cs
+++ b/OpenRA.FileFormats/Map/TileReference.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
+
+namespace OpenRA.FileFormats
+{
+	public struct TileReference<T, U>
+	{
+		public T type;
+		public U index;
+		public U image;
+		
+		public TileReference(T t, U i)
+		{
+			type = t;
+			index = i;
+			image = i;
+		}
+		
+		public TileReference(T t, U i, U im)
+		{
+			type = t;
+			index = i;
+			image = im;
+		}
+
+		public override int GetHashCode() { return type.GetHashCode() ^ index.GetHashCode(); }
+	}
+}
--- a/OpenRA.FileFormats/Map/TileSet.cs
+++ b/OpenRA.FileFormats/Map/TileSet.cs
@@ -0,0 +1,157 @@
+#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.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
+	{
+		[FieldLoader.Load] public ushort Id;
+		[FieldLoader.Load] public string Image;
+		[FieldLoader.Load] public int2 Size;
+		[FieldLoader.Load] public bool PickAny;
+
+		[FieldLoader.LoadUsing( "LoadTiles" )]
+		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
+		
+		public TileTemplate() {}
+		public TileTemplate(MiniYaml my)
+		{
+			FieldLoader.Load( this, my );
+		}
+
+		static object LoadTiles( MiniYaml y )
+		{
+			return y.NodesDict["Tiles"].NodesDict.ToDictionary(
+				t => byte.Parse(t.Key),
+				t => t.Value.Value );
+		}
+		
+		public MiniYaml Save()
+		{
+			var root = new List<MiniYamlNode>();
+			foreach (var field in new string[] {"Id", "Image", "Size", "PickAny"})
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				root.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
+			}
+
+			root.Add( new MiniYamlNode( "Tiles", null,
+				Tiles.Select( x => new MiniYamlNode( x.Key.ToString(), x.Value ) ).ToList() ) );
+			
+			return new MiniYaml(null, root);
+		}
+	}
+	
+	public class TileSet
+	{
+		public string Name;
+		public string Id;
+		public string Palette;
+		public int TileSize = 24;
+		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", "TileSize", "Id", "Palette", "Extensions"};
+
+		public TileSet() {}
+		public TileSet( string filepath )
+		{
+			var yaml = MiniYaml.DictFromFile( filepath );
+			
+			// General info
+			FieldLoader.Load(this, yaml["General"]);
+
+			// TerrainTypes
+			Terrain = yaml["Terrain"].NodesDict.Values
+				.Select(y => new TerrainTypeInfo(y)).ToDictionary(t => t.Type);
+
+			// Templates
+			Templates = yaml["Templates"].NodesDict.Values
+				.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
+		}
+		
+		public void LoadTiles()
+		{
+			foreach (var t in Templates)
+				using( Stream s = FileSystem.OpenWithExts(t.Value.Image, Extensions) )
+				{
+					if( !Tiles.ContainsKey( t.Key ) )
+						Tiles.Add( t.Key, new Terrain( s, TileSize ) );
+				}
+		}
+		
+		public void Save(string filepath)
+		{			
+			var root = new List<MiniYamlNode>();
+			var gen = new List<MiniYamlNode>();
+			foreach (var field in fields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				gen.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
+			}
+			root.Add( new MiniYamlNode( "General", null, gen ) );
+
+			root.Add( new MiniYamlNode( "Terrain", null, 
+				Terrain.Select( t => new MiniYamlNode(
+					"TerrainType@{0}".F( t.Value.Type ),
+					t.Value.Save() ) ).ToList() ) );
+
+			root.Add( new MiniYamlNode( "Templates", null,
+				Templates.Select( t => new MiniYamlNode(
+					"Template@{0}".F( t.Value.Id ),
+					t.Value.Save() ) ).ToList() ) );
+			root.WriteToFile(filepath);
+		} 
+				
+		public byte[] GetBytes(TileReference<ushort,byte> r)
+		{
+			Terrain tile;
+			if( Tiles.TryGetValue( r.type, out tile ) )
+				return tile.TileBitmapBytes[ r.image ];
+			
+			byte[] missingTile = new byte[ TileSize * TileSize ];
+			for( int i = 0 ; i < missingTile.Length ; i++ )
+				missingTile[ i ] = 0x36;
+
+			return missingTile;
+		}
+
+		public string GetTerrainType(TileReference<ushort, byte> r)
+		{
+			var tt = Templates[r.type].Tiles;
+			string ret;
+			if (!tt.TryGetValue(r.image, out ret))
+				return "Clear"; // Default walkable
+			return ret;
+		}
+	}
+}
--- a/OpenRA.FileFormats/MiniYaml.cs
+++ b/OpenRA.FileFormats/MiniYaml.cs
@@ -0,0 +1,240 @@
+#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;
+
+namespace OpenRA.FileFormats
+{
+	using MiniYamlNodes = List<MiniYamlNode>;
+
+	public class MiniYamlNode
+	{
+		public struct SourceLocation
+		{
+			public string Filename; public int Line;
+		}
+
+		public SourceLocation Location;
+		public string Key;
+		public MiniYaml Value;
+
+		public MiniYamlNode( string k, MiniYaml v )
+		{
+			Key = k;
+			Value = v;
+		}
+
+		public MiniYamlNode( string k, MiniYaml v, SourceLocation loc )
+			: this( k, v )
+		{
+			Location = loc;
+		}
+
+		public MiniYamlNode( string k, string v )
+			: this( k, v, null )
+		{
+		}
+		public MiniYamlNode( string k, string v, List<MiniYamlNode> n )
+			: this( k, new MiniYaml( v, n ) )
+		{
+		}
+
+		public MiniYamlNode( string k, string v, List<MiniYamlNode> n, SourceLocation loc )
+			: this( k, new MiniYaml( v, n ), loc )
+		{
+		}
+	}
+
+	public class MiniYaml
+	{
+		public string Value;
+		public List<MiniYamlNode> Nodes;
+
+		public Dictionary<string, MiniYaml> NodesDict { get { return Nodes.ToDictionary( x => x.Key, x => x.Value ); } }
+
+		public MiniYaml( string value ) : this( value, null ) { }
+
+		public MiniYaml( string value, List<MiniYamlNode> nodes )
+		{
+			Value = value;
+			Nodes = nodes ?? new List<MiniYamlNode>();
+		}
+
+		public static MiniYaml FromDictionary<K, V>( Dictionary<K, V> dict )
+		{
+			return new MiniYaml( null, dict.Select( x => new MiniYamlNode( x.Key.ToString(), new MiniYaml( x.Value.ToString() ) ) ).ToList() );
+		}
+
+		public static MiniYaml FromList<T>( List<T> list )
+		{
+			return new MiniYaml( null, list.Select( x => new MiniYamlNode( x.ToString(), new MiniYaml( null ) ) ).ToList() );
+		}
+		
+		static List<MiniYamlNode> FromLines(string[] lines, string filename)
+		{
+			var levels = new List<List<MiniYamlNode>>();
+			levels.Add(new List<MiniYamlNode>());
+
+			var lineNo = 0;
+			foreach (var line in lines)
+			{
+				++lineNo;
+				var t = line.TrimStart(' ', '\t');
+				if (t.Length == 0 || t[0] == '#')
+					continue;
+				var level = line.Length - t.Length;
+
+				if (levels.Count <= level)
+					throw new InvalidOperationException("Bad indent in miniyaml");
+				while (levels.Count > level + 1)
+					levels.RemoveAt(levels.Count - 1);
+
+				var d = new List<MiniYamlNode>();
+				var rhs = SplitAtColon( ref t );
+				levels[ level ].Add( new MiniYamlNode( t, rhs, d, new MiniYamlNode.SourceLocation { Filename = filename, Line = lineNo } ) );
+				
+				levels.Add(d);
+			}
+			return levels[ 0 ];
+		}
+
+		static string SplitAtColon( ref string t )
+		{
+			var colon = t.IndexOf(':');
+			if( colon == -1 )
+				return null;
+			var ret = t.Substring( colon + 1 ).Trim();
+			if( ret.Length == 0 )
+				ret = null;
+			t = t.Substring( 0, colon ).Trim();
+			return ret;
+		}
+
+		public static List<MiniYamlNode> FromFileInPackage( string path )
+		{
+			StreamReader reader = new StreamReader( FileSystem.Open(path) );
+			List<string> lines = new List<string>();
+			
+			while( !reader.EndOfStream )
+				lines.Add(reader.ReadLine());
+			reader.Close();
+			
+			return FromLines(lines.ToArray(), path);
+		}
+
+		public static Dictionary<string, MiniYaml> DictFromFile( string path )
+		{
+			return FromFile( path ).ToDictionary( x => x.Key, x => x.Value );
+		}
+
+		public static Dictionary<string, MiniYaml> DictFromStream( Stream stream )
+		{
+			return FromStream( stream ).ToDictionary( x => x.Key, x => x.Value );
+		}
+
+		public static List<MiniYamlNode> FromFile( string path )
+		{			
+			return FromLines(File.ReadAllLines( path ), path);
+		}
+
+		public static List<MiniYamlNode> FromStream(Stream s)
+		{
+			using (var reader = new StreamReader(s))
+				return FromString(reader.ReadToEnd());
+		}
+
+		public static List<MiniYamlNode> FromString(string text)
+		{
+			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), "<no filename available>");
+		}
+
+		public static List<MiniYamlNode> Merge( List<MiniYamlNode> a, List<MiniYamlNode> b )
+		{
+			if( a.Count == 0 )
+				return b;
+			if( b.Count == 0 )
+				return a;
+
+			var ret = new List<MiniYamlNode>();
+
+			var aDict = a.ToDictionary( x => x.Key );
+			var bDict = b.ToDictionary( x => x.Key );
+			var keys = aDict.Keys.Union( bDict.Keys ).ToList();
+
+			var noInherit = keys.Where( x => x.Length > 0 && x[ 0 ] == '-' ).Select( x => x.Substring( 1 ) ).ToList();
+
+			foreach( var key in keys )
+			{
+				MiniYamlNode aa, bb;
+				aDict.TryGetValue( key, out aa );
+				bDict.TryGetValue( key, out bb );
+
+				if( noInherit.Contains( key ) )
+				{
+					if( aa != null )
+						ret.Add( aa );
+				}
+				else
+				{
+					var loc = aa == null ? default( MiniYamlNode.SourceLocation ) : aa.Location;
+					var merged = ( aa == null || bb == null ) ? aa ?? bb : new MiniYamlNode( key, Merge( aa.Value, bb.Value ), loc );
+					ret.Add( merged );
+				}
+			}
+
+			return ret;
+		}
+
+		public static MiniYaml Merge( MiniYaml a, MiniYaml b )
+		{
+			if( a == null )
+				return b;
+			if( b == null )
+				return a;
+
+			return new MiniYaml( a.Value ?? b.Value, Merge( a.Nodes, b.Nodes ) );
+		}
+
+		public IEnumerable<string> ToLines(string name)
+		{
+			yield return name + ": " + Value;
+			if (Nodes != null)
+				foreach (var line in Nodes.ToLines(false))
+					yield return "\t" + line;
+		}
+	}
+
+	public static class MiniYamlExts
+	{
+		public static void WriteToFile(this MiniYamlNodes y, string filename)
+		{
+			File.WriteAllLines(filename, y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
+		}
+
+		public static string WriteToString(this MiniYamlNodes y)
+		{
+			return string.Join("\n", y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
+		}
+
+		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
+		{
+			foreach (var kv in y)
+			{
+				foreach (var line in kv.Value.ToLines(kv.Key))
+					yield return line;
+				if (lowest)
+					yield return "";
+			}
+		}
+	}
+}
--- a/OpenRA.FileFormats/OpenRA.FileFormats.csproj
+++ b/OpenRA.FileFormats/OpenRA.FileFormats.csproj
@@ -0,0 +1,112 @@
+<?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>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA.FileFormats</RootNamespace>
+    <AssemblyName>OpenRA.FileFormats</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Evaluator.cs" />
+    <Compile Include="Exts.cs" />
+    <Compile Include="FieldLoader.cs" />
+    <Compile Include="FileSystem.cs" />
+    <Compile Include="Folder.cs" />
+    <Compile Include="Graphics\IGraphicsDevice.cs" />
+    <Compile Include="Graphics\Vertex.cs" />
+    <Compile Include="Manifest.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="Thirdparty\Random.cs" />
+    <Compile Include="Support\Log.cs" />
+    <Compile Include="Support\Stopwatch.cs" />
+    <Compile Include="Support\Timer.cs" />
+    <Compile Include="TypeDictionary.cs" />
+    <Compile Include="Map\TileReference.cs" />
+    <Compile Include="Map\Terrain.cs" />
+    <Compile Include="Primitives\Cache.cs" />
+    <Compile Include="Primitives\float2.cs" />
+    <Compile Include="Primitives\Pair.cs" />
+    <Compile Include="Map\TileSet.cs" />
+    <Compile Include="Primitives\PriorityQueue.cs" />
+    <Compile Include="Primitives\Lazy.cs" />
+    <Compile Include="FileFormats\AudLoader.cs" />
+    <Compile Include="FileFormats\Blowfish.cs" />
+    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
+    <Compile Include="Primitives\Set.cs" />
+    <Compile Include="Graphics\Dune2ShpReader.cs" />
+    <Compile Include="FileFormats\Format2.cs" />
+    <Compile Include="FileFormats\Format40.cs" />
+    <Compile Include="FileFormats\Format80.cs" />
+    <Compile Include="FileFormats\IniFile.cs" />
+    <Compile Include="Graphics\ShpReader.cs" />
+    <Compile Include="Primitives\int2.cs" />
+    <Compile Include="Map\MapStub.cs" />
+    <Compile Include="Map\SmudgeReference.cs" />
+    <Compile Include="Map\PlayerReference.cs" />
+    <Compile Include="CompressedPackage.cs" />
+    <Compile Include="Graphics\VqaReader.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. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/OpenRA.FileFormats/Package.cs
+++ b/OpenRA.FileFormats/Package.cs
@@ -0,0 +1,160 @@
+#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;
+
+namespace OpenRA.FileFormats
+{
+	public interface IFolder
+	{
+		Stream GetContent(string filename);
+		bool Exists(string filename);
+		IEnumerable<uint> AllFileHashes();
+	}
+
+	public class Package : IFolder
+	{
+		readonly Dictionary<uint, PackageEntry> index;
+		readonly bool isRmix, isEncrypted;
+		readonly long dataStart;
+		readonly Stream s;
+
+		public Package(string filename)
+		{
+			s = FileSystem.Open(filename);
+
+			BinaryReader reader = new BinaryReader(s);
+			uint signature = reader.ReadUInt32();
+
+			isRmix = 0 == (signature & ~(uint)(MixFileFlags.Checksum | MixFileFlags.Encrypted));
+
+			if (isRmix)
+			{
+				isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted);
+				if( isEncrypted )
+				{
+					index = ParseRaHeader( s, out dataStart ).ToDictionary(x => x.Hash);
+					return;
+				}
+			}
+			else
+				s.Seek( 0, SeekOrigin.Begin );
+
+			isEncrypted = false;
+			index = ParseTdHeader(s, out dataStart).ToDictionary(x => x.Hash);
+		}
+
+		const long headerStart = 84;
+
+		List<PackageEntry> ParseRaHeader(Stream s, out long dataStart)
+		{
+			BinaryReader reader = new BinaryReader(s);
+			byte[] keyblock = reader.ReadBytes(80);
+			byte[] blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
+
+			uint[] h = ReadUints(reader, 2);
+
+			Blowfish fish = new Blowfish(blowfishKey);
+			MemoryStream ms = Decrypt( h, fish );
+			BinaryReader reader2 = new BinaryReader(ms);
+
+			ushort numFiles = reader2.ReadUInt16();
+			reader2.ReadUInt32(); /*datasize*/
+
+			s.Position = headerStart;
+			reader = new BinaryReader(s);
+
+			int byteCount = 6 + numFiles * PackageEntry.Size;
+			h = ReadUints( reader, ( byteCount + 3 ) / 4 );
+
+			ms = Decrypt( h, fish );
+
+			dataStart = headerStart + byteCount + ( ( ~byteCount + 1 ) & 7 );
+
+			long ds;
+			return ParseTdHeader( ms, out ds );
+		}
+
+		static MemoryStream Decrypt( uint[] h, Blowfish fish )
+		{
+			uint[] decrypted = fish.Decrypt( h );
+
+			MemoryStream ms = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter( ms );
+			foreach( uint t in decrypted )
+				writer.Write( t );
+			writer.Flush();
+
+			ms.Position = 0;
+			return ms;
+		}
+
+		uint[] ReadUints(BinaryReader r, int count)
+		{
+			uint[] ret = new uint[count];
+			for (int i = 0; i < ret.Length; i++)
+				ret[i] = r.ReadUInt32();
+
+			return ret;
+		}
+
+		List<PackageEntry> ParseTdHeader(Stream s, out long dataStart)
+		{
+			List<PackageEntry> items = new List<PackageEntry>();
+
+			BinaryReader reader = new BinaryReader(s);
+			ushort numFiles = reader.ReadUInt16();
+			/*uint dataSize = */reader.ReadUInt32();
+
+			for (int i = 0; i < numFiles; i++)
+				items.Add(new PackageEntry(reader));
+
+			dataStart = s.Position;
+			return items;
+		}
+		
+		public Stream GetContent(uint hash)
+		{
+			PackageEntry e;
+			if (!index.TryGetValue(hash, out e))
+				return null;
+
+			s.Seek( dataStart + e.Offset, SeekOrigin.Begin );
+			byte[] data = new byte[ e.Length ];
+			s.Read( data, 0, (int)e.Length );
+			return new MemoryStream(data);
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return GetContent(PackageEntry.HashFilename(filename));
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			return index.Keys;
+		}
+		
+		public bool Exists(string filename)
+		{
+			return index.ContainsKey(PackageEntry.HashFilename(filename));
+		}
+	}
+
+	[Flags]
+	enum MixFileFlags : uint
+	{
+		Checksum = 0x10000,
+		Encrypted = 0x20000,
+	}
+}
--- a/OpenRA.FileFormats/PackageEntry.cs
+++ b/OpenRA.FileFormats/PackageEntry.cs
@@ -0,0 +1,85 @@
+#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;
+using System.Text;
+
+namespace OpenRA.FileFormats
+{
+	public class PackageEntry
+	{
+		public readonly uint Hash;
+		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()
+		{
+			string filename;
+			if (Names.TryGetValue(Hash, out filename))
+				return string.Format("{0} - offset 0x{1:x8} - length 0x{2:x8}", filename, Offset, Length);
+			else
+				return string.Format("0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}", Hash, Offset, Length);
+		}
+
+		public static uint HashFilename(string name)
+		{
+			if (name.Length > 12)
+				name = name.Substring(0, 12);
+
+			name = name.ToUpperInvariant();
+			if (name.Length % 4 != 0)
+				name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');
+
+			MemoryStream ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
+			BinaryReader reader = new BinaryReader(ms);
+
+			int len = name.Length >> 2; 
+			uint result = 0;
+
+			while (len-- != 0)
+				result = ((result << 1) | (result >> 31)) + reader.ReadUInt32();
+
+			return result;
+		}
+
+		static Dictionary<uint, string> Names = new Dictionary<uint,string>();
+		
+		public static void AddStandardName(string s)
+		{
+			uint hash = HashFilename(s);
+			Names.Add(hash, s);
+		}
+
+		public const int Size = 12;
+	}
+}
--- 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
@@ -0,0 +1,80 @@
+#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.Drawing;
+using System.IO;
+using System.Linq;
+using System;
+
+namespace OpenRA.FileFormats
+{
+	public class Palette
+	{
+		uint[] colors;
+		public Color GetColor(int index)
+		{
+			return Color.FromArgb((int)colors[index]);
+		}
+		
+		public void SetColor(int index, Color color)
+		{
+			colors[index] = (uint)color.ToArgb();
+		}
+		
+		public void SetColor(int index, uint color)
+		{
+			colors[index] = (uint)color;
+		}
+				
+		public uint[] Values
+		{			
+			get { return colors; }
+		}
+
+		public Palette(Stream s, bool remapTransparent)
+		{
+			colors = new uint[256];
+			
+			using (BinaryReader reader = new BinaryReader(s))
+			{
+				for (int i = 0; i < 256; i++)
+				{
+					byte r = (byte)(reader.ReadByte() << 2);
+					byte g = (byte)(reader.ReadByte() << 2);
+					byte b = (byte)(reader.ReadByte() << 2);
+					colors[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
+				}
+			}
+
+			colors[0] = 0;
+			if (remapTransparent)
+			{
+				colors[1] = 178u << 24; // Hack for d2k; may have side effects
+				colors[3] = 178u << 24;
+				colors[4] = 140u << 24;
+			}
+		}
+
+		public Palette(Palette p, IPaletteRemap r)
+		{
+			colors = new uint[256];
+			for(int i = 0; i < 256; i++)
+				colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)p.colors[i]),i).ToArgb();
+		}
+		
+		public Palette(Palette p)
+		{
+			colors = (uint[])p.colors.Clone();
+		}
+	}
+
+	public interface IPaletteRemap { Color GetRemappedColor(Color original, int index);	}
+}
--- a/OpenRA.FileFormats/PlayerColorRemap.cs
+++ b/OpenRA.FileFormats/PlayerColorRemap.cs
@@ -0,0 +1,50 @@
+#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.Drawing;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	// TODO: ship this out of here.
+	public enum PaletteFormat { ra, cnc, d2k }
+
+	public class PlayerColorRemap : IPaletteRemap
+	{
+		Dictionary<int, Color> remapColors;
+
+		public PlayerColorRemap(Color c1, Color c2, PaletteFormat fmt)
+		{
+			var baseIndex = (fmt == PaletteFormat.cnc) ? 0xb0 : (fmt == PaletteFormat.d2k) ? 240 : 80;
+			var ramp = (fmt == PaletteFormat.cnc)
+				? new[] { 0, 2, 4, 6, 8, 10, 13, 15, 1, 3, 5, 7, 9, 11, 12, 14 }
+				: new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+
+			remapColors = ramp.Select((x, i) => Pair.New(baseIndex + i, ColorLerp(x / 16f, c1, c2)))
+				.ToDictionary(u => u.First, u => u.Second);
+		}
+
+		static Color ColorLerp(float t, Color c1, Color c2)
+		{
+			return Color.FromArgb(255,
+				(int)(t * c2.R + (1 - t) * c1.R),
+				(int)(t * c2.G + (1 - t) * c1.G),
+				(int)(t * c2.B + (1 - t) * c1.B));
+		}
+		
+		public Color GetRemappedColor(Color original, int index)
+		{
+			Color c;
+			return remapColors.TryGetValue(index, out c) 
+				? c : original;
+		}
+	}
+}
--- a/OpenRA.FileFormats/Primitives/Cache.cs
+++ b/OpenRA.FileFormats/Primitives/Cache.cs
@@ -0,0 +1,49 @@
+#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;
+using System.Collections.Generic;
+
+namespace OpenRA.FileFormats
+{
+	public class Cache<T, U> : IEnumerable<KeyValuePair<T, U>>
+	{
+		Dictionary<T, U> hax = new Dictionary<T, U>();
+		Func<T,U> loader;
+
+		public Cache(Func<T,U> loader)
+		{
+			if (loader == null)
+				throw new ArgumentNullException();
+
+			this.loader = loader;
+		}
+
+		public U this[T key]
+		{
+			get
+			{
+				U result;
+				if (!hax.TryGetValue(key, out result))
+					hax.Add(key, result = loader(key));
+
+				return result;
+			}
+		}
+
+		public IEnumerator<KeyValuePair<T, U>> GetEnumerator() { return hax.GetEnumerator(); }
+
+		IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
+
+		public IEnumerable<T> Keys { get { return hax.Keys; } }
+		public IEnumerable<U> Values { get { return hax.Values; } }
+	}
+}
--- 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
@@ -0,0 +1,46 @@
+#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.FileFormats
+{
+	public class Lazy<T>
+	{
+		Func<T> p;
+		T value;
+
+		public Lazy(Func<T> p)
+		{
+			if (p == null)
+				throw new ArgumentNullException();
+
+			this.p = p;
+		}
+
+		public T Value
+		{
+			get
+			{
+				if (p == null)
+					return value;
+
+				value = p();
+				p = null;
+				return value;
+			}
+		}
+	}
+
+	public static class Lazy
+	{
+		public static Lazy<T> New<T>(Func<T> p) { return new Lazy<T>(p); }
+	}
+}
--- a/OpenRA.FileFormats/Primitives/Pair.cs
+++ b/OpenRA.FileFormats/Primitives/Pair.cs
@@ -0,0 +1,70 @@
+#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;
+
+namespace OpenRA.FileFormats
+{
+	public struct Pair<T, U>
+	{
+		public T First;
+		public U Second;
+
+		public Pair(T first, U second)
+		{
+			First = first;
+			Second = second;
+		}
+
+		static IEqualityComparer<T> tc = EqualityComparer<T>.Default;
+		static IEqualityComparer<U> uc = EqualityComparer<U>.Default;
+
+		public static bool operator ==(Pair<T, U> a, Pair<T, U> b)
+		{
+			return tc.Equals(a.First, b.First) && uc.Equals(a.Second, b.Second);
+		}
+
+		public static bool operator !=(Pair<T, U> a, Pair<T, U> b)
+		{
+			return !(a == b);
+		}
+
+		public override bool Equals(object obj)
+		{
+			if (!(obj is Pair<T, U>))
+				return false;
+
+			return (Pair<T, U>)obj == this;
+		}
+
+		public override int GetHashCode()
+		{
+			return First.GetHashCode() ^ Second.GetHashCode();
+		}
+
+		public Pair<T, U> WithFirst(T t) { return new Pair<T, U>(t, Second); }
+		public Pair<T, U> WithSecond(U u) { return new Pair<T, U>(First, u); }
+
+		public static T AsFirst(Pair<T, U> p) { return p.First; }
+		public static U AsSecond(Pair<T, U> p) { return p.Second; }
+
+        public Pair<U, T> Swap() { return Pair.New(Second, First); }
+
+		public override string ToString()
+		{
+			return "({0},{1})".F(First, Second);
+		}
+	}
+
+    public static class Pair
+    {
+        public static Pair<T, U> New<T, U>(T t, U u) { return new Pair<T, U>(t, u); }
+    }
+}
--- a/OpenRA.FileFormats/Primitives/PriorityQueue.cs
+++ b/OpenRA.FileFormats/Primitives/PriorityQueue.cs
@@ -0,0 +1,103 @@
+#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;
+
+namespace OpenRA.FileFormats
+{
+	public class PriorityQueue<T>
+			where T : IComparable<T>
+	{
+		List<T[]> items = new List<T[]>();
+		int level, index;
+
+		public PriorityQueue()
+		{
+			items.Add(new T[1]);
+		}
+
+		public void Add(T item)
+		{
+			int addLevel = level;
+			int addIndex = index;
+
+			while (addLevel >= 1 && Above(addLevel, addIndex).CompareTo(item) > 0)
+			{
+				items[addLevel][addIndex] = Above(addLevel, addIndex);
+				--addLevel;
+				addIndex >>= 1;
+			}
+
+			items[addLevel][addIndex] = item;
+
+			if (++index >= (1 << level))
+			{
+				index = 0;
+				if (items.Count <= ++level)
+					items.Add(new T[1 << level]);
+			}
+		}
+
+		public bool Empty { get { return (level == 0); } }
+
+		T At(int level, int index) { return items[level][index]; }
+		T Above(int level, int index) { return items[level - 1][index >> 1]; }
+
+		T Last()
+		{
+			int lastLevel = level;
+			int lastIndex = index;
+
+			if (--lastIndex < 0)
+				lastIndex = (1 << --lastLevel) - 1;
+
+			return At(lastLevel, lastIndex);
+		}
+
+		public T Pop()
+		{
+			if (level == 0 && index == 0)
+				throw new InvalidOperationException("Attempting to pop empty PriorityQueue");
+
+			T ret = At(0, 0);
+			BubbleInto(0, 0, Last());
+			if (--index < 0)
+				index = (1 << --level) - 1;
+
+			return ret;
+		}
+
+		void BubbleInto(int intoLevel, int intoIndex, T val)
+		{
+			int downLevel = intoLevel + 1;
+			int downIndex = intoIndex << 1;
+
+			if (downLevel > level || (downLevel == level && downIndex >= index))
+			{
+				items[intoLevel][intoIndex] = val;
+				return;
+			}
+
+			if (downLevel <= level && downIndex < index - 1 &&
+				At(downLevel, downIndex).CompareTo(At(downLevel, downIndex + 1)) >= 0)
+				++downIndex;
+
+			if (val.CompareTo(At(downLevel, downIndex)) <= 0)
+			{
+				items[intoLevel][intoIndex] = val;
+				return;
+			}
+
+			items[intoLevel][intoIndex] = At(downLevel, downIndex);
+			BubbleInto(downLevel, downIndex, val);
+		}
+	}
+}
--- a/OpenRA.FileFormats/Primitives/Set.cs
+++ b/OpenRA.FileFormats/Primitives/Set.cs
@@ -0,0 +1,66 @@
+#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;
+using System.Collections.Generic;
+
+namespace OpenRA.Collections
+{
+	public class Set<T> : IEnumerable<T>
+	{
+		Dictionary<T, bool> data = new Dictionary<T, bool>();
+
+		public void Add( T obj )
+		{
+			data.Add( obj, false );
+			if( OnAdd != null )
+				OnAdd( obj );
+		}
+
+		public void Remove( T obj )
+		{
+			data.Remove( obj );
+			if( OnRemove != null )
+				OnRemove( obj );
+		}
+
+		public event Action<T> OnAdd;
+		public event Action<T> OnRemove;
+
+		public IEnumerator<T> GetEnumerator()
+		{
+			return data.Keys.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+
+	public class CachedView<T,U> : Set<U>
+	{
+		public CachedView( Set<T> set, Func<T, bool> include, Func<T, U> store )
+			: this( set, include, x => new[] { store( x ) } )
+		{
+		}
+
+		public CachedView( Set<T> set, Func<T,bool> include, Func<T,IEnumerable<U>> store )
+		{
+			foreach( var t in set )
+				if( include( t ) )
+					store( t ).Do( x => Add( x ) );
+
+			set.OnAdd += obj => { if( include( obj ) ) store( obj ).Do( x => Add( x ) ); };
+			set.OnRemove += obj => { if( include( obj ) ) store( obj ).Do( x => Remove( x ) ); };
+		}
+	}
+}
--- a/OpenRA.FileFormats/Primitives/float2.cs
+++ b/OpenRA.FileFormats/Primitives/float2.cs
@@ -0,0 +1,103 @@
+#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.Drawing;
+using System.Runtime.InteropServices;
+
+namespace OpenRA
+{
+	[StructLayout(LayoutKind.Sequential)]
+	public struct float2
+	{
+		public float X, Y;
+
+		public float2(float x, float y) { X = x; Y = y; }
+		public float2(PointF p) { X = p.X; Y = p.Y; }
+		public float2(Point p) { X = p.X; Y = p.Y; }
+		public float2(Size p) { X = p.Width; Y = p.Height; }
+		public float2(SizeF p) { X = p.Width; Y = p.Height; }
+
+		public PointF ToPointF() { return new PointF(X, Y); }
+		public SizeF ToSizeF() { return new SizeF(X, Y); }
+
+		public static implicit operator float2(int2 src) { return new float2(src.X, src.Y); }
+
+		public static float2 operator +(float2 a, float2 b) { return new float2(a.X + b.X, a.Y + b.Y); }
+		public static float2 operator -(float2 a, float2 b) { return new float2(a.X - b.X, a.Y - b.Y); }
+
+		public static float2 operator -(float2 a) { return new float2(-a.X, -a.Y); }
+
+		public static float Lerp(float a, float b, float t) { return a + t * (b - a); }
+
+		public static float2 Lerp(float2 a, float2 b, float t)
+		{
+			return new float2(
+				Lerp(a.X, b.X, t),
+				Lerp(a.Y, b.Y, t));
+		}
+
+		public static float2 Lerp(float2 a, float2 b, float2 t)
+		{
+			return new float2(
+				Lerp(a.X, b.X, t.X),
+				Lerp(a.Y, b.Y, t.Y));
+		}
+
+		public static float2 FromAngle(float a) { return new float2((float)Math.Sin(a), (float)Math.Cos(a)); }
+
+		static float Constrain(float x, float a, float b) { return x < a ? a : x > b ? b : x; }
+
+		public float2 Constrain(float2 min, float2 max)
+		{
+			return new float2(
+				Constrain(X, min.X, max.X),
+				Constrain(Y, min.Y, max.Y));
+		}
+
+		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
+		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
+
+        public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
+        public static bool operator !=(float2 me, float2 other) { return !(me == other); }
+        public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+                return false;
+
+            float2 o = (float2)obj;
+            return o == this;
+        }
+
+		public static readonly float2 Zero = new float2(0, 0);
+
+		public static bool WithinEpsilon(float2 a, float2 b, float e)
+		{
+			float2 d = a - b;
+			return Math.Abs(d.X) < e && Math.Abs(d.Y) < e;
+		}
+
+		public float2 Sign() { return new float2(Math.Sign(X), Math.Sign(Y)); }
+		public static float Dot(float2 a, float2 b) { return a.X * b.X + a.Y * b.Y; }
+		public float2 Round() { return new float2((float)Math.Round(X), (float)Math.Round(Y)); }
+
+		public override string ToString() { return string.Format("({0},{1})", X, Y); }
+		public int2 ToInt2() { return new int2((int)X, (int)Y); }
+
+		public static float2 Max(float2 a, float2 b) { return new float2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static float2 Min(float2 a, float2 b) { return new float2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public float LengthSquared { get { return X * X + Y * Y; } }
+		public float Length { get { return (float)Math.Sqrt(LengthSquared); } }
+	}
+}
--- a/OpenRA.FileFormats/Primitives/int2.cs
+++ b/OpenRA.FileFormats/Primitives/int2.cs
@@ -0,0 +1,74 @@
+#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.Drawing;
+
+namespace OpenRA
+{
+	public struct int2
+	{
+		public int X,Y;
+
+		public int2( int x, int y ) { this.X = x; this.Y = y; }
+		public int2( Point p ) { X = p.X; Y = p.Y; }
+		public int2( Size p ) { X = p.Width; Y = p.Height; }
+
+		public static int2 operator +(int2 a, int2 b) { return new int2(a.X + b.X, a.Y + b.Y); }
+		public static int2 operator -(int2 a, int2 b) { return new int2(a.X - b.X, a.Y - b.Y); }
+		public static int2 operator *(int a, int2 b) { return new int2(a * b.X, a * b.Y); }
+		public static int2 operator *(int2 b, int a) { return new int2(a * b.X, a * b.Y); }
+		public static int2 operator /(int2 a, int b) { return new int2(a.X / b, a.Y / b); }
+
+		public static bool operator ==(int2 me, int2 other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator !=(int2 me, int2 other) { return !(me == other); }
+
+		public int2 Sign() { return new int2(Math.Sign(X), Math.Sign(Y)); }
+		public int2 Abs() { return new int2( Math.Abs( X ), Math.Abs( Y ) ); }
+		public int LengthSquared { get { return X * X + Y * Y; } }
+		public int Length { get { return (int)Math.Sqrt(LengthSquared); } }
+		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+		public static int2 Max(int2 a, int2 b) { return new int2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static int2 Min(int2 a, int2 b) { return new int2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
+
+			int2 o = (int2)obj;
+			return o == this;
+		}
+
+		public static readonly int2 Zero = new int2(0, 0);
+		public Point ToPoint() { return new Point(X, Y); }
+        public PointF ToPointF() { return new PointF(X, Y); }
+		public float2 ToFloat2() { return new float2(X, Y); }
+
+		public override string ToString() { return string.Format("{0},{1}", X, Y); }
+		
+		// Change endianness of a uint32
+		public static uint Swap(uint orig)
+		{
+			return (uint)((orig & 0xff000000) >> 24) | ((orig & 0x00ff0000) >> 8) | ((orig & 0x0000ff00) << 8) | ((orig & 0x000000ff) << 24);
+		}
+
+		public static int Lerp( int a, int b, int mul, int div )
+		{
+			return a + ( b - a ) * mul / div;
+		}
+
+		public static int2 Lerp( int2 a, int2 b, int mul, int div )
+		{
+			return a + ( b - a ) * mul / div;
+		}
+	}
+}
--- a/OpenRA.FileFormats/Properties/AssemblyInfo.cs
+++ b/OpenRA.FileFormats/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+#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.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("OpenRA.FileFormats")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenRA.FileFormats")]
+[assembly: AssemblyCopyright("Copyright ©  2007,2009,2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/OpenRA.FileFormats/Support/Log.cs
+++ b/OpenRA.FileFormats/Support/Log.cs
@@ -0,0 +1,74 @@
+#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.Compression;
+using System.Linq;
+using System.Net;
+
+namespace OpenRA
+{
+	public struct ChannelInfo
+	{
+		public string Filename;
+		public StreamWriter Writer;
+	}
+
+	public static class Log
+	{
+		static string LogPathPrefix = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + Path.DirectorySeparatorChar;
+		static Dictionary<string, ChannelInfo> channels = new Dictionary<string,ChannelInfo>();
+
+		public static string LogPath
+		{
+			get { return LogPathPrefix; }
+			set
+			{
+				LogPathPrefix = value;				
+				if (!Directory.Exists(LogPathPrefix))
+					Directory.CreateDirectory(LogPathPrefix);
+			}
+		}
+		
+		public static void AddChannel(string channelName, string filename)
+		{
+			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() { Filename = filename, Writer = writer });
+					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() { Filename = filename, Writer = w });
+			
+		}
+
+		public static void Write(string channel, string format, params object[] args)
+		{
+			ChannelInfo info;
+			if (!channels.TryGetValue(channel, out info))
+				throw new Exception("Tried logging to non-existant channel " + channel);
+
+			info.Writer.WriteLine(format, args);
+		}
+	}
+}
--- a/OpenRA.FileFormats/Support/Stopwatch.cs
+++ b/OpenRA.FileFormats/Support/Stopwatch.cs
@@ -0,0 +1,31 @@
+#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.Support
+{
+	public class Stopwatch
+	{
+		System.Diagnostics.Stopwatch sw;
+		public Stopwatch ()
+		{
+			Reset();
+		}
+
+		public double ElapsedTime()
+		{
+			return sw.Elapsed.TotalMilliseconds / 1000.0;
+		}
+
+		public void Reset()
+		{
+			sw = System.Diagnostics.Stopwatch.StartNew();
+		}
+	}
+}
--- a/OpenRA.FileFormats/Support/Timer.cs
+++ b/OpenRA.FileFormats/Support/Timer.cs
@@ -0,0 +1,27 @@
+#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.Support
+{
+	public static class Timer
+	{
+		static Stopwatch sw = new Stopwatch();
+		static double lastTime = 0;
+
+		public static void Time( string message )
+		{
+			var time = sw.ElapsedTime();
+			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
@@ -0,0 +1,66 @@
+#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
+{
+	// quick & dirty Mersenne Twister [MT19937] implementation
+
+	public class Random
+	{
+		uint[] mt = new uint[624];
+		int index = 0;
+		
+		public int Last;
+
+		public Random() : this(Environment.TickCount) { }
+		
+		public Random(int seed)
+		{
+			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()
+		{
+			if (index == 0) Generate();
+
+			var y = mt[index];
+			y ^= (y >> 11);
+			y ^= ((y << 7) & 2636928640);
+			y ^= ((y << 15) & 4022730752);
+			y ^= y >> 18;
+
+			index = (index + 1) % 624;
+			Last = (int)(y % int.MaxValue);
+			return Last;
+		}
+
+		public int Next(int low, int high) { return low + Next() % (high - low); }
+		public int Next(int high) { return Next() % high; }
+		public double NextDouble() { return Math.Abs(Next() / (double)0x7fffffff); }
+
+		void Generate()
+		{
+			unchecked
+			{
+				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
@@ -0,0 +1,106 @@
+#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;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class TypeDictionary : IEnumerable
+	{
+		Dictionary<Type, object> dataSingular = new Dictionary<Type, object>();
+		Dictionary<Type, List<object>> dataMultiple = new Dictionary<Type, List<object>>();
+
+		public void Add( object val )
+		{
+			var t = val.GetType();
+
+			foreach( var i in t.GetInterfaces() )
+				InnerAdd( i, val );
+			foreach( var tt in t.BaseTypes() )
+				InnerAdd( tt, val );
+		}
+
+		void InnerAdd( Type t, object val )
+		{
+			List<object> objs;
+			object obj;
+
+			if( dataMultiple.TryGetValue( t, out objs ) )
+				objs.Add( val );
+			else if( dataSingular.TryGetValue( t, out obj ) )
+			{
+				dataSingular.Remove( t );
+				dataMultiple.Add( t, new List<object> { obj, val } );
+			}
+			else
+				dataSingular.Add( t, val );
+		}
+
+		public bool Contains<T>()
+		{
+			return dataSingular.ContainsKey( typeof( T ) ) || dataMultiple.ContainsKey( typeof( T ) );
+		}
+
+		public T Get<T>()
+		{
+			if( dataMultiple.ContainsKey( typeof( T ) ) )
+				throw new InvalidOperationException( string.Format( "TypeDictionary contains multiple instance of type `{0}`", typeof( T ) ) );
+
+			object ret;
+			if( !dataSingular.TryGetValue( typeof( T ), out ret ) )
+				throw new InvalidOperationException(string.Format("TypeDictionary does not contain instance of type `{0}`", typeof(T)));
+			return (T)ret;
+		}
+
+		public T GetOrDefault<T>()
+		{
+			if( dataMultiple.ContainsKey( typeof( T ) ) )
+				throw new InvalidOperationException( string.Format( "TypeDictionary contains multiple instance of type `{0}`", typeof( T ) ) );
+
+			object ret;
+			if( !dataSingular.TryGetValue( typeof( T ), out ret ) )
+				return default( T );
+			return (T)ret;
+		}
+
+		public IEnumerable<T> WithInterface<T>()
+		{
+			List<object> objs;
+			object obj;
+
+			if( dataMultiple.TryGetValue( typeof( T ), out objs ) )
+				return objs.Cast<T>();
+			else if( dataSingular.TryGetValue( typeof( T ), out obj ) )
+				return new T[] { (T)obj };
+			else
+				return new T[ 0 ];
+		}
+
+		public IEnumerator GetEnumerator()
+		{
+			return WithInterface<object>().GetEnumerator();
+		}
+	}
+
+	public static class TypeExts
+	{
+		public static IEnumerable<Type> BaseTypes( this Type t )
+		{
+			while( t != null )
+			{
+				yield return t;
+				t = t.BaseType;
+			}
+		}
+	}
+}
--- a/OpenRA.Game.exe.config
+++ b/OpenRA.Game.exe.config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <runtime>
-    <loadFromRemoteSources enabled="true" />
-  </runtime>
-</configuration>
--- a/OpenRA.Game/Activities/Activity.cs
+++ b/OpenRA.Game/Activities/Activity.cs
@@ -1,303 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Traits;
-
-namespace OpenRA.Activities
-{
-	public enum ActivityState { Queued, Active, Done, Canceled }
-
-	/*
-	 * Activities are actions carried out by actors during each tick.
-	 *
-	 * Activities exist in a graph data structure built up amongst themselves. Each activity has a parent activity,
-	 * optionally child activities, and usually a next activity. An actor's CurrentActivity is a pointer into that graph
-	 * and moves through it as activities run.
-	 *
-	 * There are two kinds of activities, the base activity and composite activities. They differ in the way their children
-	 * are run: while a base activity is responsible for running its children itself, a composite activity relies on the actor's
-	 * activity-running code. Therefore, the actor's CurrentActivity stays on the base activity while it runs its children. With
-	 * composite activities however, the CurrentActivity moves through the list of children as they run.
-	 *
-	 *
-	 * Things to be aware of when writing activities:
-	 *
-	 * - Use "return NextActivity" at least once somewhere in the tick method.
-	 * - Do not use "return new SomeActivity()" as that will break the graph. Queue the new activity and use "return NextActivity" instead.
-	 * - Do not "reuse" (with "SequenceActivities", for example) activity objects that have already finished running.
-	 *   Queue a new instance instead.
-	 * - Avoid calling actor.CancelActivity(). It is almost always a bug. Call activity.Cancel() instead.
-	 * - A composite activity will run at least twice. The first time when it returns its children,
-	 *   the second time when its last child returns its Parent.
-	 * - Do not return the Parent explicitly unless you have an extremly good reason. "return NextActivity"
-	 *   will do the right thing in all circumstances.
-	 * - You do not need to care about the ChildActivity pointer advancing through the list of children,
-	 *   the activity code already takes care of that.
-	 * - If you want to check whether there are any follow-up activities queued, check against "NextInQueue"
-	 *   in favour of "NextActivity" to avoid checking against the Parent activity.
-	 *
-	 *
-	 * Guide when to use which kind of activity:
-	 *
-	 * - The activity does not have any children -> base activity
-	 * - The activity needs to run preparatory steps during each tick before its children can be run -> base activity
-	 * - The activity or the actor is left in a bogus state when one of the child activities is canceled -> base activity
-	 * - The activity's children are self-contained and can run independently of the parent -> composite activity
-	 * - The activity does not have any or little logic of its own, but is just composed of sub-steps -> composite activity
-	*/
-	public abstract class Activity
-	{
-		public ActivityState State { get; private set; }
-
-		/// <summary>
-		/// Returns the top-most activity *from the point of view of the calling activity*. Note that the root activity
-		/// can and likely will have next activities of its own, which would in turn be the root for their children.
-		/// </summary>
-		public Activity RootActivity
-		{
-			get
-			{
-				var p = this;
-				while (p.ParentActivity != null)
-					p = p.ParentActivity;
-
-				return p;
-			}
-		}
-
-		Activity parentActivity;
-		public Activity ParentActivity
-		{
-			get
-			{
-				return parentActivity;
-			}
-
-			protected set
-			{
-				parentActivity = value;
-
-				var next = NextInQueue;
-				if (next != null)
-					next.ParentActivity = parentActivity;
-			}
-		}
-
-		Activity childActivity;
-		protected Activity ChildActivity
-		{
-			get
-			{
-				return childActivity != null && childActivity.State < ActivityState.Done ? childActivity : null;
-			}
-
-			set
-			{
-				if (value == this || value == ParentActivity || value == NextInQueue)
-					childActivity = null;
-				else
-				{
-					childActivity = value;
-
-					if (childActivity != null)
-						childActivity.ParentActivity = this;
-				}
-			}
-		}
-
-		Activity nextActivity;
-
-		/// <summary>
-		/// The getter will return either the next activity or, if there is none, the parent one.
-		/// </summary>
-		public virtual Activity NextActivity
-		{
-			get
-			{
-				return nextActivity != null ? nextActivity : ParentActivity;
-			}
-
-			set
-			{
-				if (value == this || value == ParentActivity || (value != null && value.ParentActivity == this))
-					nextActivity = null;
-				else
-				{
-					nextActivity = value;
-
-					if (nextActivity != null)
-						nextActivity.ParentActivity = ParentActivity;
-				}
-			}
-		}
-
-		/// <summary>
-		/// The getter will return the next activity on the same level _only_, in contrast to NextActivity.
-		/// Use this to check whether there are any follow-up activities queued.
-		/// </summary>
-		public Activity NextInQueue
-		{
-			get { return nextActivity; }
-			set { NextActivity = value; }
-		}
-
-		public bool IsInterruptible { get; protected set; }
-		public bool IsCanceled { get { return State == ActivityState.Canceled; } }
-
-		public Activity()
-		{
-			IsInterruptible = true;
-		}
-
-		public Activity TickOuter(Actor self)
-		{
-			if (State == ActivityState.Done && Game.Settings.Debug.StrictActivityChecking)
-				throw new InvalidOperationException("Actor {0} attempted to tick activity {1} after it had already completed.".F(self, this.GetType()));
-
-			if (State == ActivityState.Queued)
-			{
-				OnFirstRun(self);
-				State = ActivityState.Active;
-			}
-
-			var ret = Tick(self);
-			if (ret == null || (ret != this && ret.ParentActivity != this))
-			{
-				// Make sure that the Parent's ChildActivity pointer is moved forwards as the child queue advances.
-				// The Child's ParentActivity will be set automatically during assignment.
-				if (ParentActivity != null && ParentActivity != ret)
-					ParentActivity.ChildActivity = ret;
-
-				if (State != ActivityState.Canceled)
-					State = ActivityState.Done;
-
-				OnLastRun(self);
-			}
-
-			return ret;
-		}
-
-		public abstract Activity Tick(Actor self);
-
-		/// <summary>
-		/// Runs once immediately before the first Tick() execution.
-		/// </summary>
-		protected virtual void OnFirstRun(Actor self) { }
-
-		/// <summary>
-		/// Runs once immediately after the last Tick() execution.
-		/// </summary>
-		protected virtual void OnLastRun(Actor self) { }
-
-		public virtual bool Cancel(Actor self, bool keepQueue = false)
-		{
-			if (!IsInterruptible)
-				return false;
-
-			if (ChildActivity != null && !ChildActivity.Cancel(self))
-				return false;
-
-			if (!keepQueue)
-				NextActivity = null;
-
-			ChildActivity = null;
-			State = ActivityState.Canceled;
-
-			return true;
-		}
-
-		public virtual void Queue(Activity activity)
-		{
-			if (NextInQueue != null)
-				NextInQueue.Queue(activity);
-			else
-				NextInQueue = activity;
-		}
-
-		public virtual void QueueChild(Activity activity)
-		{
-			if (ChildActivity != null)
-				ChildActivity.Queue(activity);
-			else
-				ChildActivity = activity;
-		}
-
-		/// <summary>
-		/// Prints the activity tree, starting from the root or optionally from a given origin.
-		///
-		/// Call this method from any place that's called during a tick, such as the Tick() method itself or
-		/// the Before(First|Last)Run() methods. The origin activity will be marked in the output.
-		/// </summary>
-		/// <param name="origin">Activity from which to start traversing, and which to mark. If null, mark the calling activity, and start traversal from the root.</param>
-		/// <param name="level">Initial level of indentation.</param>
-		protected void PrintActivityTree(Activity origin = null, int level = 0)
-		{
-			if (origin == null)
-				RootActivity.PrintActivityTree(this);
-			else
-			{
-				Console.Write(new string(' ', level * 2));
-				if (origin == this)
-					Console.Write("*");
-
-				Console.WriteLine(this.GetType().ToString().Split('.').Last());
-
-				if (ChildActivity != null)
-					ChildActivity.PrintActivityTree(origin, level + 1);
-
-				if (NextInQueue != null)
-					NextInQueue.PrintActivityTree(origin, level);
-			}
-		}
-
-		public virtual IEnumerable<Target> GetTargets(Actor self)
-		{
-			yield break;
-		}
-	}
-
-	/// <summary>
-	/// In contrast to the base activity class, which is responsible for running its children itself,
-	/// composite activities rely on the actor's activity-running logic for their children.
-	/// </summary>
-	public abstract class CompositeActivity : Activity
-	{
-		/// <summary>
-		/// The getter will return the first non-null value of either child, next or parent activity, in that order, or ultimately null.
-		/// </summary>
-		public override Activity NextActivity
-		{
-			get
-			{
-				if (ChildActivity != null)
-					return ChildActivity;
-				else if (NextInQueue != null)
-					return NextInQueue;
-				else
-					return ParentActivity;
-			}
-		}
-	}
-
-	public static class ActivityExts
-	{
-		public static IEnumerable<Target> GetTargetQueue(this Actor self)
-		{
-			return self.CurrentActivity
-				.Iterate(u => u.NextActivity)
-				.TakeWhile(u => u != null)
-				.SelectMany(u => u.GetTargets(self));
-		}
-	}
-}
--- a/OpenRA.Game/Activities/CallFunc.cs
+++ b/OpenRA.Game/Activities/CallFunc.cs
@@ -1,33 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-
-namespace OpenRA.Activities
-{
-	public class CallFunc : Activity
-	{
-		public CallFunc(Action a) { this.a = a; }
-		public CallFunc(Action a, bool interruptible)
-		{
-			this.a = a;
-			IsInterruptible = interruptible;
-		}
-
-		Action a;
-
-		public override Activity Tick(Actor self)
-		{
-			if (a != null) a();
-			return NextActivity;
-		}
-	}
-}
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -1,210 +1,150 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using Eluant;
-using Eluant.ObjectBinding;
-using OpenRA.Activities;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
-using OpenRA.Scripting;
-using OpenRA.Traits;
+#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.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Support;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;

 namespace OpenRA
 {
-	public sealed class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IDisposable
+	public class Actor
 	{
-		internal struct SyncHash
-		{
-			public readonly ISync Trait;
-			readonly Func<object, int> hashFunction;
-			public SyncHash(ISync trait) { Trait = trait; hashFunction = Sync.GetHashFunction(trait); }
-			public int Hash() { return hashFunction(Trait); }
-		}
-
 		public readonly ActorInfo Info;

 		public readonly World World;
+		public readonly uint ActorID;
+
+		public int2 Location { get { return Trait<IOccupySpace>().TopLeft; } }
+		public float2 CenterLocation { get { return Trait<IHasLocation>().PxPosition; } }
+		[Sync]
+		public Player Owner;

-		public readonly uint ActorID;
-
-		public Player Owner { get; internal set; }
-
-		public bool IsInWorld { get; internal set; }
-		public bool Disposed { get; private set; }
-
-		public Activity CurrentActivity { get; private set; }
-
-		public int Generation;
-
-		public IEffectiveOwner EffectiveOwner { get; private set; }
-		public IOccupySpace OccupiesSpace { get; private set; }
-		public ITargetable[] Targetables { get; private set; }
-
-		public bool IsIdle { get { return CurrentActivity == null; } }
-		public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
-
-		public CPos Location { get { return OccupiesSpace.TopLeft; } }
-		public WPos CenterPosition { get { return OccupiesSpace.CenterPosition; } }
-
-		public WRot Orientation
-		{
-			get
-			{
-				// TODO: Support non-zero pitch/roll in IFacing (IOrientation?)
-				var facingValue = facing != null ? facing.Facing : 0;
-				return new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facingValue));
-			}
-		}
-
-		internal SyncHash[] SyncHashes { get; private set; }
-
-		readonly IFacing facing;
-		readonly IHealth health;
-		readonly IRenderModifier[] renderModifiers;
-		readonly IRender[] renders;
-		readonly IMouseBounds[] mouseBounds;
-		readonly IVisibilityModifier[] visibilityModifiers;
-		readonly IDefaultVisibility defaultVisibility;
-
-		internal Actor(World world, string name, TypeDictionary initDict)
-		{
-			var init = new ActorInitializer(this, initDict);
+		IActivity currentActivity;
+		public Group Group;
+
+		internal Actor(World world, string name, TypeDictionary initDict )
+		{
+			var init = new ActorInitializer( this, initDict );

 			World = world;
-			ActorID = world.NextAID();
-			if (initDict.Contains<OwnerInit>())
-				Owner = init.Get<OwnerInit, Player>();
+			ActorID = world.NextAID();
+			if( initDict.Contains<OwnerInit>() )
+				Owner = init.Get<OwnerInit,Player>();

 			if (name != null)
 			{
-				name = name.ToLowerInvariant();
+				if (!Rules.Info.ContainsKey(name.ToLowerInvariant()))
+					throw new NotImplementedException("No rules definition for unit {0}".F(name.ToLowerInvariant()));

-				if (!world.Map.Rules.Actors.ContainsKey(name))
-					throw new NotImplementedException("No rules definition for unit " + name);
-
-				Info = world.Map.Rules.Actors[name];
+				Info = Rules.Info[name.ToLowerInvariant()];
 				foreach (var trait in Info.TraitsInConstructOrder())
-				{
 					AddTrait(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]);

-					// Some traits rely on properties provided by IOccupySpace in their initialization,
-					// so we must ready it now, we cannot wait until all traits have finished construction.
-					if (trait is IOccupySpaceInfo)
-						OccupiesSpace = Trait<IOccupySpace>();
-				}
-			}
-
-			// PERF: Cache all these traits as soon as the actor is created. This is a fairly cheap one-off cost per
-			// actor that allows us to provide some fast implementations of commonly used methods that are relied on by
-			// performance-sensitive parts of the core game engine, such as pathfinding, visibility and rendering.
-			EffectiveOwner = TraitOrDefault<IEffectiveOwner>();
-			facing = TraitOrDefault<IFacing>();
-			health = TraitOrDefault<IHealth>();
-			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
-			renders = TraitsImplementing<IRender>().ToArray();
-			mouseBounds = TraitsImplementing<IMouseBounds>().ToArray();
-			visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
-			defaultVisibility = Trait<IDefaultVisibility>();
-			Targetables = TraitsImplementing<ITargetable>().ToArray();
-
-			SyncHashes = TraitsImplementing<ISync>().Select(sync => new SyncHash(sync)).ToArray();
+				// auto size from render
+				var firstSprite = TraitsImplementing<IRender>().SelectMany(x => x.Render(this)).FirstOrDefault();
+				if (firstSprite.Sprite == null) return float2.Zero;
+				return firstSprite.Sprite.size;
+			});
 		}

 		public void Tick()
-		{
-			var wasIdle = IsIdle;
-			CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
-
-			if (!wasIdle && IsIdle)
-				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
-					n.OnBecomingIdle(this);
-		}
-
-		public IEnumerable<IRenderable> Render(WorldRenderer wr)
-		{
-			// PERF: Avoid LINQ.
-			var renderables = Renderables(wr);
-			foreach (var modifier in renderModifiers)
-				renderables = modifier.ModifyRender(this, wr, renderables);
-			return renderables;
-		}
-
-		IEnumerable<IRenderable> Renderables(WorldRenderer wr)
-		{
-			// PERF: Avoid LINQ.
-			// Implementations of Render are permitted to return both an eagerly materialized collection or a lazily
-			// generated sequence.
-			// For large amounts of renderables, a lazily generated sequence (e.g. as returned by LINQ, or by using
-			// `yield`) will avoid the need to allocate a large collection.
-			// For small amounts of renderables, allocating a small collection can often be faster and require less
-			// memory than creating the objects needed to represent a sequence.
-			foreach (var render in renders)
-				foreach (var renderable in render.Render(this, wr))
-					yield return renderable;
-		}
-
-		public IEnumerable<Rectangle> ScreenBounds(WorldRenderer wr)
-		{
-			var bounds = Bounds(wr);
-			foreach (var modifier in renderModifiers)
-				bounds = modifier.ModifyScreenBounds(this, wr, bounds);
-			return bounds;
-		}
-
-		IEnumerable<Rectangle> Bounds(WorldRenderer wr)
-		{
-			// PERF: Avoid LINQ. See comments for Renderables
-			foreach (var render in renders)
-				foreach (var r in render.ScreenBounds(this, wr))
-					if (!r.IsEmpty)
-						yield return r;
-		}
-
-		public Rectangle MouseBounds(WorldRenderer wr)
-		{
-			foreach (var mb in mouseBounds)
+		{
+			var wasIdle = currentActivity is Idle;
+			while (currentActivity != null)
 			{
-				var bounds = mb.MouseoverBounds(this, wr);
-				if (!bounds.IsEmpty)
-					return bounds;
+				var a = currentActivity;
+				
+				var sw = new Stopwatch();
+				currentActivity = a.Tick(this) ?? new Idle();
+				var dt = sw.ElapsedTime();
+				if(dt > Game.Settings.Debug.LongTickThreshold)
+					Log.Write("perf", "[{2}] Activity: {0} ({1:0.000} ms)", a, dt * 1000, Game.LocalTick);
+				
+				if (a == currentActivity) break;
+
+				if (currentActivity is Idle)
+				{
+					if (!wasIdle)
+						foreach (var ni in TraitsImplementing<INotifyIdle>())
+							ni.Idle(this);
+
+					break;
+				}
+			}
+		}
+
+		public bool IsIdle
+		{
+			get { return currentActivity == null || currentActivity is Idle; }
+		}
+
+        OpenRA.FileFormats.Lazy<float2> Size;
+
+		public IEnumerable<Renderable> Render()
+		{
+			var mods = TraitsImplementing<IRenderModifier>();
+			var sprites = TraitsImplementing<IRender>().SelectMany(x => x.Render(this));
+			return mods.Aggregate(sprites, (m, p) => p.ModifyRender(this, m));
+		}
+
+		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 = TraitOrDefault<IMove>();
+				if (move != null) loc -= new float2(0, move.Altitude);
 			}

-			return Rectangle.Empty;
+			return new RectangleF(loc.X, loc.Y, size.X, size.Y);
 		}

-		public void QueueActivity(bool queued, Activity nextActivity)
-		{
-			if (!queued)
-				CancelActivity();
-			QueueActivity(nextActivity);
-		}
+		public bool IsInWorld { get; internal set; }

-		public void QueueActivity(Activity nextActivity)
+		public void QueueActivity( IActivity nextActivity )
 		{
-			if (CurrentActivity == null)
-				CurrentActivity = nextActivity;
+			if( currentActivity == null )
+				currentActivity = nextActivity;
 			else
-				CurrentActivity.RootActivity.Queue(nextActivity);
+				currentActivity.Queue( nextActivity );
 		}

-		public bool CancelActivity()
+		public void CancelActivity()
 		{
-			if (CurrentActivity != null)
-				return CurrentActivity.RootActivity.Cancel(this);
+			if( currentActivity != null )
+				currentActivity.Cancel( this );
+		}

-			return true;
+		// For pathdebug, et al
+		public IActivity GetCurrentActivity()
+		{
+			return currentActivity;
 		}

 		public override int GetHashCode()
@@ -212,194 +152,52 @@ namespace OpenRA
 			return (int)ActorID;
 		}

-		public override bool Equals(object obj)
+		public override bool Equals( object obj )
 		{
 			var o = obj as Actor;
-			return o != null && Equals(o);
+			return ( o != null && o.ActorID == ActorID );
 		}

-		public bool Equals(Actor other)
-		{
-			return ActorID == other.ActorID;
+		public override string ToString()
+		{
+			return "{0} {1}{2}".F( Info.Name, ActorID, IsInWorld ? "" : " (not in world)" );
 		}

-		public override string ToString()
-		{
-			// PERF: Avoid format strings.
-			var name = Info.Name + " " + ActorID;
-			if (!IsInWorld)
-				name += " (not in world)";
-			return name;
-		}
-
-		public T Trait<T>()
-		{
-			return World.TraitDict.Get<T>(this);
-		}
-
-		public T TraitOrDefault<T>()
-		{
-			return World.TraitDict.GetOrDefault<T>(this);
-		}
-
-		public IEnumerable<T> TraitsImplementing<T>()
-		{
-			return World.TraitDict.WithInterface<T>(this);
-		}
-
-		public void AddTrait(object trait)
-		{
-			World.TraitDict.AddTrait(this, trait);
-		}
-
-		public void Dispose()
-		{
-			World.AddFrameEndTask(w =>
-			{
-				if (Disposed)
-					return;
-
-				if (IsInWorld)
-					World.Remove(this);
-
-				foreach (var t in TraitsImplementing<INotifyActorDisposing>())
-					t.Disposing(this);
-
-				World.TraitDict.RemoveActor(this);
-				Disposed = true;
-
-				if (luaInterface != null)
-					luaInterface.Value.OnActorDestroyed();
-			});
-		}
-
-		// TODO: move elsewhere.
-		public void ChangeOwner(Player newOwner)
-		{
-			World.AddFrameEndTask(_ => ChangeOwnerSync(newOwner));
-		}
-
-		/// <summary>
-		/// Change the actors owner without queuing a FrameEndTask.
-		/// This must only be called from inside an existing FrameEndTask.
-		/// </summary>
-		public void ChangeOwnerSync(Player newOwner)
-		{
-			if (Disposed)
-				return;
-
-			var oldOwner = Owner;
-			var wasInWorld = IsInWorld;
-
-			// momentarily remove from world so the ownership queries don't get confused
-			if (wasInWorld)
-				World.Remove(this);
-
-			Owner = newOwner;
-			Generation++;
-
-			foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
-				t.OnOwnerChanged(this, oldOwner, newOwner);
-
-			if (wasInWorld)
-				World.Add(this);
-		}
-
-		public DamageState GetDamageState()
-		{
-			if (Disposed)
-				return DamageState.Dead;
-
-			return (health == null) ? DamageState.Undamaged : health.DamageState;
-		}
-
-		public void InflictDamage(Actor attacker, Damage damage)
-		{
-			if (Disposed || health == null)
-				return;
-
-			health.InflictDamage(this, attacker, damage, false);
-		}
-
-		public void Kill(Actor attacker)
-		{
-			if (Disposed || health == null)
-				return;
-
-			health.Kill(this, attacker);
-		}
-
-		public bool CanBeViewedByPlayer(Player player)
-		{
-			// PERF: Avoid LINQ.
-			foreach (var visibilityModifier in visibilityModifiers)
-				if (!visibilityModifier.IsVisible(this, player))
-					return false;
-
-			return defaultVisibility.IsVisible(this, player);
-		}
-
-		public IEnumerable<string> GetAllTargetTypes()
-		{
-			// PERF: Avoid LINQ.
-			foreach (var targetable in Targetables)
-				foreach (var targetType in targetable.TargetTypes)
-					yield return targetType;
-		}
-
-		public IEnumerable<string> GetEnabledTargetTypes()
-		{
-			// PERF: Avoid LINQ.
-			foreach (var targetable in Targetables)
-				if (targetable.IsTraitEnabled())
-					foreach (var targetType in targetable.TargetTypes)
-						yield return targetType;
-		}
-
-		public bool IsTargetableBy(Actor byActor)
-		{
-			// PERF: Avoid LINQ.
-			foreach (var targetable in Targetables)
-				if (targetable.IsTraitEnabled() && targetable.TargetableBy(this, byActor))
-					return true;
-
-			return false;
-		}
-
-		#region Scripting interface
-
-		Lazy<ScriptActorInterface> luaInterface;
-		public void OnScriptBind(ScriptContext context)
-		{
-			if (luaInterface == null)
-				luaInterface = Exts.Lazy(() => new ScriptActorInterface(context, this));
-		}
-
-		public LuaValue this[LuaRuntime runtime, LuaValue keyValue]
-		{
-			get { return luaInterface.Value[runtime, keyValue]; }
-			set { luaInterface.Value[runtime, keyValue] = value; }
-		}
-
-		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
-		{
-			Actor a, b;
-			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
-				return false;
-
-			return a == b;
-		}
-
-		public LuaValue ToString(LuaRuntime runtime)
-		{
-			return "Actor ({0})".F(this);
-		}
-
-		public bool HasScriptProperty(string name)
-		{
-			return luaInterface.Value.ContainsKey(name);
-		}
-
-		#endregion
-	}
+		public T Trait<T>()
+		{
+			return World.traitDict.Get<T>( this );
+		}
+
+		public T TraitOrDefault<T>()
+		{
+			return World.traitDict.GetOrDefault<T>( this );
+		}
+
+		public IEnumerable<T> TraitsImplementing<T>()
+		{
+			return World.traitDict.WithInterface<T>( this );
+		}
+
+		public bool HasTrait<T>()
+		{
+			return World.traitDict.Contains<T>( this );
+		}
+
+		public void AddTrait( object trait )
+		{
+			World.traitDict.AddTrait( this, trait );
+		}
+
+		public bool Destroyed { get; private set; }
+
+		public void Destroy()
+		{
+			World.AddFrameEndTask( w =>
+			{
+				World.Remove( this );
+				World.traitDict.RemoveActor( this );
+				Destroyed = true;
+			} );
+		}
+	}
 }
--- 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.Values.First( x => x.InternalName == PlayerName );
+		}
+	}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Chris Forbes	ae29941d52	fix bogus target lines being drawn to 0,0	2010-10-08 21:04:31 +13:00
Caleb Anderson	e224fadbeb	bandage to fix dogs not killing infantry in certain cases	2010-10-08 19:56:27 +13:00
Bob	1cccef5434	use a getter for Aircraft.Location	2010-10-08 19:54:56 +13:00
Bob	319da4c5ae	add IHasLocation	2010-10-08 19:54:52 +13:00
Bob	94fc260293	remove setters on Mobile.{from,to}Cell. use SetLocation instead	2010-10-08 19:54:49 +13:00