Fix Monodevelop build

Known regressions:
 - cnc only
 - health bar colors
 - can't repair buildings

.gitignore

@@ -11,7 +11,6 @@ mods/*/*.dll
 
 # Red Alert binary files
 *.[mM][iI][xX]
-*.[aA][uU][dD]
 
 # Crap generated by OpenRa
 sheet-*.png
@@ -23,12 +22,13 @@ log.txt
 /*.dll
 *.pdb
 *.mdb
-/*.exe
+*.exe
 OpenRA
 OpenRA.app
 
 # backup files by various editors
 *~
+*.orig
 # dependency DLLs (different for every platform!)
 cg.dll
 cgGL.dll
@@ -53,3 +53,4 @@ temp.o
 temp.s
 
 *.config
+*.resources

AUTHORS

@@ -0,0 +1,9 @@
+AUTHORS
+
+The OpenRA developers are:
+	* Chris Forbes
+	* Robert Pepperell
+	* Matthew Bowra-Dean
+	* Paul Chote
+	* Alli Witheford
+	* Joakim Lindberg

FileExtractor/FileExtractor.cs

@@ -0,0 +1,54 @@
+using System;
+using OpenRA.FileFormats;
+using System.IO;
+
+namespace FileExtractor
+{
+	public class FileExtractor
+	{
+		int Length = 256;
+		
+		public FileExtractor (string[] args)
+		{
+			if (args.Length != 2)
+			{
+				Console.WriteLine("usage: FileExtractor mod[,mod]* filename");
+				return;
+			}
+
+			var mods = args[0].Split(',');
+			var manifest = new Manifest(mods);
+
+			foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
+			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
+			
+			try
+			{
+				var readStream = FileSystem.Open(args[1]);
+				var writeStream = new FileStream(args[1], FileMode.OpenOrCreate, FileAccess.Write);
+				
+				WriteOutFile(readStream, writeStream);
+				
+			} 
+			catch (FileNotFoundException) 
+			{
+				Console.WriteLine(String.Format("No Such File {0}", args[1]));
+			}
+		}
+		
+		void WriteOutFile (Stream readStream, Stream writeStream)
+		{
+   			Byte[] buffer = new Byte[Length];
+   			int bytesRead = readStream.Read(buffer,0,Length);
+
+ 			while( bytesRead > 0 ) 
+    		{
+        		writeStream.Write(buffer,0,bytesRead);
+        		bytesRead = readStream.Read(buffer,0,Length);
+    		}
+    		readStream.Close();
+    		writeStream.Close();
+		}
+	}
+}
+

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>

FileExtractor/Main.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace FileExtractor
+{
+	public class MainClass
+	{
+		public static void Main (string[] args)
+		{
+			new FileExtractor(args);
+		}
+	}
+}
+

Makefile

@@ -1,23 +1,22 @@
 CSC     = gmcs
 CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
 DEFINE  = DEBUG;TRACE
-PROGRAMS	=fileformats gl game ra cnc aftermath seqed mapcvtr editor
+PROGRAMS	=fileformats gl game ra cnc seqed mapcvtr editor ralint filex tsbuild
 prefix = /usr/local
 datarootdir = $(prefix)/share
 datadir = $(datarootdir)
 bindir = $(prefix)/bin
+BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
 INSTALL_DIR = $(DESTDIR)$(datadir)/openra
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
 
 COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
 
-CORE = fileformats gl game seqed mapcvtr
-
 fileformats_SRCS	=	$(shell find OpenRA.FileFormats/ -iname '*.cs')
 fileformats_TARGET	=	OpenRA.FileFormats.dll
 fileformats_KIND	=	library
-fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll
+fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll WindowsBase.dll
 
 gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
 gl_TARGET			= OpenRA.Gl.dll
@@ -47,20 +46,14 @@ cnc_KIND			=	library
 cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
 cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)
 
-aftermath_SRCS		=	$(shell find OpenRA.Mods.Aftermath/ -iname '*.cs')
-aftermath_TARGET	=	mods/aftermath/OpenRA.Mods.Aftermath.dll
-aftermath_KIND		=	library
-aftermath_DEPS		= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
-aftermath_LIBS		= $(COMMON_LIBS) $(aftermath_DEPS)
-
 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
 
 editor_SRCS			= $(shell find OpenRA.Editor/ -iname '*.cs')
-
 editor_TARGET		= OpenRA.Editor.exe
 editor_KIND			= winexe
 editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
@@ -70,31 +63,47 @@ editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources
 mapcvtr_SRCS		= $(shell find MapConverter/ -iname '*.cs')
 mapcvtr_TARGET		= MapConverter.exe
 mapcvtr_KIND		= winexe
-mapcvtr_DEPS		= $(fileformats_TARGET)
+mapcvtr_DEPS		= $(fileformats_TARGET) $(game_TARGET)
 mapcvtr_LIBS		= $(COMMON_LIBS) $(mapcvtr_DEPS)
 
+ralint_SRCS		= $(shell find RALint/ -iname '*.cs')
+ralint_TARGET	= RALint.exe
+ralint_KIND		= winexe
+ralint_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+ralint_LIBS		= $(COMMON_LIBS) $(ralint_DEPS)
+
+filex_SRCS		= $(shell find FileExtractor/ -iname '*.cs')
+filex_TARGET	= FileExtractor.exe
+filex_KIND		= winexe
+filex_DEPS		= $(fileformats_TARGET)
+filex_LIBS		= $(COMMON_LIBS) $(filex_DEPS)
+
+tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_TARGET		= TilesetBuilder.exe
+tsbuild_KIND		= winexe
+tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
+tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
+
 # -platform:x86
 
 .SUFFIXES:
-.PHONY: clean all default mods seqed mapcvtr install uninstall
+.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed mapcvtr filex
 
-all: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(seqed_TARGET) $(mapcvtr_TARGET)
+game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
 
 clean: 
-	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 
 distclean: clean
 
+CORE = fileformats gl game seqed mapcvtr
+
 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/aftermath
-	@$(INSTALL_PROGRAM) $(aftermath_TARGET) $(INSTALL_DIR)/mods/aftermath
-	@-cp $(foreach f,$(shell ls mods/aftermath --hide=*.dll),mods/aftermath/$(f)) $(INSTALL_DIR)/mods/aftermath
-	@cp -r mods/aftermath/packages $(INSTALL_DIR)/mods/aftermath
-	
+		
 	@$(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
@@ -109,6 +118,13 @@ install: all
 	@cp *.ttf $(INSTALL_DIR)
 	@-cp *.ini $(INSTALL_DIR)
 	@cp -r thirdparty $(INSTALL_DIR)
+	
+	@echo "#!/bin/sh" > openra
+	@echo "cd "$(datadir)"/openra" >> openra
+	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe" >> openra
+	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
+	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
+		
 	@echo "OpenRA is now installed. You will now want to download"
 	@echo "http://open-ra.org/packages/ra-packages.zip and"
 	@echo "http://open-ra.org/packages/cnc-packages.zip"
@@ -122,10 +138,26 @@ uninstall:
 	@-rm -r $(INSTALL_DIR)
 	@-rm $(DESTDIR)$(bindir)/openra
 
-mods: $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET)
-seqed: $(seqed_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
+
+OpenRA.Editor.Form1.resources:
+	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
+editor: OpenRA.Editor.Form1.resources $(editor_TARGET)
+ralint: $(ralint_TARGET)
+seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
+SequenceEditor.Form1.resources:
+	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
 mapcvtr: $(mapcvtr_TARGET)
-editor: $(editor_TARGET)
+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 mapcvtr filex tsbuild
+all: game tools
 
 define BUILD_ASSEMBLY
 

MapConverter/AssemblyInfo.cs

@@ -1,26 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes. 
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("MapConverter")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]

MapConverter/Main.cs

@@ -1,3 +1,13 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
 using System;
 using OpenRA.FileFormats;
 

MapConverter/MapConverter.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -23,8 +13,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using OpenRA;
 using OpenRA.FileFormats;
 
@@ -95,7 +83,6 @@ namespace MapConverter
 		int MapSize;
 		int ActorCount = 0; 
 		Map Map = new Map();
-		Manifest manifest;
 
 		public MapConverter(string[] args)
 		{
@@ -105,39 +92,24 @@ namespace MapConverter
 				return;
 			}
 
-			var mods = args[0].Split(',');
-			manifest = new Manifest(mods);
-
-			foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
-			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
-			
+			Game.InitializeEngineWithMods(args[0].Split(','));
 			ConvertIniMap(args[1]);
 			Save(args[2]);
 		}
+
+		enum IniMapFormat { RedAlert = 3, /* otherwise, cnc (2 variants exist, we don't care to differentiate) */ };
 		
-		
-		static Dictionary<Pair<string,string>,Pair<string,string> > fileMapping = new Dictionary<Pair<string,string>,Pair<string,string> >()
-		{
-			{Pair.New("ra","TEMPERAT"),Pair.New("tem","temperat.col")},
-			{Pair.New("ra","SNOW"),Pair.New("sno","snow.col")},
-			{Pair.New("ra","INTERIOR"),Pair.New("int","temperat.col")},
-			{Pair.New("cnc","DESERT"),Pair.New("des","desert.col")},
-			{Pair.New("cnc","TEMPERAT"),Pair.New("tem","temperat.col")},
-			{Pair.New("cnc","WINTER"),Pair.New("win","winter.col")},
-		};
-		
-		TileSet tileset;
 		public void ConvertIniMap(string iniFile)
 		{
-			IniFile file = new IniFile(FileSystem.Open(iniFile));
-			IniSection basic = file.GetSection("Basic");
-			IniSection map = file.GetSection("Map");
-			var INIFormat = int.Parse(basic.GetValue("NewINIFormat", "0"));
+			var 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 = (INIFormat == 3) ? 128 : 64;
+			MapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64;
 			
 			Map.Title = basic.GetValue("Name", "(null)");
 			Map.Author = "Westwood Studios";
@@ -147,8 +119,8 @@ namespace MapConverter
 			Map.TopLeft = new int2 (XOffset, YOffset);
 			Map.BottomRight = new int2(XOffset+Width,YOffset+Height);
 			Map.Selectable = true;
-			
-			if (INIFormat == 3) // RA map
+
+			if (legacyMapFormat == IniMapFormat.RedAlert)
 			{
 				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
 				UnpackRAOverlayData(ReadPackedSection(file.GetSection("OverlayPack")));
@@ -173,7 +145,8 @@ namespace MapConverter
 		
 			var wp = file.GetSection("Waypoints")
 					.Where(kv => int.Parse(kv.Value) > 0)
-					.Select(kv => Pair.New(int.Parse(kv.Key), new int2(int.Parse(kv.Value) % MapSize, int.Parse(kv.Value) / MapSize)))
+					.Select(kv => Pair.New(int.Parse(kv.Key), 
+						LocationFromMapOffset( int.Parse( kv.Value ), MapSize )))
 					.Where(a => a.First < 8)
 					.ToArray();
 			
@@ -182,6 +155,11 @@ namespace MapConverter
 			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)
 		{

MapConverter/MapConverter.csproj

@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?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>
@@ -35,7 +36,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
-    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="MapConverter.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -43,6 +43,10 @@
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
       <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+      <Name>OpenRA.Game</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

OpenRA.Editor.vshost.exe.manifest

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

OpenRA.Editor/ActorTemplate.cs

@@ -1,4 +1,14 @@
-using System.Drawing;
+#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;
 

OpenRA.Editor/Form1.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -56,7 +46,6 @@ namespace OpenRA.Editor
 		}
 
 		string loadedMapName;
-		string colors;
 		string currentMod = "ra";
 		TileSet tileset;
 
@@ -104,7 +93,7 @@ namespace OpenRA.Editor
 			Rules.LoadRules(manifest, map);			
 			tileset = Rules.TileSets[map.Theater];
 			tileset.LoadTiles();
-			var palette = new Palette(FileSystem.Open(map.Theater.ToLowerInvariant() + ".pal"), true);
+			var palette = new Palette(FileSystem.Open(tileset.Palette), true);
 
 			surface1.Bind(map, tileset, palette);
 
@@ -330,25 +319,6 @@ namespace OpenRA.Editor
 			}
 		}
 		
-		void SavePreviewImage(string filepath)
-		{
-			var Map = surface1.Map;
-
-			var xs = Map.TopLeft.X;
-			var ys = Map.TopLeft.Y;
-
-			var bitmap = new Bitmap(Map.Width, Map.Height);
-			for (var x = 0; x < Map.Width; x++)
-				for (var y = 0; y < Map.Height; y++)
-					bitmap.SetPixel(x, y, tileset.Terrain[tileset.GetTerrainType(Map.MapTiles[x + xs, y + ys])].Color);
-
-			for (var x = 0; x < Map.Width; x++)
-				for (var y = 0; y < Map.Height; y++)
-					if (Map.MapResources[x + xs, y + ys].type > 0)
-						bitmap.SetPixel(x, y, tileset.Terrain["Ore"].Color);
-			bitmap.Save(filepath, ImageFormat.Png);
-		}
-
 		void SaveClicked(object sender, EventArgs e)
 		{
 			if (loadedMapName == null)
@@ -357,7 +327,6 @@ namespace OpenRA.Editor
 			{
 				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
 				surface1.Map.Package = new Folder(loadedMapName);
-				SavePreviewImage(Path.Combine(loadedMapName, "preview.png"));
 				surface1.Map.Save(loadedMapName);
 			}
 		}
@@ -399,8 +368,7 @@ namespace OpenRA.Editor
 					map.TopLeft = new int2((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value);
 					map.BottomRight = new int2((int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
 					map.Tileset = nmd.theater.SelectedItem as string;
-
-
+					map.Players.Add("Neutral", new PlayerReference("Neutral", Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
 					NewMap(map);
 				}
 			}

OpenRA.Editor/NewMapDialog.cs

@@ -1,10 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
+#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

OpenRA.Editor/OpenRA.Editor.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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>
@@ -44,7 +44,6 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
@@ -121,7 +120,7 @@
       <Name>OpenRA.Game</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <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">

OpenRA.Editor/Program.cs

@@ -1,4 +1,14 @@
-using System;
+#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;
 

OpenRA.Editor/PropertiesDialog.cs

@@ -1,4 +1,14 @@
-using System.Windows.Forms;
+#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
 {

OpenRA.Editor/ResizeDialog.cs

@@ -1,10 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
+#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

OpenRA.Editor/Surface.cs

@@ -1,3 +1,13 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -5,7 +15,6 @@ using System.Linq;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.Thirdparty;
-using System.Collections;
 
 namespace OpenRA.Editor
 {

OpenRA.FileFormats/CompressedPackage.cs

@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Packaging;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class CompressedPackage : IFolder
+	{
+		readonly uint[] hashes;
+		readonly Stream s;
+		readonly ZipPackage pkg;
+
+		public CompressedPackage(string filename)
+		{
+			s = FileSystem.Open(filename);
+			pkg = (ZipPackage)ZipPackage.Open(s, FileMode.Open);
+			hashes = pkg.GetParts()
+				.Select(p => PackageEntry.HashFilename(p.Uri.LocalPath)).ToArray();
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return pkg.GetPart(new Uri(filename)).GetStream(FileMode.Open);
+		}
+
+		public IEnumerable<uint> AllFileHashes() { return hashes; }
+	}
+}

OpenRA.FileFormats/ConnectedComponents.cs

@@ -1,97 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-
-namespace OpenRA.FileFormats
-{
-	public static class ConnectedComponents
-	{
-		static readonly int2[] Neighbors 
-			= { new int2(-1, -1), new int2(0, -1), new int2(1, -1), new int2(-1, 0) };
-
-		public static int[,] Extract(Map m, Func<int, int, int> f)
-		{
-			var result = new int[m.MapSize.X, m.MapSize.Y];
-			var types = new int[m.MapSize.X, m.MapSize.Y];
-			var d = new Dictionary<int, Node>();
-			var n = 1;
-
-			for( var j = m.YOffset; j < m.YOffset + m.Height; j++ )
-				for (var i = m.XOffset; i < m.XOffset + m.Width; i++)
-				{
-					types[i, j] = f(i, j);
-
-					var k = n;
-
-					foreach (var a in Neighbors)
-						if (types[i + a.X, j + a.Y] == types[i, j])
-							k = (k == n) 
-								? result[i + a.X, j + a.Y]
-								: Union( d, k, result[i+a.X, j+a.Y] );
-
-					result[i,j] = k;
-					if (k == n) MakeSet(d, n++);
-				}
-
-			for (var j = m.YOffset; j < m.YOffset + m.Height; j++)
-				for (var i = m.XOffset; i < m.XOffset + m.Width; i++)
-					result[i, j] = Find(d, result[i, j]);
-
-			return result;
-		}
-
-		// disjoint-set forest stuff
-
-		class Node { public int a, b; public Node(int a, int b) { this.a = a; this.b = b; } }
-
-		static int MakeSet(Dictionary<int, Node> d, int x)
-		{
-			d[x] = new Node(x, 0);
-			return x;
-		}
-
-		static int Union(Dictionary<int, Node> d, int x, int y)
-		{
-			var xr = Find(d, x);
-			var yr = Find(d, y);
-			var xa = d[xr].b;
-			var ya = d[yr].b;
-
-			if (xa > ya) d[yr].a = xr;
-			else if (xa < ya) d[xr].a = yr;
-			else if (xr != yr)
-			{
-				d[yr].a = xr;
-				++d[xr].b;
-			}
-
-			return xr;
-		}
-
-		static int Find(Dictionary<int, Node> d, int x)
-		{
-			if (d[x].a == x) return x;
-			return d[x].a = Find(d, d[x].a);
-		}
-
-	}
-}

OpenRA.FileFormats/DisposableAction.cs

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

OpenRA.FileFormats/Evaluator.cs

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

OpenRA.FileFormats/Exts.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -61,6 +51,11 @@ namespace OpenRA
 			}
 		}
 
+		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))
@@ -73,5 +68,10 @@ namespace OpenRA
 						yield return line;
 				}
 		}
+
+		public static bool HasAttribute<T>(this MemberInfo mi)
+		{
+			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
+		}
 	}
 }

OpenRA.FileFormats/FieldLoader.cs

@@ -1,25 +1,16 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Reflection;
 
@@ -27,17 +18,23 @@ namespace OpenRA.FileFormats
 {
 	public static class FieldLoader
 	{
-		public static void Load(object self, IniSection ini)
+		public static Func<string,Type,string,object> InvalidValueAction = (s,t,f) =>
 		{
-			foreach (var x in ini)
-				LoadField(self, x.Key, x.Value);
-		}
+			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s,f,t) );
+		};
+		
+		public static Action<string,Type> UnknownFieldAction = (s,f) =>
+		{
+			throw new NotImplementedException( "FieldLoader: Missing field `{0}` on `{1}`".F( s, f.Name ) );
+		};
 
-		public static void Load(object self, MiniYaml my)
+		public static void Load(object self, MiniYaml my) { Load(self, my.Nodes); }
+
+		public static void Load(object self, Dictionary<string, MiniYaml> my)
 		{
-			foreach (var x in my.Nodes)
+			foreach (var x in my)
 				if (!x.Key.StartsWith("-"))
-					LoadField( self, x.Key, x.Value.Value );
+					LoadField(self, x.Key, x.Value.Value);
 		}
 
 		public static T Load<T>(MiniYaml y) where T : new()
@@ -52,44 +49,69 @@ namespace OpenRA.FileFormats
 			foreach (var field in fields)
 			{
 				if (!my.ContainsKey(field)) continue;
-				FieldLoader.LoadField(self,field,my[field].Value);
+				LoadField(self,field,my[field].Value);
 			}
 		}
 
 		public static void LoadField( object self, string key, string value )
 		{
 			var field = self.GetType().GetField( key.Trim() );
-			if( field == null )
-				throw new NotImplementedException( "Missing field `{0}` on `{1}`".F( key.Trim(), self.GetType().Name ) );
-			field.SetValue( self, GetValue( field.FieldType, value ) );
-		}
 
-		public static object GetValue( Type fieldType, string x )
+			if( field == null )
+				UnknownFieldAction(key.Trim(), self.GetType());
+			else
+				field.SetValue( self, GetValue( field.Name, field.FieldType, value ) );
+		}
+				
+		public static object GetValue( string field, Type fieldType, string x )
 		{
 			if (x != null) x = x.Trim();
 			if( fieldType == typeof( int ) )
-				return int.Parse( x );
+			{
+				int res;
+				if (int.TryParse(x,out res))
+					return res;
+				return InvalidValueAction(x,fieldType, field);
+			}
 			
 			else if( fieldType == typeof( ushort ) )
-				return ushort.Parse( x );
+			{
+				ushort res;
+				if (ushort.TryParse(x,out res))
+					return res;
+				return InvalidValueAction(x,fieldType, field);
+			}
 
 			else if (fieldType == typeof(float))
-				return float.Parse(x.Replace("%","")) * (x.Contains( '%' ) ? 0.01f : 1f);
+			{
+				float res;
+				if (float.TryParse(x.Replace("%",""), out res))
+					return res * (x.Contains( '%' ) ? 0.01f : 1f);
+				return InvalidValueAction(x,fieldType, field);
+			}
 
 			else if (fieldType == typeof(string))
 				return x;
 			
-			else if (fieldType == typeof(System.Drawing.Color))
+			else if (fieldType == typeof(Color))
 			{
 				var parts = x.Split(',');
-				return System.Drawing.Color.FromArgb(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]));
+				if (parts.Length == 3)
+					return Color.FromArgb(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]));
+				if (parts.Length == 4)
+					return Color.FromArgb(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
+				return InvalidValueAction(x,fieldType, field);
 			}
 			
 			else if (fieldType.IsEnum)
+			{
+				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
+					return InvalidValueAction(x,fieldType, field);
 				return Enum.Parse(fieldType, x, true);
-
+			}
+			
 			else if (fieldType == typeof(bool))
-				return ParseYesNo(x);
+				return ParseYesNo(x, fieldType, field);
 
 			else if (fieldType.IsArray)
 			{
@@ -100,7 +122,7 @@ namespace OpenRA.FileFormats
 
 				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
 				for (int i = 0; i < parts.Length; i++)
-					ret.SetValue(GetValue(fieldType.GetElementType(), parts[i].Trim()), i);
+					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
 				return ret;
 			}
 			else if (fieldType == typeof(int2))
@@ -108,18 +130,19 @@ namespace OpenRA.FileFormats
 				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
 			}
-			else
-				throw new InvalidOperationException("FieldLoader: don't know how to load field of type " + fieldType.ToString());
+			
+			UnknownFieldAction("[Type] {0}".F(x),fieldType);
+			return null;
 		}
 
-		static bool ParseYesNo( string p )
+		static object ParseYesNo( string p, System.Type fieldType, string field )
 		{
 			p = p.ToLowerInvariant();
 			if( p == "yes" ) return true;
 			if( p == "true" ) return true;
 			if( p == "no" ) return false;
 			if( p == "false" ) return false;
-			throw new InvalidOperationException();
+			return InvalidValueAction(p,fieldType, field);
 		}
 	}
 
@@ -132,10 +155,33 @@ namespace OpenRA.FileFormats
 					f => f.Name,
 					f => new MiniYaml(FormatValue(o, f))));
 		}
+		
+		public static MiniYaml SaveDifferences(object o, object from)
+		{
+			if (o.GetType() != from.GetType())
+				throw new InvalidOperationException("FieldLoader: can't diff objects of different types");
+
+			var fields = o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
+				.Where(f => FormatValue(o,f) != FormatValue(from,f));
+			
+			return new MiniYaml(null, fields.ToDictionary(
+					f => f.Name,
+					f => new MiniYaml(FormatValue(o, f))));
+		}
 
 		public static string FormatValue(object o, FieldInfo f)
 		{
 			var v = f.GetValue(o);
+			if (v == null)
+				return "";
+
+			// Color.ToString() does the wrong thing; force it to format as an array
+			if (f.FieldType == typeof(Color))
+			{
+				var c = (Color)v;
+				return "{0},{1},{2},{3}".F(c.A,c.R,c.G,c.B);
+			}
+			
 			return f.FieldType.IsArray
 				? string.Join(",", ((Array)v).OfType<object>().Select(a => a.ToString()).ToArray())
 				: v.ToString();

OpenRA.FileFormats/FileFormats/AudLoader.cs

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

OpenRA.FileFormats/FileFormats/Blowfish.cs

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

OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs

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

OpenRA.FileFormats/FileFormats/Format2.cs

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

OpenRA.FileFormats/FileFormats/Format40.cs

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

OpenRA.FileFormats/FileFormats/Format80.cs

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

OpenRA.FileFormats/FileFormats/IniFile.cs

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

OpenRA.FileFormats/FileSystem.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -43,15 +33,23 @@ namespace OpenRA.FileFormats
 			}
 		}
 
+		static IFolder OpenPackage(string filename)
+		{
+			if (filename.EndsWith(".mix"))
+				return new Package(filename);
+			else if (filename.EndsWith(".zip"))
+				return new CompressedPackage(filename);
+			else
+				return new Folder(filename);
+		}
+
 		public static void Mount(string name)
 		{
 			name = name.ToLowerInvariant();
 			var optional = name.StartsWith("~");
 			if (optional) name = name.Substring(1);
 
-			var a = name.EndsWith(".mix")
-				? (Action)(() => FileSystem.MountInner(new Package(name)))
-				: () => FileSystem.MountInner(new Folder(name));
+			var a = (Action)(() => FileSystem.MountInner(OpenPackage(name)));
 
 			if (optional)
 				try { a(); }

OpenRA.FileFormats/Folder.cs

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

OpenRA.FileFormats/Graphics/Dune2ShpReader.cs

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

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

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

OpenRA.FileFormats/Graphics/ShpReader.cs

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

OpenRA.FileFormats/Graphics/Vertex.cs

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

OpenRA.FileFormats/IPaletteRemap.cs

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

OpenRA.FileFormats/Map/ActorReference.cs

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

OpenRA.FileFormats/Map/Map.cs

@@ -1,21 +1,11 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
 using System;
@@ -61,11 +51,9 @@ namespace OpenRA.FileFormats
 		public int2 TopLeft;
 		public int2 BottomRight;
 
-		public Rectangle Bounds { get { return Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y); } }
-
 		public TileReference<ushort, byte>[,] MapTiles;
 		public TileReference<byte, byte>[,] MapResources;
-
+		public string [,] CustomTerrain;
 
 		// Temporary compat hacks
 		public int XOffset { get { return TopLeft.X; } }
@@ -74,31 +62,29 @@ namespace OpenRA.FileFormats
 		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
 		public string Theater { get { return Tileset; } }
 		public IEnumerable<int2> SpawnPoints { get { return Waypoints.Select(kv => kv.Value); } }
+		public Rectangle Bounds { get { return Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y); } }
 
 		static List<string> SimpleFields = new List<string>() {
 			"Selectable", "MapFormat", "Title", "Description", "Author", "PlayerCount", "Tileset", "MapSize", "TopLeft", "BottomRight"
 		};
 
-		public Map()
-		{
-			MapSize = new int2(1, 1);
-			MapResources = new TileReference<byte, byte>[1, 1];
+		public Map()
+		{
+			MapSize = new int2(1, 1);
+			MapResources = new TileReference<byte, byte>[1, 1];
 			MapTiles = new TileReference<ushort, byte>[1, 1] 
 				{ { new TileReference<ushort, byte> { 
 					type =  (ushort)0xffffu, 
 					image = (byte)0xffu, 
-					index = (byte)0xffu } } };
-
-			PlayerCount = 0;
-			TopLeft = new int2(0,0);
-			BottomRight = new int2(0,0);
-
-			Tileset = "TEMPERAT";
-			Players.Add("Neutral", new PlayerReference("Neutral", "neutral", "allies", true, true));
-
-			Title = "Name your map here";
-			Description = "Describe your map here";
-			Author = "Your name here";
+					index = (byte)0xffu } } };
+
+			PlayerCount = 0;
+			TopLeft = new int2(0, 0);
+			BottomRight = new int2(0, 0);
+
+			Title = "Name your map here";
+			Description = "Describe your map here";
+			Author = "Your name here";
 		}
 
 		public Map(IFolder package)
@@ -119,7 +105,7 @@ namespace OpenRA.FileFormats
 			// Players
 			if (MapFormat == 1)
 			{
-				Players.Add("Neutral", new PlayerReference("Neutral", "neutral", "allies", true, true));
+				Players.Add("Neutral", new PlayerReference("Neutral", "allies", true, true));
 			}
 			else
 			{
@@ -162,6 +148,7 @@ namespace OpenRA.FileFormats
 			// Rules
 			Rules = yaml["Rules"].Nodes;
 
+			CustomTerrain = new string[MapSize.X, MapSize.Y];			
 			LoadUid();
 			LoadBinaryData();
 		}
@@ -170,27 +157,28 @@ namespace OpenRA.FileFormats
 		{
 			MapFormat = 2;
 			
-			Dictionary<string, MiniYaml> root = new Dictionary<string, MiniYaml>();
+			var root = new Dictionary<string, MiniYaml>();
 			foreach (var field in SimpleFields)
 			{
 				FieldInfo f = this.GetType().GetField(field);
 				if (f.GetValue(this) == null) continue;
 				root.Add(field, new MiniYaml(FieldSaver.FormatValue(this, f), null));
-			}
-			
-			Dictionary<string, MiniYaml> playerYaml = new Dictionary<string, MiniYaml>();
-			foreach(var p in Players)
-				playerYaml.Add("PlayerReference@{0}".F(p.Key), FieldSaver.Save(p.Value));
-			root.Add("Players",new MiniYaml(null, playerYaml));
-			
-			Dictionary<string, MiniYaml> actorYaml = new Dictionary<string, MiniYaml>();
-			foreach(var p in Actors)
-				actorYaml.Add("ActorReference@{0}".F(p.Key), FieldSaver.Save(p.Value));
-			root.Add("Actors",new MiniYaml(null, actorYaml));
+			}
+
+			root.Add("Players",
+				new MiniYaml(null, Players.ToDictionary(
+					p => "PlayerReference@{0}".F(p.Key),
+					p => FieldSaver.Save(p.Value))));
+
+			root.Add("Actors",
+				new MiniYaml(null, Actors.ToDictionary(
+					a => "ActorReference@{0}".F(a.Key),
+					a => FieldSaver.Save(a.Value))));
 			
 			root.Add("Waypoints", MiniYaml.FromDictionary<string, int2>(Waypoints));
 			root.Add("Smudges", MiniYaml.FromList<SmudgeReference>(Smudges));
 			root.Add("Rules", new MiniYaml(null, Rules));
+
 			SaveBinaryData(Path.Combine(filepath, "map.bin"));
 			root.WriteToFile(Path.Combine(filepath, "map.yaml"));
 			SaveUid(Path.Combine(filepath, "map.uid"));

OpenRA.FileFormats/Map/MapStub.cs

@@ -1,27 +1,17 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 
 namespace OpenRA.FileFormats
 {
@@ -38,20 +28,19 @@ namespace OpenRA.FileFormats
 		public string Author;
 		public int PlayerCount;
 		public string Tileset;
-		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
-
+		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
+		public IEnumerable<int2> SpawnPoints { get { return Waypoints.Select(kv => kv.Value); } }
+		
 		public int2 TopLeft;
 		public int2 BottomRight;
 		public int Width { get { return BottomRight.X - TopLeft.X; } }
 		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
-		public Lazy<Bitmap> Preview;
-
+		public Map Map { get { return new Map(Package); }}
+	
 		static List<string> Fields = new List<string>() {
 			"Selectable", "Title", "Description", "Author", "PlayerCount", "Tileset", "TopLeft", "BottomRight"
 		};
 
-		public MapStub() { }
-
 		public MapStub(IFolder package)
 		{
 			Package = package;
@@ -63,35 +52,9 @@ namespace OpenRA.FileFormats
 			{
 				string[] loc = wp.Value.Value.Split(',');
 				Waypoints.Add(wp.Key, new int2(int.Parse(loc[0]), int.Parse(loc[1])));
-			}
-			
-			Preview = Lazy.New(
-				() => { return new Bitmap(Package.GetContent("preview.png")); }
-			);
+			}
 
 			Uid = Package.GetContent("map.uid").ReadAllText();
 		}
-		
-		public int2 ConvertToPreview(int2 point, Rectangle container)
-		{
-			float scale = Math.Min(container.Width * 1.0f / Width, container.Height * 1.0f / Height);
-
-			var size = Math.Max(Width, Height);
-			var dw = (int)(scale * (size - Width)) / 2;
-			var dh = (int)(scale * (size - Height)) / 2;
-
-			return new int2(container.X + dw + (int)(scale*(point.X - TopLeft.X)) , container.Y + dh + (int)(scale*(point.Y - TopLeft.Y)));
-		}
-		
-		public Rectangle PreviewBounds(Rectangle container)
-		{
-			float scale = Math.Min(container.Width * 1.0f / Width, container.Height * 1.0f / Height);
-
-			var size = Math.Max(Width, Height);
-			var dw = (int)(scale * (size - Width)) / 2;
-			var dh = (int)(scale * (size - Height)) / 2;
-
-			return new Rectangle(container.X + dw, container.Y + dh, (int)(Width * scale), (int)(Height * scale));
-		}
 	}
 }

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -1,23 +1,15 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
+using System.Drawing;
+
 namespace OpenRA.FileFormats
 {
 	public class PlayerReference
@@ -27,16 +19,17 @@ namespace OpenRA.FileFormats
 		public readonly string Race;
 		public readonly bool OwnsWorld = false;
 		public readonly bool NonCombatant = false;
+		public readonly Color Color = Color.FromArgb(238,238,238);
+		public readonly Color Color2 = Color.FromArgb(44,28,24);
 		
 		public PlayerReference(MiniYaml my)
 		{
 			FieldLoader.Load(this, my);
 		}
 		
-		public PlayerReference(string name, string palette, string race, bool ownsworld, bool noncombatant)
+		public PlayerReference(string name, string race, bool ownsworld, bool noncombatant)
 		{
 			Name = name;
-			Palette = palette;
 			Race = race;
 			OwnsWorld = ownsworld;
 			NonCombatant = noncombatant;

OpenRA.FileFormats/Map/SmudgeReference.cs

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

OpenRA.FileFormats/Map/Terrain.cs

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

OpenRA.FileFormats/Map/TileReference.cs

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

OpenRA.FileFormats/Map/TileSet.cs

@@ -1,27 +1,18 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
 
 namespace OpenRA.FileFormats
 {
@@ -32,11 +23,10 @@ namespace OpenRA.FileFormats
 		public bool AcceptSmudge = true;
 		public bool IsWater = false;
 		public Color Color;
-		
-		public TerrainTypeInfo(MiniYaml my)
-		{
-			FieldLoader.Load(this, my);
-		}
+
+		public TerrainTypeInfo() {}
+		public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
+		public MiniYaml Save() { return FieldSaver.Save(this); }
 	}
 	
 	public class TileTemplate
@@ -49,23 +39,47 @@ namespace OpenRA.FileFormats
 		
 		static List<string> fields = new List<string>() {"Id", "Image", "Size", "PickAny"};
 
-		public TileTemplate(Dictionary<string,MiniYaml> my)
+		public TileTemplate() {}
+		public TileTemplate(MiniYaml my)
 		{
-			FieldLoader.LoadFields(this, my, fields);
-			foreach (var tt in my["Tiles"].Nodes)
-				Tiles.Add(byte.Parse(tt.Key), tt.Value.Value);
+			FieldLoader.LoadFields(this, my.Nodes, fields);
+
+			Tiles = my.Nodes["Tiles"].Nodes.ToDictionary(
+				t => byte.Parse(t.Key),
+				t => t.Value.Value);
+		}
+		
+		public MiniYaml Save()
+		{
+			var root = new Dictionary<string, MiniYaml>();
+			foreach (var field in fields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				root.Add(field, new MiniYaml(FieldSaver.FormatValue(this, f), null));
+			}
+
+			root.Add("Tiles",
+				new MiniYaml(null, Tiles.ToDictionary(
+					p => p.Key.ToString(),
+					p => new MiniYaml(p.Value))));
+			
+			return new MiniYaml(null, root);
 		}
 	}
 	
 	public class TileSet
 	{
-		public readonly string Name;
-		public readonly string Id;
-		public readonly string[] Extensions;
-		public readonly Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
-		public readonly Dictionary<ushort, Terrain> Tiles = new Dictionary<ushort, Terrain>();
-		public readonly Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
-		
+		public string Name;
+		public string Id;
+		public string Palette;
+		public string[] Extensions;
+		public Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
+		public Dictionary<ushort, Terrain> Tiles = new Dictionary<ushort, Terrain>();
+		public Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
+		static List<string> fields = new List<string>() {"Name", "Id", "Palette", "Extensions"};
+
+		public TileSet() {}
 		public TileSet( string filepath )
 		{
 			var yaml = MiniYaml.FromFile(filepath);
@@ -74,18 +88,12 @@ namespace OpenRA.FileFormats
 			FieldLoader.Load(this, yaml["General"]);
 
 			// TerrainTypes
-			foreach (var tt in yaml["Terrain"].Nodes)
-			{
-				var t = new TerrainTypeInfo(tt.Value);
-				Terrain.Add(t.Type, t);
-			}
-			
+			Terrain = yaml["Terrain"].Nodes.Values
+				.Select(y => new TerrainTypeInfo(y)).ToDictionary(t => t.Type);
+
 			// Templates
-			foreach (var tt in yaml["Templates"].Nodes)
-			{
-				var t = new TileTemplate(tt.Value.Nodes);
-				Templates.Add(t.Id, t);
-			}
+			Templates = yaml["Templates"].Nodes.Values
+				.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
 		}
 		
 		public void LoadTiles()
@@ -97,6 +105,37 @@ namespace OpenRA.FileFormats
 						Tiles.Add( t.Key, new Terrain( s ) );
 				}
 		}
+		
+		public void Save(string filepath)
+		{			
+			var root = new Dictionary<string, MiniYaml>();
+			foreach (var field in fields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				root.Add(field, new MiniYaml(FieldSaver.FormatValue(this, f), null));
+			}
+			
+			var gen = new Dictionary<string, MiniYaml>();
+			foreach (var field in fields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				gen.Add(field, new MiniYaml(FieldSaver.FormatValue(this, f), null));
+			}
+			root.Add("General", new MiniYaml(null, gen)); 
+			
+			root.Add("Terrain",
+				new MiniYaml(null, Terrain.ToDictionary(
+					t => "TerrainType@{0}".F(t.Value.Type),
+					t => t.Value.Save())));
+			
+			root.Add("Templates",
+				new MiniYaml(null, Templates.ToDictionary(
+					t => "Template@{0}".F(t.Value.Id),
+					t => t.Value.Save())));
+			root.WriteToFile(filepath);
+		} 
 				
 		public byte[] GetBytes(TileReference<ushort,byte> r)
 		{

OpenRA.FileFormats/MiniYaml.cs

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

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -50,10 +50,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
     </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConnectedComponents.cs" />
-    <Compile Include="DisposableAction.cs" />
     <Compile Include="Evaluator.cs" />
     <Compile Include="Exts.cs" />
     <Compile Include="FieldLoader.cs" />
@@ -61,18 +62,16 @@
     <Compile Include="Folder.cs" />
     <Compile Include="Graphics\IGraphicsDevice.cs" />
     <Compile Include="Graphics\Vertex.cs" />
-    <Compile Include="IPaletteRemap.cs" />
     <Compile Include="MiniYaml.cs" />
     <Compile Include="PackageEntry.cs" />
     <Compile Include="Package.cs" />
+    <Compile Include="PackageWriter.cs" />
     <Compile Include="Palette.cs" />
     <Compile Include="PlayerColorRemap.cs" />
+    <Compile Include="Primitives\DisposableAction.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ProtocolVersion.cs" />
     <Compile Include="Thirdparty\Random.cs" />
     <Compile Include="Session.cs" />
-    <Compile Include="ShroudPaletteRemap.cs" />
-    <Compile Include="SingleColorRemap.cs" />
     <Compile Include="Support\Log.cs" />
     <Compile Include="Support\Stopwatch.cs" />
     <Compile Include="Support\Timer.cs" />
@@ -101,6 +100,7 @@
     <Compile Include="Map\MapStub.cs" />
     <Compile Include="Map\SmudgeReference.cs" />
     <Compile Include="Map\PlayerReference.cs" />
+    <Compile Include="CompressedPackage.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

OpenRA.FileFormats/Package.cs

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

OpenRA.FileFormats/PackageEntry.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -30,12 +20,27 @@ namespace OpenRA.FileFormats
 		public readonly uint Offset;
 		public readonly uint Length;
 
+		
+		public PackageEntry(uint hash, uint offset, uint length)
+		{
+			Hash = hash;
+			Offset = offset;
+			Length = length;
+		}
+		
 		public PackageEntry(BinaryReader r)
 		{
 			Hash = r.ReadUInt32();
 			Offset = r.ReadUInt32();
 			Length = r.ReadUInt32();
 		}
+		
+		public void Write(BinaryWriter w)
+		{
+			w.Write(Hash);
+			w.Write(Offset);
+			w.Write(Length);
+		}
 
 		public override string ToString()
 		{

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));
+			}
+		}
+	}
+}

OpenRA.FileFormats/Palette.cs

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

OpenRA.FileFormats/PlayerColorRemap.cs

@@ -1,30 +1,21 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;
 
 namespace OpenRA.FileFormats
 {
+	// TODO: ship this out of here.
+
 	public class PlayerColorRemap : IPaletteRemap
 	{
 		Dictionary<int, Color> remapColors;

OpenRA.FileFormats/Primitives/Cache.cs

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

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();
+		}
+	}
+}

OpenRA.FileFormats/Primitives/Lazy.cs

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

OpenRA.FileFormats/Primitives/Pair.cs

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

OpenRA.FileFormats/Primitives/PriorityQueue.cs

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

OpenRA.FileFormats/Primitives/Set.cs

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

OpenRA.FileFormats/Primitives/float2.cs

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

OpenRA.FileFormats/Primitives/int2.cs

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

OpenRA.FileFormats/ProtocolVersion.cs

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

OpenRA.FileFormats/Session.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -23,6 +13,10 @@ using System.Linq;
 
 namespace OpenRA.FileFormats
 {
+	// todo: ship most of this back to the Game assembly;
+	// it was only in FileFormats due to the original server model,
+	// in a sep. process.
+
 	public class Session
 	{
 		public List<Client> Clients = new List<Client>();
@@ -31,14 +25,14 @@ namespace OpenRA.FileFormats
 		public enum ClientState
 		{
 			NotReady,
-			Downloading,
 			Ready
 		}
 
 		public class Client
 		{
 			public int Index;
-			public int PaletteIndex;
+			public System.Drawing.Color Color1;
+			public System.Drawing.Color Color2;
 			public string Country;
 			public int SpawnPoint;
 			public string Name;
@@ -49,10 +43,11 @@ namespace OpenRA.FileFormats
 		public class Global
 		{
 			public string Map;
-			public string[] Packages = {};	// filename:sha1 pairs.
 			public string[] Mods = { "ra" };	// mod names
 			public int OrderLatency = 3;
 			public int RandomSeed = 0;
+			public bool LockTeams = false;	// don't allow team changes after game start.
+			public bool AllowCheats = false;
 		}
 	}
 

OpenRA.FileFormats/ShroudPaletteRemap.cs

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

OpenRA.FileFormats/SingleColorRemap.cs

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

OpenRA.FileFormats/Support/Log.cs

@@ -1,28 +1,18 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
-using System.IO;
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.IO;
 using System.IO.Compression;
+using System.Linq;
 using System.Net;
 
 namespace OpenRA
@@ -37,31 +27,41 @@ namespace OpenRA
 
 	public static class Log
 	{
-		public static string LogPathPrefix = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + Path.DirectorySeparatorChar;
+		static string LogPathPrefix = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + Path.DirectorySeparatorChar;
 		static Dictionary<string, ChannelInfo> channels = new Dictionary<string,ChannelInfo>();
 
-		static Log()
+		public static string LogPath
 		{
-			AddChannel("debug", "openra.log.txt", false, false);
+			get { return LogPathPrefix; }
+			set
+			{
+				LogPathPrefix = value;				
+				if (!Directory.Exists(LogPathPrefix))
+					Directory.CreateDirectory(LogPathPrefix);
+			}
 		}
-
+		
 		public static void AddChannel(string channelName, string filename, bool upload, bool diff)
 		{
 			if (channels.ContainsKey(channelName)) return;
 			
-			/* HACK: avoid sharing violations if running multiple instances */
-			StreamWriter writer = null;
-			while (writer == null)
-			{
+			var i = 0;
+			var f = filename;
+			while (File.Exists(LogPathPrefix + filename))
 				try 
 				{
-					writer = File.CreateText(LogPathPrefix + filename);
+					StreamWriter writer = File.CreateText(LogPathPrefix + filename);
+					writer.AutoFlush = true;
+					channels.Add(channelName, new ChannelInfo() { Upload = upload, Filename = filename, Writer = writer, Diff = diff });
+					return;
 				}
-				catch(IOException e){ filename = new Random().Next().ToString() + filename; }
-			}
+				catch (IOException) { filename = f + ".{0}".F(++i); }
+			
+			//if no logs exist, just make it
+			StreamWriter w = File.CreateText(LogPathPrefix + filename);
+			w.AutoFlush = true;
+			channels.Add(channelName, new ChannelInfo() { Upload = upload, Filename = filename, Writer = w, Diff = diff });
 			
-			writer.AutoFlush = true;
-			channels.Add(channelName, new ChannelInfo() { Upload = upload, Filename = filename, Writer = writer, Diff = diff });
 		}
 
 		public static void Write(string channel, string format, params object[] args)

OpenRA.FileFormats/Support/Stopwatch.cs

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

OpenRA.FileFormats/Support/Timer.cs

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

OpenRA.FileFormats/Thirdparty/Random.cs

@@ -1,3 +1,13 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
 using System;
 
 namespace OpenRA.Thirdparty

OpenRA.FileFormats/TypeDictionary.cs

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

OpenRA.Game/Actor.cs

@@ -1,21 +1,11 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
 using System;
@@ -41,8 +31,6 @@ namespace OpenRA
 		public int2 Location { get { return traits.Get<IOccupySpace>().TopLeft; } }
 		[Sync]
 		public Player Owner;
-		[Sync]
-		public int Health;
 
 		IActivity currentActivity;
 		public Group Group;
@@ -61,8 +49,6 @@ namespace OpenRA
 					throw new NotImplementedException("No rules definition for unit {0}".F(name.ToLowerInvariant()));
 
 				Info = Rules.Info[name.ToLowerInvariant()];
-				Health = this.GetMaxHP();
-
 				foreach (var trait in Info.TraitsInConstructOrder())
 					traits.Add(trait.Create(init));
 			}
@@ -129,8 +115,8 @@ namespace OpenRA
 				return null;
 
 			var underCursor = World.FindUnitsAtMouse(mi.Location)
-				.Where(a => a.Info.Traits.Contains<SelectableInfo>())
-				.OrderByDescending(a => a.Info.Traits.Get<SelectableInfo>().Priority)
+				//.Where(a => a.Info.Traits.Contains<SelectableInfo>())
+				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
 				.FirstOrDefault();
 			
 			return traits.WithInterface<IIssueOrder>()
@@ -150,74 +136,14 @@ namespace OpenRA
 
 			if (useAltitude)
 			{
-				var unit = traits.GetOrDefault<Unit>();
-				if (unit != null) loc -= new float2(0, unit.Altitude);
+				var move = traits.GetOrDefault<IMove>();
+				if (move != null) loc -= new float2(0, move.Altitude);
 			}
 
 			return new RectangleF(loc.X, loc.Y, size.X, size.Y);
 		}
 
-		public bool IsDead { get { return Health <= 0; } }
 		public bool IsInWorld { get; set; }
-		public bool RemoveOnDeath = true;
-
-		public DamageState GetDamageState()
-		{
-			if (Health <= 0)
-				return DamageState.Dead;
-			
-			if (Health < this.GetMaxHP() * World.Defaults.ConditionYellow)
-				return DamageState.Half;
-
-			return DamageState.Normal;
-		}
-
-		public void InflictDamage(Actor attacker, int damage, WarheadInfo warhead)
-		{
-			if (IsDead) return;		/* overkill! don't count extra hits as more kills! */
-
-			var rawDamage = damage;
-			var oldState = GetDamageState();
-
-			/* apply the damage modifiers, if we have any. */
-			var modifier = (float)traits.WithInterface<IDamageModifier>()
-				.Select(t => t.GetDamageModifier(warhead)).Product();
-
-			damage = (int)(damage * modifier);
-
-			Health -= damage;
-			if (Health <= 0)
-			{
-				Health = 0;
-
-				attacker.Owner.Kills++;
-				Owner.Deaths++;
-
-				if (RemoveOnDeath)
-					World.AddFrameEndTask(w => w.Remove(this));
-
-				Log.Write("debug", "{0} #{1} killed by {2} #{3}", Info.Name, ActorID, attacker.Info.Name, attacker.ActorID);
-			}
-
-			var maxHP = this.GetMaxHP();
-
-			if (Health > maxHP)	Health = maxHP;
-
-//			Log.Write("debug", "InflictDamage: {0} #{1} -> {2} #{3} raw={4} adj={5} hp={6} mod={7}",
-//				attacker.Info.Name, attacker.ActorID, Info.Name, ActorID, rawDamage, damage, Health, modifier);
-
-			var newState = GetDamageState();
-
-			foreach (var nd in traits.WithInterface<INotifyDamage>())
-				nd.Damaged(this, new AttackInfo
-				{
-					Attacker = attacker,
-					Damage = damage,
-					DamageState = newState,
-					DamageStateChanged = newState != oldState,
-					Warhead = warhead
-				});
-		}
 
 		public void QueueActivity( IActivity nextActivity )
 		{

OpenRA.Game/Chat.cs

@@ -1,103 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using OpenRA.FileFormats;
-using OpenRA.Traits;
-using System.Text;
-
-namespace OpenRA
-{
-	class Chat
-	{
-		const int logLength = 10;
-
-		public List<ChatLine> recentLines = new List<ChatLine>();
-		public string typing = "";
-		public bool isChatting = true;
-		public bool isTeamChat = false;
-
-		public void Toggle()
-		{
-			if( isChatting && typing.Length > 0 )
-				Game.IssueOrder( isTeamChat ? Order.TeamChat( typing ) : Order.Chat( typing ) );
-
-			typing = "";
-			if( Game.orderManager.GameStarted )
-				isChatting ^= true;
-		}
-		
-		public void Reset()
-		{
-			typing = "";
-			isChatting = false;
-			recentLines.Clear();
-		}
-
-		public void TypeChar(char c)
-		{
-			if (c == '\b' || c == 0x7f)
-			{
-				if (typing.Length > 0)
-					typing = typing.Remove(typing.Length - 1);
-			}
-			else if (!char.IsControl(c))
-				typing += c;
-		}
-
-		public void AddLine(Session.Client p, string text)
-		{
-			AddLine(Game.world.PlayerColors()[p.PaletteIndex].Color, p.Name, text);
-		}
-
-		public void AddLine(Color c, string from, string text)
-		{
-			var sizeOwner = Game.chrome.renderer.RegularFont.Measure(from);
-			var sizeText = Game.chrome.renderer.RegularFont.Measure(text);
-			
-			if (sizeOwner.X + sizeText.X + 10 <= Chrome.ChatWidth)
-				recentLines.Add(new ChatLine { Color = c, Owner = from, Text = text });
-			else
-			{
-				StringBuilder sb = new StringBuilder();
-				foreach (var w in text.Split(' '))
-				{
-					if ( Game.chrome.renderer.RegularFont.Measure(sb.ToString() + ' ' + w).X > Chrome.ChatWidth )
-					{
-						recentLines.Add(new ChatLine { Color = c, Owner = from, Text = sb.ToString() } );
-						sb = new StringBuilder();
-						sb.Append(w);
-					}
-					else 
-						sb.Append( ' '  + w);
-				}
-				if (sb.Length != 0)	
-					recentLines.Add(new ChatLine { Color = c, Owner = from, Text = sb.ToString() } );
-			}
-			
-			var eva = Rules.Info["world"].Traits.Get<EvaAlertsInfo>();
-			Sound.Play(eva.ChatBeep);
-			while (recentLines.Count > logLength) recentLines.RemoveAt(0);
-		}
-	}
-
-	class ChatLine { public Color Color = Color.White; public string Owner, Text; public bool wrapped = false; }
-}

OpenRA.Game/Chrome.cs

@@ -1,265 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-using OpenRA.Widgets;
-
-namespace OpenRA
-{
-	class Chrome : IHandleInput
-	{
-		//todo: remove when have a real chat widget
-		public static int ChatWidth = 760;
-		
-		public readonly Renderer renderer;
-		public readonly LineRenderer lineRenderer;
-
-		SpriteRenderer rgbaRenderer { get { return renderer.RgbaSpriteRenderer; } }
-		SpriteRenderer shpRenderer { get { return renderer.WorldSpriteRenderer; } }
-	
-		readonly List<Pair<RectangleF, Action<bool>>> buttons = new List<Pair<RectangleF, Action<bool>>>();
-
-		internal MapStub currentMap;
-
-		public Chrome(Renderer r, Manifest m)
-		{
-			this.renderer = r;
-			lineRenderer = new LineRenderer(renderer);
-					
-			var widgetYaml = m.ChromeLayout.Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge);
-			
-			if (rootWidget == null)
-			{
-				rootWidget = WidgetLoader.LoadWidget( widgetYaml.FirstOrDefault() );
-				rootWidget.Initialize();
-				rootWidget.InitDelegates();
-				Widget.WindowList.Push("MAINMENU_BG");
-			}
-		}
-
-		public static Widget rootWidget = null;
-		public static Widget selectedWidget;
-				
-		public void Tick(World world)
-		{
-			if (!world.GameHasStarted) return;
-			if (world.LocalPlayer == null) return;
-
-			++ticksSinceLastMove;
-			
-			rootWidget.Tick(world);
-		}
-				
-		public void Draw( World world )
-		{
-			buttons.Clear();
-			renderer.Device.DisableScissor();
-			
-			var typingArea = new Rectangle(240, Game.viewport.Height - 30, Game.viewport.Width - 420, 30);
-			var chatLogArea = new Rectangle(240, Game.viewport.Height - 500, Game.viewport.Width - 420, 500 - 40);
-			DrawChat(typingArea, chatLogArea);
-		}
-		
-		void AddUiButton(int2 pos, string text, Action<bool> a)
-		{
-			var rect = new Rectangle(pos.X - 160 / 2, pos.Y - 4, 160, 24);
-			DrawDialogBackground( rect, "dialog2");
-			DrawCentered(text, new int2(pos.X, pos.Y), Color.White);
-			rgbaRenderer.Flush();
-			AddButton(rect, a);
-		}
-
-		public void DrawMapChooser()
-		{
-			buttons.Clear();
-
-			var w = 800;
-			var h = 600;
-			var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h );
-
-			AddUiButton(new int2(r.Left + 200, r.Bottom - 40), "OK",
-				_ =>
-				{
-					Game.IssueOrder(Order.Chat("/map " + currentMap.Uid));
-					Chrome.rootWidget.CloseWindow();
-				});
-
-			AddUiButton(new int2(r.Right - 200, r.Bottom - 40), "Cancel",
-				_ =>
-				{
-					Chrome.rootWidget.CloseWindow();
-				});
-
-			var mapContainer = new Rectangle(r.Right - 280, r.Top + 30, 256, 256);
-
-			var y = r.Top + 50;
-					
-			// Don't bother showing a subset of the data
-			// This will be fixed properly when we move the map list to widgets
-			foreach (var kv in Game.AvailableMaps)
-			{
-				var map = kv.Value;
-				if (!map.Selectable)
-					continue;
-
-				var itemRect = new Rectangle(r.Left + 50, y - 2, r.Width - 340, 20);
-				if (map == currentMap)
-				{
-					rgbaRenderer.Flush();
-					DrawDialogBackground(itemRect, "dialog2");
-				}
-
-				renderer.RegularFont.DrawText(map.Title, new int2(r.Left + 60, y), Color.White);
-				rgbaRenderer.Flush();
-				var closureMap = map;
-				AddButton(itemRect, _ => { currentMap = closureMap; });
-				y += 20;
-			}
-
-			y = mapContainer.Bottom + 20;
-			DrawCentered("Title: {0}".F(currentMap.Title),
-				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
-			y += 20;
-			DrawCentered("Size: {0}x{1}".F(currentMap.Width, currentMap.Height),
-				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
-			y += 20;
-
-			DrawCentered("Theater: {0}".F(Rules.TileSets[currentMap.Tileset].Name),
-				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
-			y += 20;
-			DrawCentered("Spawnpoints: {0}".F(currentMap.PlayerCount),
-				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
-
-			AddButton(r, _ => { });
-		}
-		
-
-		public void DrawWidgets(World world) { rootWidget.Draw(world); shpRenderer.Flush(); rgbaRenderer.Flush(); lineRenderer.Flush(); }
-		
-		public void DrawLobby()
-		{
-			buttons.Clear();
-
-			if( Game.LobbyInfo.GlobalSettings.Map == null )
-				currentMap = null;
-			else
-				currentMap = Game.AvailableMaps[ Game.LobbyInfo.GlobalSettings.Map ];
-			
-			var w = 800;
-			var h = 600;
-			var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h );
-
-			var typingBox = new Rectangle(r.Left + 20, r.Bottom - 77, r.Width - 40, 27);
-			var chatBox = new Rectangle(r.Left + 20, r.Bottom - 269, r.Width - 40, 190);
-
-			DrawDialogBackground(typingBox, "dialog2");
-			DrawDialogBackground(chatBox, "dialog3");
-
-			DrawChat(typingBox, chatBox);
-		}
-		
-		void AddButton(RectangleF r, Action<bool> b) { buttons.Add(Pair.New(r, b)); }
-
-		void DrawDialogBackground(Rectangle r, string collection)
-		{
-			WidgetUtils.DrawPanel(collection, r);
-		}
-
-		void DrawChat(Rectangle typingArea, Rectangle chatLogArea)
-		{
-			
-			var chatpos = new int2(chatLogArea.X + 10, chatLogArea.Bottom - 6);
-			ChatWidth = chatLogArea.Width - 10;
-			
-			renderer.Device.EnableScissor(typingArea.Left, typingArea.Top, typingArea.Width, typingArea.Height);
-			if (Game.chat.isChatting)
-				RenderChatLine(new ChatLine { Owner = Game.chat.isTeamChat ? "TeamChat:" : "Chat:", Text = Game.chat.typing },
-					new int2(typingArea.X + 10, typingArea.Y + 6));
-
-			rgbaRenderer.Flush();
-			renderer.Device.DisableScissor();
-
-			renderer.Device.EnableScissor(chatLogArea.Left, chatLogArea.Top, chatLogArea.Width, chatLogArea.Height);
-			foreach (var line in Game.chat.recentLines.AsEnumerable().Reverse())
-			{
-				chatpos.Y -= 20;
-				RenderChatLine(line, chatpos);
-			}
-
-			rgbaRenderer.Flush();
-			renderer.Device.DisableScissor();
-		}
-
-		void RenderChatLine(ChatLine line, int2 p)
-		{
-			var size = renderer.RegularFont.Measure(line.Owner);
-			renderer.RegularFont.DrawText(line.Owner, p, line.Color);
-			renderer.RegularFont.DrawText(line.Text, p + new int2(size.X + 10, 0), Color.White);
-		}
-
-		public int ticksSinceLastMove = 0;
-		public int2 lastMousePos;
-		public bool HandleInput(World world, MouseInput mi)
-		{
-			if (selectedWidget != null)
-				return selectedWidget.HandleInput(mi);
-				
-			if (rootWidget.HandleInput(mi))
-				return true;
-
-			if (mi.Event == MouseInputEvent.Move)
-			{
-				lastMousePos = mi.Location;
-				ticksSinceLastMove = 0;
-			}
-
-			var action = buttons.Where(a => a.First.Contains(mi.Location.ToPoint()))
-				.Select(a => a.Second).FirstOrDefault();
-
-			if (action == null)
-				return false;
-
-			if (mi.Event == MouseInputEvent.Down)
-				action(mi.Button == MouseButton.Left);
-
-			return true;
-		}
-
-		public bool HitTest(int2 mousePos)
-		{
-			if (selectedWidget != null)
-				return true;
-			
-			return rootWidget.HitTest(mousePos)
-				|| buttons.Any(a => a.First.Contains(mousePos.ToPoint()));
-		}
-
-		void DrawCentered(string text, int2 pos, Color c)
-		{
-			renderer.BoldFont.DrawText(text, pos - new int2(renderer.BoldFont.Measure(text).X / 2, 0), c);
-		}
-	}
-}

OpenRA.Game/Controller.cs

@@ -1,171 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Orders;
-using OpenRA.Traits;
-
-namespace OpenRA
-{
-	public class Controller : IHandleInput
-	{
-		public IOrderGenerator orderGenerator = new UnitOrderGenerator();
-		public Selection selection = new Selection();
-
-		public void CancelInputMode() { orderGenerator = new UnitOrderGenerator(); }
-
-		public bool ToggleInputMode<T>() where T : IOrderGenerator, new()
-		{
-			if (orderGenerator is T)
-			{
-				CancelInputMode();
-				return false;
-			}
-			else
-			{
-				orderGenerator = new T();
-				return true;
-			}
-		}
-
-		static bool HasVoice(Actor a)
-		{
-			return a.Info.Traits.Contains<SelectableInfo>() && a.Info.Traits.Get<SelectableInfo>().Voice != null;
-		}
-
-		void ApplyOrders(World world, float2 xy, MouseInput mi)
-		{
-			if (orderGenerator == null) return;
-
-			var orders = orderGenerator.Order(world, xy.ToInt2(), mi).ToArray();
-			Game.orderManager.IssueOrders( orders );
-
-			var voicedActor = orders.Select(o => o.Subject)
-				.FirstOrDefault(a => a.Owner == world.LocalPlayer && HasVoice(a));
-
-			var isMove = orders.Any(o => o.OrderString == "Move");
-			var isAttack = orders.Any( o => o.OrderString == "Attack" );
-
-			if (voicedActor != null)
-			{
-				if(voicedActor.traits.GetOrDefault<IMove>().CanEnterCell(xy.ToInt2()))
-					Sound.PlayVoice(isAttack ? "Attack" : "Move", voicedActor);
-
-				if (isMove)
-					world.Add(new Effects.MoveFlash(world, Game.CellSize * xy));
-			}
-		}
-
-		float2 dragStart, dragEnd;
-		public bool HandleInput(World world, MouseInput mi)
-		{
-			var xy = Game.viewport.ViewToWorld(mi);
-
-			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down)
-			{
-				dragStart = dragEnd = xy;
-				ApplyOrders(world, xy, mi);
-			}
-
-			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Move)
-				dragEnd = xy;
-
-			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Up)
-			{
-				if (orderGenerator is UnitOrderGenerator)
-				{
-					var newSelection = world.SelectActorsInBox(Game.CellSize * dragStart, Game.CellSize * xy);
-					selection.Combine(world, newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
-				}
-
-				dragStart = dragEnd = xy;
-			}
-
-			if (mi.Button == MouseButton.None && mi.Event == MouseInputEvent.Move)
-				dragStart = dragEnd = xy;
-
-			if (mi.Button == MouseButton.Right && mi.Event == MouseInputEvent.Down)
-				ApplyOrders(world, xy, mi);
-
-			return true;
-		}
-
-		public Pair<float2, float2>? SelectionBox
-		{
-			get
-			{
-				if (dragStart == dragEnd) return null;
-				return Pair.New(Game.CellSize * dragStart, Game.CellSize * dragEnd);
-			}
-		}
-
-		public float2 MousePosition { get { return dragEnd; } }
-		Modifiers modifiers;
-
-		public string ChooseCursor( World world )
-		{
-			int sync = world.SyncHash();
-
-			try
-			{
-				if (!world.GameHasStarted)
-					return "default";
-
-				var mi = new MouseInput
-				{
-					Location = ( Game.CellSize * MousePosition - Game.viewport.Location ).ToInt2(),
-					Button = MouseButton.Right,
-					Modifiers = modifiers
-				};
-
-				return orderGenerator.GetCursor( world, MousePosition.ToInt2(), mi );
-			}
-			finally
-			{
-				if( sync != world.SyncHash() )
-					throw new InvalidOperationException( "Desync in Controller.ChooseCursor" );
-			}
-		}
-
-		public void SetModifiers(Modifiers mods) { modifiers = mods; }
-		public Modifiers GetModifiers() { return modifiers; }
-
-		public void GotoNextBase()
-		{
-			var bases = Game.world.Queries.OwnedBy[Game.world.LocalPlayer].WithTrait<BaseBuilding>().ToArray();
-			if (!bases.Any()) return;
-
-			var next = bases
-				.Select( b => b.Actor )
-				.SkipWhile(b => Game.controller.selection.Actors.Contains(b))
-				.Skip(1)
-				.FirstOrDefault();
-
-			if (next == null)
-				next = bases.Select(b => b.Actor).First();
-
-			Game.controller.selection.Combine(Game.world, new Actor[] { next }, false, true);
-			Game.viewport.Center(Game.controller.selection.Actors);
-		}
-	}
-}

OpenRA.Game/Cursor.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -29,8 +19,10 @@ namespace OpenRA
 		{
 			sequence = SequenceProvider.GetCursorSequence(cursor);
 		}
-
-		public Sprite GetSprite(int frame) { return sequence.GetSprite(frame); }
-		public int2 GetHotspot() { return sequence.Hotspot; }
+		
+		public void Draw(int frame, float2 pos)
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite(sequence.GetSprite(frame), pos - sequence.Hotspot, sequence.Palette);
+		}
 	}
 }

OpenRA.Game/Effects/DelayedAction.cs

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

OpenRA.Game/Effects/Explosion.cs

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

OpenRA.Game/Effects/FlashTarget.cs

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

OpenRA.Game/Effects/IEffect.cs

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

OpenRA.Game/Effects/MoveFlash.cs

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

OpenRA.Game/Effects/RepairIndicator.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -33,12 +23,12 @@ namespace OpenRA.Effects
 		public RepairIndicator(Actor a) 
 		{ 
 			this.a = a; anim.PlayRepeating("repair"); 
-			framesLeft =  (int)(a.World.Defaults.RepairRate * 25 * 60 / 2);
+			framesLeft =  (int)(a.Info.Traits.Get<RepairableBuildingInfo>().RepairRate * 25 * 60 / 2);
 		}
 
 		public void Tick( World world )
 		{
-			if (--framesLeft == 0 || a.IsDead)
+			if (--framesLeft == 0 || a.IsDead())
 				world.AddFrameEndTask(w => w.Remove(this));
 		}
 

OpenRA.Game/Effects/Smoke.cs

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

OpenRA.Game/Exts.cs

@@ -1,29 +1,18 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.GameRules;
-using OpenRA.Traits;
 using OpenRA.Support;
+using OpenRA.Traits;
 
 namespace OpenRA
 {
@@ -45,35 +34,6 @@ namespace OpenRA
 			return xs.Aggregate(1f, (a, x) => a * x);
 		}
 
-		public static WeaponInfo GetPrimaryWeapon(this Actor self)
-		{
-			var info = self.Info.Traits.GetOrDefault<AttackBaseInfo>();
-			if (info == null) return null;
-			
-			var weapon = info.PrimaryWeapon;
-			if (weapon == null) return null;
-
-			return Rules.Weapons[weapon.ToLowerInvariant()];
-		}
-
-		public static WeaponInfo GetSecondaryWeapon(this Actor self)
-		{
-			var info = self.Info.Traits.GetOrDefault<AttackBaseInfo>();
-			if (info == null) return null;
-
-			var weapon = info.SecondaryWeapon;
-			if (weapon == null) return null;
-
-			return Rules.Weapons[weapon.ToLowerInvariant()];
-		}
-
-		public static int GetMaxHP(this Actor self)
-		{
-			var oai = self.Info.Traits.GetOrDefault<OwnedActorInfo>();
-			if (oai == null) return 0;
-			return oai.HP;
-		}
-
 		public static V GetOrAdd<K, V>( this Dictionary<K, V> d, K k )
 			where V : new()
 		{

OpenRA.Game/Game.cs

@@ -1,21 +1,11 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
 using System;
@@ -27,6 +17,7 @@ using System.Reflection;
 using System.Text;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
+using OpenRA.FileFormats.Graphics;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Network;
@@ -45,9 +36,7 @@ namespace OpenRA
 		public static readonly int CellSize = 24;
 
 		public static World world;
-		internal static Viewport viewport;
-		public static Controller controller;
-		internal static Chrome chrome;
+		public static Viewport viewport;
 		internal static UserSettings Settings;
 
 		internal static OrderManager orderManager;
@@ -56,26 +45,21 @@ namespace OpenRA
 
 		public static XRandom CosmeticRandom = new XRandom();	// not synced
 
-		internal static Renderer renderer;
+		public static Renderer Renderer;
 		static int2 clientSize;
 		static string mapName;
 		public static Session LobbyInfo = new Session();
 		static bool packageChangePending;
 		static bool mapChangePending;
 		static Pair<Assembly, string>[] ModAssemblies;
-
-		static internal bool scrollUp = false;
-		static internal bool scrollDown = false;
-		static internal bool scrollLeft = false;
-		static internal bool scrollRight = false;
 
-		static void LoadModPackages(Manifest manifest)
+		static void LoadModPackages()
 		{
 			FileSystem.UnmountAll();
 			Timer.Time("reset: {0}");
 
-			foreach (var dir in manifest.Folders) FileSystem.Mount(dir);
-			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
+			foreach (var dir in Manifest.Folders) FileSystem.Mount(dir);
+			foreach (var pkg in Manifest.Packages) FileSystem.Mount(pkg);
 
 			Timer.Time("mount temporary packages: {0}");
 		}
@@ -97,6 +81,9 @@ namespace OpenRA
 			ModAssemblies = asms.ToArray();
 		}
 
+		public static Action<string> MissingTypeAction = 
+			s => { throw new InvalidOperationException("Cannot locate type: {0}".F(s)); };
+
 		public static T CreateObject<T>(string classname)
 		{
 			foreach (var mod in ModAssemblies)
@@ -107,7 +94,8 @@ namespace OpenRA
 					return (T)obj;
 			}
 
-			throw new InvalidOperationException("Cannot locate type: {0}".F(classname));
+			MissingTypeAction(classname);
+			return default(T);
 		}
 
 		public static Dictionary<string, MapStub> AvailableMaps;
@@ -115,10 +103,6 @@ namespace OpenRA
 		// TODO: Do this nicer
 		static Dictionary<string, MapStub> FindMaps(string[] mods)
 		{
-			Console.WriteLine("Finding maps");
-			foreach (var mod in mods)
-				Console.WriteLine(mod);
-
 			var paths = new[] { "maps/" }.Concat(mods.Select(m => "mods/" + m + "/maps/"))
 				.Where(p => Directory.Exists(p))
 				.SelectMany(p => Directory.GetDirectories(p)).ToList();
@@ -129,20 +113,22 @@ namespace OpenRA
 		static void ChangeMods()
 		{
 			Timer.Time("----ChangeMods");
-			var manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
+			Manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
 			Timer.Time("manifest: {0}");
-			LoadModAssemblies(manifest);
-			SheetBuilder.Initialize(renderer);
-			LoadModPackages(manifest);
+			LoadModAssemblies(Manifest);
+			SheetBuilder.Initialize();
+			LoadModPackages();
 			Timer.Time("load assemblies, packages: {0}");
 			packageChangePending = false;
 		}
-
+		
+		public static Manifest Manifest;
+		
 		static void LoadMap(string mapName)
 		{
 			Timer.Time("----LoadMap");
-			SheetBuilder.Initialize(renderer);
-			var manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
+			SheetBuilder.Initialize();
+			Manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
 			Timer.Time("manifest: {0}");
 
 			if (!Game.AvailableMaps.ContainsKey(mapName))
@@ -150,23 +136,20 @@ namespace OpenRA
 
 			var map = new Map(Game.AvailableMaps[mapName].Package);
 
-			viewport = new Viewport(clientSize, map.TopLeft, map.BottomRight, renderer);
+			viewport = new Viewport(clientSize, map.TopLeft, map.BottomRight, Renderer);
 			world = null;	// trying to access the old world will NRE, rather than silently doing it wrong.
-			ChromeProvider.Initialize(manifest.Chrome);
+			ChromeProvider.Initialize(Manifest.Chrome);
 			Timer.Time("viewport, ChromeProvider: {0}");
-			world = new World(manifest, map);
+			world = new World(Manifest, map);
 			Timer.Time("world: {0}");
 
-			SequenceProvider.Initialize(manifest.Sequences, map.Theater);
+			SequenceProvider.Initialize(Manifest.Sequences);
 			Timer.Time("ChromeProv, SeqProv: {0}");
 
-			chrome = new Chrome(renderer, manifest);
-			Timer.Time("chrome: {0}");
-
 			Timer.Time("----end LoadMap");
 			Debug("Map change {0} -> {1}".F(Game.mapName, mapName));
 		}
-
+					
 		public static void MoveViewport(int2 loc)
 		{
 			viewport.Center(loc);
@@ -182,6 +165,9 @@ namespace OpenRA
 			CurrentHost = host;
 			CurrentPort = port;
 
+			lastConnectionState = ConnectionState.PreConnecting;
+			ConnectionStateChanged();
+			
 			orderManager = new OrderManager(new NetworkConnection(host, port), ChooseReplayFilename());
 		}
 
@@ -192,6 +178,9 @@ namespace OpenRA
 
 		static void JoinLocal()
 		{
+			lastConnectionState = ConnectionState.PreConnecting;
+			ConnectionStateChanged();
+			
 			if (orderManager != null) orderManager.Dispose();
 			orderManager = new OrderManager(new EchoConnection());
 		}
@@ -204,9 +193,6 @@ namespace OpenRA
 		}
 
 		internal static int RenderFrame = 0;
-
-		internal static Chat chat = new Chat();
-
 		internal static int LocalTick = 0;
 		const int NetTickScale = 3;		// 120ms net tick for 40ms local tick
 
@@ -252,7 +238,7 @@ namespace OpenRA
 		internal static void DumpSyncReport(int frame)
 		{
 			var f = syncReports.FirstOrDefault(a => a.First == frame);
-			if (f == null)
+			if (f == default(Pair<int, string>))
 			{
 				Log.Write("sync", "No sync report available!");
 				return;
@@ -261,7 +247,10 @@ namespace OpenRA
 			Log.Write("sync", "Sync for net frame {0} -------------", f.First);
 			Log.Write("sync", "{0}", f.Second);
 		}
-
+
+		public static event Action ConnectionStateChanged = () => { };
+		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
+		
 		static void Tick()
 		{
 			if (packageChangePending)
@@ -279,8 +268,14 @@ namespace OpenRA
 				mapName = LobbyInfo.GlobalSettings.Map;
 				mapChangePending = false;
 				return;
-			}
-
+			}
+			
+			if (orderManager.Connection.ConnectionState != lastConnectionState)
+			{
+				lastConnectionState = orderManager.Connection.ConnectionState;
+				ConnectionStateChanged();
+			}
+			
 			int t = Environment.TickCount;
 			int dt = t - lastTime;
 			if (dt >= Settings.Timestep)
@@ -288,7 +283,7 @@ namespace OpenRA
 				using (new PerfSample("tick_time"))
 				{
 					lastTime += Settings.Timestep;
-					chrome.Tick(world);
+					Widget.DoTick(world);
 
 					orderManager.TickImmediate(world);
 
@@ -300,9 +295,8 @@ namespace OpenRA
 
 						if (isNetTick) orderManager.Tick(world);
 
-						controller.orderGenerator.Tick(world);
-						controller.selection.Tick(world);
-
+						world.OrderGenerator.Tick(world);
+						world.Selection.Tick(world);
 						world.Tick();
 
 						PerfHistory.Tick();
@@ -313,15 +307,6 @@ namespace OpenRA
 				}
 			}
 
-			if (scrollUp == true)
-				viewport.Scroll(new float2(0, -10));
-			if (scrollRight == true)
-				viewport.Scroll(new float2(10, 0));
-			if (scrollDown == true)
-				viewport.Scroll(new float2(0, 10));
-			if (scrollLeft == true)
-				viewport.Scroll(new float2(-10, 0));
-
 			using (new PerfSample("render"))
 			{
 				++RenderFrame;
@@ -403,20 +388,22 @@ namespace OpenRA
 				gs.GameStarted(world);
 			orderManager.StartGame();
 		}
-
+
+		public static event Action OnGameStart = () => { };
 		internal static void StartGame()
 		{
 			LoadMap(LobbyInfo.GlobalSettings.Map);
 			if (orderManager.GameStarted) return;
-			chat.Reset();
-
+			Widget.SelectedWidget = null;
+			
 			world.Queries = new World.AllQueries(world);
 
 			foreach (var gs in world.WorldActor.traits.WithInterface<IGameStarted>())
 				gs.GameStarted(world);
 
 			viewport.GoToStartLocation(world.LocalPlayer);
-			orderManager.StartGame();
+			orderManager.StartGame();
+			OnGameStart();
 		}
 
 		public static Stance ChooseInitialStance(Player p, Player q)
@@ -438,33 +425,20 @@ namespace OpenRA
 			return LobbyInfo.Clients.Single(c => c.Index == p.Index);
 		}
 
-		static int2 lastPos;
 		public static void DispatchMouseInput(MouseInputEvent ev, MouseEventArgs e, Modifiers modifierKeys)
 		{
 			int sync = world.SyncHash();
 			var initialWorld = world;
 
-			if (ev == MouseInputEvent.Down)
-				lastPos = new int2(e.Location);
-
-			if (ev == MouseInputEvent.Move &&
-				(e.Button == MouseButtons.Middle ||
-				e.Button == (MouseButtons.Left | MouseButtons.Right)))
+			var mi = new MouseInput
 			{
-				var p = new int2(e.Location);
-				viewport.Scroll(lastPos - p);
-				lastPos = p;
-			}
-
-			viewport.DispatchMouseInput(world,
-				new MouseInput
-				{
-					Button = (MouseButton)(int)e.Button,
-					Event = ev,
-					Location = new int2(e.Location),
-					Modifiers = modifierKeys,
-				});
-
+				Button = (MouseButton)(int)e.Button,
+				Event = ev,
+				Location = new int2(e.Location),
+				Modifiers = modifierKeys,
+			};
+			Widget.HandleInput(world, mi);
+			
 			if (sync != world.SyncHash() && world == initialWorld)
 				throw new InvalidOperationException("Desync in DispatchMouseInput");
 		}
@@ -479,84 +453,30 @@ namespace OpenRA
 			get { return LobbyInfo.Clients.FirstOrDefault(c => c.Index == orderManager.Connection.LocalClientId); }
 		}
 
-		static Dictionary<char, char> RemapKeys = new Dictionary<char, char>
-		{
-			{ '!', '1' },
-			{ '@', '2' },
-			{ '#', '3' },
-			{ '$', '4' },
-			{ '%', '5' },
-			{ '^', '6' },
-			{ '&', '7' },
-			{ '*', '8' },
-			{ '(', '9' },
-			{ ')', '0' },
-		};
-
-		public static void HandleKeyPress(KeyPressEventArgs e, Modifiers modifiers)
+		public static void HandleKeyEvent(KeyInput e)
 		{
-			int sync = world.SyncHash();
-
-			if (e.KeyChar == '\r')
-			{
-				chat.Toggle();
-				chat.isTeamChat = modifiers.HasModifier(Modifiers.Shift);
-			}
-			else if (Game.chat.isChatting)
-				chat.TypeChar(e.KeyChar);
-			else
-			{
-				var c = RemapKeys.ContainsKey(e.KeyChar) ? RemapKeys[e.KeyChar] : e.KeyChar;
-
-				if (c >= '0' && c <= '9')
-					Game.controller.selection.DoControlGroup(world,
-						c - '0', modifiers);
-
-				if (c == 08)
-					Game.controller.GotoNextBase();
-
-				if (c == 09)
-					BuildPaletteWidget.TabChange((Control.ModifierKeys & Keys.Shift) == Keys.Shift ? true : false);
-
-				BuildPaletteWidget.DoBuildingHotkey(c, world);
-			}
+			int sync = world.SyncHash();
+			
+			if (Widget.HandleKeyPress(e))
+				return;
 
 			if (sync != Game.world.SyncHash())
 				throw new InvalidOperationException("Desync in OnKeyPress");
 		}
 
-		public static void HandleArrowKeyScroll(String k, Boolean pressed)
-		{
-			if (k == "up")
-			{
-				scrollUp = pressed;
-			}
-			if (k == "left")
-			{
-				scrollLeft = pressed;
-			}
-			if (k == "down")
-			{
-				scrollDown = pressed;
-			}
-			if (k == "right")
-			{
-				scrollRight = pressed;
-			}
-		}
+		static Modifiers modifiers;
+		public static Modifiers GetModifierKeys() { return modifiers; }
+		public static void HandleModifierKeys(Modifiers mods) {	modifiers = mods; }
 
-		public static void HandleModifierKeys(Modifiers mods)
+		static Size GetResolution(Settings settings, WindowMode windowmode)
 		{
-			controller.SetModifiers(mods);
-		}
-
-		static Size GetResolution(Settings settings)
-		{
-			var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
-			if (Settings.Width > 0 && Settings.Height > 0)
+			var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
+			var customSize = (windowmode == WindowMode.Windowed) ? Settings.WindowedSize : Settings.FullscreenSize;
+			
+			if (customSize.X > 0 && customSize.Y > 0)
 			{
-				desktopResolution.Width = Settings.Width;
-				desktopResolution.Height = Settings.Height;
+				desktopResolution.Width = customSize.X;
+				desktopResolution.Height = customSize.Y;
 			}
 			return new Size(
 				desktopResolution.Width,
@@ -565,22 +485,30 @@ namespace OpenRA
 
 		internal static void Initialize(Settings settings)
 		{
-			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
+			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
+			
+			var defaultSupport = Environment.GetFolderPath(Environment.SpecialFolder.Personal)
+												+ Path.DirectorySeparatorChar + "OpenRA";
+			
+			SupportDir = settings.GetValue("SupportDir", defaultSupport);
+			Settings = new UserSettings(settings);
+			
+			Log.LogPath = SupportDir + "Logs" + Path.DirectorySeparatorChar;
+			Log.AddChannel("perf", "perf.log", false, false);
+			Log.AddChannel("debug", "debug.log", false, false);
+			Log.AddChannel("sync", "syncreport.log", true, true);
 
-			LoadUserSettings(settings);
 			LobbyInfo.GlobalSettings.Mods = Settings.InitialMods;
+			Manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
 
 			// Load the default mod to access required files
-			LoadModPackages(new Manifest(LobbyInfo.GlobalSettings.Mods));
+			LoadModPackages();
 
 			Renderer.SheetSize = Settings.SheetSize;
 
-			bool windowed = !Game.Settings.Fullscreen;
-			var resolution = GetResolution(settings);
-			renderer = new Renderer(resolution, windowed);
-			resolution = renderer.Resolution;
-
-			controller = new Controller();
+			var resolution = GetResolution(settings, Game.Settings.WindowMode);
+			Renderer = new Renderer(resolution, Game.Settings.WindowMode);
+			resolution = Renderer.Resolution;
 			clientSize = new int2(resolution);
 
 			Sound.Initialize();
@@ -592,29 +520,15 @@ namespace OpenRA
 
 			ChangeMods();
 
-			if (Settings.Replay != "")
+			if (Settings.Replay != null)
 				orderManager = new OrderManager(new ReplayConnection(Settings.Replay));
 			else
 				JoinLocal();
 
-			LoadShellMap(new Manifest(LobbyInfo.GlobalSettings.Mods).ShellmapUid);
+			LoadShellMap(Manifest.ShellmapUid);
 
 			ResetTimer();
 
-			Log.AddChannel("sync", "openra.syncreport.txt", true, true);
-		}
-
-		static void LoadUserSettings(Settings settings)
-		{
-			Settings = new UserSettings();
-			var settingsFile = settings.GetValue("settings", "settings.ini");
-			FileSystem.Mount("./");
-			if (FileSystem.Exists(settingsFile))
-				FieldLoader.Load(Settings,
-					new IniFile(FileSystem.Open(settingsFile)).GetSection("Settings"));
-			FileSystem.UnmountAll();
-			
-			Settings.AddSettings(settings);
 		}
 
 		static bool quit;
@@ -627,27 +541,52 @@ namespace OpenRA
 			}
 		}
 
-		public static void Exit() { quit = true; }
+		public static void Exit() { quit = true; }
+		
+		public static Action<Color,string,string> AddChatLine = (c,n,s) => {};
 
-		public static void Debug(string s) { chat.AddLine(Color.White, "Debug", s); }
+		public static void Debug(string s) 	
+		{
+			AddChatLine(Color.White, "Debug", s); 
+		}
 
 		public static void Disconnect()
 		{
-			var shellmap = new Manifest(LobbyInfo.GlobalSettings.Mods).ShellmapUid;
+			orderManager.Dispose();
+			var shellmap = Manifest.ShellmapUid;
 			LobbyInfo = new Session();
 			LobbyInfo.GlobalSettings.Mods = Settings.InitialMods;
 			JoinLocal();
 			LoadShellMap(shellmap);
 
-			Chrome.rootWidget.CloseWindow();
-			Chrome.rootWidget.OpenWindow("MAINMENU_BG");
-		}
+			Widget.RootWidget.CloseWindow();
+			Widget.RootWidget.OpenWindow("MAINMENU_BG");
+		}
+		
+		static string baseSupportDir = null;
+		public static string SupportDir
+		{
+			set {
+				var dir = value;
+				
+				// Expand paths relative to the personal directory
+				if (dir.ElementAt(0) == '~')
+					dir = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + dir.Substring(1);
+				
+				if (!Directory.Exists(dir))
+					Directory.CreateDirectory(dir);
+				
+				baseSupportDir = dir + Path.DirectorySeparatorChar;
+			}
+			get {return baseSupportDir;}
+		}
+
 
 		internal static int GetGameId()
 		{
 			try
 			{
-				string s = File.ReadAllText(Log.LogPathPrefix + "openra.gameid");
+				string s = File.ReadAllText(SupportDir + "currentgameid");
 				return int.Parse(s);
 			}
 			catch (Exception)
@@ -658,10 +597,23 @@ namespace OpenRA
 
 		internal static void SetGameId(int id)
 		{
-			var file = File.CreateText(Log.LogPathPrefix + "openra.gameid");
+			var file = File.CreateText(SupportDir + "currentgameid");
 			file.Write(id);
 			file.Flush();
 			file.Close();
 		}
+
+		public static void InitializeEngineWithMods(string[] mods)
+		{
+			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
+			Manifest = new Manifest(mods);
+			LoadModAssemblies(Manifest);
+
+			FileSystem.UnmountAll();
+			foreach (var folder in Manifest.Folders) FileSystem.Mount(folder);
+			foreach (var pkg in Manifest.Packages) FileSystem.Mount(pkg);
+
+			Rules.LoadRules(Manifest, new Map());
+		}
 	}
 }

OpenRA.Game/GameRules/ActorInfo.cs

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

OpenRA.Game/GameRules/Footprint.cs

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

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,7 +1,13 @@
-
-using System;
-
-using System.Collections.Generic;
+#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 OpenRA.FileFormats;
 
 namespace OpenRA.GameRules

OpenRA.Game/GameRules/Rules.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -38,12 +28,6 @@ namespace OpenRA
 
 		public static void LoadRules(Manifest m, Map map)
 		{
-			Log.Write("debug", "Using rules files: ");
-			foreach (var y in m.Rules)
-				Log.Write("debug", " -- {0}", y);
-			
-			Log.Write("debug", "Using Map: {0}",map.Uid);
-
 			Info = LoadYamlRules(m.Rules, map.Rules, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
 			Weapons = LoadYamlRules(m.Weapons, map.Weapons, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
 			Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new VoiceInfo(k.Value));

OpenRA.Game/GameRules/TechTree.cs

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

OpenRA.Game/GameRules/UserSettings.cs

@@ -1,63 +1,111 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+using OpenRA.FileFormats.Graphics;
+
 namespace OpenRA.GameRules
 {
 	public class UserSettings
 	{
+		// Behaviour settings
+		public bool ViewportEdgeScroll = true;
+		
 		// Debug settings
+		public bool PerfDebug = false;
+		public bool RecordSyncReports = true;
+		public bool ShowGameTimer = true;
+		public bool DeveloperMode = false;
 		public bool UnitDebug = false;
-		public bool PathDebug = true;
-		public bool PerfDebug = true;
-		public bool IndexDebug = false;
-		public bool RecordSyncReports = true;
 		
 		// Window settings
-		public readonly int Width = 0;
-		public readonly int Height = 0;
-		public readonly bool Fullscreen = false;
-		public bool MusicPlayer = true;
+		public WindowMode WindowMode = WindowMode.PseudoFullscreen;
+		public int2 FullscreenSize = new int2(Screen.PrimaryScreen.Bounds.Width,Screen.PrimaryScreen.Bounds.Height);
+		public int2 WindowedSize = new int2(1024,768);
+		public readonly static int2 MinResolution = new int2(800, 600);
+		
+		//Sound Settings
+		public float SoundVolume = 0.5f;
+		public float MusicVolume = 0.5f;
+		public bool MusicPlayer = false;
 		
 		// Internal game settings
-		public readonly int Timestep = 40;
-		public readonly int SheetSize = 2048;
+		public int Timestep = 40;
+		public int SheetSize = 2048;
 		
 		// External game settings
-		public readonly string NetworkHost = "";
-		public readonly int NetworkPort = 0;
-		public readonly int Player = 1;
-		public readonly string Replay = "";
-		public readonly string PlayerName = "";
-		public readonly string[] InitialMods = { "ra" };
+		public string LastServer = "localhost:1234";
+		public string Replay = null;
+		public string PlayerName = "Newbie";
+		public Color PlayerColor1 = Color.FromArgb(255,160,238);
+		public Color PlayerColor2 = Color.FromArgb(68,0,56);
 
-		public readonly string GameName = "OpenRA Game";
-		public readonly int ListenPort = 1234;
-		public readonly int ExternalPort = 1234;
-		public readonly bool InternetServer = true;
-		public readonly string MasterServer = "http://open-ra.org/master/";
+		public string[] InitialMods = { "ra" };
+
+		// Server settings
+		public string LastServerTitle = "OpenRA Game";
+		public int ListenPort = 1234;
+		public int ExternalPort = 1234;
+		public bool AdvertiseOnline = true;
+		public string MasterServer = "http://open-ra.org/master/";
+		public bool AllowCheats = false;
 		
-		public void AddSettings(Settings settings)
-		{
+		string SettingsFile;
+		UserSettings defaults;
+		
+		public UserSettings() {}
+		public UserSettings(Settings args)
+		{			
+			defaults = new UserSettings();
+			SettingsFile = Game.SupportDir + "settings.yaml";
+
+			// Override settings loading to not crash
+			var err1 = FieldLoader.UnknownFieldAction;
+			var err2 = FieldLoader.InvalidValueAction;
+			
+			FieldLoader.InvalidValueAction = (s,t,f) =>
+			{
+				object ret = defaults.GetType().GetField(f).GetValue(defaults);
+				System.Console.WriteLine("FieldLoader: Cannot parse `{0}` into `{2}:{1}`; substituting default `{3}`".F(s,t.Name,f,ret) );
+				return ret;
+			};
+			
+			FieldLoader.UnknownFieldAction = (s,f) =>
+			{
+				System.Console.WriteLine( "Ignoring unknown field `{0}` on `{1}`".F( s, f.Name ) );
+			};
+			
+			if (File.Exists(SettingsFile))
+			{
+				System.Console.WriteLine("Loading settings file {0}",SettingsFile);
+				var yaml = MiniYaml.FromFile(SettingsFile);
+				FieldLoader.Load(this, yaml["Settings"]);
+			}
+			
 			foreach (var f in this.GetType().GetFields())
-				if (settings.Contains(f.Name))
-					OpenRA.FileFormats.FieldLoader.LoadField( this, f.Name, settings.GetValue(f.Name, "") );
+				if (args.Contains(f.Name))
+					OpenRA.FileFormats.FieldLoader.LoadField( this, f.Name, args.GetValue(f.Name, "") );
+			
+			FieldLoader.UnknownFieldAction = err1;
+			FieldLoader.InvalidValueAction = err2;
+		}
+		
+		public void Save()
+		{
+			Dictionary<string, MiniYaml> root = new Dictionary<string, MiniYaml>();
+			root.Add("Settings", FieldSaver.SaveDifferences(this, defaults));
+			root.WriteToFile(SettingsFile);
 		}
 	}
 }

OpenRA.Game/GameRules/VoiceInfo.cs

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

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,27 +1,17 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
 using System.Collections.Generic;
-using OpenRA.FileFormats;
 using OpenRA.Effects;
-using System;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
 namespace OpenRA.GameRules
 {
@@ -41,7 +31,13 @@ namespace OpenRA.GameRules
 		public readonly int Delay = 0;									// delay in ticks before dealing the damage. 0=instant (old model)
 		public readonly DamageModel DamageModel = DamageModel.Normal;	// which damage model to use
 
-		public float EffectivenessAgainst(ArmorType at) { return Verses[(int)at]; }
+		public float EffectivenessAgainst(Actor self)
+		{
+			var health = self.Info.Traits.GetOrDefault<HealthInfo>();
+			if (health == null) return 0f;
+			
+			return Verses[(int)(health.Armor)];
+		}
 	}
 
 	public enum ArmorType
@@ -66,7 +62,7 @@ namespace OpenRA.GameRules
 		public int2 src;
 		public int srcAltitude;
 		public int facing;
-		public Actor target;
+		public Target target;
 		public int2 dest;
 		public int destAltitude;
 	}

OpenRA.Game/Graphics/Animation.cs

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

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -26,7 +16,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
 {
-	static class ChromeProvider
+	public static class ChromeProvider
 	{
 		static Dictionary<string, Dictionary<string, MappedImage>> collections;
 		static Dictionary<string, Sheet> cachedSheets;
@@ -62,7 +52,7 @@ namespace OpenRA.Graphics
 			collections.Add(elementName, images);
 		}
 
-		public static Sprite GetImage(Renderer renderer, string collection, string image)
+		public static Sprite GetImage(string collection, string image)
 		{
 			// Cached sprite
 			if (cachedSprites.ContainsKey(collection) && cachedSprites[collection].ContainsKey(image))
@@ -82,14 +72,14 @@ namespace OpenRA.Graphics
 				sheet = cachedSheets[mi.Src];
 			else
 			{
-				sheet = new Sheet(renderer, mi.Src);
+				sheet = new Sheet(mi.Src);
 				cachedSheets.Add(mi.Src, sheet);
 			}
 
 			// Cache the sprite
 			if (!cachedSprites.ContainsKey(collection))
 				cachedSprites.Add(collection, new Dictionary<string, Sprite>());
-			cachedSprites[collection].Add(image, mi.GetImage(renderer, sheet));
+			cachedSprites[collection].Add(image, mi.GetImage(sheet));
 
 			return cachedSprites[collection][image];
 		}

OpenRA.Game/Graphics/CursorSequence.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -22,24 +12,26 @@ using System.Xml;
 
 namespace OpenRA.Graphics
 {
-	class CursorSequence
+	public class CursorSequence
 	{
 		readonly int start, length;
+		readonly string palette;
 
 		public int Start { get { return start; } }
 		public int End { get { return start + length; } }
 		public int Length { get { return length; } }
-
+		public string Palette { get { return palette; } }
 		public readonly int2 Hotspot;
 
 		Sprite[] sprites;
 
-		public CursorSequence(string cursorSrc, XmlElement e)
+		public CursorSequence(string cursorSrc, string palette, XmlElement e)
 		{
 			sprites = CursorSheetBuilder.LoadAllSprites(cursorSrc);
 
 			start = int.Parse(e.GetAttribute("start"));
-
+			this.palette = palette;
+			
 			if (e.GetAttribute("length") == "*" || e.GetAttribute("end") == "*")
 				length = sprites.Length - start;
 			else if (e.HasAttribute("length"))

OpenRA.Game/Graphics/CursorSheetBuilder.cs

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

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -35,8 +25,8 @@ namespace OpenRA.Graphics
 		// We should probably try to fix this somehow
 		static Dictionary<string, Palette> palettes;
 		static Dictionary<string, int> indices;
-		public HardwarePalette(Renderer renderer, Map map)
-			: base(renderer,new Size(256, MaxPalettes))
+		public HardwarePalette(Map map)
+			: base(new Size(256, MaxPalettes))
 		{
 			palettes = new Dictionary<string, Palette>();
 			indices = new Dictionary<string, int>();
@@ -72,7 +62,18 @@ namespace OpenRA.Graphics
 			}
 			return allocated++;
 		}
-
+		
+		public void UpdatePalette(string name, Palette p)	
+		{
+			palettes[name] = p;
+			var j = indices[name];
+			
+			for (int i = 0; i < 256; i++)
+			{
+				this[new Point(i, j)] = p.GetColor(i);
+			}
+		}
+		
 		public void Update(IEnumerable<IPaletteModifier> paletteMods)
 		{
 			var b = new Bitmap(Bitmap);
@@ -80,7 +81,7 @@ namespace OpenRA.Graphics
 				mod.AdjustPalette(b);
 
 			Texture.SetData(b);
-			Game.renderer.PaletteTexture = Texture;
+			Game.Renderer.PaletteTexture = Texture;
 		}
 	}
 }

OpenRA.Game/Graphics/LineRenderer.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -23,7 +13,7 @@ using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Graphics
 {
-	class LineRenderer
+	public class LineRenderer
 	{
 		Renderer renderer;
 		IVertexBuffer<Vertex> vertexBuffer;

OpenRA.Game/Graphics/MappedImage.cs

@@ -1,20 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
  */
 #endregion
 
@@ -43,7 +33,7 @@ namespace OpenRA.Graphics
 								 int.Parse(e.GetAttribute("height")));
 		}
 
-		public Sprite GetImage(Renderer r, Sheet s)
+		public Sprite GetImage(Sheet s)
 		{
 			return new Sprite(s, rect, TextureChannel.Alpha);
 		}