Fixes to include extra mod dirs in Makefile and correct paths in post install scripts.

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,4 +53,4 @@ temp.o
 temp.s
 
 *.config
-*.resources
+*.resources

Makefile

@@ -1,7 +1,7 @@
 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 ralint filex tsbuild
+PROGRAMS	=fileformats gl game ra cnc seqed editor ralint filex tsbuild
 prefix = /usr/local
 datarootdir = $(prefix)/share
 datadir = $(datarootdir)
@@ -16,7 +16,7 @@ COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
 fileformats_SRCS	=	$(shell find OpenRA.FileFormats/ -iname '*.cs')
 fileformats_TARGET	=	OpenRA.FileFormats.dll
 fileformats_KIND	=	library
-fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll
+fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll WindowsBase.dll
 
 gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
 gl_TARGET			= OpenRA.Gl.dll
@@ -46,17 +46,12 @@ 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
@@ -65,12 +60,6 @@ editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
 editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
 editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources
 
-mapcvtr_SRCS		= $(shell find MapConverter/ -iname '*.cs')
-mapcvtr_TARGET		= MapConverter.exe
-mapcvtr_KIND		= winexe
-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
@@ -93,45 +82,42 @@ tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
 # -platform:x86
 
 .SUFFIXES:
-.PHONY: clean all game tool default mods mod_ra mod_aftermath mod_cnc install uninstall editor_res editor tsbuild ralint seqed mapcvtr filex
+.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex
 
-game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET)
+game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
 
 clean: 
 	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 
 distclean: clean
 
-CORE = fileformats gl game seqed mapcvtr
+CORE = fileformats gl game seqed
 
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
-	
-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/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
 	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/chrome $(INSTALL_DIR)/mods/cnc
 	
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
 	@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
 	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/extras $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/chrome $(INSTALL_DIR)/mods/ra
 	
 	@cp -r shaders $(INSTALL_DIR)
 	@cp *.ttf $(INSTALL_DIR)
-	@-cp *.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
+	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=~/.openra" >> openra
 	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
 		
@@ -150,23 +136,22 @@ uninstall:
 
 mod_ra: $(ra_TARGET) $(ralint_TARGET)
 	mono RALint.exe ra
-mod_aftermath: $(aftermath_TARGET) $(ralint_TARGET)
-	mono RALint.exe ra aftermath
 mod_cnc: $(cnc_TARGET) $(ralint_TARGET)
 	mono RALint.exe cnc
 mods: mod_ra mod_cnc
 
-editor_res:
-	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources
-editor: editor_res $(editor_TARGET)
+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: $(seqed_TARGET)
-mapcvtr: $(mapcvtr_TARGET)
+seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
+SequenceEditor.Form1.resources:
+	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
 filex: $(filex_TARGET)
-tsbuild: tsbuild_res $(tsbuild_TARGET)
-tsbuild_res:
-	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources
-tools: editor ralint seqed mapcvtr filex tsbuild
+tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
+OpenRA.TilesetBuilder.Form1.resources:
+	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
+tools: editor ralint seqed filex tsbuild
 all: game tools
 
 define BUILD_ASSEMBLY

MapConverter/MapConverter.csproj

@@ -1,51 +0,0 @@
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BA2B4C61-D5EE-4C3E-9BA1-EB32C531FA36}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>MapConverter</RootNamespace>
-    <AssemblyName>MapConverter</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="MapConverter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
-      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRA.FileFormats</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</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/Form1.Designer.cs

@@ -39,14 +39,24 @@
 			this.actorPalette = new System.Windows.Forms.FlowLayoutPanel();
 			this.tabPage3 = new System.Windows.Forms.TabPage();
 			this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel();
-			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-			this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
-			this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
-			this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
-			this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
-			this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
-			this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
-			this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.cCRedAlertMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.bitmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.exotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.spawnpointsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.tt = new System.Windows.Forms.ToolTip(this.components);
 			this.folderBrowser = new System.Windows.Forms.FolderBrowserDialog();
 			this.surface1 = new OpenRA.Editor.Surface();
@@ -60,7 +70,7 @@
 			this.tabPage1.SuspendLayout();
 			this.tabPage2.SuspendLayout();
 			this.tabPage3.SuspendLayout();
-			this.toolStrip1.SuspendLayout();
+			this.menuStrip1.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// toolStripContainer1
@@ -69,7 +79,7 @@
 			// toolStripContainer1.ContentPanel
 			// 
 			this.toolStripContainer1.ContentPanel.Controls.Add(this.splitContainer1);
-			this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(985, 680);
+			this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(985, 681);
 			this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.toolStripContainer1.Location = new System.Drawing.Point(0, 0);
 			this.toolStripContainer1.Name = "toolStripContainer1";
@@ -79,7 +89,7 @@
 			// 
 			// toolStripContainer1.TopToolStripPanel
 			// 
-			this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.toolStrip1);
+			this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.menuStrip1);
 			// 
 			// splitContainer1
 			// 
@@ -94,13 +104,12 @@
 			// splitContainer1.Panel2
 			// 
 			this.splitContainer1.Panel2.Controls.Add(this.surface1);
-			this.splitContainer1.Size = new System.Drawing.Size(985, 680);
+			this.splitContainer1.Size = new System.Drawing.Size(985, 681);
 			this.splitContainer1.SplitterDistance = 198;
 			this.splitContainer1.TabIndex = 0;
 			// 
 			// tabControl1
 			// 
-			this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Left;
 			this.tabControl1.Controls.Add(this.tabPage1);
 			this.tabControl1.Controls.Add(this.tabPage2);
 			this.tabControl1.Controls.Add(this.tabPage3);
@@ -109,16 +118,16 @@
 			this.tabControl1.Multiline = true;
 			this.tabControl1.Name = "tabControl1";
 			this.tabControl1.SelectedIndex = 0;
-			this.tabControl1.Size = new System.Drawing.Size(198, 680);
+			this.tabControl1.Size = new System.Drawing.Size(198, 681);
 			this.tabControl1.TabIndex = 0;
 			// 
 			// tabPage1
 			// 
 			this.tabPage1.Controls.Add(this.tilePalette);
-			this.tabPage1.Location = new System.Drawing.Point(23, 4);
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
 			this.tabPage1.Name = "tabPage1";
 			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-			this.tabPage1.Size = new System.Drawing.Size(171, 672);
+			this.tabPage1.Size = new System.Drawing.Size(190, 655);
 			this.tabPage1.TabIndex = 0;
 			this.tabPage1.Text = "Templates";
 			this.tabPage1.UseVisualStyleBackColor = true;
@@ -130,16 +139,16 @@
 			this.tilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tilePalette.Location = new System.Drawing.Point(3, 3);
 			this.tilePalette.Name = "tilePalette";
-			this.tilePalette.Size = new System.Drawing.Size(165, 666);
+			this.tilePalette.Size = new System.Drawing.Size(184, 649);
 			this.tilePalette.TabIndex = 1;
 			// 
 			// tabPage2
 			// 
 			this.tabPage2.Controls.Add(this.actorPalette);
-			this.tabPage2.Location = new System.Drawing.Point(23, 4);
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
 			this.tabPage2.Name = "tabPage2";
 			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-			this.tabPage2.Size = new System.Drawing.Size(171, 672);
+			this.tabPage2.Size = new System.Drawing.Size(190, 655);
 			this.tabPage2.TabIndex = 1;
 			this.tabPage2.Text = "Actors";
 			this.tabPage2.UseVisualStyleBackColor = true;
@@ -151,15 +160,15 @@
 			this.actorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.actorPalette.Location = new System.Drawing.Point(3, 3);
 			this.actorPalette.Name = "actorPalette";
-			this.actorPalette.Size = new System.Drawing.Size(165, 666);
+			this.actorPalette.Size = new System.Drawing.Size(184, 649);
 			this.actorPalette.TabIndex = 2;
 			// 
 			// tabPage3
 			// 
 			this.tabPage3.Controls.Add(this.resourcePalette);
-			this.tabPage3.Location = new System.Drawing.Point(23, 4);
+			this.tabPage3.Location = new System.Drawing.Point(4, 22);
 			this.tabPage3.Name = "tabPage3";
-			this.tabPage3.Size = new System.Drawing.Size(171, 672);
+			this.tabPage3.Size = new System.Drawing.Size(190, 655);
 			this.tabPage3.TabIndex = 2;
 			this.tabPage3.Text = "Resources";
 			this.tabPage3.UseVisualStyleBackColor = true;
@@ -171,87 +180,154 @@
 			this.resourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.resourcePalette.Location = new System.Drawing.Point(0, 0);
 			this.resourcePalette.Name = "resourcePalette";
-			this.resourcePalette.Size = new System.Drawing.Size(171, 672);
+			this.resourcePalette.Size = new System.Drawing.Size(190, 655);
 			this.resourcePalette.TabIndex = 3;
 			// 
-			// toolStrip1
+			// menuStrip1
 			// 
-			this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
-			this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripButton3,
-            this.toolStripButton5,
-            this.toolStripButton4,
-            this.toolStripButton1,
-            this.toolStripButton6,
-            this.toolStripButton7,
-            this.toolStripButton2});
-			this.toolStrip1.Location = new System.Drawing.Point(3, 0);
-			this.toolStrip1.Name = "toolStrip1";
-			this.toolStrip1.Size = new System.Drawing.Size(480, 25);
-			this.toolStrip1.TabIndex = 0;
+			this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None;
+			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem,
+            this.mapToolStripMenuItem});
+			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip1.Name = "menuStrip1";
+			this.menuStrip1.Size = new System.Drawing.Size(985, 24);
+			this.menuStrip1.TabIndex = 1;
+			this.menuStrip1.Text = "menuStrip1";
 			// 
-			// toolStripButton3
+			// fileToolStripMenuItem
 			// 
-			this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
-			this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButton3.Name = "toolStripButton3";
-			this.toolStripButton3.Size = new System.Drawing.Size(51, 22);
-			this.toolStripButton3.Text = "New";
-			this.toolStripButton3.Click += new System.EventHandler(this.NewClicked);
+			this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.newToolStripMenuItem,
+            this.toolStripSeparator1,
+            this.openToolStripMenuItem,
+            this.saveToolStripMenuItem,
+            this.saveAsToolStripMenuItem,
+            this.toolStripSeparator2,
+            this.toolStripMenuItem1,
+            this.toolStripSeparator3,
+            this.exotToolStripMenuItem});
+			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+			this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+			this.fileToolStripMenuItem.Text = "&File";
 			// 
-			// toolStripButton5
+			// newToolStripMenuItem
 			// 
-			this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
-			this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButton5.Name = "toolStripButton5";
-			this.toolStripButton5.Size = new System.Drawing.Size(56, 22);
-			this.toolStripButton5.Text = "Open";
-			this.toolStripButton5.Click += new System.EventHandler(this.OpenClicked);
+			this.newToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripMenuItem.Image")));
+			this.newToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia;
+			this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+			this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.newToolStripMenuItem.Text = "&New...";
+			this.newToolStripMenuItem.Click += new System.EventHandler(this.NewClicked);
 			// 
-			// toolStripButton4
+			// toolStripSeparator1
 			// 
-			this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
-			this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButton4.Name = "toolStripButton4";
-			this.toolStripButton4.Size = new System.Drawing.Size(51, 22);
-			this.toolStripButton4.Text = "Save";
-			this.toolStripButton4.Click += new System.EventHandler(this.SaveClicked);
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
 			// 
-			// toolStripButton1
+			// openToolStripMenuItem
 			// 
-			this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
-			this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButton1.Name = "toolStripButton1";
-			this.toolStripButton1.Size = new System.Drawing.Size(76, 22);
-			this.toolStripButton1.Text = "Save As...";
-			this.toolStripButton1.Click += new System.EventHandler(this.SaveAsClicked);
+			this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image")));
+			this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+			this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.openToolStripMenuItem.Text = "&Open...";
+			this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenClicked);
 			// 
-			// toolStripButton6
+			// saveToolStripMenuItem
 			// 
-			this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
-			this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButton6.Name = "toolStripButton6";
-			this.toolStripButton6.Size = new System.Drawing.Size(59, 22);
-			this.toolStripButton6.Text = "Resize";
-			this.toolStripButton6.Click += new System.EventHandler(this.ResizeClicked);
+			this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
+			this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+			this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.saveToolStripMenuItem.Text = "&Save";
+			this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveClicked);
 			// 
-			// toolStripButton7
+			// saveAsToolStripMenuItem
 			// 
-			this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
-			this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButton7.Name = "toolStripButton7";
-			this.toolStripButton7.Size = new System.Drawing.Size(80, 22);
-			this.toolStripButton7.Text = "Properties";
-			this.toolStripButton7.Click += new System.EventHandler(this.PropertiesClicked);
+			this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
+			this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.saveAsToolStripMenuItem.Text = "Save &As...";
+			this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsClicked);
 			// 
-			// toolStripButton2
+			// toolStripSeparator2
 			// 
-			this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
-			this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButton2.Name = "toolStripButton2";
-			this.toolStripButton2.Size = new System.Drawing.Size(95, 22);
-			this.toolStripButton2.Text = "Spawnpoints";
-			this.toolStripButton2.Click += new System.EventHandler(this.SpawnPointsClicked);
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+			// 
+			// toolStripMenuItem1
+			// 
+			this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cCRedAlertMapToolStripMenuItem,
+            this.bitmapToolStripMenuItem});
+			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
+			this.toolStripMenuItem1.Text = "&Import";
+			// 
+			// cCRedAlertMapToolStripMenuItem
+			// 
+			this.cCRedAlertMapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cCRedAlertMapToolStripMenuItem.Image")));
+			this.cCRedAlertMapToolStripMenuItem.Name = "cCRedAlertMapToolStripMenuItem";
+			this.cCRedAlertMapToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.cCRedAlertMapToolStripMenuItem.Text = "&C&&C / Red Alert Map...";
+			this.cCRedAlertMapToolStripMenuItem.Click += new System.EventHandler(this.ImportLegacyMapClicked);
+			// 
+			// bitmapToolStripMenuItem
+			// 
+			this.bitmapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("bitmapToolStripMenuItem.Image")));
+			this.bitmapToolStripMenuItem.Name = "bitmapToolStripMenuItem";
+			this.bitmapToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.bitmapToolStripMenuItem.Text = "&Bitmap...";
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+			// 
+			// exotToolStripMenuItem
+			// 
+			this.exotToolStripMenuItem.Name = "exotToolStripMenuItem";
+			this.exotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.exotToolStripMenuItem.Text = "E&xit";
+			this.exotToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked);
+			// 
+			// mapToolStripMenuItem
+			// 
+			this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.propertiesToolStripMenuItem,
+            this.resizeToolStripMenuItem,
+            this.toolStripSeparator4,
+            this.spawnpointsToolStripMenuItem});
+			this.mapToolStripMenuItem.Name = "mapToolStripMenuItem";
+			this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+			this.mapToolStripMenuItem.Text = "&Map";
+			// 
+			// propertiesToolStripMenuItem
+			// 
+			this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image")));
+			this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
+			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.propertiesToolStripMenuItem.Text = "&Properties...";
+			this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked);
+			// 
+			// resizeToolStripMenuItem
+			// 
+			this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image")));
+			this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem";
+			this.resizeToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.resizeToolStripMenuItem.Text = "&Resize...";
+			this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked);
+			// 
+			// toolStripSeparator4
+			// 
+			this.toolStripSeparator4.Name = "toolStripSeparator4";
+			this.toolStripSeparator4.Size = new System.Drawing.Size(139, 6);
+			// 
+			// spawnpointsToolStripMenuItem
+			// 
+			this.spawnpointsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("spawnpointsToolStripMenuItem.Image")));
+			this.spawnpointsToolStripMenuItem.Name = "spawnpointsToolStripMenuItem";
+			this.spawnpointsToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.spawnpointsToolStripMenuItem.Text = "&Spawnpoints";
+			this.spawnpointsToolStripMenuItem.Click += new System.EventHandler(this.SpawnPointsClicked);
 			// 
 			// tt
 			// 
@@ -263,7 +339,7 @@
 			this.surface1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.surface1.Location = new System.Drawing.Point(0, 0);
 			this.surface1.Name = "surface1";
-			this.surface1.Size = new System.Drawing.Size(783, 680);
+			this.surface1.Size = new System.Drawing.Size(783, 681);
 			this.surface1.TabIndex = 5;
 			this.surface1.Text = "surface1";
 			// 
@@ -274,9 +350,11 @@
 			this.ClientSize = new System.Drawing.Size(985, 705);
 			this.Controls.Add(this.toolStripContainer1);
 			this.KeyPreview = true;
+			this.MainMenuStrip = this.menuStrip1;
 			this.Name = "Form1";
 			this.Text = "OpenRA Editor";
 			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing);
 			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);
 			this.toolStripContainer1.ContentPanel.ResumeLayout(false);
 			this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false);
@@ -290,8 +368,8 @@
 			this.tabPage1.ResumeLayout(false);
 			this.tabPage2.ResumeLayout(false);
 			this.tabPage3.ResumeLayout(false);
-			this.toolStrip1.ResumeLayout(false);
-			this.toolStrip1.PerformLayout();
+			this.menuStrip1.ResumeLayout(false);
+			this.menuStrip1.PerformLayout();
 			this.ResumeLayout(false);
 
 		}
@@ -301,23 +379,33 @@
 		private System.Windows.Forms.ToolStripContainer toolStripContainer1;
 		private System.Windows.Forms.SplitContainer splitContainer1;
 		private System.Windows.Forms.ToolTip tt;
-		private System.Windows.Forms.ToolStrip toolStrip1;
-		private System.Windows.Forms.ToolStripButton toolStripButton1;
 		private System.Windows.Forms.TabControl tabControl1;
 		private System.Windows.Forms.TabPage tabPage1;
 		private System.Windows.Forms.FlowLayoutPanel tilePalette;
 		private System.Windows.Forms.TabPage tabPage2;
-		private System.Windows.Forms.ToolStripButton toolStripButton2;
 		private System.Windows.Forms.FlowLayoutPanel actorPalette;
 		private System.Windows.Forms.TabPage tabPage3;
 		private System.Windows.Forms.FlowLayoutPanel resourcePalette;
-		private System.Windows.Forms.ToolStripButton toolStripButton3;
-		private System.Windows.Forms.ToolStripButton toolStripButton5;
-		private System.Windows.Forms.ToolStripButton toolStripButton4;
 		private System.Windows.Forms.FolderBrowserDialog folderBrowser;
-		private System.Windows.Forms.ToolStripButton toolStripButton6;
-		private System.Windows.Forms.ToolStripButton toolStripButton7;
 		private Surface surface1;
+		private System.Windows.Forms.MenuStrip menuStrip1;
+		private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+		private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+		private System.Windows.Forms.ToolStripMenuItem exotToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+		private System.Windows.Forms.ToolStripMenuItem cCRedAlertMapToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem bitmapToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+		private System.Windows.Forms.ToolStripMenuItem mapToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem resizeToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+		private System.Windows.Forms.ToolStripMenuItem spawnpointsToolStripMenuItem;
 
 	}
 }

OpenRA.Editor/Form1.cs

@@ -43,11 +43,16 @@ namespace OpenRA.Editor
 
 			folderBrowser.SelectedPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
 				.Aggregate(Path.Combine);
+
+			surface1.AfterChange += MakeDirty;
 		}
 
+		void MakeDirty() { dirty = true; }
+
 		string loadedMapName;
 		string currentMod = "ra";
 		TileSet tileset;
+		bool dirty = false;
 
 		void LoadMap(string mapname)
 		{
@@ -67,7 +72,15 @@ namespace OpenRA.Editor
 			// load the map
 			var map = new Map(new Folder(mapname));
 
+			// upgrade maps that have no player definitions. editor doesnt care,
+			// but this breaks the game pretty badly.
+			if (map.Players.Count == 0)
+				map.Players.Add("Neutral", new PlayerReference("Neutral",
+						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+
 			PrepareMapResources(manifest, map);
+
+			dirty = false;
 		}
 
 		void NewMap(Map map)
@@ -86,6 +99,8 @@ namespace OpenRA.Editor
 			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
 
 			PrepareMapResources(manifest, map);
+
+			MakeDirty();
 		}
 
 		void PrepareMapResources(Manifest manifest, Map map)
@@ -137,6 +152,7 @@ namespace OpenRA.Editor
 				try
 				{
 					var info = Rules.Info[a];
+					if( !info.Traits.Contains<RenderSimpleInfo>() ) continue;
 					var template = RenderActor(info, tileset, palette);
 					var ibox = new PictureBox
 					{
@@ -328,6 +344,8 @@ namespace OpenRA.Editor
 				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
 				surface1.Map.Package = new Folder(loadedMapName);
 				surface1.Map.Save(loadedMapName);
+
+				dirty = false;
 			}
 		}
 
@@ -337,7 +355,6 @@ namespace OpenRA.Editor
 
 			if (DialogResult.OK == folderBrowser.ShowDialog())
 			{
-
 				loadedMapName = folderBrowser.SelectedPath;
 				SaveClicked(sender, e);
 			}
@@ -396,5 +413,48 @@ namespace OpenRA.Editor
 		void SpawnPointsClicked(object sender, EventArgs e) { surface1.SetWaypoint(new WaypointTemplate()); }
 		void Form1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = true; }
 		void Form1_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = false; }
+
+		void CloseClicked(object sender, EventArgs e)
+		{
+			Close();
+		}
+
+		void ImportLegacyMapClicked(object sender, EventArgs e)
+		{
+			using (var ofd = new OpenFileDialog { Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
+				if (DialogResult.OK == ofd.ShowDialog())
+				{
+					/* massive hack: we should be able to call NewMap() with the imported Map object,
+					 * but something's not right internally in it, unless loaded via the real maploader */
+
+					var savePath = Path.Combine(Path.GetTempPath(), "OpenRA.Import");
+					Directory.CreateDirectory(savePath);
+
+					var map = LegacyMapImporter.Import(ofd.FileName);
+					map.Package = new Folder(savePath);
+					map.Players.Add("Neutral", new PlayerReference("Neutral", 
+						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+					
+					map.Save(savePath);
+					LoadMap(savePath);
+					loadedMapName = null;	/* editor needs to think this hasnt been saved */
+
+					Directory.Delete(savePath, true);
+					MakeDirty();
+				}
+		}
+
+		void OnFormClosing(object sender, FormClosingEventArgs e)
+		{
+			if (!dirty) return;
+
+			switch (MessageBox.Show("The map has been modified since it was last saved. Save changes now?",
+				"Unsaved Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
+			{
+				case DialogResult.Yes: SaveClicked(null, EventArgs.Empty); break;
+				case DialogResult.No: break;
+				case DialogResult.Cancel: e.Cancel = true; break;
+			}
+		}
 	}
 }

OpenRA.Editor/Form1.resx

@@ -117,113 +117,175 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>77, 17</value>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>309, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="newToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHNSURBVDhPjZNdTxNREIb5LV54azSRxJ8gt95445XGa/8A
+        CU0MMVgIWNmgRSioGN0AapQaISAWrEaITQTkQyhL2WbbWtt1+7ll+7h7SDdBocskk3Mm58xzZt7JaWmx
+        bTdyk9/rPsz0fbYmz2JqfvSdHhJLPpxzTzMUid13F0D3k/h41V57iU+dI7/dfTqA8zKGBLUohjpurxER
+        7/24i/RkSnj/47csLsWOB27IZ1DmrlDQJrHIU8q8EbE63UrD7oVe09p243iIqEAPQGVOQJxKRJwfdgE9
+        gxO8X1wRkIWv/1Ri7A0QD5/HSrWT/HTNTgwIDapayAV0DTwXyQ0/IqwSvXU4hWQn6uwl4usPKCl9pGI+
+        F2DV6zwaX2BQjgjIiZPpHXrpJjU2di7lao2sXmLiwwYXL18/GeB/KP8HqJgH5Iwy++k/yDOrzQF3+p8d
+        AZi1A/RCleQvg81ElrHwt+aA232jLqBmWRjFKlq2wM/9HLGtFCOvPjcHdHQPCYBl1SmWTdK5IvFknu/b
+        GaIrKsEX880B7V1B6rZq5cqhaIqms7aT4cuqyuyygvR0xhvgiOao7Qjm9Byyyw7K80hj0wRGw94tOGPy
+        cs8fetoLfwGP5fd9L1vD4gAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="openToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACeklE
+        QVQ4T6WTWUiUURiG/4suurJIjUIwskQsEANDqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF
+        sEIoFInQcqHE1CwoKsXUUMnt6Z+RLMtA8OK5OZz3Oe/5OEcAhPWwpnBaodZZmqfjWmY5GSo98XJNwq9D
+        1yQIilLhFaYIMIQuxZaZJ4uy6FS1T2BUIUKdNsdPhL9pqpEp/ne18PiiE94RCjzDco0C+rs1zIzXGvkx
+        pmNuRI2+XEG9NjV5NYlXuBLP0DzcQwoQaiuUTI9VrQgvfC5irjeSqrJMKovTURcmU5KbxE15HAWyGNH5
+        e/BCtSab6a+a5ZMXxTD9cdAbsir/CG6Xyvj+qcRY2xBurss28lCfRYNOxr3KdPTqFHQlUspV17mVl0Cx
+        Mg5VdqyxjVBZks7k+3wMtYdaJdRXKVkYksJw6kreiWuD8dAXBa8j6Krx5UqwR4WgVqUwMZAJH+Tcr1bQ
+        /ki+tOnPK7wKhA5v5tvcmHnsxNsKOy6ePTohCvYKpXkSvr2RMtyWSL1OzuKgBHpClwRdwWLwNPPtHsy0
+        HGGy6RCjdfuQhllzxsUs1zBMoUiZyGh3LHe02XQ+E5v0RYqC89AZwOLzk8w+Pc5U82HG6h34Um1LR9pm
+        /N2scLAxsTEKVFlx9LQkcVebBQNJ8FKs+8KH2VZ3pp44Md7gyIjejo+a3fTKTZGE7MJ+j0Xj8lPOz4ih
+        tjyT3gfhdOQIy7TLN9Ai20hj8iZqEsxRx1hw4+oO/F13LjraW7ouC3JSo8mRXCAjNoj4y36GyXLO14VT
+        xw7gfNCO/XbW2FpZYLndjK1bTNhmarLyIa3nKxuyPwG9D9E7Fbto+QAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="saveToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACMklE
+        QVQ4T6WT3UuTcRTH9y90303QRbc1NYZrMRs86hzKsmFoIb09kqZpunxJUqxMxZYvkK1w6sTlahJOKvIF
+        TJEUMZaSlZkrWuJQU3QiGHz7nZ+wn0vrQh84Nw98Puc553wfBQDFXorDL18EQOXuXEGHaxlPHItoafbj
+        kXUW9XU/YLnnxd3yaZSWfEZR4Qfk5Y7japaHoVBwAYF9vUBd7Tq9/Oeztr4BfVIfTic95xUUuJ4tcUFl
+        xa//wv7FNRw3voJSKcN0yikEjrYFLigt+bmjgDoT/NW3hDCDG4UFMzhpbBUCW+McF1w3f9km2Aq/n/Lj
+        kORCTvYkEuJtQtDwwMcFmVfGQwR/w0MeH/ZrHZDlURgMViGorfnOBfKl0aBgJ7h35Bv2RTYj5cwbxMbW
+        C0FV5Qx6usFOCaSeH4bp7CDfNi2MZqbPps6bcD8STa8hSRYhuFU2hS43WAaAVvtvdvdVlN+Z50ulhdHM
+        GemeIByX0AmdrkIIbhRNwtkONNk2WHAC0Cdnh5TxnBnJl4t557h4Bsc4odWWCYE5b4LBQM39AO9MAgXL
+        WJhawtinOUxMz0POvY0T+g4Oq6Ps0GiKhYBiaX2I4GeTgOC0/Gp89C7AO7uMazctCNfaGdyC8GOPoY7M
+        F4KM9Hds7hU+80GdEweOSHjaNQB39xB6+kcw+HYM0QYTlJpGRDD4sKoBKlVOiCDx4oUBHk9KGIWE7kyn
+        om3Twmhm6kpF8NGITCGgn2K39QfkKu4LIHJHnwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="cCRedAlertMapToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
+        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
+        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
+        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
+        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
+        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
+        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
+        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
+        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
+        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
+        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
+        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
+        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
+        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
+        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
+        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
+        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
+        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
+        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
+        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
+        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
+        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
+        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
+        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
+        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
+        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
+        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
+        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
+        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
+        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
+        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
+        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
+        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
+        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
+        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
+        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
+        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
+        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
+        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
+        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
+        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
+        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
+        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAN5JREFUOE+FUwEOAyEI
+        8+k+7X7GoFBWmZdtISYgtS3csrXsFtvzf2Mv8/8d4Hkec2SLM+IHzJsjdwVAcxQrtl8OsDgBxPMGgKJG
+        SQkwMlI2zSCS+cuL0YCceHEDAcBbM6gTQOhDDpnBxHqVOsmgdYvmfCxk7q+JpDZN4yQOJhOAOtmslGna
+        MYE3AN2HeBEmyvhYZ44mL5rRXkijgoAZAA3nCVBzbzM5vuE8x8xmbGIzqE1LkNwHOO2RZmZOjQYTjoWF
+        g/YYr+qn2QBQSl2ofL8oC6Wb2hIOM8WD+bXOex/mMAFDkP1eQgAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bitmapToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACR0lE
+        QVQ4T6WTXUiTARSGdxkRRBdB0IUREV1EKRFEYYuQAklL8sKQfphUoJSUWJbLxAVZWqyBio5WajorM1PL
+        xExUlLQfbU5n0lygRerMP/qxOZ92vpjfCKLAi3P5Puc957xHA2gWUoo49147gWUqbSPrdjOXChrQm56S
+        lFVFvKEcXaqV2OQiohMt7Esw+6Ro5gGeWfhbff0BY9NzDI3N0f/JS6fLy7rd6f8HcNsdOI6EYD8cjK3V
+        roiLawdYu+vivwHSWcQM1THz/DQv96+ixeHlVvU71oQFAGTmP+37bdsPBf8WZ4fRFhVEXdcsBQ9srN6Z
+        pjqQhQUCAmcW29JZxA8fvaWyY5YcawdBOy6oANm2H9A3MMypDLNS7b1flJnFtnQWcVmrB2NhMytD9SpA
+        TiUA5+CYInQOjWPrH2V7RBzmijdo9x5VKr+yj6ImD9nmelZsS1UBcme/+OPIJIOfv/Gi201ZXQ/hMfFU
+        Peuktqnbd3QN+U/cXM6tYfmW8ypAQiKdh91TTE7PYHNOYKl6z916F3m+eSNjT1B4vxHjzWoFYrhRwbLN
+        51SAJOynx8vo5Ay9rimKHzu5XtJDpuU1WZY2Eg1WgrXRJOpNxKdcUyBLN6WoAInnyPh3XvW6KW/4MC9O
+        z2ki+Wo1CWklROkMCiT8wEm0kXEsCTmrAiTbDtcEpTVdZOS1oDfWk5xZ6RPeQZeUR8zxK0Qe1BO65xjr
+        t0YotXhjAEAeQ7It8ZSESUjkznIq2bYsTGYW29JZxIs2nFEdLOSdfwFwpvLxRKIY2AAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
-  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="propertiesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACCklE
+        QVQ4T6WT30tTUQDHz39QD0UQSpAPIkgPyR60AiUiyoGBL4qZjOyt0tZP9tBDk1AsXIhj93ILdd27DPPH
+        3VwrUrdK2ioJHAgVOdoPaQsarBg43L6ec+akuRsEPnw5D4fP5/vlXg4BQHaSf8LjjwdqaTA2cg+y1Ith
+        qxmi5Tas/SYWk+QRoPgmtNsLcPq7GYX8+XoTqaUL+KR2cAmDxeBgqeBv2NhWzwUFOBk4g5/zRxB3V8Es
+        38AtbzuIw/0RLMrMeyhTs2CzGdRtaOTn1dajvLkAR9VKLNvLcHmoExddzSDKzAfkcjkkEtEiOLxoQpdB
+        z+Er7ScQUg/DL5TD2bsfl5oPoKWnCZ3jehDZGeAC1hwL3uXNs55Jep7Gis/AJWxyTeVe1FXvhq5qH6oP
+        7nlw/NoxGByNIKPT77CezSEeD6Pn+jlEIiGk6X8N+F9zyfLYIZzUVUCwT0J36jy9yX83KjDq7zSADE8t
+        cGB7kpksFt76YDzbgMWVFLzBX0WCTcku8mjiTSm8lkUslcHnH2kK/+aw6k+UCJiESE+9XCApz2Gzu5Gk
+        sEVy4r6got82vRV5blVbIDyZ21rAZrPmL7w5P5s1KxQWXRFtgU15lV8ge2AbdXPY8pAuEIsXWJ6FtAVW
+        +SWSmXWssuZ4vnl+s5nNFl1hMLjP8U1bMGR/wS/+N9tf7o6eMpNtADko6xybtEXLAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="resizeToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAADLklE
+        QVQ4T3WS60/ScRjFf39CL3rR1ovurduWbbU2t7ZqdlkXt7Lrym6O1VoXcdYqQ54wKlGxABE1CzWF0nIm
+        lZcoTbyUNJFIzDJSJK+E0qy8wInvz+i2erazfd+cz3m+zw4nTS+FLOeZNim3Vp6UU5sqvf5MSZqnyjhV
+        pfKUvEx54kqp8rCkWHVQVKSJPHtbs+tUgSYiOicVAMfEqfR1dVFCGSqrX94cHQeN/aXhbyD3Zz91uf3U
+        9tFHTQ4fzVtH9BOQVdKcW2F6/eKkWA1zcxu6vUAQMmCzk/3AErLtDyFrrY035z16T3PXin8B5LfqZE6P
+        HyZzKw5FX+Yh4XtjwZKZGV3lNPIkhhojplON3Uc3S9/Q7LDfADKtKYklMsgTkwV7joixKHQr2Nq2fSET
+        5uQwqtsyjcot45R510ozV8f/2iAhsyolCNh9WIyFoRGYHbIGfYN+SVd7Nznzk8ll0FLzKxdZO3xkaOjG
+        GYUxcIIfRxSlPU4N/rn1fS8JJVlU1WCT3npggVLfAIWuHjJtNRIyjIhTPEKM7D6OSop4RcXpwZ2Wl11l
+        gHanmze/c36ioc8jyRlFjSzljxl2daI9Pwuv1Cnw9PRjZeQ1cCcSS68Fza6+IXL2fCG7w0ssmc3o2IR8
+        gbc1PQU9NUp48sNRcUyAkPBL4AIlUbLk3gEvS6YXrW6p0dx9UZ5n4gHjzBmYAAPPYwRwazeiMXYWqjcs
+        wLSVInAHRYWq0TEf9Q+NUEsg+fr9t2nF1U71leyqn+u3vPuIl2298HZ2wnxkO5q2LYOtxoKpK86D23tW
+        r+7zfCVzywAVGT/QVV2LvNDo0Eo0j3mAtbUTiRnFOJ94Axp9LfIKK5Ctq0RDmw9TQuPAsW7bHYNUYLCQ
+        JL2GRAqjtMDYwV+8wzUAWeY9eIfHYW0fxNodxyGWZeOSPBvzl27C5OXnwG0T5irmr79wgdWTNYyVJFL8
+        kAeo8wyBA/rx2jGErBIH0nXPsWmPEHcM9YgURGPS0jMTZfiXGKDfM4Y0fVOgA/UgRQWECTpExaqxUyDF
+        wuUbJjb4H0AQfxtrDqiweLMUc8LEmLEqnv9zUMzM9B1/cM83lepxTAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="spawnpointsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAABrUlE
+        QVQ4T6WTWyhDcRzHl8g1D/IkxZ4mjcgDB0U5ubbVbJLkkubJSt7w6M1eENHUENrktmzJ3HKEiSh7US5l
+        QiK5JUXpy/9f/9O2zhY59at//c/n87uc35EBkP0nAsL6Bi33E9CpeBINJElHthIkvBNKChh8YVPi1Cpn
+        Eo7ANSnJwQUMfnLEobVejZbaCnis8VRiyFSgXJ4QWOAPO5fXYJ2xo1HD48QcRSV5CfHSAn94fV0gL9Jn
+        eVWAtjgXRwPhrJ18Ngc6g2AwkzhXBJTmZ+GgN8xHwgRgPXtnZvDH5xde3j6x6BTAcxk47JFRCUnOBAWF
+        2WkQhC2xbH/49uEd59evGLfYoJAnEkGjKCCHyjqDDzw72YOpUSMmTF0w93VS2H32iLmlXSSlcuIgxT1Q
+        VTf7CAj87IjFgy2Gfk4Cu9x3sNhd0oIyXZMoID2TzPez0biyREKvK6bw6t4NxuYDCEo0ZFsBNjBStmci
+        Asb2Kmj4HAovbF5ieHpHugJeXUfhja19rGzsYai7DcemULj7Q1DEpWNkzgXTDzxo3ZYWFKlq6cVvw2eR
+        vP+uv56/AehVvkSccelEAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

OpenRA.Editor/LegacyMapImporter.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#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 
@@ -16,9 +16,9 @@ using System.Text;
 using OpenRA;
 using OpenRA.FileFormats;
 
-namespace MapConverter
+namespace OpenRA.Editor
 {
-	public class MapConverter
+	public class LegacyMapImporter
 	{
 		// Mapping from ra overlay index to type string
 		static string[] raOverlayNames =
@@ -29,8 +29,8 @@ namespace MapConverter
 			"v12", "v13", "v14", "v15", "v16", "v17", "v18",
 			"fpls", "wcrate", "scrate", "barb", "sbag",
 		};
-		
-		static Dictionary< string, Pair<byte,byte> > overlayResourceMapping = new Dictionary<string, Pair<byte, byte>>()
+
+		static Dictionary<string, Pair<byte, byte>> overlayResourceMapping = new Dictionary<string, Pair<byte, byte>>()
 		{
 			// RA Gems, Gold
 			{ "gold01", new Pair<byte,byte>(1,0) },
@@ -57,8 +57,8 @@ namespace MapConverter
 			{ "ti11", new Pair<byte,byte>(1,10) },
 			{ "ti12", new Pair<byte,byte>(1,11) },
 		};
-		
-		static Dictionary<string, string> overlayActorMapping = new Dictionary<string,string>() {
+
+		static Dictionary<string, string> overlayActorMapping = new Dictionary<string, string>() {
 			// Fences
 			{"sbag","sbag"},
 			{"cycl","cycl"},
@@ -76,29 +76,27 @@ namespace MapConverter
 			{"v18","v18"},
 			
 			// Crates
-			{"wcrate","crate"},
-			{"scrate","crate"},
+//			{"wcrate","crate"},
+//			{"scrate","crate"},
 		};
-		
+
 		int MapSize;
-		int ActorCount = 0; 
+		int ActorCount = 0;
 		Map Map = new Map();
 
-		public MapConverter(string[] args)
+		LegacyMapImporter(string filename)
 		{
-			if (args.Length != 3)
-			{
-				Console.WriteLine("usage: MapConverter mod[,mod]* input-map.ini output-map.yaml");
-				return;
-			}
+			ConvertIniMap(filename);
+		}
 
-			Game.InitializeEngineWithMods(args[0].Split(','));
-			ConvertIniMap(args[1]);
-			Save(args[2]);
+		public static Map Import(string filename)
+		{
+			var converter = new LegacyMapImporter(filename);
+			return converter.Map;
 		}
 
 		enum IniMapFormat { RedAlert = 3, /* otherwise, cnc (2 variants exist, we don't care to differentiate) */ };
-		
+
 		public void ConvertIniMap(string iniFile)
 		{
 			var file = new IniFile(FileSystem.Open(iniFile));
@@ -110,14 +108,14 @@ namespace MapConverter
 			var Width = int.Parse(map.GetValue("Width", "0"));
 			var Height = int.Parse(map.GetValue("Height", "0"));
 			MapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64;
-			
+
 			Map.Title = basic.GetValue("Name", "(null)");
 			Map.Author = "Westwood Studios";
 			Map.Tileset = Truncate(map.GetValue("Theater", "TEMPERAT"), 8);
 			Map.MapSize.X = MapSize;
 			Map.MapSize.Y = MapSize;
-			Map.TopLeft = new int2 (XOffset, YOffset);
-			Map.BottomRight = new int2(XOffset+Width,YOffset+Height);
+			Map.TopLeft = new int2(XOffset, YOffset);
+			Map.BottomRight = new int2(XOffset + Width, YOffset + Height);
 			Map.Selectable = true;
 
 			if (legacyMapFormat == IniMapFormat.RedAlert)
@@ -130,37 +128,37 @@ namespace MapConverter
 			}
 			else // CNC
 			{
-				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0,iniFile.Length-4)+".bin"));
+				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"));
 				ReadCncOverlay(file);
 				ReadCncTrees(file);
-				
+
 				// TODO: Fixme
 				//tileset = new TileSet("tileSet.til","templates.ini",fileMapping[Pair.New("cnc",Map.Tileset)].First);
 			}
-			
+
 			LoadActors(file, "STRUCTURES");
 			LoadActors(file, "UNITS");
 			LoadActors(file, "INFANTRY");
 			LoadSmudges(file, "SMUDGE");
-		
+
 			var wp = file.GetSection("Waypoints")
 					.Where(kv => int.Parse(kv.Value) > 0)
-					.Select(kv => Pair.New(int.Parse(kv.Key), 
-						LocationFromMapOffset( int.Parse( kv.Value ), MapSize )))
+					.Select(kv => Pair.New(int.Parse(kv.Key),
+						LocationFromMapOffset(int.Parse(kv.Value), MapSize)))
 					.Where(a => a.First < 8)
 					.ToArray();
-			
+
 			Map.PlayerCount = wp.Count();
-			
+
 			foreach (var kv in wp)
-				Map.Waypoints.Add("spawn"+kv.First, kv.Second);
+				Map.Waypoints.Add("spawn" + kv.First, kv.Second);
 		}
 
 		static int2 LocationFromMapOffset(int offset, int mapSize)
 		{
 			return new int2(offset % mapSize, offset / mapSize);
 		}
-		
+
 		static MemoryStream ReadPackedSection(IniSection mapPackSection)
 		{
 			StringBuilder sb = new StringBuilder();
@@ -185,7 +183,8 @@ namespace MapConverter
 					byte[] dest = new byte[8192];
 					byte[] src = reader.ReadBytes((int)length);
 
-					/*int actualLength =*/ Format80.DecodeInto(src, dest);
+					/*int actualLength =*/
+					Format80.DecodeInto(src, dest);
 
 					chunks.Add(dest);
 				}
@@ -201,10 +200,10 @@ namespace MapConverter
 			return ms;
 		}
 
-		static byte ReadByte( Stream s )
+		static byte ReadByte(Stream s)
 		{
 			int ret = s.ReadByte();
-			if( ret == -1 )
+			if (ret == -1)
 				throw new NotImplementedException();
 			return (byte)ret;
 		}
@@ -217,147 +216,164 @@ namespace MapConverter
 			return ret;
 		}
 
-		void UnpackRATileData( MemoryStream ms )
+		void UnpackRATileData(MemoryStream ms)
 		{
-			Map.MapTiles = new TileReference<ushort, byte>[ MapSize, MapSize ];
-			for( int i = 0 ; i < MapSize ; i++ )
-				for( int j = 0 ; j < MapSize ; j++ )
-					Map.MapTiles[i,j] = new TileReference<ushort,byte>();
-			
-			for( int j = 0 ; j < MapSize ; j++ )
-				for( int i = 0 ; i < MapSize ; i++ )
-					Map.MapTiles[i,j].type = ReadWord(ms);
+			Map.MapTiles = new TileReference<ushort, byte>[MapSize, MapSize];
+			for (int i = 0; i < MapSize; i++)
+				for (int j = 0; j < MapSize; j++)
+					Map.MapTiles[i, j] = new TileReference<ushort, byte>();
 
-			for( int j = 0 ; j < MapSize ; j++ )
-				for( int i = 0 ; i < MapSize ; i++ )
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+					Map.MapTiles[i, j].type = ReadWord(ms);
+
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
 				{
-					Map.MapTiles[i,j].index = ReadByte(ms);
-					if( Map.MapTiles[i,j].type == 0xff || Map.MapTiles[i,j].type == 0xffff )
-						Map.MapTiles[i,j].index = byte.MaxValue;
+					Map.MapTiles[i, j].index = ReadByte(ms);
+					if (Map.MapTiles[i, j].type == 0xff || Map.MapTiles[i, j].type == 0xffff)
+						Map.MapTiles[i, j].index = byte.MaxValue;
 				}
 		}
-	
-		void UnpackRAOverlayData( MemoryStream ms )
+
+		void UnpackRAOverlayData(MemoryStream ms)
 		{
-			Map.MapResources = new TileReference<byte, byte>[ MapSize, MapSize ];		
-			for( int j = 0 ; j < MapSize ; j++ )
-				for( int i = 0 ; i < MapSize ; i++ )
+			Map.MapResources = new TileReference<byte, byte>[MapSize, MapSize];
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
 				{
-					byte o = ReadByte( ms );
-					var res = Pair.New((byte)0,(byte)0);
-					
+					byte o = ReadByte(ms);
+					var res = Pair.New((byte)0, (byte)0);
+
 					if (o != 255 && overlayResourceMapping.ContainsKey(raOverlayNames[o]))
 						res = overlayResourceMapping[raOverlayNames[o]];
-					
-					Map.MapResources[i,j] = new TileReference<byte,byte>(res.First, res.Second);
-				
+
+					Map.MapResources[i, j] = new TileReference<byte, byte>(res.First, res.Second);
+
 					if (o != 255 && overlayActorMapping.ContainsKey(raOverlayNames[o]))
-							Map.Actors.Add("Actor"+ActorCount, new ActorReference("Actor"+ActorCount++, overlayActorMapping[raOverlayNames[o]], new int2(i,j), "Neutral"));
+						Map.Actors.Add("Actor" + ActorCount,
+							new ActorReference(overlayActorMapping[raOverlayNames[o]]) 
+							{ 
+								new LocationInit( new int2(i, j) ),
+								new OwnerInit( "Neutral" ) 
+							});
 				}
 		}
 
-		void ReadRATrees( IniFile file )
+		void ReadRATrees(IniFile file)
 		{
-			IniSection terrain = file.GetSection( "TERRAIN", true );
-			if( terrain == null )
-				return;
-			
-			foreach( KeyValuePair<string, string> kv in terrain )
-			{
-				var loc = int.Parse( kv.Key );
-				Map.Actors.Add("Actor"+ActorCount, new ActorReference("Actor"+ActorCount++,kv.Value.ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), "Neutral" ) );
-			}
-		}
-		
-		void UnpackCncTileData( Stream ms )
-		{		
-			Map.MapTiles = new TileReference<ushort, byte>[ MapSize, MapSize ];
-			for( int i = 0 ; i < MapSize ; i++ )
-				for( int j = 0 ; j < MapSize ; j++ )
-					Map.MapTiles[i,j] = new TileReference<ushort,byte>();
-			
-			for( int j = 0 ; j < MapSize ; j++ )
-				for( int i = 0 ; i < MapSize ; i++ )
-				{
-					Map.MapTiles[i,j].type = ReadByte(ms);
-					Map.MapTiles[i,j].index = ReadByte(ms);
-					
-					if( Map.MapTiles[i,j].type == 0xff )
-						Map.MapTiles[i,j].index = byte.MaxValue;
-				}			
-		}
-				
-		void ReadCncOverlay( IniFile file )
-		{
-			IniSection overlay = file.GetSection( "OVERLAY", true );
-			if( overlay == null )
-				return;
-		
-			Map.MapResources = new TileReference<byte, byte>[ MapSize, MapSize ];		
-			foreach( KeyValuePair<string, string> kv in overlay )
-			{
-				var loc = int.Parse( kv.Key );
-				int2 cell = new int2(loc % MapSize, loc / MapSize);
-				
-				var res = Pair.New((byte)0,(byte)0);
-				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
-						res = overlayResourceMapping[kv.Value.ToLower()];
-				
-				Map.MapResources[ cell.X, cell.Y ] = new TileReference<byte,byte>(res.First, res.Second);
-				
-				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
-					Map.Actors.Add("Actor"+ActorCount, new ActorReference("Actor"+ActorCount++, overlayActorMapping[kv.Value.ToLower()], new int2(cell.X,cell.Y), "Neutral"));
-			}
-		}
-		
-		
-		void ReadCncTrees( IniFile file )
-		{
-			IniSection terrain = file.GetSection( "TERRAIN", true );
-			if( terrain == null )
+			IniSection terrain = file.GetSection("TERRAIN", true);
+			if (terrain == null)
 				return;
 
-			foreach( KeyValuePair<string, string> kv in terrain )
+			foreach (KeyValuePair<string, string> kv in terrain)
 			{
-				var loc = int.Parse( kv.Key );
-				Map.Actors.Add("Actor"+ActorCount, new ActorReference("Actor"+ActorCount++, kv.Value.Split(',')[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize),"Neutral"));
+				var loc = int.Parse(kv.Key);
+				Map.Actors.Add("Actor" + ActorCount, 
+					new ActorReference(kv.Value.ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit("Neutral")
+					});
 			}
 		}
-		
+
+		void UnpackCncTileData(Stream ms)
+		{
+			Map.MapTiles = new TileReference<ushort, byte>[MapSize, MapSize];
+			for (int i = 0; i < MapSize; i++)
+				for (int j = 0; j < MapSize; j++)
+					Map.MapTiles[i, j] = new TileReference<ushort, byte>();
+
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+				{
+					Map.MapTiles[i, j].type = ReadByte(ms);
+					Map.MapTiles[i, j].index = ReadByte(ms);
+
+					if (Map.MapTiles[i, j].type == 0xff)
+						Map.MapTiles[i, j].index = byte.MaxValue;
+				}
+		}
+
+		void ReadCncOverlay(IniFile file)
+		{
+			IniSection overlay = file.GetSection("OVERLAY", true);
+			if (overlay == null)
+				return;
+
+			Map.MapResources = new TileReference<byte, byte>[MapSize, MapSize];
+			foreach (KeyValuePair<string, string> kv in overlay)
+			{
+				var loc = int.Parse(kv.Key);
+				int2 cell = new int2(loc % MapSize, loc / MapSize);
+
+				var res = Pair.New((byte)0, (byte)0);
+				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
+					res = overlayResourceMapping[kv.Value.ToLower()];
+
+				Map.MapResources[cell.X, cell.Y] = new TileReference<byte, byte>(res.First, res.Second);
+
+				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
+					Map.Actors.Add("Actor" + ActorCount, 
+						new ActorReference(overlayActorMapping[kv.Value.ToLower()])
+						{
+							new LocationInit(cell),
+							new OwnerInit("Neutral")
+						});
+			}
+		}
+
+		void ReadCncTrees(IniFile file)
+		{
+			IniSection terrain = file.GetSection("TERRAIN", true);
+			if (terrain == null)
+				return;
+
+			foreach (KeyValuePair<string, string> kv in terrain)
+			{
+				var loc = int.Parse(kv.Key);
+				Map.Actors.Add("Actor" + ActorCount,
+					new ActorReference(kv.Value.Split(',')[0].ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit("Neutral")
+					});
+			}
+		}
+
 		void LoadActors(IniFile file, string section)
 		{
 			foreach (var s in file.GetSection(section, true))
 			{
 				//num=owner,type,health,location,facing,...
-				var parts = s.Value.Split( ',' );
+				var parts = s.Value.Split(',');
 				var loc = int.Parse(parts[3]);
 				if (parts[0] == "")
 					parts[0] = "Neutral";
-				Map.Actors.Add("Actor"+ActorCount, new ActorReference("Actor"+ActorCount++, parts[1].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), parts[0]));
+				Map.Actors.Add("Actor" + ActorCount,
+					new ActorReference(parts[1].ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit(parts[0])
+					});
 			}
 		}
-		
+
 		void LoadSmudges(IniFile file, string section)
 		{
 			foreach (var s in file.GetSection(section, true))
 			{
 				//loc=type,loc,depth
-				var parts = s.Value.Split( ',' );
+				var parts = s.Value.Split(',');
 				var loc = int.Parse(parts[1]);
-				Map.Smudges.Add(new SmudgeReference(parts[0].ToLowerInvariant(),new int2(loc % MapSize, loc / MapSize),int.Parse(parts[2])));
+				Map.Smudges.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), int.Parse(parts[2])));
 			}
 		}
-		static string Truncate( string s, int maxLength )
+
+		static string Truncate(string s, int maxLength)
 		{
-			return s.Length <= maxLength ? s : s.Substring(0,maxLength );
-		}
-				
-		public void Save(string filepath)
-		{
-			Directory.CreateDirectory(filepath);
-			
-			Map.Package = new Folder(filepath);
-			Map.Save(filepath);
+			return s.Length <= maxLength ? s : s.Substring(0, maxLength);
 		}
 	}
 }

OpenRA.Editor/OpenRA.Editor.csproj

@@ -23,6 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -44,7 +46,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" />
@@ -57,6 +58,7 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="LegacyMapImporter.cs" />
     <Compile Include="NewMapDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -121,7 +123,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

@@ -22,6 +22,7 @@ namespace OpenRA.Editor
 			Application.CurrentCulture = CultureInfo.InvariantCulture;
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
+
 			Application.Run(new Form1(args));
 		}
 	}

OpenRA.Editor/Surface.cs

@@ -8,13 +8,13 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
-using OpenRA.Thirdparty;
 
 namespace OpenRA.Editor
 {
@@ -31,6 +31,7 @@ namespace OpenRA.Editor
 		WaypointTemplate Waypoint;
 
 		public bool IsPanning;
+		public event Action AfterChange = () => { };
 
 		Dictionary<string, ActorTemplate> ActorTemplates = new Dictionary<string, ActorTemplate>();
 		Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
@@ -129,6 +130,8 @@ namespace OpenRA.Editor
 			/* todo: optimize */
 			foreach (var ch in Chunks.Values) ch.Dispose();
 			Chunks.Clear();
+
+			AfterChange();
 		}
 
 		int2 FindEdge(int2 p, int2 d, TileReference<ushort, byte> replace)
@@ -178,6 +181,8 @@ namespace OpenRA.Editor
 						}
 					}
 				}
+
+			AfterChange();
 		}
 
 		int wpid;
@@ -197,6 +202,8 @@ namespace OpenRA.Editor
 			if (k.Key != null) Map.Waypoints.Remove(k.Key);
 
 			Map.Waypoints.Add(NextWpid(), GetBrushLocation());
+
+			AfterChange();
 		}
 
 		void Erase()
@@ -206,7 +213,7 @@ namespace OpenRA.Editor
 			Resource = null;
 			Waypoint = null;
 
-			var key = Map.Actors.FirstOrDefault(a => a.Value.Location == GetBrushLocation());
+			var key = Map.Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
 			if (key.Key != null) Map.Actors.Remove(key.Key);
 
 			if (Map.MapResources[GetBrushLocation().X, GetBrushLocation().Y].type != 0)
@@ -222,6 +229,8 @@ namespace OpenRA.Editor
 
 			var k = Map.Waypoints.FirstOrDefault(a => a.Value == GetBrushLocation());
 			if (k.Key != null) Map.Waypoints.Remove(k.Key);
+
+			AfterChange();
 		}
 
 		void Draw()
@@ -230,6 +239,8 @@ namespace OpenRA.Editor
 			if (Actor != null) DrawWithActor();
 			if (Resource != null) DrawWithResource();
 			if (Waypoint != null) DrawWithWaypoint();
+
+			AfterChange();
 		}
 
 		int id;
@@ -244,15 +255,21 @@ namespace OpenRA.Editor
 
 		void DrawWithActor()
 		{
-			if (Map.Actors.Any(a => a.Value.Location == GetBrushLocation()))
+			if (Map.Actors.Any(a => a.Value.Location() == GetBrushLocation()))
 				return;
 
 			var owner = "Neutral";
 			var id = NextActorName();
-			Map.Actors[id] = new ActorReference(id,Actor.Info.Name.ToLowerInvariant(), GetBrushLocation(), owner);
+			Map.Actors[id] = new ActorReference(Actor.Info.Name.ToLowerInvariant())
+			{
+				new LocationInit( GetBrushLocation() ),
+				new OwnerInit( owner)
+			};
+
+			AfterChange();
 		}
 
-		Random r = new Random();
+		System.Random r = new System.Random();
 		void DrawWithResource()
 		{
 			Map.MapResources[GetBrushLocation().X, GetBrushLocation().Y]
@@ -269,6 +286,8 @@ namespace OpenRA.Editor
 				Chunks[ch].Dispose();
 				Chunks.Remove(ch);
 			}
+
+			AfterChange();
 		}
 
 		protected override void OnMouseDown(MouseEventArgs e)
@@ -288,10 +307,11 @@ namespace OpenRA.Editor
 
 		Bitmap RenderChunk(int u, int v)
 		{
+
 			var bitmap = new Bitmap(ChunkSize * 24, ChunkSize * 24);
 			bitmap.SetPixel(0, 0, Color.Green);
 
-			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), 
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
 
 			unsafe
@@ -308,7 +328,7 @@ namespace OpenRA.Editor
 						var rawImage = tile.TileBitmapBytes[index];
 						for (var x = 0; x < 24; x++)
 							for (var y = 0; y < 24; y++)
-								p[ (j * 24 + y) * stride + i * 24 + x ] = Palette.GetColor(rawImage[x + 24 * y]).ToArgb();
+								p[(j * 24 + y) * stride + i * 24 + x] = Palette.GetColor(rawImage[x + 24 * y]).ToArgb();
 
 						if (Map.MapResources[u * ChunkSize + i, v * ChunkSize + j].type != 0)
 						{
@@ -379,7 +399,7 @@ namespace OpenRA.Editor
 				new Rectangle(Map.XOffset * 24 + Offset.X, Map.YOffset * 24 + Offset.Y, Map.Width * 24, Map.Height * 24));
 
 			foreach (var ar in Map.Actors)
-				DrawActor(e.Graphics, ar.Value.Location, ActorTemplates[ar.Value.Type]);
+				DrawActor(e.Graphics, ar.Value.Location(), ActorTemplates[ar.Value.Type]);
 
 			foreach (var wp in Map.Waypoints)
 				e.Graphics.DrawRectangle(Pens.LimeGreen, new Rectangle(
@@ -406,10 +426,18 @@ namespace OpenRA.Editor
 
 			if (Brush == null && Actor == null && Resource == null)
 			{
-				var x = Map.Actors.FirstOrDefault(a => a.Value.Location == GetBrushLocation());
+				var x = Map.Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
 				if (x.Key != null)
-					DrawActorBorder(e.Graphics, x.Value.Location, ActorTemplates[x.Value.Type]);
+					DrawActorBorder(e.Graphics, x.Value.Location(), ActorTemplates[x.Value.Type]);
 			}
 		}
 	}
+
+	static class ActorReferenceExts
+	{
+		public static int2 Location(this ActorReference ar)
+		{
+			return ar.InitDict.Get<LocationInit>().value;
+		}
+	}
 }

OpenRA.FileFormats/FieldLoader.cs

@@ -28,13 +28,15 @@ namespace OpenRA.FileFormats
 			throw new NotImplementedException( "FieldLoader: Missing field `{0}` on `{1}`".F( s, f.Name ) );
 		};
 
-		public static void Load(object self, MiniYaml my) { Load(self, my.Nodes); }
-
-		public static void Load(object self, Dictionary<string, MiniYaml> my)
+		public static void Load( object self, MiniYaml my )
 		{
-			foreach (var x in my)
+			foreach( var x in my.Nodes )
 				if (!x.Key.StartsWith("-"))
 					LoadField(self, x.Key, x.Value.Value);
+
+			foreach( var field in self.GetType().GetFields())
+				if( field.HasAttribute<FieldFromYamlKeyAttribute>() )
+					field.SetValue( self, GetValue( field.Name, field.FieldType, my.Value ) );
 		}
 
 		public static T Load<T>(MiniYaml y) where T : new()
@@ -58,7 +60,9 @@ namespace OpenRA.FileFormats
 			var field = self.GetType().GetField( key.Trim() );
 
 			if( field == null )
-				UnknownFieldAction(key.Trim(), self.GetType());
+				UnknownFieldAction( key.Trim(), self.GetType() );
+			else if( field.HasAttribute<FieldFromYamlKeyAttribute>() )
+				return;
 			else
 				field.SetValue( self, GetValue( field.Name, field.FieldType, value ) );
 		}
@@ -150,10 +154,18 @@ namespace OpenRA.FileFormats
 	{
 		public static MiniYaml Save(object o)
 		{
-			return new MiniYaml(null, o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
-				.ToDictionary(
-					f => f.Name,
-					f => new MiniYaml(FormatValue(o, f))));
+			var dict = new Dictionary<string, MiniYaml>();
+			string root = null;
+
+			foreach( var f in o.GetType().GetFields( BindingFlags.Public | BindingFlags.Instance ) )
+			{
+				if( f.HasAttribute<FieldFromYamlKeyAttribute>() )
+					root = FormatValue( o, f );
+				else
+					dict.Add( f.Name, new MiniYaml( FormatValue( o, f ) ) );
+			}
+
+			return new MiniYaml( root, dict );
 		}
 		
 		public static MiniYaml SaveDifferences(object o, object from)
@@ -187,4 +199,6 @@ namespace OpenRA.FileFormats
 				: v.ToString();
 		}
 	}
+
+	public class FieldFromYamlKeyAttribute : Attribute { }
 }

OpenRA.FileFormats/Map/ActorReference.cs

@@ -1,34 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public class ActorReference
-	{
-		public readonly string Id;
-		public readonly string Type;
-		public readonly int2 Location;
-		public readonly string Owner;
-		
-		public ActorReference(MiniYaml my)
-		{
-			FieldLoader.Load(this, my);
-		}
-		
-		// Legacy construtor for old format maps
-		public ActorReference(string id, string type, int2 location, string owner )
-		{
-			Id = id;
-			Type = type;
-			Location = location;
-			Owner = owner;
-		}
-	}
-}

OpenRA.FileFormats/Map/MapStub.cs

@@ -17,10 +17,10 @@ namespace OpenRA.FileFormats
 {
 	public class MapStub
 	{
-		public IFolder Package;
+		public readonly IFolder Package;
 		
 		// Yaml map data
-		public string Uid;
+		public readonly string Uid;
 		public bool Selectable;
 
 		public string Title;
@@ -35,7 +35,6 @@ namespace OpenRA.FileFormats
 		public int2 BottomRight;
 		public int Width { get { return BottomRight.X - TopLeft.X; } }
 		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
-		public Map Map { get { return new Map(Package); }}
 	
 		static List<string> Fields = new List<string>() {
 			"Selectable", "Title", "Description", "Author", "PlayerCount", "Tileset", "TopLeft", "BottomRight"

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -76,8 +76,6 @@
     <Compile Include="Support\Stopwatch.cs" />
     <Compile Include="Support\Timer.cs" />
     <Compile Include="TypeDictionary.cs" />
-    <Compile Include="Map\ActorReference.cs" />
-    <Compile Include="Map\Map.cs" />
     <Compile Include="Map\TileReference.cs" />
     <Compile Include="Map\Terrain.cs" />
     <Compile Include="Primitives\Cache.cs" />

OpenRA.FileFormats/Package.cs

@@ -68,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);

OpenRA.FileFormats/Session.cs

@@ -47,6 +47,7 @@ namespace OpenRA.FileFormats
 			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/TypeDictionary.cs

@@ -9,12 +9,13 @@
 #endregion
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace OpenRA.FileFormats
 {
-	public class TypeDictionary
+	public class TypeDictionary : IEnumerable
 	{
 		Dictionary<Type, object> dataSingular = new Dictionary<Type, object>();
 		Dictionary<Type, List<object>> dataMultiple = new Dictionary<Type, List<object>>();
@@ -85,7 +86,7 @@ namespace OpenRA.FileFormats
 				return new T[ 0 ];
 		}
 
-		public IEnumerator<object> GetEnumerator()
+		public IEnumerator GetEnumerator()
 		{
 			return WithInterface<object>().GetEnumerator();
 		}

OpenRA.Game/Actor.cs

@@ -31,19 +31,18 @@ namespace OpenRA
 		public int2 Location { get { return traits.Get<IOccupySpace>().TopLeft; } }
 		[Sync]
 		public Player Owner;
-		[Sync]
-		public int Health;
 
 		IActivity currentActivity;
 		public Group Group;
 
-		public Actor(World world, string name, int2 location, Player owner)
+		internal Actor(World world, string name, TypeDictionary initDict )
 		{
-			World = world;
-			ActorID = world.NextAID();
-			Owner = owner;
+			var init = new ActorInitializer( this, initDict );
 
-			var init = new ActorInitializer( this, location );
+			World = world;
+			ActorID = world.NextAID();
+			if( initDict.Contains<OwnerInit>() )
+				Owner = init.Get<OwnerInit,Player>();
 
 			if (name != null)
 			{
@@ -51,8 +50,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));
 			}
@@ -119,8 +116,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>()
@@ -140,73 +137,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 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 )
 		{
@@ -245,18 +183,10 @@ namespace OpenRA
 			var o = obj as Actor;
 			return ( o != null && o.ActorID == ActorID );
 		}
-	}
-
-	public class ActorInitializer
-	{
-		public readonly Actor self;
-		public World world { get { return self.World; } }
-		public readonly int2 location;
-
-		public ActorInitializer( Actor actor, int2 location )
+
+		public override string ToString()
 		{
-			this.self = actor;
-			this.location = location;
-		}
-	}
+			return "{0} {1}{2}".F( Info.Name, ActorID, IsInWorld ? "" : " (not in world)" );
+		}
+	}
 }

OpenRA.Game/ActorInitializer.cs

@@ -0,0 +1,134 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Linq;
+using OpenRA.FileFormats;
+
+namespace OpenRA
+{
+	public class ActorInitializer
+	{
+		public readonly Actor self;
+		public World world { get { return self.World; } }
+		internal TypeDictionary dict;
+
+		public ActorInitializer( Actor actor, TypeDictionary dict )
+		{
+			this.self = actor;
+			this.dict = dict;
+		}
+
+		public T Get<T>()
+			where T : IActorInit
+		{
+			return dict.Get<T>();
+		}
+
+		public U Get<T,U>()
+			where T : IActorInit<U>
+		{
+			return dict.Get<T>().Value( world );
+		}
+		
+		public bool Contains<T>()
+			where T : IActorInit
+		{
+			return dict.Contains<T>();
+		}
+	}
+	
+	public interface IActorInit {}
+
+	public interface IActorInit<T> : IActorInit
+	{
+		T Value( World world );
+	}
+	
+	public class FacingInit : IActorInit<int>
+	{
+		[FieldFromYamlKey]
+		public readonly int value = 128;
+		
+		public FacingInit() { }
+		
+		public FacingInit( int init )
+		{
+			value = init;
+		}
+		
+		public int Value( World world )
+		{
+			return value;	
+		}
+	}
+	
+	public class AltitudeInit : IActorInit<int>
+	{
+		[FieldFromYamlKey]
+		public readonly int value = 0;
+		
+		public AltitudeInit() { }
+		
+		public AltitudeInit( int init )
+		{
+			value = init;
+		}
+		
+		public int Value( World world )
+		{
+			return value;	
+		}
+	}
+
+	public class LocationInit : IActorInit<int2>
+	{
+		[FieldFromYamlKey]
+		public readonly int2 value = int2.Zero;
+
+		public LocationInit() { }
+
+		public LocationInit( int2 init )
+		{
+			value = init;
+		}
+
+		public int2 Value( World world )
+		{
+			return value;
+		}
+	}
+
+	public class OwnerInit : IActorInit<Player>
+	{
+		[FieldFromYamlKey]
+		public readonly string PlayerName = "Neutral";
+		Player player;
+
+		public OwnerInit() { }
+
+		public OwnerInit( string playerName )
+		{
+			this.PlayerName = playerName;
+		}
+
+		public OwnerInit( Player player )
+		{
+			this.player = player;
+			this.PlayerName = player.InternalName;
+		}
+
+		public Player Value( World world )
+		{
+			if( player != null )
+				return player;
+			return world.players.First( x => x.Value.InternalName == PlayerName ).Value;
+		}
+	}
+}

OpenRA.Game/ActorReference.cs

@@ -0,0 +1,53 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Collections;
+
+namespace OpenRA.FileFormats
+{
+	public class ActorReference : IEnumerable
+	{
+		public readonly string Type;
+		public readonly TypeDictionary InitDict;
+
+		public ActorReference( string type ) : this( type, new Dictionary<string, MiniYaml>() ) { }
+
+		public ActorReference( string type, Dictionary<string, MiniYaml> inits )
+		{
+			Type = type;
+			InitDict = new TypeDictionary();
+			foreach( var i in inits )
+				InitDict.Add( LoadInit( i.Key, i.Value ) );
+		}
+
+		static IActorInit LoadInit(string traitName, MiniYaml my)
+		{
+			var info = Game.CreateObject<IActorInit>(traitName + "Init");
+			FieldLoader.Load(info, my);
+			return info;
+		}
+
+		public MiniYaml Save()
+		{
+			var ret = new MiniYaml( Type );
+			foreach( var init in InitDict )
+			{
+				var initName = init.GetType().Name;
+				ret.Nodes.Add( initName.Substring( 0, initName.Length - 4 ), FieldSaver.Save( init ) );
+			}
+			return ret;
+		}
+
+		// for initialization syntax
+		public void Add( object o ) { InitDict.Add( o ); }
+		public IEnumerator GetEnumerator() { return InitDict.GetEnumerator(); }
+	}
+}

OpenRA.Game/Chrome.cs

@@ -1,91 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Widgets;
-
-namespace OpenRA
-{
-	class Chrome : IHandleInput
-	{
-		public readonly Renderer renderer;
-		public readonly LineRenderer lineRenderer;
-
-		SpriteRenderer rgbaRenderer { get { return renderer.RgbaSpriteRenderer; } }
-		SpriteRenderer shpRenderer { get { return renderer.WorldSpriteRenderer; } }
-
-		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();
-			}
-		}
-
-		public static Widget rootWidget = null;
-
-		public void Tick(World world)
-		{
-			rootWidget.Tick(world);
-			
-			if (!world.GameHasStarted) return;
-			if (world.LocalPlayer == null) return;
-			++ticksSinceLastMove;
-		}	
-
-		public void Draw(World world) { rootWidget.Draw(world); shpRenderer.Flush(); rgbaRenderer.Flush(); lineRenderer.Flush(); }
-		
-		public int ticksSinceLastMove = 0;
-		public int2 lastMousePos;
-		public bool HandleInput(World world, MouseInput mi)
-		{
-			if (Widget.SelectedWidget != null && Widget.SelectedWidget.HandleMouseInputOuter(mi))
-				return true;
-			
-			if (rootWidget.HandleMouseInputOuter(mi))
-				return true;
-
-			if (mi.Event == MouseInputEvent.Move)
-			{
-				lastMousePos = mi.Location;
-				ticksSinceLastMove = 0;
-			}
-			return false;
-		}
-
-		
-		public bool HandleKeyPress(KeyInput e)
-		{
-			if (Widget.SelectedWidget != null)
-				return Widget.SelectedWidget.HandleKeyPressOuter(e);
-			
-			if (rootWidget.HandleKeyPressOuter(e))
-				return true;
-			return false;
-		}
-		
-		public bool HitTest(int2 mousePos)
-		{
-			if (Widget.SelectedWidget != null)
-				return true;
-			
-			return rootWidget.HitTest(mousePos);
-		}
-	}
-}

OpenRA.Game/Controller.cs

@@ -1,156 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using System;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Orders;
-using OpenRA.Traits;
-
-namespace OpenRA
-{
-	public class Controller : IHandleInput
-	{
-		public IOrderGenerator orderGenerator = new UnitOrderGenerator();
-		public Selection selection = new Selection();
-
-		public void CancelInputMode() { orderGenerator = new UnitOrderGenerator(); }
-
-		public bool ToggleInputMode<T>() where T : IOrderGenerator, new()
-		{
-			if (orderGenerator is T)
-			{
-				CancelInputMode();
-				return false;
-			}
-			else
-			{
-				orderGenerator = new T();
-				return true;
-			}
-		}
-
-		void ApplyOrders(World world, float2 xy, MouseInput mi)
-		{
-			if (orderGenerator == null) return;
-
-			var orders = orderGenerator.Order(world, xy.ToInt2(), mi).ToArray();
-			Game.orderManager.IssueOrders( orders );
-
-			var voicedActor = orders.Select(o => o.Subject)
-				.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.HasVoice());
-
-			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

@@ -19,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/MoveFlash.cs

@@ -14,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

@@ -23,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/Exts.cs

@@ -34,13 +34,6 @@ namespace OpenRA
 			return xs.Aggregate(1f, (a, x) => a * x);
 		}
 
-		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

@@ -36,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;
@@ -47,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}");
 		}
@@ -88,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)
@@ -98,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;
@@ -116,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))
@@ -137,19 +136,16 @@ 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);
+			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));
 		}
@@ -169,6 +165,9 @@ namespace OpenRA
 			CurrentHost = host;
 			CurrentPort = port;
 
+			lastConnectionState = ConnectionState.PreConnecting;
+			ConnectionStateChanged();
+			
 			orderManager = new OrderManager(new NetworkConnection(host, port), ChooseReplayFilename());
 		}
 
@@ -179,6 +178,9 @@ namespace OpenRA
 
 		static void JoinLocal()
 		{
+			lastConnectionState = ConnectionState.PreConnecting;
+			ConnectionStateChanged();
+			
 			if (orderManager != null) orderManager.Dispose();
 			orderManager = new OrderManager(new EchoConnection());
 		}
@@ -236,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;
@@ -281,7 +283,7 @@ namespace OpenRA
 				using (new PerfSample("tick_time"))
 				{
 					lastTime += Settings.Timestep;
-					chrome.Tick(world);
+					Widget.DoTick(world);
 
 					orderManager.TickImmediate(world);
 
@@ -293,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();
@@ -306,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;
@@ -433,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");
 		}
@@ -474,66 +453,20 @@ namespace OpenRA
 			get { return LobbyInfo.Clients.FirstOrDefault(c => c.Index == orderManager.Connection.LocalClientId); }
 		}
 
-		public static void HandleKeyDown(KeyInput e)
+		public static void HandleKeyEvent(KeyInput e)
 		{
 			int sync = world.SyncHash();
 			
-			if (chrome.HandleKeyPress(e))
+			if (Widget.HandleKeyPress(e))
 				return;
 
-			switch (e.KeyName)
-			{
-				case "up": scrollUp = true; break;
-				case "down": scrollDown = true; break;
-				case "left": scrollLeft = true; break;
-				case "right": scrollRight = true; break;
-			}
-
-			if (e.KeyName.Length == 1 && char.IsDigit(e.KeyName[0]))
-				Game.controller.selection.DoControlGroup(world, e.KeyName[0] - '0', e.Modifiers);
-			
-			if (e.KeyChar == 08)
-				Game.controller.GotoNextBase();
-
 			if (sync != Game.world.SyncHash())
 				throw new InvalidOperationException("Desync in OnKeyPress");
 		}
 
-		public static void HandleKeyUp(KeyInput e)
-		{
-			switch (e.KeyName)
-			{
-				case "up": scrollUp = false; break;
-				case "down": scrollDown = false; break;
-				case "left": scrollLeft = false; break;
-				case "right": scrollRight = false; break;
-			}
-		}
-
-		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;
-			}
-		}
-
-		public static void HandleModifierKeys(Modifiers mods)
-		{
-			controller.SetModifiers(mods);
-		}
+		static Modifiers modifiers;
+		public static Modifiers GetModifierKeys() { return modifiers; }
+		public static void HandleModifierKeys(Modifiers mods) {	modifiers = mods; }
 
 		static Size GetResolution(Settings settings, WindowMode windowmode)
 		{
@@ -566,17 +499,16 @@ namespace OpenRA
 			Log.AddChannel("sync", "syncreport.log", true, true);
 
 			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;
 
 			var resolution = GetResolution(settings, Game.Settings.WindowMode);
-			renderer = new Renderer(resolution, Game.Settings.WindowMode);
-			resolution = renderer.Resolution;
-
-			controller = new Controller();
+			Renderer = new Renderer(resolution, Game.Settings.WindowMode);
+			resolution = Renderer.Resolution;
 			clientSize = new int2(resolution);
 
 			Sound.Initialize();
@@ -593,7 +525,7 @@ namespace OpenRA
 			else
 				JoinLocal();
 
-			LoadShellMap(new Manifest(LobbyInfo.GlobalSettings.Mods).ShellmapUid);
+			LoadShellMap(Manifest.ShellmapUid);
 
 			ResetTimer();
 
@@ -620,14 +552,15 @@ namespace OpenRA
 
 		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;
@@ -673,14 +606,14 @@ namespace OpenRA
 		public static void InitializeEngineWithMods(string[] mods)
 		{
 			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
-			var manifest = new Manifest(mods);
-			LoadModAssemblies(manifest);
+			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);
+			foreach (var folder in Manifest.Folders) FileSystem.Mount(folder);
+			foreach (var pkg in Manifest.Packages) FileSystem.Mount(pkg);
 
-			Rules.LoadRules(manifest, new Map());
+			Rules.LoadRules(Manifest, new Map());
 		}
 	}
 }

OpenRA.Game/GameRules/ActorInfo.cs

@@ -14,7 +14,7 @@ using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
 
-namespace OpenRA.GameRules
+namespace OpenRA
 {
 	public class ActorInfo
 	{

OpenRA.Game/GameRules/UserSettings.cs

@@ -19,13 +19,15 @@ namespace OpenRA.GameRules
 {
 	public class UserSettings
 	{
+		// Behaviour settings
+		public bool ViewportEdgeScroll = true;
+		
 		// Debug settings
-		public bool UnitDebug = false;
-		public bool PathDebug = false;
 		public bool PerfDebug = false;
-		public bool IndexDebug = false;
-		public bool RecordSyncReports = true;
-		public bool ShowGameTimer = true;
+		public bool RecordSyncReports = true;
+		public bool ShowGameTimer = true;
+		public bool DeveloperMode = false;
+		public bool UnitDebug = false;
 		
 		// Window settings
 		public WindowMode WindowMode = WindowMode.PseudoFullscreen;
@@ -57,6 +59,7 @@ namespace OpenRA.GameRules
 		public int ExternalPort = 1234;
 		public bool AdvertiseOnline = true;
 		public string MasterServer = "http://open-ra.org/master/";
+		public bool AllowCheats = false;
 		
 		string SettingsFile;
 		UserSettings defaults;

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.FileFormats;
+using OpenRA.Traits;
 
 namespace OpenRA.GameRules
 {
@@ -30,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
@@ -55,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/ChromeProvider.cs

@@ -16,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;
@@ -52,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))
@@ -72,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

@@ -15,21 +15,23 @@ namespace OpenRA.Graphics
 	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/HardwarePalette.cs

@@ -25,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>();
@@ -81,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

@@ -13,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

@@ -33,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);
 		}

OpenRA.Game/Graphics/Minimap.cs

@@ -17,168 +17,41 @@ using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
-	class Minimap
-	{
-		readonly World world;
-		Sheet sheet;
-		SpriteRenderer rgbaRenderer;
-		Sprite sprite;
-		Bitmap terrain, customLayer;
-		Rectangle bounds;
-		
-		const int alpha = 230;
-
-		public Minimap(World world, Renderer r)
+	public class Minimap
+	{		
+		public static Bitmap TerrainBitmap(Map map)
 		{
-			this.world = world;
-			sheet = new Sheet(r, new Size(world.Map.MapSize.X, world.Map.MapSize.Y));
-			rgbaRenderer = r.RgbaSpriteRenderer;
-			var size = Math.Max(world.Map.Width, world.Map.Height);
-			var dw = (size - world.Map.Width) / 2;
-			var dh = (size - world.Map.Height) / 2;
-
-			bounds = new Rectangle(world.Map.TopLeft.X - dw, world.Map.TopLeft.Y - dh, size, size);
-
-			sprite = new Sprite(sheet, bounds, TextureChannel.Alpha);
-		
-			shroudColor = Color.FromArgb(alpha, Color.Black);
-		}
-
-		public static Rectangle MakeMinimapBounds(Map m)
-		{
-			var size = Math.Max(m.Width, m.Height);
-			var dw = (size - m.Width) / 2;
-			var dh = (size - m.Height) / 2;
-
-			return new Rectangle(m.TopLeft.X - dw, m.TopLeft.Y - dh, size, size);
-		}
-		
-		static Color shroudColor;
-
-		public void InvalidateCustom() { customLayer = null; }
-
-		public static Bitmap RenderTerrainBitmap(Map map, TileSet tileset)
-		{
-			var terrain = new Bitmap(map.MapSize.X, map.MapSize.Y);
+			var tileset = Rules.TileSets[map.Tileset];
+			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			Bitmap terrain = new Bitmap(size, size);
+			
 			var bitmapData = terrain.LockBits(new Rectangle(0, 0, terrain.Width, terrain.Height),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+			
 			unsafe
 			{
 				int* c = (int*)bitmapData.Scan0;
 
-				for (var x = 0; x < map.MapSize.X; x++)
-					for (var y = 0; y < map.MapSize.Y; y++)
+				for (var x = 0; x < map.Width; x++)
+					for (var y = 0; y < map.Height; y++)
 					{
-						var type = tileset.GetTerrainType(map.MapTiles[x, y]);
-						*(c + (y * bitmapData.Stride >> 2) + x) = map.IsInMap(x, y)
-							? Color.FromArgb(alpha, tileset.Terrain[type].Color).ToArgb()
-							: shroudColor.ToArgb();
+						var mapX = x + map.TopLeft.X;
+						var mapY = y + map.TopLeft.Y;
+						var type = tileset.GetTerrainType(map.MapTiles[mapX, mapY]);
+						*(c + (y * bitmapData.Stride >> 2) + x) = tileset.Terrain[type].Color.ToArgb();
 					}
 			}
 			terrain.UnlockBits(bitmapData);
 			return terrain;
 		}
-
-		public void Update()
-		{			
-			if (terrain == null)
-				terrain = RenderTerrainBitmap(world.Map, world.TileSet);
-
-			// Custom terrain layer
-			if (customLayer == null)
-			{
-				customLayer = new Bitmap(terrain);
-				for (var x = world.Map.TopLeft.X; x < world.Map.BottomRight.X; x++)
-					for (var y = world.Map.TopLeft.Y; y < world.Map.BottomRight.Y; y++)
-					{
-						var customTerrain = world.WorldActor.traits.WithInterface<ITerrainTypeModifier>()
-							.Select( t => t.GetTerrainType(new int2(x,y)) )
-							.FirstOrDefault( t => t != null );
-						if (customTerrain == null) continue;
-						customLayer.SetPixel(x, y, Color.FromArgb(alpha, world.TileSet.Terrain[customTerrain].Color));
-					}							
-			}
-
-			if (!world.GameHasStarted || !world.Queries.OwnedBy[world.LocalPlayer].WithTrait<ProvidesRadar>().Any())
-				return;
-
-			var bitmap = new Bitmap(customLayer);
-			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				int* c = (int*)bitmapData.Scan0;
-
-				foreach (var a in world.Queries.WithTrait<Unit>().Where(a => a.Actor.Owner != null && a.Actor.IsVisible()))
-					*(c + (a.Actor.Location.Y * bitmapData.Stride >> 2) + a.Actor.Location.X) =
-						Color.FromArgb(alpha, a.Actor.Owner.Color).ToArgb();
-
-				for (var x = world.Map.TopLeft.X; x < world.Map.BottomRight.X; x++)
-					for (var y = world.Map.TopLeft.Y; y < world.Map.BottomRight.Y; y++)
-					{
-						if (!world.LocalPlayer.Shroud.DisplayOnRadar(x, y))
-						{
-							*(c + (y * bitmapData.Stride >> 2) + x) = shroudColor.ToArgb();
-							continue;
-						}
-						var b = world.WorldActor.traits.Get<BuildingInfluence>().GetBuildingAt(new int2(x, y));
-						
-						if (b != null)
-							*(c + (y * bitmapData.Stride >> 2) + x) = Color.FromArgb(alpha, b.Owner.Color).ToArgb();
-					}
-			}
-
-			bitmap.UnlockBits(bitmapData);
-			sheet.Texture.SetData(bitmap);
-		}
-
-		public void Draw(RectangleF rect)
-		{
-			rgbaRenderer.DrawSprite(sprite, 
-				new float2(rect.X, rect.Y), "chrome", new float2(rect.Width, rect.Height));
-			rgbaRenderer.Flush();
-		}
-
-		int2 CellToMinimapPixel(RectangleF viewRect, int2 p)
-		{
-			var fx = (float)(p.X - bounds.X) / bounds.Width;
-			var fy = (float)(p.Y - bounds.Y) / bounds.Height;
-
-			return new int2(
-				(int)(viewRect.Width * fx + viewRect.Left),
-				(int)(viewRect.Height * fy + viewRect.Top));
-		}
-
-		public int2 MinimapPixelToCell(RectangleF viewRect, int2 p)
-		{
-			var fx = (float)(p.X - viewRect.Left) / viewRect.Width;
-			var fy = (float)(p.Y - viewRect.Top) / viewRect.Height;
-
-			return new int2(
-				(int)(bounds.Width * fx + bounds.Left),
-				(int)(bounds.Height * fy + bounds.Top));
-		}
 		
-		
-		static int NextPowerOf2(int v)
+		// Add the static resources defined in the map; if the map lives
+		// in a world use AddCustomTerrain instead
+		public static Bitmap AddStaticResources(Map map, Bitmap terrainBitmap)
 		{
-			--v;
-			v |= v >> 1;
-			v |= v >> 2;
-			v |= v >> 4;
-			v |= v >> 8;
-			++v;
-			return v;
-		}
-		
-		public static Bitmap RenderMapPreview(MapStub stub)
-		{
-			Map map = stub.Map;
+			Bitmap terrain = new Bitmap(terrainBitmap);
 			var tileset = Rules.TileSets[map.Tileset];
-			var size = NextPowerOf2(Math.Max(map.Width, map.Height));
-			Bitmap terrain = new Bitmap(size, size);
-			
+
 			var bitmapData = terrain.LockBits(new Rectangle(0, 0, terrain.Width, terrain.Height),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
 
@@ -190,22 +63,114 @@ namespace OpenRA.Graphics
 					for (var y = 0; y < map.Height; y++)
 					{
 						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;
-						var type = tileset.GetTerrainType(map.MapTiles[mapX, mapY]);
-						string res = null;
-						if (map.MapResources[mapX, mapY].type != 0)
-							res = Rules.Info["world"].Traits.WithInterface<ResourceTypeInfo>()
+						var mapY = y + map.TopLeft.Y;	
+						if (map.MapResources[mapX, mapY].type == 0)
+							continue;
+					
+						var res = Rules.Info["world"].Traits.WithInterface<ResourceTypeInfo>()
 								.Where(t => t.ResourceType == map.MapResources[mapX, mapY].type)
 								.Select(t => t.TerrainType).FirstOrDefault();
-						if (res != null)
-							type = res;
+						if (res == null)
+							continue;
 						
-						*(c + (y * bitmapData.Stride >> 2) + x) = tileset.Terrain[type].Color.ToArgb();
+						*(c + (y * bitmapData.Stride >> 2) + x) = tileset.Terrain[res].Color.ToArgb();
 					}
 			}
 			terrain.UnlockBits(bitmapData);
 
 			return terrain;
 		}
+		
+		public static Bitmap CustomTerrainBitmap(World world)
+		{
+			var map = world.Map;
+			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			Bitmap bitmap = new Bitmap(size, size);
+			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* c = (int*)bitmapData.Scan0;
+
+				for (var x = 0; x < map.Width; x++)
+					for (var y = 0; y < map.Height; y++)
+					{
+						var mapX = x + map.TopLeft.X;
+						var mapY = y + map.TopLeft.Y;
+						var custom = map.CustomTerrain[mapX,mapY];
+						if (custom == null)
+							continue;
+						*(c + (y * bitmapData.Stride >> 2) + x) = world.TileSet.Terrain[custom].Color.ToArgb();
+					}
+			}
+			bitmap.UnlockBits(bitmapData);
+			return bitmap;
+		}
+				
+		public static Bitmap ActorsBitmap(World world)
+		{	
+			var map = world.Map;
+			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			Bitmap bitmap = new Bitmap(size, size);
+			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+		
+			unsafe
+			{
+				int* c = (int*)bitmapData.Scan0;
+				
+				foreach (var t in world.Queries.WithTraitMultiple<IRadarSignature>())
+				{
+					if (!t.Actor.IsVisible())
+						continue;
+					
+					var color = t.Trait.RadarSignatureColor(t.Actor);
+					foreach (var cell in t.Trait.RadarSignatureCells(t.Actor))
+						if (world.Map.IsInMap(cell))
+							*(c + ((cell.Y - world.Map.TopLeft.Y) * bitmapData.Stride >> 2) + cell.X - world.Map.TopLeft.X) = color.ToArgb();
+				}
+			}
+
+			bitmap.UnlockBits(bitmapData);
+			return bitmap;
+		}
+		
+		public static Bitmap ShroudBitmap(World world)
+		{	
+			var map = world.Map;
+			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			Bitmap bitmap = new Bitmap(size, size);
+			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+
+			var shroud = Color.Black.ToArgb();
+			var fog = Color.FromArgb(128, Color.Black).ToArgb();
+						
+			unsafe
+			{
+				int* c = (int*)bitmapData.Scan0;
+				
+				for (var x = 0; x < map.Width; x++)
+					for (var y = 0; y < map.Height; y++)
+					{
+						var mapX = x + map.TopLeft.X;
+						var mapY = y + map.TopLeft.Y;
+						if (!world.LocalPlayer.Shroud.IsExplored(mapX, mapY))
+							*(c + (y * bitmapData.Stride >> 2) + x) = shroud;
+						else if (!world.LocalPlayer.Shroud.IsVisible(mapX,mapY))					
+							*(c + (y * bitmapData.Stride >> 2) + x) = fog;
+					}
+			}
+
+			bitmap.UnlockBits(bitmapData);
+			return bitmap;
+		}
+		
+		public static Bitmap RenderMapPreview(Map map)
+		{
+			Bitmap terrain = TerrainBitmap(map);
+			return AddStaticResources(map, terrain);
+		}
 	}
 }

OpenRA.Game/Graphics/Renderer.cs

@@ -18,7 +18,7 @@ using OpenRA.Support;
 
 namespace OpenRA.Graphics
 {
-	internal class Renderer
+	public class Renderer
 	{
 		internal static int SheetSize;
 
@@ -32,6 +32,7 @@ namespace OpenRA.Graphics
 		public SpriteRenderer SpriteRenderer { get; private set; }
 		public SpriteRenderer RgbaSpriteRenderer { get; private set; }
 		public SpriteRenderer WorldSpriteRenderer { get; private set; }
+		public LineRenderer LineRenderer { get; private set; }
 
 		public ITexture PaletteTexture;
 
@@ -51,10 +52,11 @@ namespace OpenRA.Graphics
 			SpriteRenderer = new SpriteRenderer( this, SpriteShader );
 			RgbaSpriteRenderer = new SpriteRenderer( this, RgbaSpriteShader );
 			WorldSpriteRenderer = new SpriteRenderer( this, WorldSpriteShader );
+			LineRenderer = new LineRenderer(this);
 
-			RegularFont = new SpriteFont(this, "FreeSans.ttf", 14);
-			BoldFont = new SpriteFont(this, "FreeSansBold.ttf", 14);
-			TitleFont = new SpriteFont(this, "titles.ttf", 48);
+			RegularFont = new SpriteFont("FreeSans.ttf", 14);
+			BoldFont = new SpriteFont("FreeSansBold.ttf", 14);
+			TitleFont = new SpriteFont("titles.ttf", 48);
 		}
 
 		IGraphicsDevice CreateDevice( Assembly rendererDll, int width, int height, WindowMode window, bool vsync )
@@ -118,5 +120,12 @@ namespace OpenRA.Graphics
 
 			PerfHistory.Increment("batches", 1);
 		}
+		
+		public void Flush()
+		{
+			WorldSpriteRenderer.Flush();
+			RgbaSpriteRenderer.Flush();
+			LineRenderer.Flush();
+		}
 	}
 }

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -46,9 +46,10 @@ namespace OpenRA.Graphics
 		static void LoadSequencesForCursor(XmlElement eCursor)
 		{
 			string cursorSrc = eCursor.GetAttribute("src");
+			string palette = eCursor.GetAttribute("palette");
 
 			foreach (XmlElement eSequence in eCursor.SelectNodes("./sequence"))
-				cursors.Add(eSequence.GetAttribute("name"), new CursorSequence(cursorSrc, eSequence));
+				cursors.Add(eSequence.GetAttribute("name"), new CursorSequence(cursorSrc, palette, eSequence));
 
 		}
 
@@ -78,6 +79,11 @@ namespace OpenRA.Graphics
 		{
 			return units[unit].ContainsKey(seq);
 		}
+		
+		public static bool HasCursorSequence(string cursor)
+		{
+			return cursors.ContainsKey(cursor);
+		}
 
 		public static CursorSequence GetCursorSequence(string cursor)
 		{

OpenRA.Game/Graphics/Sheet.cs

@@ -16,20 +16,17 @@ namespace OpenRA.Graphics
 {
 	public class Sheet
 	{
-		readonly Renderer renderer;
 		protected readonly Bitmap bitmap;
 		ITexture texture;
 		bool dirty;
 
-		internal Sheet(Renderer renderer, Size size)
+		public Sheet(Size size)
 		{
-			this.renderer = renderer;
 			this.bitmap = new Bitmap(size.Width, size.Height);
 		}
 
-		internal Sheet(Renderer renderer, string filename)
+		internal Sheet(string filename)
 		{
-			this.renderer = renderer;
 			this.bitmap = (Bitmap)Image.FromStream(FileSystem.Open(filename));
 		}
 
@@ -38,7 +35,7 @@ namespace OpenRA.Graphics
 			get
 			{
 				if (texture == null)
-					texture = renderer.Device.CreateTexture(bitmap);
+					texture = Game.Renderer.Device.CreateTexture(bitmap);
 
 				if (dirty)
 				{

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -15,14 +15,13 @@ namespace OpenRA.Graphics
 	public class SheetBuilder
 	{
 		public static SheetBuilder SharedInstance;
-		internal static void Initialize(Renderer r)
+		internal static void Initialize()
 		{
-			SharedInstance = new SheetBuilder(r, TextureChannel.Red);
+			SharedInstance = new SheetBuilder(TextureChannel.Red);
 		}
 
-		internal SheetBuilder(Renderer r, TextureChannel ch)
+		internal SheetBuilder(TextureChannel ch)
 		{
-			renderer = r;
 			current = null;
 			rowHeight = 0;
 			channel = null;
@@ -45,9 +44,8 @@ namespace OpenRA.Graphics
 			return Add(data, size);
 		}
 
-		Sheet NewSheet() { return new Sheet( renderer, new Size( Renderer.SheetSize, Renderer.SheetSize ) ); }
-
-		Renderer renderer;
+		Sheet NewSheet() { return new Sheet(new Size( Renderer.SheetSize, Renderer.SheetSize ) ); }
+		
 		Sheet current = null;
 		int rowHeight = 0;
 		Point p;

OpenRA.Game/Graphics/Sprite.cs

@@ -22,7 +22,7 @@ namespace OpenRA.Graphics
 
 		readonly float2[] uvhax;
 
-		internal Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
+		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
 		{
 			this.bounds = bounds;
 			this.sheet = sheet;

OpenRA.Game/Graphics/SpriteFont.cs

@@ -17,14 +17,12 @@ using Tao.FreeType;
 
 namespace OpenRA.Graphics
 {
-	class SpriteFont
+	public class SpriteFont
 	{
-		Renderer renderer;
 		int size;
 
-		public SpriteFont(Renderer r, string name, int size)
+		public SpriteFont(string name, int size)
 		{
-			this.renderer = r;
 			this.size = size;
 
 			if (0 != FT.FT_New_Face(library, name, 0, out face))
@@ -34,7 +32,7 @@ namespace OpenRA.Graphics
 			glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph);
 
 			// setup a 1-channel SheetBuilder for our private use
-			if (builder == null) builder = new SheetBuilder(r, TextureChannel.Alpha);
+			if (builder == null) builder = new SheetBuilder(TextureChannel.Alpha);
 
 			PrecacheColor(Color.White);
 			PrecacheColor(Color.Red);
@@ -63,7 +61,7 @@ namespace OpenRA.Graphics
 				}
 				
 				var g = glyphs[Pair.New(s, c)];
-				renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite, 
+				Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite, 
 					new float2(
 						(int)Math.Round(p.X + g.Offset.X, 0),
 						p.Y + g.Offset.Y), 

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -12,7 +12,7 @@ using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Graphics
 {
-	class SpriteRenderer
+	public class SpriteRenderer
 	{
 		IVertexBuffer<Vertex> vertexBuffer;
 		IIndexBuffer indexBuffer;

OpenRA.Game/Graphics/SpriteSheetBuilder.cs

@@ -13,7 +13,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
 {
-	static class SpriteSheetBuilder
+	public static class SpriteSheetBuilder
 	{
 		public static void Initialize( TileSet tileset )
 		{

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -23,13 +23,11 @@ namespace OpenRA.Graphics
 		Sheet terrainSheet;
 
 		World world;
-		Renderer renderer;
 		Map map;
 
-		public TerrainRenderer(World world, Renderer renderer, WorldRenderer wr)
+		public TerrainRenderer(World world, WorldRenderer wr)
 		{
 			this.world = world;
-			this.renderer = renderer;
 			this.map = world.Map;
 
 			Size tileSize = new Size( Game.CellSize, Game.CellSize );
@@ -58,10 +56,10 @@ namespace OpenRA.Graphics
 						throw new InvalidOperationException("Terrain sprites span multiple sheets");
 				}
 
-			vertexBuffer = renderer.Device.CreateVertexBuffer( vertices.Length );
+			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer( vertices.Length );
 			vertexBuffer.SetData( vertices );
 
-			indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
+			indexBuffer = Game.Renderer.Device.CreateIndexBuffer( indices.Length );
 			indexBuffer.SetData( indices );
 		}
 
@@ -93,12 +91,12 @@ namespace OpenRA.Graphics
 
 			if( lastRow < firstRow ) lastRow = firstRow;
 
-			renderer.SpriteShader.SetValue( "DiffuseTexture", terrainSheet.Texture );
-			renderer.SpriteShader.Render(() =>
-				renderer.DrawBatch(vertexBuffer, indexBuffer,
+			Game.Renderer.SpriteShader.SetValue( "DiffuseTexture", terrainSheet.Texture );
+			Game.Renderer.SpriteShader.Render(() =>
+				Game.Renderer.DrawBatch(vertexBuffer, indexBuffer,
 					new Range<int>(verticesPerRow * firstRow, verticesPerRow * lastRow),
 					new Range<int>(indicesPerRow * firstRow, indicesPerRow * lastRow),
-					PrimitiveType.TriangleList, renderer.SpriteShader));
+					PrimitiveType.TriangleList, Game.Renderer.SpriteShader));
 
 			foreach (var r in world.WorldActor.traits.WithInterface<IRenderOverlay>())
 				r.Render();

OpenRA.Game/Graphics/Util.cs

@@ -112,10 +112,30 @@ namespace OpenRA.Graphics
 				LerpChannel(t, a.G, b.G),
 				LerpChannel(t, a.B, b.B));
 		}
+		
+		public static int LerpARGBColor(float t, int c1, int c2)
+		{
+			int a = LerpChannel(t, (c1 >> 24) & 255, (c2 >> 24) & 255);
+			int r = LerpChannel(t, (c1 >> 16) & 255, (c2 >> 16) & 255);
+			int g = LerpChannel(t, (c1 >> 8) & 255, (c2 >> 8) & 255);
+			int b = LerpChannel(t, c1 & 255, c2 & 255);
+			return (a << 24) | (r << 16) | (g << 8) | b;
+		}
 
 		public static int LerpChannel(float t, int a, int b)
 		{
 			return (int)((1 - t) * a + t * b);
 		}
+		
+		public static int NextPowerOf2(int v)
+		{
+			--v;
+			v |= v >> 1;
+			v |= v >> 2;
+			v |= v >> 4;
+			v |= v >> 8;
+			++v;
+			return v;
+		}
 	}
 }

OpenRA.Game/Graphics/Viewport.cs

@@ -13,15 +13,11 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Support;
 using OpenRA.Traits;
+using OpenRA.Widgets;
 
 namespace OpenRA.Graphics
 {
-	interface IHandleInput
-	{
-		bool HandleInput(World world, MouseInput mi);
-	}
-
-	class Viewport
+	public class Viewport
 	{
 		readonly float2 screenSize;
 		float2 scrollPosition;
@@ -32,22 +28,20 @@ namespace OpenRA.Graphics
 		public int Width { get { return (int)screenSize.X; } }
 		public int Height { get { return (int)screenSize.Y; } }
 
-		SpriteRenderer cursorRenderer;
-		int2 mousePos;
 		float cursorFrame = 0f;
 
+		public static int TicksSinceLastMove = 0;
+		public static int2 LastMousePos;
+
 		public void Scroll(float2 delta)
 		{
 			scrollPosition = scrollPosition + delta;
 		}
 
-		public IEnumerable<IHandleInput> regions { get { return new IHandleInput[] { Game.chrome, Game.controller }; } }
-
 		public Viewport(float2 screenSize, int2 mapStart, int2 mapEnd, Renderer renderer)
 		{
 			this.screenSize = screenSize;
 			this.renderer = renderer;
-			cursorRenderer = renderer.SpriteRenderer;
 
 			this.scrollPosition = Game.CellSize* mapStart;
 		}
@@ -66,12 +60,12 @@ namespace OpenRA.Graphics
 			world.WorldRenderer.Draw();
 			Timer.Time( "worldRenderer: {0}" );
 
-			Game.chrome.Draw(world);
+			Widget.DoDraw(world);
 			Timer.Time( "widgets: {0}" );
 
-			var cursorName = Game.chrome.HitTest(mousePos) ? "default" : Game.controller.ChooseCursor( world );
+			var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
 			var c = new Cursor(cursorName);
-			cursorRenderer.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), "cursor");
+			c.Draw((int)cursorFrame, Viewport.LastMousePos + Location); 
 			Timer.Time( "cursors: {0}" );
 
 			renderer.RgbaSpriteRenderer.Flush();
@@ -87,26 +81,13 @@ namespace OpenRA.Graphics
 			cursorFrame += 0.5f;
 		}
 
-		IHandleInput dragRegion = null;
-		public void DispatchMouseInput(World world, MouseInput mi)
+		public float2 ViewToWorld(int2 loc)
 		{
-			if (mi.Event == MouseInputEvent.Move)
-				mousePos = mi.Location;
-
-			if (dragRegion != null) {
-				dragRegion.HandleInput( world, mi );
-				if (mi.Event == MouseInputEvent.Up) dragRegion = null;
-				return;
-			}
-
-			dragRegion = regions.FirstOrDefault(r => r.HandleInput(world, mi));
-			if (mi.Event != MouseInputEvent.Down)
-				dragRegion = null;
+			return (1f / Game.CellSize) * (loc.ToFloat2() + Location);
 		}
-
 		public float2 ViewToWorld(MouseInput mi)
 		{
-			return (1 / 24.0f) * (new float2(mi.Location.X, mi.Location.Y) + Location);
+			return ViewToWorld(mi.Location);
 		}
 		
 		public void Center(int2 loc)

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -21,57 +21,23 @@ namespace OpenRA.Graphics
 	{
 		readonly World world;
 		internal readonly TerrainRenderer terrainRenderer;
-		internal readonly SpriteRenderer spriteRenderer;
-		internal readonly LineRenderer lineRenderer;
 		internal readonly UiOverlay uiOverlay;
-		internal readonly Renderer renderer;
 		internal readonly HardwarePalette palette;
 
-		internal WorldRenderer(World world, Renderer renderer)
+		internal WorldRenderer(World world)
 		{
 			this.world = world;
-			this.renderer = renderer;
 
-			terrainRenderer = new TerrainRenderer(world, renderer, this);
-			spriteRenderer = renderer.SpriteRenderer;
-			lineRenderer = new LineRenderer(renderer);
-			uiOverlay = new UiOverlay(spriteRenderer);
-			palette = new HardwarePalette(renderer, world.Map);
+			terrainRenderer = new TerrainRenderer(world, this);
+			uiOverlay = new UiOverlay();
+			palette = new HardwarePalette(world.Map);
 		}
 		
-		public void DrawLine(float2 start, float2 end, Color startColor, Color endColor)
-		{
-			lineRenderer.DrawLine(start,end,startColor,endColor);
-		}
+		public int GetPaletteIndex(string name) { return palette.GetPaletteIndex(name); }
+		public Palette GetPalette(string name) { return palette.GetPalette(name); }
+		public void AddPalette(string name, Palette pal) { palette.AddPalette(name, pal); }
+		public void UpdatePalette(string name, Palette pal) { palette.UpdatePalette(name, pal); }
 		
-		public int GetPaletteIndex(string name)
-		{
-			return palette.GetPaletteIndex(name);
-		}
-
-		public Palette GetPalette(string name)
-		{
-			return palette.GetPalette(name);
-		}
-		
-		public void AddPalette(string name, Palette pal)
-		{
-			System.Console.WriteLine("Registering Palette "+name);
-
-			palette.AddPalette(name, pal);
-		}
-		
-		public void UpdatePalette(string name, Palette pal)
-		{
-			palette.UpdatePalette(name, pal);
-		}
-		
-		void DrawSpriteList(IEnumerable<Renderable> images)
-		{
-			foreach (var image in images)
-				spriteRenderer.DrawSprite(image.Sprite, image.Pos, image.Palette);
-		}
-
 		class SpriteComparer : IComparer<Renderable>
 		{
 			public int Compare(Renderable x, Renderable y)
@@ -129,32 +95,32 @@ namespace OpenRA.Graphics
 		public void Draw()
 		{
 			var bounds = GetBoundsRect();
-			renderer.Device.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
+			Game.Renderer.Device.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
 
 			terrainRenderer.Draw(Game.viewport);
 
-			DrawSpriteList(worldSprites);
-			uiOverlay.Draw(world);
-			spriteRenderer.Flush();
-			DrawBandBox();
+			if (world.OrderGenerator != null)
+				world.OrderGenerator.RenderBeforeWorld(world);
 
-			if (Game.controller.orderGenerator != null)
-				Game.controller.orderGenerator.Render(world);
+			Game.Renderer.SpriteRenderer.Flush();
+			Game.Renderer.LineRenderer.Flush();
+
+			foreach (var image in worldSprites)
+				Game.Renderer.SpriteRenderer.DrawSprite(image.Sprite, image.Pos, image.Palette);
+			uiOverlay.Draw(world);
+			Game.Renderer.SpriteRenderer.Flush();
+
+			if (world.OrderGenerator != null)
+				world.OrderGenerator.RenderAfterWorld(world);
 
 			if (world.LocalPlayer != null)
-				world.LocalPlayer.Shroud.Draw(spriteRenderer);
+				world.LocalPlayer.Shroud.Draw();
 
-			spriteRenderer.Flush();
+			Game.Renderer.SpriteRenderer.Flush();
 
-			renderer.Device.DisableScissor();
+			Game.Renderer.Device.DisableScissor();
 
-			if (Game.Settings.IndexDebug)
-			{
-				bounds.Offset((int)Game.viewport.Location.X, (int)Game.viewport.Location.Y);
-				DrawBins(bounds);
-			}
-
-			lineRenderer.Flush();
+			Game.Renderer.LineRenderer.Flush();
 		}
 
 		void DrawBox(RectangleF r, Color color)
@@ -162,10 +128,10 @@ namespace OpenRA.Graphics
 			var a = new float2(r.Left, r.Top);
 			var b = new float2(r.Right - a.X, 0);
 			var c = new float2(0, r.Bottom - a.Y);
-			lineRenderer.DrawLine(a, a + b, color, color);
-			lineRenderer.DrawLine(a + b, a + b + c, color, color);
-			lineRenderer.DrawLine(a + b + c, a + c, color, color);
-			lineRenderer.DrawLine(a, a + c, color, color);
+			Game.Renderer.LineRenderer.DrawLine(a, a + b, color, color);
+			Game.Renderer.LineRenderer.DrawLine(a + b, a + b + c, color, color);
+			Game.Renderer.LineRenderer.DrawLine(a + b + c, a + c, color, color);
+			Game.Renderer.LineRenderer.DrawLine(a, a + c, color, color);
 		}
 
 		void DrawBins(RectangleF bounds)
@@ -177,30 +143,12 @@ namespace OpenRA.Graphics
 			for (var j = 0; j < world.Map.MapSize.Y;
 				j += world.WorldActor.Info.Traits.Get<SpatialBinsInfo>().BinSize)
 			{
-				lineRenderer.DrawLine(new float2(0, j * 24), new float2(world.Map.MapSize.X * 24, j * 24), Color.Black, Color.Black);
-				lineRenderer.DrawLine(new float2(j * 24, 0), new float2(j * 24, world.Map.MapSize.Y * 24), Color.Black, Color.Black);
+				Game.Renderer.LineRenderer.DrawLine(new float2(0, j * 24), new float2(world.Map.MapSize.X * 24, j * 24), Color.Black, Color.Black);
+				Game.Renderer.LineRenderer.DrawLine(new float2(j * 24, 0), new float2(j * 24, world.Map.MapSize.Y * 24), Color.Black, Color.Black);
 			}
 		}
 
-		void DrawBandBox()
-		{
-			var selbox = Game.controller.SelectionBox;
-			if (selbox == null) return;
-
-			var a = selbox.Value.First;
-			var b = new float2(selbox.Value.Second.X - a.X, 0);
-			var c = new float2(0, selbox.Value.Second.Y - a.Y);
-
-			lineRenderer.DrawLine(a, a + b, Color.White, Color.White);
-			lineRenderer.DrawLine(a + b, a + b + c, Color.White, Color.White);
-			lineRenderer.DrawLine(a + b + c, a + c, Color.White, Color.White);
-			lineRenderer.DrawLine(a, a + c, Color.White, Color.White);
-
-			foreach (var u in world.SelectActorsInBox(selbox.Value.First, selbox.Value.Second))
-				DrawSelectionBox(u, Color.Yellow, false);
-		}
-
-		public void DrawSelectionBox(Actor selectedUnit, Color c, bool drawHealthBar)
+		public void DrawSelectionBox(Actor selectedUnit, Color c)
 		{
 			var bounds = selectedUnit.GetBounds(true);
 
@@ -209,145 +157,16 @@ namespace OpenRA.Graphics
 			var xY = new float2(bounds.Left, bounds.Bottom);
 			var XY = new float2(bounds.Right, bounds.Bottom);
 
-			lineRenderer.DrawLine(xy, xy + new float2(4, 0), c, c);
-			lineRenderer.DrawLine(xy, xy + new float2(0, 4), c, c);
-			lineRenderer.DrawLine(Xy, Xy + new float2(-4, 0), c, c);
-			lineRenderer.DrawLine(Xy, Xy + new float2(0, 4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xy, xy + new float2(4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xy, xy + new float2(0, 4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(Xy, Xy + new float2(-4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(Xy, Xy + new float2(0, 4), c, c);
 
-			lineRenderer.DrawLine(xY, xY + new float2(4, 0), c, c);
-			lineRenderer.DrawLine(xY, xY + new float2(0, -4), c, c);
-			lineRenderer.DrawLine(XY, XY + new float2(-4, 0), c, c);
-			lineRenderer.DrawLine(XY, XY + new float2(0, -4), c, c);
-
-			if (drawHealthBar)
-			{
-				DrawHealthBar(selectedUnit, xy, Xy);
-				DrawControlGroup(selectedUnit, xy);
-
-				// Only display pips and tags to the owner
-				if (selectedUnit.Owner == world.LocalPlayer)
-				{
-					DrawPips(selectedUnit, xY);
-					DrawTags(selectedUnit, new float2(.5f * (bounds.Left + bounds.Right ), xy.Y));
+			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(0, -4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(-4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(0, -4), c, c);
 				}
-			}	
-
-			if (Game.Settings.PathDebug)
-				DrawUnitPath(selectedUnit);
-		}
-
-		void DrawUnitPath(Actor selectedUnit)
-		{
-			var mobile = selectedUnit.traits.WithInterface<IMove>().FirstOrDefault();
-			if (mobile != null)
-			{
-				var path = mobile.GetCurrentPath(selectedUnit);
-				var start = selectedUnit.CenterLocation;
-
-				var c = Color.Green;
-
-				foreach (var step in path)
-				{
-					lineRenderer.DrawLine(step + new float2(-1, -1), step + new float2(-1, 1), c, c);
-					lineRenderer.DrawLine(step + new float2(-1, 1), step + new float2(1, 1), c, c);
-					lineRenderer.DrawLine(step + new float2(1, 1), step + new float2(1, -1), c, c);
-					lineRenderer.DrawLine(step + new float2(1, -1), step + new float2(-1, -1), c, c);
-					lineRenderer.DrawLine(start, step, c, c);
-					start = step;
-				}
-			}
-		}
-
-		void DrawHealthBar(Actor selectedUnit, float2 xy, float2 Xy)
-		{
-			var c = Color.Gray;
-			lineRenderer.DrawLine(xy + new float2(0, -2), xy + new float2(0, -4), c, c);
-			lineRenderer.DrawLine(Xy + new float2(0, -2), Xy + new float2(0, -4), c, c);
-
-			var healthAmount = (float)selectedUnit.Health / selectedUnit.Info.Traits.Get<OwnedActorInfo>().HP;
-			var healthColor = (healthAmount < selectedUnit.World.Defaults.ConditionRed) ? Color.Red
-				: (healthAmount < selectedUnit.World.Defaults.ConditionYellow) ? Color.Yellow
-				: Color.LimeGreen;
-
-			var healthColor2 = Color.FromArgb(
-				255,
-				healthColor.R / 2,
-				healthColor.G / 2,
-				healthColor.B / 2);
-
-			var z = float2.Lerp(xy, Xy, healthAmount);
-
-			lineRenderer.DrawLine(z + new float2(0, -4), Xy + new float2(0, -4), c, c);
-			lineRenderer.DrawLine(z + new float2(0, -2), Xy + new float2(0, -2), c, c);
-
-			lineRenderer.DrawLine(xy + new float2(0, -3), z + new float2(0, -3), healthColor, healthColor);
-			lineRenderer.DrawLine(xy + new float2(0, -2), z + new float2(0, -2), healthColor2, healthColor2);
-			lineRenderer.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), healthColor2, healthColor2);
-		}
-
-		// depends on the order of pips in TraitsInterfaces.cs!
-		static readonly string[] pipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray" };
-		static readonly string[] tagStrings = { "", "tag-fake", "tag-primary" };
-
-		void DrawControlGroup(Actor selectedUnit, float2 basePosition)
-		{
-			var group = Game.controller.selection.GetControlGroupForActor(selectedUnit);
-			if (group == null) return;
-
-			var pipImages = new Animation("pips");
-			pipImages.PlayFetchIndex("groups", () => (int)group);
-			pipImages.Tick();
-			spriteRenderer.DrawSprite(pipImages.Image, basePosition + new float2(-8, 1), "chrome");
-		}
-
-		void DrawPips(Actor selectedUnit, float2 basePosition)
-		{
-			// If a mod wants to implement a unit with multiple pip sources, then they are placed on multiple rows
-			var pipxyBase = basePosition + new float2(-12, -7); // Correct for the offset in the shp file
-			var pipxyOffset = new float2(0, 0); // Correct for offset due to multiple columns/rows
-
-			foreach (var pips in selectedUnit.traits.WithInterface<IPips>())
-			{
-				foreach (var pip in pips.GetPips(selectedUnit))
-				{
-					if (pipxyOffset.X+5 > selectedUnit.GetBounds(false).Width)
-					{
-						pipxyOffset.X = 0;
-						pipxyOffset.Y -= 4;
-					}
-					var pipImages = new Animation("pips");
-					pipImages.PlayRepeating(pipStrings[(int)pip]);
-					spriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, "chrome");
-					pipxyOffset += new float2(4, 0);
-				}
-				// Increment row
-				pipxyOffset.X = 0;
-				pipxyOffset.Y -= 5;
-			}
-		}
-		
-		void DrawTags(Actor selectedUnit, float2 basePosition)
-		{
-			// If a mod wants to implement a unit with multiple tags, then they are placed on multiple rows
-			var tagxyBase = basePosition + new float2(-16, 2); // Correct for the offset in the shp file
-			var tagxyOffset = new float2(0, 0); // Correct for offset due to multiple rows
-
-			foreach (var tags in selectedUnit.traits.WithInterface<ITags>())
-			{
-				foreach (var tag in tags.GetTags())
-				{
-					if (tag == TagType.None)
-						continue;
-						
-					var tagImages = new Animation("pips");
-					tagImages.PlayRepeating(tagStrings[(int)tag]);
-					spriteRenderer.DrawSprite(tagImages.Image, tagxyBase + tagxyOffset, "chrome");
-					
-					// Increment row
-					tagxyOffset.Y += 8;
-				}
-			}
-		}
 
 		public void DrawLocus(Color c, int2[] cells)
 		{
@@ -355,16 +174,16 @@ namespace OpenRA.Graphics
 			foreach (var t in dict.Keys)
 			{
 				if (!dict.ContainsKey(t + new int2(-1, 0)))
-					lineRenderer.DrawLine(Game.CellSize * t, Game.CellSize * (t + new int2(0, 1)),
+					Game.Renderer.LineRenderer.DrawLine(Game.CellSize * t, Game.CellSize * (t + new int2(0, 1)),
 						c, c);
 				if (!dict.ContainsKey(t + new int2(1, 0)))
-					lineRenderer.DrawLine(Game.CellSize * (t + new int2(1, 0)), Game.CellSize * (t + new int2(1, 1)),
+					Game.Renderer.LineRenderer.DrawLine(Game.CellSize * (t + new int2(1, 0)), Game.CellSize * (t + new int2(1, 1)),
 						c, c);
 				if (!dict.ContainsKey(t + new int2(0, -1)))
-					lineRenderer.DrawLine(Game.CellSize * t, Game.CellSize * (t + new int2(1, 0)),
+					Game.Renderer.LineRenderer.DrawLine(Game.CellSize * t, Game.CellSize * (t + new int2(1, 0)),
 						c, c);
 				if (!dict.ContainsKey(t + new int2(0, 1)))
-					lineRenderer.DrawLine(Game.CellSize * (t + new int2(0, 1)), Game.CellSize * (t + new int2(1, 1)),
+					Game.Renderer.LineRenderer.DrawLine(Game.CellSize * (t + new int2(0, 1)), Game.CellSize * (t + new int2(1, 1)),
 						c, c);
 			}
 		}
@@ -374,8 +193,8 @@ namespace OpenRA.Graphics
 			var prev = location + Game.CellSize * range * float2.FromAngle(0);
 			for (var i = 1; i <= 32; i++)
 			{
-				var pos = location + Game.CellSize * range * float2.FromAngle((float)(Math.PI * i) / 8);
-				lineRenderer.DrawLine(prev, pos, c, c);
+				var pos = location + Game.CellSize * range * float2.FromAngle((float)(Math.PI * i) / 16);
+				Game.Renderer.LineRenderer.DrawLine(prev, pos, c, c);
 				prev = pos;
 			}
 		}

OpenRA.Game/MainWindow.cs

@@ -41,8 +41,10 @@ namespace OpenRA
 		Ctrl = (int)Keys.Control,
 	}
 
+	public enum KeyInputEvent { Down, Up };
 	public struct KeyInput
 	{
+		public KeyInputEvent Event;
 		public char KeyChar;
 		public string KeyName;
 		public Modifiers Modifiers;

OpenRA.Game/Map.cs

@@ -15,8 +15,9 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
+using OpenRA.FileFormats;
 
-namespace OpenRA.FileFormats
+namespace OpenRA
 {
 	public class Map
 	{
@@ -53,7 +54,7 @@ namespace OpenRA.FileFormats
 
 		public TileReference<ushort, byte>[,] MapTiles;
 		public TileReference<byte, byte>[,] MapResources;
-
+		public string [,] CustomTerrain;
 
 		// Temporary compat hacks
 		public int XOffset { get { return TopLeft.X; } }
@@ -87,6 +88,14 @@ namespace OpenRA.FileFormats
 			Author = "Your name here";
 		}
 
+		class Format2ActorReference
+		{
+			public string Id;
+			public string Type;
+			public int2 Location;
+			public string Owner;
+		}
+
 		public Map(IFolder package)
 		{
 			Package = package;
@@ -100,41 +109,66 @@ namespace OpenRA.FileFormats
 			{
 				string[] loc = wp.Value.Value.Split(',');
 				Waypoints.Add(wp.Key, new int2(int.Parse(loc[0]), int.Parse(loc[1])));
-			}
-			
-			// Players
-			if (MapFormat == 1)
-			{
-				Players.Add("Neutral", new PlayerReference("Neutral", "allies", true, true));
-			}
-			else
-			{
-				foreach (var kv in yaml["Players"].Nodes)
-				{
-					var player = new PlayerReference(kv.Value);
-					Players.Add(player.Name, player);
-				}
-			}
-			
-			// Actors
-			if (MapFormat == 1)
-			{
-				int actors = 0;
-				foreach (var kv in yaml["Actors"].Nodes)
-				{
-					string[] vals = kv.Value.Value.Split(' ');
-					string[] loc = vals[2].Split(',');
-					var a = new ActorReference("Actor"+actors++, vals[0], new int2(int.Parse(loc[0]), int.Parse(loc[1])), "Neutral");
-					Actors.Add(a.Id, a);
-				}
-			}
-			else
-			{
-				foreach (var kv in yaml["Actors"].Nodes)
-				{
-					var a = new ActorReference(kv.Value);
-					Actors.Add(a.Id, a);
-				}
+			}
+
+			// Players & Actors -- this has changed several times.
+			//	- Be backwards compatible wherever possible.
+			//	- Loading a map then saving it out upgrades to latest.
+			// Minimum criteria for dropping a format:
+			//	- There are no maps of this format left in tree
+
+			switch (MapFormat)
+			{
+				case 1:
+					{
+						Players.Add("Neutral", new PlayerReference("Neutral", "allies", true, true));
+
+						int actors = 0;
+						foreach (var kv in yaml["Actors"].Nodes)
+						{
+							string[] vals = kv.Value.Value.Split(' ');
+							string[] loc = vals[2].Split(',');
+							Actors.Add("Actor" + actors++, new ActorReference(vals[0])
+							{
+								new LocationInit( new int2( int.Parse( loc[ 0 ] ), int.Parse( loc[ 1 ] ) ) ),
+								new OwnerInit( "Neutral" ),
+							});
+						}
+					} break;
+
+				case 2:
+					{
+						foreach (var kv in yaml["Players"].Nodes)
+						{
+							var player = new PlayerReference(kv.Value);
+							Players.Add(player.Name, player);
+						}
+
+						foreach (var kv in yaml["Actors"].Nodes)
+						{
+							var oldActorReference = FieldLoader.Load<Format2ActorReference>(kv.Value);
+							Actors.Add(oldActorReference.Id, new ActorReference(oldActorReference.Type)
+							{
+								new LocationInit( oldActorReference.Location ),
+								new OwnerInit( oldActorReference.Owner )
+							});
+						}
+					} break;
+
+				case 3:
+					{
+						foreach (var kv in yaml["Players"].Nodes)
+						{
+							var player = new PlayerReference(kv.Value);
+							Players.Add(player.Name, player);
+						}
+
+						foreach (var kv in yaml["Actors"].Nodes)
+							Actors.Add(kv.Key, new ActorReference(kv.Value.Value, kv.Value.Nodes));
+					} break;
+
+				default:
+					throw new InvalidDataException("Map format {0} is not supported.".F(MapFormat));
 			}
 
 			// Smudges
@@ -148,13 +182,14 @@ namespace OpenRA.FileFormats
 			// Rules
 			Rules = yaml["Rules"].Nodes;
 
+			CustomTerrain = new string[MapSize.X, MapSize.Y];			
 			LoadUid();
 			LoadBinaryData();
 		}
 
 		public void Save(string filepath)
 		{
-			MapFormat = 2;
+			MapFormat = 3;
 			
 			var root = new Dictionary<string, MiniYaml>();
 			foreach (var field in SimpleFields)
@@ -170,10 +205,10 @@ namespace OpenRA.FileFormats
 					p => FieldSaver.Save(p.Value))));
 
 			root.Add("Actors",
-				new MiniYaml(null, Actors.ToDictionary(
-					a => "ActorReference@{0}".F(a.Key),
-					a => FieldSaver.Save(a.Value))));
-			
+				new MiniYaml( null, Actors.ToDictionary(
+					x => x.Key,
+					x => x.Value.Save() ) ) );
+
 			root.Add("Waypoints", MiniYaml.FromDictionary<string, int2>(Waypoints));
 			root.Add("Smudges", MiniYaml.FromList<SmudgeReference>(Smudges));
 			root.Add("Rules", new MiniYaml(null, Rules));
@@ -272,8 +307,8 @@ namespace OpenRA.FileFormats
 		{
 			// UID is calculated by taking an SHA1 of the yaml and binary data
 			// Read the relevant data into a buffer
-			var data = Exts.ReadAllBytes(Package.GetContent("map.yaml"))
-				.Concat(Exts.ReadAllBytes(Package.GetContent("map.bin"))).ToArray();
+			var data = Package.GetContent("map.yaml").ReadAllBytes()
+				.Concat(Package.GetContent("map.bin").ReadAllBytes()).ToArray();
 
 			// Take the SHA1
 			using (var csp = SHA1.Create())

OpenRA.Game/Network/Connection.cs

@@ -14,6 +14,7 @@ using System.IO;
 using System.Net.Sockets;
 using System.Threading;
 using OpenRA.Server;
+using OpenRA.Support;
 
 namespace OpenRA.Network
 {
@@ -74,15 +75,16 @@ namespace OpenRA.Network
 		}
 	}
 
-	class NetworkConnection : EchoConnection
+	class NetworkConnection : EchoConnection, IDisposable
 	{
 		TcpClient socket;
 		int clientId;
 		ConnectionState connectionState = ConnectionState.Connecting;
+		Thread t;
 
 		public NetworkConnection( string host, int port )
 		{
-			new Thread( _ =>
+			t = new Thread( _ =>
 			{
 				try
 				{
@@ -114,8 +116,11 @@ namespace OpenRA.Network
 				{
 					connectionState = ConnectionState.NotConnected;
 				}
+				catch ( IOException ) { socket.Close(); }
+				catch (ThreadAbortException ) { socket.Close(); }
 			}
-			) { IsBackground = true }.Start();
+			) { IsBackground = true };
+			t.Start();
 		}
 
 		public override int LocalClientId { get { return clientId; } }
@@ -136,6 +141,21 @@ namespace OpenRA.Network
 			}
 			catch (SocketException) { /* drop this on the floor; we'll pick up the disconnect from the reader thread */ }
 		}
+		bool disposed = false;
+		public void Dispose ()
+		{
+			if (disposed) return;
+			disposed = true;
+			GC.SuppressFinalize( this );
+
+			t.Abort();
+			if (socket != null)
+				socket.Client.Close();
+			using( new PerfSample( "Thread.Join" ))
+				t.Join();
+		}
+		
+		~NetworkConnection() { Dispose(); }
 	}
 
 	class ReplayConnection : IConnection

OpenRA.Game/Network/UnitOrders.cs

@@ -24,8 +24,13 @@ namespace OpenRA.Network
 				{
 					var client = Game.LobbyInfo.Clients.FirstOrDefault(c => c.Index == clientId);
 					if (client != null)
-						Game.AddChatLine(client.Color1, 
-							client.Name, order.TargetString);
+					{
+						var player = world.players.Values.FirstOrDefault(p => p.Index == client.Index);
+						if (player != null && player.WinState == WinState.Lost)
+							Game.AddChatLine(client.Color1, client.Name + " (Dead)", order.TargetString);
+						else
+							Game.AddChatLine(client.Color1, client.Name, order.TargetString);
+					}
 					break;
 				}
 			case "TeamChat":
@@ -33,13 +38,17 @@ namespace OpenRA.Network
 					var client = Game.LobbyInfo.Clients.FirstOrDefault(c => c.Index == clientId);
 					if (client != null)
 					{
-						var player = Game.world.players.Values.FirstOrDefault(p => p.Index == client.Index);
-						var isAlly = (world.GameHasStarted) ? 
-							player != null && Game.world.LocalPlayer != null && player.Stances[Game.world.LocalPlayer] == Stance.Ally :
+						var player = world.players.Values.FirstOrDefault(p => p.Index == client.Index);
+						var display = (world.GameHasStarted) ? 
+							player != null && (world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally 
+								|| player.WinState == WinState.Lost) :
 							client == Game.LocalClient || (client.Team == Game.LocalClient.Team && client.Team != 0);
-
-						if (isAlly)
-							Game.AddChatLine(client.Color1, client.Name + " (Team)", order.TargetString);
+						
+						if (display)
+						{
+							var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : " (Team)";
+							Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString);
+						}
 					}
 					break;
 				}
@@ -57,9 +66,14 @@ namespace OpenRA.Network
 			case "SetStance":
 				{
 					var targetPlayer = order.Player.World.players[order.TargetLocation.X];
+					var oldStance = order.Player.Stances[targetPlayer];
 					order.Player.Stances[targetPlayer] = (Stance)order.TargetLocation.Y;
+					
+					if (targetPlayer == world.LocalPlayer)
+						world.WorldActor.traits.Get<Shroud>().UpdatePlayerStance(world, order.Player, oldStance, order.Player.Stances[targetPlayer]);
+					
 					Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F(
-						order.Player.PlayerName, targetPlayer.PlayerName, (Stance)order.TargetLocation.Y));
+						order.Player.PlayerName, targetPlayer.PlayerName, order.Player.Stances[targetPlayer]));
 					break;
 				}
 			default:

OpenRA.Game/OpenRA.Game.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -75,31 +75,24 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Chrome.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="GameRules\WeaponInfo.cs" />
     <Compile Include="Group.cs" />
     <Compile Include="Orders\GenericSelectTarget.cs" />
     <Compile Include="Server\ProtocolVersion.cs" />
     <Compile Include="Traits\BaseBuilding.cs" />
-    <Compile Include="Traits\DetectCloaked.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
-    <Compile Include="Traits\Modifiers\FrozenUnderFog.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Player\TechTreeCache.cs" />
-    <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
     <Compile Include="Traits\World\Shroud.cs" />
     <Compile Include="Widgets\ChatEntryWidget.cs" />
     <Compile Include="Widgets\Delegates\ConnectionDialogsDelegate.cs" />
     <Compile Include="Widgets\Delegates\CreateServerMenuDelegate.cs" />
     <Compile Include="Widgets\Delegates\DiplomacyDelegate.cs" />
     <Compile Include="Widgets\Delegates\MainMenuButtonsDelegate.cs" />
-    <Compile Include="Widgets\RadarBinWidget.cs" />
     <Compile Include="Widgets\Delegates\ServerBrowserDelegate.cs" />
     <Compile Include="Widgets\Delegates\SettingsMenuDelegate.cs" />
-    <Compile Include="Widgets\MoneyBinWidget.cs" />
     <Compile Include="Widgets\MapPreviewWidget.cs" />
-    <Compile Include="Widgets\PostGameWidget.cs" />
     <Compile Include="Widgets\WidgetUtils.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
     <Compile Include="Effects\FlashTarget.cs" />
@@ -130,10 +123,8 @@
     <Compile Include="Sync.cs" />
     <Compile Include="Traits\CustomSellValue.cs" />
     <Compile Include="Traits\World\SpatialBins.cs" />
-    <Compile Include="Traits\World\ChoosePaletteOnSelect.cs" />
     <Compile Include="Traits\World\Country.cs" />
     <Compile Include="Actor.cs" />
-    <Compile Include="Controller.cs" />
     <Compile Include="Cursor.cs" />
     <Compile Include="GameRules\Footprint.cs" />
     <Compile Include="GameRules\Rules.cs" />
@@ -183,10 +174,8 @@
     <Compile Include="Traits\Production.cs" />
     <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
-    <Compile Include="Traits\Cloak.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
     <Compile Include="Traits\Turreted.cs" />
-    <Compile Include="Traits\Unit.cs" />
     <Compile Include="Traits\World\UnitInfluence.cs" />
     <Compile Include="Network\UnitOrders.cs" />
     <Compile Include="Traits\Util.cs" />
@@ -206,23 +195,16 @@
     <Compile Include="Widgets\BackgroundWidget.cs" />
     <Compile Include="Widgets\LabelWidget.cs" />
     <Compile Include="Widgets\CheckboxWidget.cs" />
-    <Compile Include="Traits\World\GlobalDefaults.cs" />
     <Compile Include="Traits\World\BibLayer.cs" />
     <Compile Include="Traits\World\SmudgeLayer.cs" />
-    <Compile Include="Widgets\Delegates\IngameChromeDelegate.cs" />
-    <Compile Include="Widgets\SpecialPowerBinWidget.cs" />
     <Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" />
     <Compile Include="Widgets\PerfGraphWidget.cs" />
     <Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
-    <Compile Include="Widgets\BuildPaletteWidget.cs" />
     <Compile Include="Widgets\Delegates\LobbyDelegate.cs" />
     <Compile Include="Widgets\ColorBlockWidget.cs" />
     <Compile Include="GameRules\MusicInfo.cs" />
-    <Compile Include="Widgets\PowerBinWidget.cs" />
     <Compile Include="Widgets\ImageWidget.cs" />
     <Compile Include="Traits\SharesCell.cs" />
-    <Compile Include="Traits\World\AircraftInfluence.cs" />
-    <Compile Include="Traits\World\HazardLayer.cs" />
     <Compile Include="Widgets\TextFieldWidget.cs" />
     <Compile Include="Widgets\ChatDisplayWidget.cs" />
     <Compile Include="Widgets\Delegates\MapChooserDelegate.cs" />
@@ -230,12 +212,25 @@
     <Compile Include="Widgets\SliderWidget.cs" />
     <Compile Include="Widgets\TimerWidget.cs" />
     <Compile Include="Widgets\ShpImageWidget.cs" />
+    <Compile Include="Traits\DrawLineToTarget.cs" />
+    <Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
+    <Compile Include="Widgets\ViewportScrollControllerWidget.cs" />
+    <Compile Include="Traits\Player\DeveloperMode.cs" />
+    <Compile Include="Traits\RevealsShroud.cs" />
+    <Compile Include="Traits\Targetable.cs" />
+    <Compile Include="Traits\Health.cs" />
+    <Compile Include="Traits\RepairableBuilding.cs" />
+    <Compile Include="Traits\Activities\Drag.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
       <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
+    <Compile Include="ActorInitializer.cs" />
+    <Compile Include="ActorReference.cs" />
+    <Compile Include="Map.cs" />
+    <Compile Include="Widgets\Delegates\DeveloperModeDelegate.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
@@ -265,4 +260,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <Folder Include="Traits\" />
+  </ItemGroup>
 </Project>

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -29,7 +29,7 @@ namespace OpenRA.Orders
 		public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
 		{
 			if (mi.Button == MouseButton.Right)
-				Game.controller.CancelInputMode();
+				world.CancelInputMode();
 			return OrderInner(world, xy, mi);
 		}
 
@@ -40,7 +40,8 @@ namespace OpenRA.Orders
 		}
 
 		public virtual void Tick(World world) { }
-		public void Render(World world) { }
+		public void RenderAfterWorld(World world) { }
+		public void RenderBeforeWorld(World world) { }
 
 		public string GetCursor(World world, int2 xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
 	}
@@ -59,7 +60,7 @@ namespace OpenRA.Orders
 					.Any();
 
 			if (!hasStructure)
-				Game.controller.CancelInputMode();
+				world.CancelInputMode();
 		}
 	}
 

OpenRA.Game/Orders/IOrderGenerator.cs

@@ -14,9 +14,10 @@ namespace OpenRA
 {
 	public interface IOrderGenerator
 	{
-		IEnumerable<Order> Order( World world, int2 xy, MouseInput mi );
-		void Tick( World world );
-		void Render( World world );
-		string GetCursor( World world, int2 xy, MouseInput mi );
+		IEnumerable<Order> Order(World world, int2 xy, MouseInput mi);
+		void Tick(World world);
+		void RenderBeforeWorld(World world);
+		void RenderAfterWorld(World world);
+		string GetCursor(World world, int2 xy, MouseInput mi);
 	}
 }

OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs

@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Orders
 {
-	class PlaceBuildingOrderGenerator : IOrderGenerator
+	public class PlaceBuildingOrderGenerator : IOrderGenerator
 	{
 		readonly Actor Producer;
 		readonly string Building;
@@ -29,7 +29,7 @@ namespace OpenRA.Orders
 		public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
 		{
 			if (mi.Button == MouseButton.Right)
-				Game.controller.CancelInputMode();
+				world.CancelInputMode();
 
 			return InnerOrder(world, xy, mi);
 		}
@@ -58,12 +58,14 @@ namespace OpenRA.Orders
 		{
 			var producing = Producer.traits.Get<Traits.ProductionQueue>().CurrentItem( Rules.Info[ Building ].Category );
 			if (producing == null || producing.Item != Building || producing.RemainingTime != 0)
-				Game.controller.CancelInputMode();
+				world.CancelInputMode();
 		}
 
-		public void Render( World world )
+		public void RenderAfterWorld( World world ) {}
+
+		public void RenderBeforeWorld(World world)
 		{
-			world.WorldRenderer.uiOverlay.DrawBuildingGrid( world, Building, BuildingInfo );
+			world.WorldRenderer.uiOverlay.DrawBuildingGrid(world, Building, BuildingInfo);
 		}
 
 		public string GetCursor(World world, int2 xy, MouseInput mi) { return "default"; }

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -1,78 +1,65 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.Traits;
-
-namespace OpenRA.Orders
-{
-	class UnitOrderGenerator : IOrderGenerator
-	{
-		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
-		{
-			var orders = Game.controller.selection.Actors
-				.Select(a => a.Order(xy, mi))
-				.Where(o => o != null)
-				.ToArray();
-
-			var actorsInvolved = orders.Select(o => o.Subject).Distinct();
-			if (actorsInvolved.Any())
-				yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor,
-					string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray()));
-
-			foreach (var o in orders)
-				yield return o;
-		}
-
-		public void Tick( World world ) {}
-
-		public void Render( World world )
-		{
-			foreach (var a in Game.controller.selection.Actors)
-			{
-				world.WorldRenderer.DrawSelectionBox(a, Color.White, true);
-				if (a.Owner == world.LocalPlayer)
-				{
-					//if (a.traits.Contains<RenderRangeCircle>())
-					//    world.WorldRenderer.DrawRangeCircle(Color.FromArgb(128, Color.Yellow),
-					//        a.CenterLocation, (int)a.GetPrimaryWeapon().Range);
-
-					if (a.traits.Contains<DetectCloaked>())
-						world.WorldRenderer.DrawRangeCircle(Color.FromArgb(128, Color.LimeGreen),
-							a.CenterLocation, a.Info.Traits.Get<DetectCloakedInfo>().Range);
-				}
-			}
-		}
-
-		public string GetCursor( World world, int2 xy, MouseInput mi )
-		{
-			return ChooseCursor(world, mi);
-		}
-
-		string ChooseCursor(World world, MouseInput mi)
-		{
-			//using (new PerfSample("cursor"))
-			{
-				var p = Game.controller.MousePosition;
-				var c = Order(world, p.ToInt2(), mi)
-					.Select(o => o.Subject.traits.WithInterface<IProvideCursor>()
-						.Select(pc => pc.CursorForOrderString(o.OrderString, o.Subject, o.TargetLocation)).FirstOrDefault(a => a != null))
-					.FirstOrDefault(a => a != null);
-
-				return c ??
-					(world.SelectActorsInBox(Game.CellSize * p,
-					Game.CellSize * p).Any()
-						? "select" : "default");
-			}
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Orders
+{
+	class UnitOrderGenerator : IOrderGenerator
+	{
+		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
+		{
+			var orders = world.Selection.Actors
+				.Select(a => a.Order(xy, mi))
+				.Where(o => o != null)
+				.ToArray();
+
+			var actorsInvolved = orders.Select(o => o.Subject).Distinct();
+			if (actorsInvolved.Any())
+				yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor,
+					string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray()));
+
+			foreach (var o in orders)
+				yield return o;
+		}
+
+		public void Tick( World world ) {}
+
+		public void RenderBeforeWorld(World world)
+		{
+			foreach (var a in world.Selection.Actors)
+				foreach (var t in a.traits.WithInterface<IPreRenderSelection>())
+					t.RenderBeforeWorld(a);
+		}
+
+		public void RenderAfterWorld( World world )
+		{
+			foreach (var a in world.Selection.Actors)
+				foreach (var t in a.traits.WithInterface<IPostRenderSelection>())
+					t.RenderAfterWorld(a);
+		}
+
+		public string GetCursor( World world, int2 xy, MouseInput mi )
+		{
+			var c = Order(world, xy, mi)
+				.Select(o => o.Subject.traits.WithInterface<IOrderCursor>()
+					.Select(pc => pc.CursorForOrder(o.Subject, o)).FirstOrDefault(a => a != null))
+				.FirstOrDefault(a => a != null);
+
+			return c ??
+				(world.FindUnitsAtMouse(mi.Location)
+				.Any(a => a.Info.Traits.Contains<SelectableInfo>())
+					? "select" : "default");
+		}
+	}
+}

OpenRA.Game/PathSearch.cs

@@ -26,12 +26,14 @@ namespace OpenRA
 		public Actor ignoreBuilding;
 		Actor self;
 		public bool inReverse;
+		Mobile mobile;
 
 		public PathSearch(Actor self)
 		{
 			this.self = self;
 			world = self.World;
 			cellInfo = InitCellInfo();
+			mobile = self.traits.Get<Mobile>();
 			queue = new PriorityQueue<PathDistance>();
 		}
 
@@ -70,9 +72,14 @@ namespace OpenRA
 		public int2 Expand( World world )
 		{
 			var p = queue.Pop();
-			cellInfo[ p.Location.X, p.Location.Y ].Seen = true;
+			while (cellInfo[p.Location.X, p.Location.Y].Seen)
+				if (queue.Empty)
+					return p.Location;
+				else
+					p = queue.Pop();
+
+			cellInfo[p.Location.X, p.Location.Y].Seen = true;
 			
-			var mobile = self.traits.Get<Mobile>();
 			var thisCost = mobile.MovementCostForCell(self, p.Location);
 
 			if (thisCost == float.PositiveInfinity) 
@@ -91,7 +98,7 @@ namespace OpenRA
 				if (costHere == float.PositiveInfinity)
 					continue;
 
-				if (checkForBlocked && !mobile.CanEnterCell(newHere, ignoreBuilding, checkForBlocked))
+				if (!mobile.CanEnterCell(newHere, ignoreBuilding, checkForBlocked))
 					continue;
 				
 				if (customBlock != null && customBlock(newHere))

OpenRA.Game/Player.cs

@@ -17,12 +17,14 @@ using OpenRA.Traits;
 namespace OpenRA
 {
 	public enum PowerState { Normal, Low, Critical };
-
+	public enum WinState { Won, Lost, Undefined }; 
+	
 	public class Player
 	{
 		public Actor PlayerActor;
 		public int Kills;
-		public int Deaths;
+		public int Deaths;
+		public WinState WinState = WinState.Undefined;
 
 		public readonly string Palette;
 		public readonly Color Color;
@@ -42,7 +44,7 @@ namespace OpenRA
 			World = world;
 			Shroud = new ShroudRenderer(this, world.Map);
 
-			PlayerActor = world.CreateActor("Player", new int2(int.MaxValue, int.MaxValue), this);
+			PlayerActor = world.CreateActor("Player", new TypeDictionary{ new OwnerInit( this ) });
 			
 			Index = index;
 			Palette = "player"+index;
@@ -62,7 +64,7 @@ namespace OpenRA
 			World = world;
 			Shroud = new ShroudRenderer(this, world.Map);
 
-			PlayerActor = world.CreateActor("Player", new int2(int.MaxValue, int.MaxValue), this);
+			PlayerActor = world.CreateActor("Player", new TypeDictionary{ new OwnerInit( this ) });
 			
 			Index = client.Index;
 			Palette = "player"+client.Index;
@@ -87,8 +89,6 @@ namespace OpenRA
 		
 		public void GiveAdvice(string advice)
 		{
-			// todo: store the condition or something.
-			// repeat after World.Defaults.SpeakDelay, as long as the condition holds.
 			Sound.PlayToPlayer(this, advice);
 		}
 

OpenRA.Game/Selection.cs

@@ -18,7 +18,17 @@ namespace OpenRA
 	public class Selection
 	{
 		List<Actor> actors = new List<Actor>();
-
+		public void Add(World w, Actor a)
+		{
+			actors.Add(a);
+			foreach (var ns in w.WorldActor.traits.WithInterface<INotifySelection>())
+				ns.SelectionChanged();
+		}
+		
+		public bool Contains(Actor a)
+		{
+			return actors.AsEnumerable().Contains(a);
+		}
 		public void Combine(World world, IEnumerable<Actor> newSelection, bool isCombine, bool isClick)
 		{
 			var oldSelection = actors.AsEnumerable();

OpenRA.Game/Server/Server.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -24,12 +25,11 @@ namespace OpenRA.Server
 	static class Server
 	{
 		static List<Connection> conns = new List<Connection>();
-		static TcpListener listener;
+		static TcpListener listener = null;
 		static Dictionary<int, List<Connection>> inFlightFrames
 			= new Dictionary<int, List<Connection>>();
 		static Session lobbyInfo;
 		static bool GameStarted = false;
-		static string[] initialMods;
 		static string Name;
 		static WebClient wc = new WebClient();
 		static int ExternalPort;
@@ -45,13 +45,14 @@ namespace OpenRA.Server
 		static string masterServerUrl;
 		static bool isInitialPing;
 
-		public static void ServerMain(bool internetServer, string masterServerUrl, string name, int port, int extport, string[] mods, string map)
+		public static void ServerMain(bool internetServer, string masterServerUrl, string name, int port, int extport, string[] mods, string map, bool cheats)
 		{
+			Log.AddChannel("server", "server.log", false, false);
+
 			isInitialPing = true;
 			Server.masterServerUrl = masterServerUrl;
 			isInternetServer = internetServer;
 			listener = new TcpListener(IPAddress.Any, port);
-			initialMods = mods;
 			Name = name;
 			ExternalPort = extport;
 			randomSeed = (int)DateTime.Now.ToBinary();
@@ -60,12 +61,13 @@ namespace OpenRA.Server
 			lobbyInfo.GlobalSettings.Mods = mods;
 			lobbyInfo.GlobalSettings.RandomSeed = randomSeed;
 			lobbyInfo.GlobalSettings.Map = map;
+			lobbyInfo.GlobalSettings.AllowCheats = cheats;
 			
-			Console.WriteLine("Initial mods: ");
+			Log.Write("server", "Initial mods: ");
 			foreach( var m in lobbyInfo.GlobalSettings.Mods )
-				Console.WriteLine("- {0}", m);
+				Log.Write("server","- {0}", m);
 			
-			Console.WriteLine("Initial map: {0}",lobbyInfo.GlobalSettings.Map);
+			Log.Write("server", "Initial map: {0}",lobbyInfo.GlobalSettings.Map);
 			
 			try
 			{
@@ -92,6 +94,13 @@ namespace OpenRA.Server
 
 					if (Environment.TickCount - lastPing > MasterPingInterval * 1000)
 						PingMasterServer();
+					
+					if (conns.Count() == 0)
+					{
+						listener.Stop();
+						GameStarted = false;
+						break;
+					}
 				}
 			} ) { IsBackground = true }.Start();
 		}
@@ -105,12 +114,6 @@ namespace OpenRA.Server
 			throw new InvalidOperationException("Already got 8 players");
 		}
 
-		static int ChooseFreePalette()
-		{
-			// TODO: Query the list of palettes from somewhere, and pick one
-			return 0;
-		}
-
 		static void AcceptConnection()
 		{
 			var newConn = new Connection { socket = listener.AcceptSocket() };
@@ -118,7 +121,7 @@ namespace OpenRA.Server
 			{
 				if (GameStarted)
 				{
-					Console.WriteLine("Rejected connection from {0}; game is already started.", 
+					Log.Write("server", "Rejected connection from {0}; game is already started.", 
 						newConn.socket.RemoteEndPoint);
 					newConn.socket.Close();
 					return;
@@ -133,20 +136,21 @@ namespace OpenRA.Server
 				newConn.socket.Send(BitConverter.GetBytes(newConn.PlayerIndex));
 				conns.Add(newConn);
 
+				var defaults = new GameRules.UserSettings();
 				lobbyInfo.Clients.Add(
 					new Session.Client()
 					{
 						Index = newConn.PlayerIndex,
-						Color1 = System.Drawing.Color.FromArgb(246,214,121),
-						Color2 = System.Drawing.Color.FromArgb(40,32,8),
-						Name = "Player {0}".F(1 + newConn.PlayerIndex),
+						Color1 = defaults.PlayerColor1,
+						Color2 = defaults.PlayerColor2,
+						Name = defaults.PlayerName,
 						Country = "random",
 						State = Session.ClientState.NotReady,
 						SpawnPoint = 0,
 						Team = 0,
 					});
 
-				Console.WriteLine("Client {0}: Accepted connection from {1}",
+				Log.Write("server", "Client {0}: Accepted connection from {1}",
 					newConn.PlayerIndex, newConn.socket.RemoteEndPoint);
 
 				SendChat(newConn, "has joined the game.");
@@ -231,32 +235,34 @@ namespace OpenRA.Server
 						else if (client.State == Session.ClientState.Ready)
 							client.State = Session.ClientState.NotReady;
 
-						Console.WriteLine("Player @{0} is {1}",
+						Log.Write("server", "Player @{0} is {1}",
 							conn.socket.RemoteEndPoint, client.State);
 
 						SyncLobbyInfo();
-
-						// start the game if everyone is ready.
+						
 						if (conns.Count > 0 && conns.All(c => GetClient(c).State == Session.ClientState.Ready))
-						{
-							Console.WriteLine("All players are ready. Starting the game!");
-							GameStarted = true;
-							foreach( var c in conns )
-								foreach( var d in conns )
-									DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
+							InterpretCommand(conn, "startgame");
+						
+						return true;
+					}},
+				{ "startgame", 
+					s => 
+					{
+						GameStarted = true;
+						foreach( var c in conns )
+							foreach( var d in conns )
+								DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
 
-							DispatchOrders(null, 0,
-								new ServerOrder("StartGame", "").Serialize());
-
-							PingMasterServer();
-						}
+						DispatchOrders(null, 0,
+							new ServerOrder("StartGame", "").Serialize());
 
+						PingMasterServer();
 						return true;
 					}},
 				{ "name", 
 					s => 
 					{
-						Console.WriteLine("Player@{0} is now known as {1}", conn.socket.RemoteEndPoint, s);
+						Log.Write("server", "Player@{0} is now known as {1}", conn.socket.RemoteEndPoint, s);
 						GetClient(conn).Name = s;
 						SyncLobbyInfo();
 						return true;
@@ -265,9 +271,9 @@ namespace OpenRA.Server
 					s =>
 					{
 						int lag;
-						if (!int.TryParse(s, out lag)) { Console.WriteLine("Invalid order lag: {0}", s); return false; }
+						if (!int.TryParse(s, out lag)) { Log.Write("server", "Invalid order lag: {0}", s); return false; }
 
-						Console.WriteLine("Order lag is now {0} frames.", lag);
+						Log.Write("server", "Order lag is now {0} frames.", lag);
 
 						lobbyInfo.GlobalSettings.OrderLatency = lag;
 						SyncLobbyInfo();
@@ -284,7 +290,7 @@ namespace OpenRA.Server
 					s => 
 					{
 						int team;
-						if (!int.TryParse(s, out team)) { Console.WriteLine("Invalid team: {0}", s ); return false; }
+						if (!int.TryParse(s, out team)) { Log.Write("server", "Invalid team: {0}", s ); return false; }
 
 						GetClient(conn).Team = team;
 						SyncLobbyInfo();
@@ -296,7 +302,7 @@ namespace OpenRA.Server
 						int spawnPoint;
 						if (!int.TryParse(s, out spawnPoint) || spawnPoint < 0 || spawnPoint > 8) //TODO: SET properly!
 						{
-							Console.WriteLine("Invalid spawn point: {0}", s);
+							Log.Write("server", "Invalid spawn point: {0}", s);
 							return false;
 						}
 						
@@ -314,8 +320,8 @@ namespace OpenRA.Server
 					s =>
 					{
 						var c = s.Split(',').Select(cc => int.Parse(cc)).ToArray();
-						GetClient(conn).Color1 = System.Drawing.Color.FromArgb(c[0],c[1],c[2]);
-						GetClient(conn).Color2 = System.Drawing.Color.FromArgb(c[3],c[4],c[5]);
+						GetClient(conn).Color1 = Color.FromArgb(c[0],c[1],c[2]);
+						GetClient(conn).Color2 = Color.FromArgb(c[3],c[4],c[5]);
 						SyncLobbyInfo();		
 						return true;
 					}},
@@ -368,7 +374,7 @@ namespace OpenRA.Server
 			if (!dict.TryGetValue(cmdName, out a))
 				return false;
 
-			Console.WriteLine( "Client {0} sent server command: {1}", conn.PlayerIndex, cmd );
+			Log.Write("server", "Client {0} sent server command: {1}", conn.PlayerIndex, cmd );
 			return a(cmdValue);
 		}
 
@@ -391,11 +397,11 @@ namespace OpenRA.Server
 				{
 					if(GameStarted)
 						SendChatTo(conn, "Cannot change state when game started.");
-					else if (GetClient(conn).State == Session.ClientState.Ready && so.Data != "ready")
+					else if (GetClient(conn).State == Session.ClientState.Ready && !(so.Data == "ready" || so.Data == "startgame") )
 						SendChatTo(conn, "Cannot change state when marked as ready.");
 					else if (!InterpretCommand(conn, so.Data))
 					{
-						Console.WriteLine("Bad server command: {0}", so.Data);
+						Log.Write("server", "Bad server command: {0}", so.Data);
 						SendChatTo(conn, "Bad server command.");
 					};
 				}
@@ -414,7 +420,7 @@ namespace OpenRA.Server
 
 		public static void DropClient(Connection toDrop, Exception e)
 		{
-			Console.WriteLine("Client dropped: {0}.", toDrop.socket.RemoteEndPoint);
+			Log.Write("server", "Client dropped: {0}.", toDrop.socket.RemoteEndPoint);
 
 			conns.Remove(toDrop);
 			SendChat(toDrop, "Connection Dropped");
@@ -468,11 +474,23 @@ namespace OpenRA.Server
 
 		static void PingMasterServerResponse(object sender, DownloadDataCompletedEventArgs e)
 		{
+			if (e.Error != null)
+			{
+				Log.Write("server", "Error pinging Master Server; {0}", e.Error.Message);
+				return;
+			}
+			
+			if (e.Result.Length == 0)
+			{
+				Log.Write("server", "Error pinging Master Server; Empty Response");
+				return;
+			}
+			
 			string s = Encoding.UTF8.GetString(e.Result);
 			int gameId;
 			if (int.TryParse(s.Trim(), out gameId))
 				Game.SetGameId(gameId);
-			Log.Write("debug", "Game ID: {0}", gameId);
+			Log.Write("server", "Game ID: {0}", gameId);
 		}
 	}
 }

OpenRA.Game/ShroudRenderer.cs

@@ -44,15 +44,21 @@ namespace OpenRA
 		}
 
 		public bool IsExplored(int2 xy) { return IsExplored(xy.X, xy.Y); }
-		bool IsExplored(int x, int y)
+		public bool IsExplored(int x, int y)
 		{
 			if (disabled)
 				return true;
 			return shroud.exploredCells[x,y];
 		}
 
-		public bool DisplayOnRadar(int x, int y) { return IsExplored(x, y); }
-
+		public bool IsVisible(int2 xy) { return IsVisible(xy.X, xy.Y); }
+		public bool IsVisible(int x, int y)
+		{
+			if (disabled)
+				return true;
+			return shroud.visibleCells[x,y] != 0;
+		}
+		
 		static readonly byte[][] SpecialShroudTiles =
 		{
 			new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
@@ -122,7 +128,7 @@ namespace OpenRA
 			return shadowBits[SpecialShroudTiles[u ^ uSides][v]];
 		}
 
-		internal void Draw(SpriteRenderer r)
+		internal void Draw()
 		{
 			if (disabled)
 				return;
@@ -157,21 +163,21 @@ namespace OpenRA
 
 					if (starti != i)
 					{
-						r.DrawSprite(fogSprites[starti, j],
+						Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[starti, j],
 						    Game.CellSize * new float2(starti, j),
 						    shroudPalette,
 						    new float2(Game.CellSize * (i - starti), Game.CellSize));
 						starti = i+1;
 					}
 
-					r.DrawSprite(fogSprites[i, j],
+					Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[i, j],
 						Game.CellSize * new float2(i, j),
 						shroudPalette);
 					starti = i+1;
 				}
 
 				if (starti < maxx)
-					r.DrawSprite(fogSprites[starti, j],
+					Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[starti, j],
 						Game.CellSize * new float2(starti, j),
 						shroudPalette,
 						new float2(Game.CellSize * (maxx - starti), Game.CellSize));
@@ -189,21 +195,21 @@ namespace OpenRA
 
 					if (starti != i)
 					{
-						r.DrawSprite(sprites[starti, j],
+						Game.Renderer.SpriteRenderer.DrawSprite(sprites[starti, j],
 							Game.CellSize * new float2(starti, j),
 							shroudPalette,
 							new float2(Game.CellSize * (i - starti), Game.CellSize));
 						starti = i + 1;
 					}
 
-					r.DrawSprite(sprites[i, j],
+					Game.Renderer.SpriteRenderer.DrawSprite(sprites[i, j],
 						Game.CellSize * new float2(i, j),
 						shroudPalette);
 					starti = i + 1;
 				}
 
 				if (starti < maxx)
-					r.DrawSprite(sprites[starti, j],
+					Game.Renderer.SpriteRenderer.DrawSprite(sprites[starti, j],
 						Game.CellSize * new float2(starti, j),
 						shroudPalette,
 						new float2(Game.CellSize * (maxx - starti), Game.CellSize));

OpenRA.Game/Sound.cs

@@ -132,23 +132,26 @@ namespace OpenRA
 			}
 		}
 		
-		public static void PlayVoice(string phrase, Actor voicedUnit)
+		// Returns true if it played a phrase
+		public static bool PlayVoice(string phrase, Actor voicedUnit)
 		{
-			if (voicedUnit == null) return;
+			if (voicedUnit == null) return false;
+			if (phrase == null) return false;
 
 			var mi = voicedUnit.Info.Traits.GetOrDefault<SelectableInfo>();
-			if (mi == null) return;
+			if (mi == null) return false;
+			if (mi.Voice == null) return false;
 
 			var vi = Rules.Voices[mi.Voice.ToLowerInvariant()];
 
 			var clip = vi.Pools.Value[phrase].GetNext();
 			if (clip == null)
-				return;
+				return false;
 
 			if (clip.Contains("."))		/* no variants! */
 			{
 				Play(clip);
-				return;
+				return true;
 			}
 
 			// todo: fix this
@@ -158,6 +161,7 @@ namespace OpenRA
 			var variant = variants[voicedUnit.ActorID % variants.Length];
 
 			Play(clip + variant);
+			return true;
 		}
 	}
 

OpenRA.Game/Support/Program.cs

@@ -38,7 +38,8 @@ namespace OpenRA
 			{
 				Log.AddChannel("exception", "openra.exception.txt", true, false);
 				Log.Write("exception", "{0}", e.ToString());
-				Log.Upload(Game.GetGameId());
+				if (!Game.Settings.DeveloperMode || ( Game.Settings.DeveloperMode && Game.GetGameId() != 0) )
+					Log.Upload(Game.GetGameId());
 				throw;
 			}
 		}

OpenRA.Game/Traits/Activities/Drag.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Drag : IActivity
 	{

OpenRA.Game/Traits/Activities/Move.cs

@@ -22,7 +22,7 @@ namespace OpenRA.Traits.Activities
 		int2? destination;
 		int nearEnough;
 		public List<int2> path;
-		Func<Actor, List<int2>> getPath;
+		Func<Actor, Mobile, List<int2>> getPath;
 		public Actor ignoreBuilding;
 
 		MovePart move;
@@ -40,8 +40,8 @@ namespace OpenRA.Traits.Activities
 		public Move( int2 destination, int nearEnough ) 
 			: this()
 		{
-			this.getPath = self => self.World.PathFinder.FindUnitPath(
-				self.Location, destination, self );
+			this.getPath = (self,mobile) => self.World.PathFinder.FindUnitPath(
+				mobile.toCell, destination, self );
 			this.destination = destination;
 			this.nearEnough = nearEnough;
 		}
@@ -49,10 +49,10 @@ namespace OpenRA.Traits.Activities
 		public Move(int2 destination, Actor ignoreBuilding)
 			: this()
 		{
-			this.getPath = self => 
+			this.getPath = (self,mobile) => 
 				self.World.PathFinder.FindPath(
-					PathSearch.FromPoint( self, self.Location, destination, false )
-					.WithCustomBlocker( self.World.PathFinder.AvoidUnitsNear( self.Location, 4, self ))
+					PathSearch.FromPoint( self, mobile.toCell, destination, false )
+					.WithCustomBlocker( self.World.PathFinder.AvoidUnitsNear( mobile.toCell, 4, self ))
 					.WithIgnoredBuilding( ignoreBuilding ));
 
 			this.destination = destination;
@@ -63,24 +63,33 @@ namespace OpenRA.Traits.Activities
 		public Move( Actor target, int range )
 			: this()
 		{
-			this.getPath = self => self.World.PathFinder.FindUnitPathToRange(
-				self.Location, target.Location,
+			this.getPath = (self,mobile) => self.World.PathFinder.FindUnitPathToRange(
+				mobile.toCell, target.Location,
 				range, self );
 			this.destination = null;
 			this.nearEnough = range;
 		}
 
+		public Move(Target target, int range)
+			: this()
+		{
+			this.getPath = (self,mobile) => self.World.PathFinder.FindUnitPathToRange(
+				mobile.toCell, Util.CellContaining(target.CenterLocation),
+				range, self);
+			this.destination = null;
+			this.nearEnough = range;
+		}
+
 		public Move(Func<List<int2>> getPath)
 			: this()
 		{
-			this.getPath = _ => getPath();
+			this.getPath = (_1,_2) => getPath();
 			this.destination = null;
 			this.nearEnough = 0;
 		}
 
 		public IActivity Tick( Actor self )
 		{
-			var unit = self.traits.Get<Unit>();
 			var mobile = self.traits.Get<Mobile>();
 
 			if( move != null )
@@ -89,7 +98,7 @@ namespace OpenRA.Traits.Activities
 				return this;
 			}
 
-			if (destination == self.Location)
+			if (destination == mobile.toCell)
 				return NextActivity;
 
 			if( path == null )
@@ -100,7 +109,7 @@ namespace OpenRA.Traits.Activities
 					return this;
 				}
 
-				path = getPath( self ).TakeWhile( a => a != self.Location ).ToList();
+				path = getPath( self, mobile ).TakeWhile( a => a != mobile.toCell ).ToList();
 				SanityCheckPath( mobile );
 			}
 			
@@ -117,8 +126,8 @@ namespace OpenRA.Traits.Activities
 				return this;
 
 			int2 dir = nextCell.Value - mobile.fromCell;
-			var firstFacing = Util.GetFacing( dir, unit.Facing );
-			if( firstFacing != unit.Facing )
+			var firstFacing = Util.GetFacing( dir, mobile.Facing );
+			if( firstFacing != mobile.Facing )
 			{
 				path.Add( nextCell.Value );
 
@@ -130,8 +139,8 @@ namespace OpenRA.Traits.Activities
 				move = new MoveFirstHalf(
 					Util.CenterOfCell( mobile.fromCell ),
 					Util.BetweenCells( mobile.fromCell, mobile.toCell ),
-					unit.Facing,
-					unit.Facing,
+					mobile.Facing,
+					mobile.Facing,
 					0 );
 
 				move.TickMove( self, mobile, this );
@@ -151,8 +160,19 @@ namespace OpenRA.Traits.Activities
 		}
 
 		bool hasWaited;
+		bool hasNudged;
 		int waitTicksRemaining;
 
+		void NudgeBlocker(Actor self, int2 nextCell)
+		{
+			var blocker = self.World.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(nextCell).FirstOrDefault();
+			if (blocker == null) return;
+
+			var nudge = blocker.traits.GetOrDefault<INudge>();
+			if (nudge != null)
+				nudge.OnNudge(blocker, self);
+		}
+
 		int2? PopPath( Actor self, Mobile mobile )
 		{
 			if( path.Count == 0 ) return null;
@@ -165,6 +185,12 @@ namespace OpenRA.Traits.Activities
 					return null;
 				}
 
+				if (!hasNudged)
+				{
+					NudgeBlocker(self, nextCell);
+					hasNudged = true;
+				}
+
 				if (!hasWaited)
 				{
 					var info = self.Info.Traits.Get<MobileInfo>();
@@ -175,18 +201,16 @@ namespace OpenRA.Traits.Activities
 				if (--waitTicksRemaining >= 0)
 					return null;
 
-				
-				//self.World.WorldActor.traits.Get<UnitInfluence>().Remove( self, mobile );
 				mobile.RemoveInfluence();
-				var newPath = getPath(self).TakeWhile(a => a != self.Location).ToList();
-
-				//self.World.WorldActor.traits.Get<UnitInfluence>().Add( self, mobile );
+				var newPath = getPath( self, mobile ).TakeWhile(a => a != mobile.toCell).ToList();
 				mobile.AddInfluence();
+
 				if (newPath.Count != 0)
 					path = newPath;
 
 				return null;
 			}
+			hasNudged = false;
 			hasWaited = false;
 			path.RemoveAt( path.Count - 1 );
 			return nextCell;
@@ -217,7 +241,7 @@ namespace OpenRA.Traits.Activities
 
 			public void TickMove( Actor self, Mobile mobile, Move parent )
 			{
-				moveFraction += (int)mobile.MovementSpeedForCell(self, self.Location);
+				moveFraction += (int)mobile.MovementSpeedForCell(self, mobile.toCell);
 				if( moveFraction >= moveFractionTotal )
 					moveFraction = moveFractionTotal;
 				UpdateCenterLocation( self, mobile );
@@ -231,15 +255,14 @@ namespace OpenRA.Traits.Activities
 
 			void UpdateCenterLocation( Actor self, Mobile mobile )
 			{
-				var unit = self.traits.Get<Unit>();
 				var frac = (float)moveFraction / moveFractionTotal;
 
 				self.CenterLocation = float2.Lerp( from, to, frac );
 
 				if( moveFraction >= moveFractionTotal )
-					unit.Facing = toFacing & 0xFF;
+					mobile.Facing = toFacing & 0xFF;
 				else
-					unit.Facing = ( fromFacing + ( toFacing - fromFacing ) * moveFraction / moveFractionTotal ) & 0xFF;
+					mobile.Facing = ( fromFacing + ( toFacing - fromFacing ) * moveFraction / moveFractionTotal ) & 0xFF;
 			}
 
 			protected abstract MovePart OnComplete( Actor self, Mobile mobile, Move parent );
@@ -254,8 +277,6 @@ namespace OpenRA.Traits.Activities
 
 			protected override MovePart OnComplete( Actor self, Mobile mobile, Move parent )
 			{
-				var unit = self.traits.Get<Unit>();
-
 				var nextCell = parent.PopPath( self, mobile );
 				if( nextCell != null )
 				{
@@ -264,8 +285,8 @@ namespace OpenRA.Traits.Activities
 						var ret = new MoveFirstHalf(
 							Util.BetweenCells( mobile.fromCell, mobile.toCell ),
 							Util.BetweenCells( mobile.toCell, nextCell.Value ),
-							unit.Facing,
-							Util.GetNearestFacing( unit.Facing, Util.GetFacing( nextCell.Value - mobile.toCell, unit.Facing ) ),
+							mobile.Facing,
+							Util.GetNearestFacing( mobile.Facing, Util.GetFacing( nextCell.Value - mobile.toCell, mobile.Facing ) ),
 							moveFraction - moveFractionTotal );
 						mobile.fromCell = mobile.toCell;
 						mobile.toCell = nextCell.Value;
@@ -277,8 +298,8 @@ namespace OpenRA.Traits.Activities
 				var ret2 = new MoveSecondHalf(
 					Util.BetweenCells( mobile.fromCell, mobile.toCell ),
 					Util.CenterOfCell( mobile.toCell ),
-					unit.Facing,
-					unit.Facing,
+					mobile.Facing,
+					mobile.Facing,
 					moveFraction - moveFractionTotal );
 				mobile.fromCell = mobile.toCell;
 				return ret2;

OpenRA.Game/Traits/Activities/Sell.cs

@@ -22,11 +22,12 @@ namespace OpenRA.Traits.Activities
 		{
 			var csv = self.Info.Traits.GetOrDefault<CustomSellValueInfo>();
 			var cost = csv != null ? csv.Value : self.Info.Traits.Get<ValuedInfo>().Cost;
-			var hp = self.Info.Traits.Get<OwnedActorInfo>().HP;
-			var refund = self.World.Defaults.RefundPercent * self.Health * cost / hp;
+			
+			var health = self.traits.GetOrDefault<Health>();
+			var refundFraction = self.Info.Traits.Get<BuildingInfo>().RefundPercent * (health == null ? 1f : health.HPFraction);
 
-			self.Owner.PlayerActor.traits.Get<PlayerResources>().GiveCash((int)refund);
-			self.Health = 0;
+			self.Owner.PlayerActor.traits.Get<PlayerResources>().GiveCash((int)(refundFraction * cost));
+			
 			foreach (var ns in self.traits.WithInterface<INotifySold>())
 				ns.Sold(self);
 			self.World.AddFrameEndTask( _ => self.World.Remove( self ) );

OpenRA.Game/Traits/Activities/Turn.cs

@@ -8,12 +8,13 @@
  */
 #endregion
 
+using System.Linq;
+
 namespace OpenRA.Traits.Activities
 {
 	public class Turn : IActivity
 	{
 		public IActivity NextActivity { get; set; }
-
 		int desiredFacing;
 
 		public Turn( int desiredFacing )
@@ -23,20 +24,18 @@ namespace OpenRA.Traits.Activities
 
 		public IActivity Tick( Actor self )
 		{
-			var unit = self.traits.Get<Unit>();
+			var facing = self.traits.Get<IFacing>();
 
-			if( desiredFacing == unit.Facing )
+			if( desiredFacing == facing.Facing )
 				return NextActivity;
+			facing.Facing = Util.TickFacing(facing.Facing, desiredFacing, facing.ROT);
 
-			Util.TickFacing( ref unit.Facing, desiredFacing, self.Info.Traits.Get<UnitInfo>().ROT );
 			return this;
 		}
 
 		public void Cancel( Actor self )
 		{
-			var unit = self.traits.Get<Unit>();
-
-			desiredFacing = unit.Facing;
+			desiredFacing = self.traits.Get<IFacing>().Facing;
 			NextActivity = null;
 		}
 	}

OpenRA.Game/Traits/BaseBuilding.cs

@@ -11,6 +11,6 @@
 namespace OpenRA.Traits
 {
 	/* tag trait for "bases": mcv/fact */
-	class BaseBuildingInfo : TraitInfo<BaseBuilding> { }
-	class BaseBuilding { }
+	public class BaseBuildingInfo : TraitInfo<BaseBuilding> { }
+	public class BaseBuilding { }
 }

OpenRA.Game/Traits/Building.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.GameRules;
@@ -17,28 +18,18 @@ using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
-	public class OwnedActorInfo
-	{
-		public readonly int HP = 0;
-		public readonly ArmorType Armor = ArmorType.none;
-		public readonly bool Crewed = false;		// replace with trait?
-		public readonly int Sight = 0;
-		public readonly bool WaterBound = false;
-		public readonly string TargetType = "Ground";
-	}
-
-	public class BuildingInfo : OwnedActorInfo, ITraitInfo
+	public class BuildingInfo : ITraitInfo
 	{
 		public readonly int Power = 0;
 		public readonly bool BaseNormal = true;
+		public readonly bool WaterBound = false;
 		public readonly int Adjacent = 2;
 		public readonly bool Capturable = false;
-		public readonly bool Repairable = true;
 		public readonly string Footprint = "x";
-		public readonly string[] Produces = { };		// does this go somewhere else?
 		public readonly int2 Dimensions = new int2(1, 1);
 		public readonly bool Unsellable = false;
-
+		public readonly float RefundPercent = 0.5f;
+		
 		public readonly string[] BuildSounds = {"placbldg.aud", "build5.aud"};
 		public readonly string[] SellSounds = {"cashturn.aud"};
 		public readonly string DamagedSound = "kaboom1.aud";
@@ -47,14 +38,12 @@ namespace OpenRA.Traits
 		public object Create(ActorInitializer init) { return new Building(init); }
 	}
 
-	public class Building : INotifyDamage, IResolveOrder, ITick, IRenderModifier, IOccupySpace
+	public class Building : INotifyDamage, IResolveOrder, IRenderModifier, IOccupySpace
 	{
 		readonly Actor self;
 		public readonly BuildingInfo Info;
 		[Sync]
 		readonly int2 topLeft;
-		[Sync]
-		bool isRepairing = false;
 
 		public bool Disabled
 		{
@@ -64,7 +53,7 @@ namespace OpenRA.Traits
 		public Building(ActorInitializer init)
 		{
 			this.self = init.self;
-			this.topLeft = init.location;
+			this.topLeft = init.Get<LocationInit,int2>();
 			Info = self.Info.Traits.Get<BuildingInfo>();
 			self.CenterLocation = Game.CellSize 
 				* ((float2)topLeft + .5f * (float2)Info.Dimensions);
@@ -76,11 +65,13 @@ namespace OpenRA.Traits
 				.WithInterface<IPowerModifier>()
 				.Select(t => t.GetPowerModifier())
 				.Product();
-				
-			var maxHP = self.Info.Traits.Get<BuildingInfo>().HP;
-
+			
 			if (Info.Power > 0)
-				return (int)(modifier*(self.Health * Info.Power) / maxHP);
+			{
+				var health = self.traits.GetOrDefault<Health>();
+				var healthFraction = (health == null) ? 1f : health.HPFraction;
+				return (int)(modifier * healthFraction * Info.Power);
+			}
 			else
 				return (int)(modifier * Info.Power);
 		}
@@ -101,44 +92,6 @@ namespace OpenRA.Traits
 				self.CancelActivity();
 				self.QueueActivity(new Sell());
 			}
-
-			if (order.OrderString == "Repair")
-			{
-				isRepairing = !isRepairing;
-			}
-		}
-
-		int remainingTicks;
-
-		public void Tick(Actor self)
-		{
-			if (!isRepairing) return;
-
-			if (remainingTicks == 0)
-			{
-				var csv = self.Info.Traits.GetOrDefault<CustomSellValueInfo>();
-				var buildingValue = csv != null ? csv.Value : self.Info.Traits.Get<ValuedInfo>().Cost;
-				var maxHP = self.Info.Traits.Get<BuildingInfo>().HP;
-				var costPerHp = (self.World.Defaults.RepairPercent * buildingValue) / maxHP;
-				var hpToRepair = Math.Min(self.World.Defaults.RepairStep, maxHP - self.Health);
-				var cost = (int)Math.Ceiling(costPerHp * hpToRepair);
-				if (!self.Owner.PlayerActor.traits.Get<PlayerResources>().TakeCash(cost))
-				{
-					remainingTicks = 1;
-					return;
-				}
-
-				self.World.AddFrameEndTask(w => w.Add(new RepairIndicator(self)));
-				self.InflictDamage(self, -hpToRepair, null);
-				if (self.Health == maxHP)
-				{
-					isRepairing = false;
-					return;
-				}
-				remainingTicks = (int)(self.World.Defaults.RepairRate * 60 * 25);
-			}
-			else
-				--remainingTicks;
 		}
 		
 		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)

OpenRA.Game/Traits/DrawLineToTarget.cs

@@ -0,0 +1,70 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using OpenRA.Traits.Activities;
+
+namespace OpenRA.Traits
+{
+	public class DrawLineToTargetInfo : ITraitInfo
+	{
+		public readonly int Ticks = 60;
+
+		public virtual object Create(ActorInitializer init) { return new DrawLineToTarget(this); }
+	}
+
+	public class DrawLineToTarget : IPostRenderSelection
+	{
+		DrawLineToTargetInfo Info;
+		public DrawLineToTarget(DrawLineToTargetInfo info)
+		{
+			this.Info = info;
+		}
+
+		Target target;
+		int lifetime;
+		Color c;
+
+		public void SetTarget(Actor self, Target target, Color c)
+		{
+			this.target = target;
+			lifetime = Info.Ticks;
+			this.c = c;
+		}
+
+		public void SetTargetSilently(Actor self, Target target, Color c)
+		{
+			this.target = target;
+			this.c = c;
+		}
+
+		public void RenderAfterWorld(Actor self)
+		{
+			if (self.IsIdle) return;
+
+			var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt);
+			if ((lifetime <= 0 || --lifetime <= 0) && !force)
+				return;
+
+			var p = target.CenterLocation;
+
+			Game.Renderer.LineRenderer.DrawLine(self.CenterLocation, p, c, c);
+			for (bool b = false; !b; p = self.CenterLocation, b = true)
+			{
+				Game.Renderer.LineRenderer.DrawLine(p + new float2(-1, -1), p + new float2(-1, 1), c, c);
+				Game.Renderer.LineRenderer.DrawLine(p + new float2(-1, 1), p + new float2(1, 1), c, c);
+				Game.Renderer.LineRenderer.DrawLine(p + new float2(1, 1), p + new float2(1, -1), c, c);
+				Game.Renderer.LineRenderer.DrawLine(p + new float2(1, -1), p + new float2(-1, -1), c, c);
+			}
+			Game.Renderer.LineRenderer.Flush();
+		}
+	}
+}
+

OpenRA.Game/Traits/Health.cs

@@ -0,0 +1,167 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Effects;
+using OpenRA.Traits.Activities;
+using OpenRA.GameRules;
+using OpenRA.FileFormats;
+
+namespace OpenRA.Traits
+{
+	public class HealthInfo : ITraitInfo
+	{
+		public readonly int HP = 0;
+		public readonly ArmorType Armor = ArmorType.none;		
+		public virtual object Create(ActorInitializer init) { return new Health(init, this); }
+	}
+
+	public enum DamageState { Undamaged, Light, Medium, Heavy, Critical, Dead };
+	
+	public class Health
+	{
+		public readonly HealthInfo Info;
+		
+		[Sync]
+		int hp;
+		
+		public Health(ActorInitializer init, HealthInfo info)
+		{
+			Info = info;
+			MaxHP = info.HP;
+			hp = init.Contains<HealthInit>() ? (int)(init.Get<HealthInit, float>()*MaxHP) : MaxHP;
+		}
+		
+		public int HP { get { return hp; } }
+		public readonly int MaxHP;
+		public float HPFraction
+		{
+			get { return hp * 1f / MaxHP; }
+		}
+		
+		public bool IsDead { get { return hp <= 0; } }
+		public bool RemoveOnDeath = true;
+				
+		public DamageState DamageState
+		{
+			get 
+			{
+				if (hp <= 0)
+					return DamageState.Dead;
+	
+				if (hp < MaxHP * 0.25f)
+					return DamageState.Critical;
+	
+				if (hp < MaxHP * 0.5f)
+					return DamageState.Heavy;
+	
+				if (hp < MaxHP * 0.75f)
+					return DamageState.Medium;
+				
+				if (hp == MaxHP)
+					return DamageState.Undamaged;
+				
+				return DamageState.Light;
+			}
+		}
+		
+		public void InflictDamage(Actor self, Actor attacker, int damage, WarheadInfo warhead)
+		{
+			if (IsDead) return;		/* overkill! don't count extra hits as more kills! */
+
+			var oldState = this.DamageState;
+			
+			/* apply the damage modifiers, if we have any. */
+			var modifier = (float)self.traits.WithInterface<IDamageModifier>()
+				.Select(t => t.GetDamageModifier(warhead)).Product();
+
+			damage = (int)(damage * modifier);
+
+			hp -= damage;
+			if (hp <= 0)
+			{
+				hp = 0;
+
+				attacker.Owner.Kills++;
+				self.Owner.Deaths++;
+
+				if (RemoveOnDeath)
+					self.World.AddFrameEndTask(w => w.Remove(self));
+
+				Log.Write("debug", "{0} #{1} killed by {2} #{3}", self.Info.Name, self.ActorID, attacker.Info.Name, attacker.ActorID);
+			}
+
+			if (hp > MaxHP)	hp = MaxHP;
+
+			foreach (var nd in self.traits.WithInterface<INotifyDamage>())
+				nd.Damaged(self, new AttackInfo
+				{
+					Attacker = attacker,
+					Damage = damage,
+					DamageState = this.DamageState,
+					PreviousDamageState = oldState,
+					DamageStateChanged = this.DamageState != oldState,
+					Warhead = warhead
+				});
+		}
+	}
+	
+	
+	public class HealthInit : IActorInit<float>
+	{
+		[FieldFromYamlKey]
+		public readonly float value = 1f;
+		
+		public HealthInit() { }
+		
+		public HealthInit( float init )
+		{
+			value = init;
+		}
+		
+		public float Value( World world )
+		{
+			return value;	
+		}
+	}
+	
+	
+	public static class HealthExts
+	{
+		public static bool IsDead(this Actor self)
+		{
+			var health = self.traits.GetOrDefault<Health>();
+			return (health == null) ? true : health.IsDead;
+		}
+				
+		public static DamageState GetDamageState(this Actor self)
+		{
+			var health = self.traits.GetOrDefault<Health>();
+			return (health == null) ? DamageState.Undamaged : health.DamageState;
+		}
+		
+		public static void InflictDamage(this Actor self, Actor attacker, int damage, WarheadInfo warhead)
+		{
+			var health = self.traits.GetOrDefault<Health>();
+			if (health == null) return;
+			health.InflictDamage(self, attacker, damage, warhead);
+		}
+		
+		public static void Kill(this Actor self, Actor attacker)
+		{
+			var health = self.traits.GetOrDefault<Health>();
+			if (health == null) return;
+			health.InflictDamage(self, attacker, health.HP, null);
+		}
+	}
+}

OpenRA.Game/Traits/Mobile.cs

@@ -10,22 +10,28 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using OpenRA.Effects;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
-	public class MobileInfo : ITraitInfo, ITraitPrerequisite<UnitInfo>
+	public class MobileInfo : ITraitInfo
 	{
 		public readonly string[] TerrainTypes;
 		public readonly float[] TerrainSpeeds;
 		public readonly string[] Crushes;
 		public readonly int WaitAverage = 60;
 		public readonly int WaitSpread = 20;
+		public readonly int InitialFacing = 128;
+		public readonly int ROT = 255;
+		public readonly int Speed = 1;
 
 		public virtual object Create(ActorInitializer init) { return new Mobile(init, this); }
 	}
 
-	public class Mobile : IIssueOrder, IResolveOrder, IOccupySpace, IMove, IProvideCursor
+	public class Mobile : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice, IOccupySpace, IMove, IFacing, INudge
 	{
 		public readonly Actor self;
 		public readonly MobileInfo Info;
@@ -33,6 +39,13 @@ namespace OpenRA.Traits
 		public readonly Dictionary<string,float> TerrainSpeed;
 
 		[Sync]
+		public int Facing { get; set; }
+		[Sync]
+		public int Altitude { get; set; }
+		[Sync]
+		public int ROT { get { return Info.ROT; } }
+		public int InitialFacing { get { return Info.InitialFacing; } }
+		
 		int2 __fromCell, __toCell;
 		public int2 fromCell
 		{
@@ -54,18 +67,35 @@ namespace OpenRA.Traits
 			AddInfluence();
 		}
 
+		Shroud shroud;
+		UnitInfluence uim;
+		BuildingInfluence bim;
+		bool canShareCell;
+		
 		public Mobile(ActorInitializer init, MobileInfo info)
 		{
 			this.self = init.self;
 			this.Info = info;
-			this.__fromCell = this.__toCell = init.location;
-			AddInfluence();
 			
+			shroud = self.World.WorldActor.traits.Get<Shroud>();
+			uim = self.World.WorldActor.traits.Get<UnitInfluence>();
+			bim = self.World.WorldActor.traits.Get<BuildingInfluence>();
+			canShareCell = self.traits.Contains<SharesCell>();
+			
+			if (init.Contains<LocationInit>())
+			{
+				this.__fromCell = this.__toCell = init.Get<LocationInit,int2>();
+				AddInfluence();
+			}
+			
+			this.Facing = init.Contains<FacingInit>() ? init.Get<FacingInit,int>() : info.InitialFacing;
+			this.Altitude = init.Contains<AltitudeInit>() ? init.Get<AltitudeInit,int>() : 0;
+
 			TerrainCost = new Dictionary<string, float>();
 			TerrainSpeed = new Dictionary<string, float>();
 			
 			if (info.TerrainTypes.Count() != info.TerrainSpeeds.Count())
-				throw new InvalidOperationException("Mobile TerrainType/TerrainSpeed length missmatch");
+				throw new InvalidOperationException("Mobile TerrainType/TerrainSpeed length mismatch");
 			
 			for (int i = 0; i < info.TerrainTypes.Count(); i++)
 			{
@@ -93,8 +123,9 @@ namespace OpenRA.Traits
 				if (!mi.Modifiers.HasModifier(Modifiers.Alt)) return null;
 				if (!CanEnterCell(underCursor.Location, null, true)) return null;
 			}
-			if (MovementSpeedForCell(self, self.Location) == 0) return null;		/* allow disabling move orders from modifiers */
+			if (MovementSpeedForCell(self, toCell) == 0) return null;		/* allow disabling move orders from modifiers */
 			if (xy == toCell) return null;
+			
 			return new Order("Move", self, xy, mi.Modifiers.HasModifier(Modifiers.Shift));
 		}
 
@@ -102,20 +133,36 @@ namespace OpenRA.Traits
 		{
 			if (order.OrderString == "Move")
 			{
-				if (self.traits.GetOrDefault<IMove>().CanEnterCell(order.TargetLocation))
+				if (CanEnterCell(order.TargetLocation))
 				{
+					if (self.Owner == self.World.LocalPlayer)
+						self.World.AddFrameEndTask(w =>
+						{
+							w.Add(new MoveFlash(self.World, order.TargetLocation));
+							var line = self.traits.GetOrDefault<DrawLineToTarget>();
+							if (line != null)
+								line.SetTarget(self, Target.FromOrder(order), Color.Green);
+						});
+					
 					if( !order.Queued ) self.CancelActivity();
 					self.QueueActivity(new Activities.Move(order.TargetLocation, 8));
 				}
 			}
 		}
 		
-		public string CursorForOrderString(string s, Actor a, int2 location)
+		public string CursorForOrder(Actor self, Order order)
 		{
-			if (s != "Move")
+			if (order.OrderString != "Move")
 				return null;
 			
-			return (CanEnterCell(location)) ? "move" : "move-blocked";
+			var xy = order.TargetLocation;
+			return (!shroud.exploredCells[xy.X, xy.Y] || CanEnterCell(xy)) ? "move" : "move-blocked";
+		}
+		
+		public string VoicePhraseForOrder(Actor self, Order order)
+		{
+			var xy = order.TargetLocation;
+			return (order.OrderString == "Move" && (!shroud.exploredCells[xy.X, xy.Y] || CanEnterCell(xy))) ? "Move" : null;
 		}
 
 		public int2 TopLeft { get { return toCell; } }
@@ -133,51 +180,58 @@ namespace OpenRA.Traits
 		{
 			return CanEnterCell(p, null, true);
 		}
-		
+
 		public virtual bool CanEnterCell(int2 cell, Actor ignoreActor, bool checkTransientActors)
 		{
+			if (MovementCostForCell(self, cell) == float.PositiveInfinity)
+				return false;
+
 			// Check for buildings
-			var building = self.World.WorldActor.traits.Get<BuildingInfluence>().GetBuildingBlocking(cell);
+			var building = bim.GetBuildingBlocking(cell);
 			if (building != null && building != ignoreActor)
 			{
 				if (Info.Crushes == null)
 					return false;
-				
+
 				var crushable = building.traits.WithInterface<ICrushable>();
 				if (crushable.Count() == 0)
 					return false;
-				
+
 				if (!crushable.Any(b => b.CrushClasses.Intersect(Info.Crushes).Any()))
 					return false;
 			}
-			
+
 			// Check mobile actors
-			if (checkTransientActors)
+			if (checkTransientActors && uim.AnyUnitsAt(cell))
 			{
-				var canShare = self.traits.Contains<SharesCell>();
-				var actors = self.World.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(cell).Where(a => a != self && a != ignoreActor);
-				var nonshareable = actors.Where(a => !(canShare && a.traits.Contains<SharesCell>()));
-				var shareable = actors.Where(a => canShare && a.traits.Contains<SharesCell>());
-				
-				// only allow 5 in a cell
-				if (shareable.Count() >= 5)
-					return false;
+				var actors = uim.GetUnitsAt(cell).Where(a => a != self && a != ignoreActor).ToArray();
+				var nonshareable = canShareCell ? actors : actors.Where(a => !a.traits.Contains<SharesCell>()).ToArray();
+
+				if (canShareCell)
+				{
+					var shareable = actors.Where(a => a.traits.Contains<SharesCell>());
+
+					// only allow 5 in a cell
+					if (shareable.Count() >= 5)
+						return false;
+				}
 
 				// We can enter a cell with nonshareable units only if we can crush all of them
-				if (Info.Crushes == null && nonshareable.Count() > 0)
+				if (Info.Crushes == null && nonshareable.Length > 0)
 					return false;
 
-				if (nonshareable.Any(a => !(a.traits.Contains<ICrushable>() &&
-						                     a.traits.WithInterface<ICrushable>().Any(b => b.CrushClasses.Intersect(Info.Crushes).Any()))))
+				if (nonshareable.Length > 0 && nonshareable.Any(a => !(a.traits.Contains<ICrushable>() &&
+											 a.traits.WithInterface<ICrushable>().Any(b => b.CrushClasses.Intersect(Info.Crushes).Any()))))
 					return false;
 			}
-			
-			return MovementCostForCell(self, cell) < float.PositiveInfinity;
+
+
+			return true;
 		}
 		
 		public virtual void FinishedMoving(Actor self)
 		{
-			var crushable = self.World.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(self.Location).Where(a => a != self && a.traits.Contains<ICrushable>());
+			var crushable = uim.GetUnitsAt(toCell).Where(a => a != self && a.traits.Contains<ICrushable>());
 			foreach (var a in crushable)
 			{
 				var crushActions = a.traits.WithInterface<ICrushable>().Where(b => b.CrushClasses.Intersect(Info.Crushes).Any());
@@ -185,47 +239,30 @@ namespace OpenRA.Traits
 					b.OnCrush(self);
 			}
 		}
-		
+				
 		public virtual float MovementCostForCell(Actor self, int2 cell)
 		{
 			if (!self.World.Map.IsInMap(cell.X,cell.Y))
 				return float.PositiveInfinity;
-			
-			// Custom terrain types don't stack: pick one
-			var customTerrain = self.World.WorldActor.traits.WithInterface<ITerrainTypeModifier>()
-				.Select( t => t.GetTerrainType(cell) )
-				.FirstOrDefault( t => t != null );
-			
-			var type = (customTerrain != null) ? customTerrain : self.World.GetTerrainType(cell);
-			var additionalCost = self.World.WorldActor.traits.WithInterface<ITerrainCost>()
-				.Select( t => t.GetTerrainCost(cell, self) ).Sum();
-			
-			return TerrainCost[type] + additionalCost;
+
+			var type = self.World.GetTerrainType(cell);
+			return TerrainCost[type];
 		}
 
 		public virtual float MovementSpeedForCell(Actor self, int2 cell)
-		{		
-			var unitInfo = self.Info.Traits.GetOrDefault<UnitInfo>();
-			if( unitInfo == null )
-			   return 0f;
-			
-			// Custom terrain types don't stack: pick one
-			var customTerrain = self.World.WorldActor.traits.WithInterface<ITerrainTypeModifier>()
-				.Select( t => t.GetTerrainType(cell) )
-				.FirstOrDefault( t => t != null );
-			
-			var type = (customTerrain != null) ? customTerrain : self.World.GetTerrainType(cell);
+		{
+			var type = self.World.GetTerrainType(cell);
 
 			var modifier = self.traits
 				.WithInterface<ISpeedModifier>()
 				.Select(t => t.GetSpeedModifier())
 				.Product();
-			return unitInfo.Speed * TerrainSpeed[type] * modifier;
+			return Info.Speed * TerrainSpeed[type] * modifier;
 		}
 		
 		public IEnumerable<float2> GetCurrentPath(Actor self)
 		{
-			var move = self.GetCurrentActivity() as Activities.Move;
+			var move = self.GetCurrentActivity() as Move;
 			if (move == null || move.path == null) return new float2[] { };
 			
 			return Enumerable.Reverse(move.path).Select( c => Util.CenterOfCell(c) );
@@ -233,12 +270,55 @@ namespace OpenRA.Traits
 		
 		public virtual void AddInfluence()
 		{
-			self.World.WorldActor.traits.Get<UnitInfluence>().Add( self, this );
+			uim.Add( self, this );
 		}
 		
 		public virtual void RemoveInfluence()
 		{
-			self.World.WorldActor.traits.Get<UnitInfluence>().Remove( self, this );
+			uim.Remove( self, this );
+		}
+
+		public void OnNudge(Actor self, Actor nudger)
+		{
+			/* initial fairly braindead implementation. */
+
+			if (self.Owner.Stances[nudger.Owner] != Stance.Ally)
+				return;		/* don't allow ourselves to be pushed around
+							 * by the enemy! */
+
+			if (!self.IsIdle)
+				return;		/* don't nudge if we're busy doing something! */
+
+			// pick an adjacent available cell.
+			var availCells = new List<int2>();
+			var notStupidCells = new List<int2>();
+
+			for( var i = -1; i < 2; i++ )
+				for (var j = -1; j < 2; j++)
+				{
+					var p = toCell + new int2(i, j);
+					if (CanEnterCell(p))
+						availCells.Add(p);
+					else
+						if (p != nudger.Location && p != toCell)
+							notStupidCells.Add(p);
+				}
+
+			var moveTo = availCells.Any() ? availCells.Random(self.World.SharedRandom) :
+				notStupidCells.Any() ? notStupidCells.Random(self.World.SharedRandom) : (int2?)null;
+
+			if (moveTo.HasValue)
+			{
+				self.CancelActivity();
+				if (self.Owner == self.World.LocalPlayer)
+					self.World.AddFrameEndTask(w =>
+					{
+						var line = self.traits.GetOrDefault<DrawLineToTarget>();
+						if (line != null)
+							line.SetTargetSilently(self, Target.FromCell(moveTo.Value), Color.Green);
+					});
+				self.QueueActivity(new Move(moveTo.Value, 0));
+			}
 		}
 	}
 }

OpenRA.Game/Traits/Player/DeveloperMode.cs

@@ -0,0 +1,89 @@
+#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.Traits
+{
+	public class DeveloperModeInfo : ITraitInfo
+	{
+		public int Cash = 20000;
+		public bool FastBuild = false;
+		public bool FastCharge = false;
+		public bool DisableShroud = false;
+		public bool PathDebug = false;
+		
+		public object Create (ActorInitializer init) { return new DeveloperMode(this); }
+	}
+	
+	public class DeveloperMode : IResolveOrder
+	{
+		DeveloperModeInfo Info;
+		[Sync]
+		public bool FastCharge;
+		public bool FastBuild;
+		public bool DisableShroud;
+		public bool PathDebug;
+		
+		public DeveloperMode(DeveloperModeInfo info)
+		{
+			Info = info;
+			FastBuild = Info.FastBuild;
+			FastCharge = Info.FastCharge;
+			DisableShroud = Info.DisableShroud;
+			PathDebug = Info.PathDebug;
+		}
+		
+		public void ResolveOrder (Actor self, Order order)
+		{
+			if (!Game.LobbyInfo.GlobalSettings.AllowCheats) return;
+			
+			switch(order.OrderString)
+			{
+				case "DevFastCharge":
+					{
+						FastCharge ^= true;
+						break;
+					}
+				case "DevFastBuild":
+					{
+						FastBuild ^= true;
+						break;
+					}
+				case "DevGiveCash":
+					{
+						self.traits.Get<PlayerResources>().GiveCash(Info.Cash);
+						break;
+					}
+				case "DevShroud":
+					{
+						if (self.World.LocalPlayer == self.Owner)
+						{
+							DisableShroud ^= true;
+							Game.world.LocalPlayer.Shroud.Disabled = DisableShroud;
+						}
+						break;	
+					}
+				case "DevPathDebug":
+					{
+						if (self.World.LocalPlayer == self.Owner)
+							PathDebug ^= true;
+						break;
+					}
+				case "DevUnitDebug":
+					{
+						if (self.World.LocalPlayer == self.Owner)
+							Game.Settings.UnitDebug ^= true;
+						break;
+					}
+			}
+		}
+	}
+}
+

OpenRA.Game/Traits/Player/EvaAlerts.cs

@@ -36,10 +36,7 @@ namespace OpenRA.Traits
 		// Eva speech
 		public readonly string LowPower = "lopower1.aud";
 		public readonly string SilosNeeded = "silond1.aud";
-		public readonly string UnitLost = "unitlst1.aud";
-		public readonly string NavalUnitLost = "navylst1.aud";
 		public readonly string PrimaryBuildingSelected = "pribldg1.aud";
-		public readonly string CreditsStolen = "credit1.aud";
 		
 		// Special powers
 		public readonly string AbilityInsufficientPower = "nopowr1.aud";

OpenRA.Game/Traits/Player/PlaceBuilding.cs

@@ -11,6 +11,7 @@
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.GameRules;
+using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
@@ -40,7 +41,12 @@ namespace OpenRA.Traits
 						bool playSounds = true;
 						foreach (var t in LineBuildUtils.GetLineBuildCells(w, order.TargetLocation, order.TargetString, buildingInfo))
 						{
-							var building = w.CreateActor(order.TargetString, t, order.Player);
+							var building = w.CreateActor(order.TargetString, new TypeDictionary
+							{
+								new LocationInit( t ),
+								new OwnerInit( order.Player ),
+							});
+							                             
 							if (playSounds)
 								foreach (var s in buildingInfo.BuildSounds)
 									Sound.PlayToPlayer(order.Player, s, building.CenterLocation);
@@ -49,7 +55,11 @@ namespace OpenRA.Traits
 					}
 					else
 					{
-						var building = w.CreateActor(order.TargetString, order.TargetLocation, order.Player);
+						var building = w.CreateActor(order.TargetString, new TypeDictionary
+						{
+							new LocationInit( order.TargetLocation ),
+							new OwnerInit( order.Player ),
+						});
 						foreach (var s in buildingInfo.BuildSounds)
 							Sound.PlayToPlayer(order.Player, s, building.CenterLocation);
 					}

OpenRA.Game/Traits/Player/PlayerResources.cs

@@ -186,6 +186,6 @@ namespace OpenRA.Traits
 		{
 			TickPower();
 			TickOre(self);
-		}
+		}
 	}
 }

OpenRA.Game/Traits/Player/ProductionQueue.cs

@@ -15,14 +15,14 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
-	class ProductionQueueInfo : ITraitInfo
+	public class ProductionQueueInfo : ITraitInfo
 	{
-		public readonly float BuildSpeed = 0.4f;
+		public float BuildSpeed = 0.4f;
 		public readonly int LowPowerSlowdown = 3;
 		public object Create(ActorInitializer init) { return new ProductionQueue(init.self); }
 	}
 
-	class ProductionQueue : IResolveOrder, ITick
+	public class ProductionQueue : IResolveOrder, ITick
 	{
 		Actor self;
 
@@ -101,6 +101,7 @@ namespace OpenRA.Traits
 			if (unit == null || ! unit.Traits.Contains<BuildableInfo>())
 				return 0;
 			
+			if (Game.LobbyInfo.GlobalSettings.AllowCheats && self.traits.Get<DeveloperMode>().FastBuild) return 0;
 			var ui = unit.Traits.Get<BuildableInfo>();
 			var time = ui.Cost
 				* self.Owner.PlayerActor.Info.Traits.Get<ProductionQueueInfo>().BuildSpeed /* todo: country-specific build speed bonus */
@@ -155,51 +156,43 @@ namespace OpenRA.Traits
 			production[group].Add(item);
 		}
 
+		static bool IsDisabledBuilding(Actor a)
+		{
+			var building = a.traits.GetOrDefault<Building>();
+			return building != null && building.Disabled;
+		}
+
 		void BuildUnit( string name )
 		{
 			var newUnitType = Rules.Info[ name ];
 			var producerTypes = Rules.TechTree.UnitBuiltAt( newUnitType );
-			Actor producer = null;
 			
-			// Prioritise primary structure in build order
-			var primaryProducers = self.World.Queries.OwnedBy[self.Owner]
+			var producers = self.World.Queries.OwnedBy[self.Owner]
 				.WithTrait<Production>()
-				.Where(x => producerTypes.Contains(x.Actor.Info)
-					&& x.Trait.IsPrimary);
-			
-			foreach (var p in primaryProducers)
+				.Where(x => producerTypes.Contains(x.Actor.Info))
+				.OrderByDescending(x => x.Trait.IsPrimary ? 1 : 0)	// prioritize the primary.
+				.ToArray();
+
+			if (producers.Length == 0)
 			{
-				// Ignore buildings that are disabled
-				if (p.Actor.traits.Contains<Building>() && p.Actor.traits.Get<Building>().Disabled)
-					continue;
-				producer = p.Actor;
-				break;
-			}
-			
-			// TODO: Be smart about disabled buildings. Units in progress should be paused(?)
-			// Ignore this for now
-			
-			// Pick the first available producer
-			if (producer == null)
-			{
-				producer = self.World.Queries.OwnedBy[self.Owner]
-					.Where( x => producerTypes.Contains( x.Info ) )
-					.FirstOrDefault();
-			}
-			
-			// Something went wrong somewhere...
-			if( producer == null )
-			{
-				CancelProduction( name );
+				CancelProduction(name);
 				return;
 			}
+			
+			foreach (var p in producers)
+			{
+				if (IsDisabledBuilding(p.Actor)) continue;
 
-			if( producer.traits.WithInterface<Production>().Any( p => p.Produce( producer, newUnitType ) ) )
-				FinishProduction( newUnitType.Category );
+				if (p.Trait.Produce(p.Actor, newUnitType))
+				{
+					FinishProduction(newUnitType.Category);
+					break;
+				}
+			}
 		}
 	}
 
-	class ProductionItem
+	public class ProductionItem
 	{
 		public readonly string Item;
 		

OpenRA.Game/Traits/Production.cs

@@ -11,79 +11,107 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.GameRules;
+using System.Drawing;
+using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
-	public class ProductionInfo : TraitInfo<Production>
+	public class ProductionInfo : ITraitInfo
 	{
-		public readonly int[] SpawnOffset = null;
-		public readonly int[] ProductionOffset = null;
-		public readonly int[] ExitOffset = null;
+		public readonly float[] SpawnOffsets; // in px relative to CenterLocation
+		public readonly int[] ExitCells; // in cells relative to TopLeft, supports a list for multiple exits
+		public readonly bool EnablePrimary = true;
 		public readonly string[] Produces = { };
+		
+		public virtual object Create(ActorInitializer init) { return new Production(this); }
 	}
 
-	public class Production : IIssueOrder, IResolveOrder, ITags, IProvideCursor
+	public class Production : IIssueOrder, IResolveOrder, ITags, IOrderCursor
 	{	
-		public virtual int2? CreationLocation( Actor self, ActorInfo producee )
+		public readonly List<Pair<float2, int2>> Spawns = new List<Pair<float2, int2>>();
+		public Production(ProductionInfo info)
 		{
-			var pos = Util.CellContaining(self.CenterLocation);
-			var pi = self.Info.Traits.Get<ProductionInfo>();
-			if (pi.ProductionOffset != null)
-				pos += pi.ProductionOffset.AsInt2();
-			return pos;
-		}
-
-		public virtual int2? ExitLocation(Actor self, ActorInfo producee)
-		{
-			var pos = Util.CellContaining(self.CenterLocation);
-			var pi = self.Info.Traits.Get<ProductionInfo>();
-			if (pi.ExitOffset != null)
-				pos += pi.ExitOffset.AsInt2();
-			return pos;
+			if (info.SpawnOffsets == null || info.ExitCells == null)
+				return;
+			
+			if (info.SpawnOffsets.Length != info.ExitCells.Length)
+				throw new System.InvalidOperationException("SpawnOffset, ExitCells length mismatch");
+			
+			for (int i = 0; i < info.ExitCells.Length; i+=2)
+				Spawns.Add(Pair.New(new float2(info.SpawnOffsets[i],info.SpawnOffsets[i+1]), new int2(info.ExitCells[i], info.ExitCells[i+1])));
 		}
 		
-		public virtual int CreationFacing( Actor self, Actor newUnit )
+		public void DoProduction(Actor self, Actor newUnit, int2 exit, float2 spawn)
 		{
-			return newUnit.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing;
-		}
+			var move = newUnit.traits.Get<IMove>();
+			var facing = newUnit.traits.GetOrDefault<IFacing>();
+			
+			// Set the physical position of the unit as the exit cell
+			move.SetPosition(newUnit,exit);
+			var to = Util.CenterOfCell(exit);
+			newUnit.CenterLocation = spawn;
+			if (facing != null)
+				facing.Facing = Util.GetFacing(to - spawn, facing.Facing);
+			self.World.Add(newUnit);
 
-		public virtual bool Produce( Actor self, ActorInfo producee )
-		{
-			var location = CreationLocation( self, producee );
-			if( location == null || self.World.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt( location.Value ).Any() )
-				return false;
-
-			var newUnit = self.World.CreateActor( producee.Name, location.Value, self.Owner );
-			newUnit.traits.Get<Unit>().Facing = CreationFacing( self, newUnit ); ;
-
-			var pi = self.Info.Traits.Get<ProductionInfo>();
+			// Animate the spawn -> exit transition
+			var speed = move.MovementSpeedForCell(self, exit);
+			var length = speed > 0 ? (int)( ( to - spawn ).Length*3 / speed ) : 0;
+			newUnit.QueueActivity(new Activities.Drag(spawn, to, length));
+			
+			// For the target line
+			var target = exit;
 			var rp = self.traits.GetOrDefault<RallyPoint>();
-			if (rp != null || pi.ExitOffset != null)
+			if (rp != null)
 			{
-				var mobile = newUnit.traits.GetOrDefault<Mobile>();
-				if (mobile != null)
+				target = rp.rallyPoint;
+				// Todo: Move implies unit has Mobile
+				newUnit.QueueActivity(new Activities.Move(target, 1));
+			}
+			
+			if (newUnit.Owner == self.World.LocalPlayer)
+			{
+				self.World.AddFrameEndTask(w =>
 				{
-					if (pi.ExitOffset != null)
-						newUnit.QueueActivity(new Activities.Move(ExitLocation(self, producee).Value, 1));
-
-					if (rp != null)
-						newUnit.QueueActivity(new Activities.Move(rp.rallyPoint, 1));
-				}
+					var line = newUnit.traits.GetOrDefault<DrawLineToTarget>();
+					if (line != null)
+						line.SetTargetSilently(newUnit, Target.FromCell(target), Color.Green);
+				});
 			}
 
-			if (pi != null && pi.SpawnOffset != null)
-				newUnit.CenterLocation = self.CenterLocation + pi.SpawnOffset.AsInt2();
-
 			foreach (var t in self.traits.WithInterface<INotifyProduction>())
-				t.UnitProduced(self, newUnit);
+				t.UnitProduced(self, newUnit, exit);
 
 			Log.Write("debug", "{0} #{1} produced by {2} #{3}", newUnit.Info.Name, newUnit.ActorID, self.Info.Name, self.ActorID);
-
-			return true;
+		}
+		
+		public virtual bool Produce( Actor self, ActorInfo producee )
+		{			
+			var newUnit = self.World.CreateActor(false, producee.Name, new TypeDictionary
+			{
+				new OwnerInit( self.Owner ),
+			});
+			
+			// Todo: remove assumption on Mobile; 
+			// required for 3-arg CanEnterCell
+			var mobile = newUnit.traits.Get<Mobile>();
+	
+			// Pick a spawn/exit point pair
+			// Todo: Reorder in a synced random way
+			foreach (var s in Spawns)
+			{
+				var exit = self.Location + s.Second;
+				var spawn = self.CenterLocation + s.First;
+				if (mobile.CanEnterCell(exit,self,true))
+				{
+					DoProduction(self, newUnit, exit, spawn);
+					return true;
+				}
+			}
+			return false;
 		}
 
 		// "primary building" crap - perhaps this should be split?
-
 		bool isPrimary = false;
 		public bool IsPrimary { get { return isPrimary; } }
 
@@ -93,20 +121,20 @@ namespace OpenRA.Traits
 		}
 
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
-		{
-			if (mi.Button == MouseButton.Right && underCursor == self)
-				return new Order("Deploy", self);
+		{			
+			if (mi.Button == MouseButton.Right && underCursor == self && self.Info.Traits.Get<ProductionInfo>().EnablePrimary)
+				return new Order("PrimaryProducer", self);
 			return null;
 		}
 		
-		public string CursorForOrderString(string s, Actor a, int2 location)
+		public string CursorForOrder(Actor self, Order order)
 		{
-			return (s == "Deploy") ? "deploy" : null;
+			return (order.OrderString == "PrimaryProducer") ? "deploy" : null;
 		}
 		
 		public void ResolveOrder(Actor self, Order order)
 		{
-			if (order.OrderString == "Deploy")
+			if (order.OrderString == "PrimaryProducer")
 				SetPrimaryProducer(self, !isPrimary);
 		}
 		

OpenRA.Game/Traits/ProvidesRadar.cs

@@ -12,9 +12,9 @@ using System.Linq;
 
 namespace OpenRA.Traits
 {
-	class ProvidesRadarInfo : TraitInfo<ProvidesRadar> { }
+	public class ProvidesRadarInfo : TraitInfo<ProvidesRadar> { }
 
-	class ProvidesRadar : ITick
+	public class ProvidesRadar : ITick
 	{
 		public bool IsActive { get; private set; }
 

OpenRA.Game/Traits/RallyPoint.cs

@@ -37,7 +37,7 @@ namespace OpenRA.Traits
 
 		public IEnumerable<Renderable> Render(Actor self)
 		{
-			if (self.Owner == self.World.LocalPlayer && Game.controller.selection.Actors.Contains(self))
+			if (self.Owner == self.World.LocalPlayer && self.World.Selection.Actors.Contains(self))
 				yield return Util.Centered(self,
 					anim.Image, Util.CenterOfCell(rallyPoint));
 		}

OpenRA.Game/Traits/Render/RenderSimple.cs

@@ -64,7 +64,7 @@ namespace OpenRA.Traits
 
 		protected virtual string GetPrefix(Actor self)
 		{
-			return self.GetDamageState() == DamageState.Half ? "damaged-" : "";
+			return self.GetDamageState() >= DamageState.Heavy ? "damaged-" : "";
 		}
 
 		public void PlayCustomAnim(Actor self, string name)

OpenRA.Game/Traits/RepairableBuilding.cs

@@ -0,0 +1,85 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Effects;
+using OpenRA.GameRules;
+using OpenRA.Traits.Activities;
+
+namespace OpenRA.Traits
+{
+	public class RepairableBuildingInfo : ITraitInfo, ITraitPrerequisite<HealthInfo>
+	{
+		public readonly float RepairPercent = 0.2f;
+		public readonly float RepairRate = 0.016f;
+		public readonly int RepairStep = 7;
+		public object Create(ActorInitializer init) { return new RepairableBuilding(init.self, this); }
+	}
+
+	public class RepairableBuilding : ITick, IResolveOrder
+	{
+		[Sync]
+		bool isRepairing = false;
+		
+		Health Health;
+		RepairableBuildingInfo Info;
+		public RepairableBuilding(Actor self, RepairableBuildingInfo info)
+		{
+			Health = self.traits.Get<Health>();
+			Info = info;
+		}
+		
+		public void ResolveOrder(Actor self, Order order)
+		{
+			if (order.OrderString == "Repair")
+			{
+				isRepairing = !isRepairing;
+			}
+		}
+
+		int remainingTicks;
+		public void Tick(Actor self)
+		{
+			if (!isRepairing) return;
+
+			if (remainingTicks == 0)
+			{
+				var csv = self.Info.Traits.GetOrDefault<CustomSellValueInfo>();
+				var buildingValue = csv != null ? csv.Value : self.Info.Traits.Get<ValuedInfo>().Cost;
+				
+				var costPerHp = (Info.RepairPercent * buildingValue) / Health.MaxHP;
+				var hpToRepair = Math.Min(Info.RepairStep, Health.MaxHP - Health.HP);
+				var cost = (int)Math.Ceiling(costPerHp * hpToRepair);
+				if (!self.Owner.PlayerActor.traits.Get<PlayerResources>().TakeCash(cost))
+				{
+					remainingTicks = 1;
+					return;
+				}
+
+				self.World.AddFrameEndTask(w => w.Add(new RepairIndicator(self)));
+				self.InflictDamage(self, -hpToRepair, null);
+				if (Health.DamageState == DamageState.Undamaged)
+				{
+					isRepairing = false;
+					return;
+				}
+				remainingTicks = (int)(Info.RepairRate * 60 * 25);
+			}
+			else
+				--remainingTicks;
+		}
+	}
+	public class AllowsBuildingRepairInfo : TraitInfo<AllowsBuildingRepair> {}
+	public class AllowsBuildingRepair {}
+
+}

OpenRA.Game/Traits/RevealsShroud.cs

@@ -1,30 +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 OpenRA.Traits;
-
-namespace OpenRA.Mods.RA
-{
-	class RevealsShroudInfo : TraitInfo<RevealsShroud> { }
-
-	class RevealsShroud : ITick
-	{
-		int2 previousLocation;
-
-		public void Tick(Actor self)
-		{
-			if (!self.IsIdle && previousLocation != self.Location)
-			{
-				previousLocation = self.Location;
-				self.World.WorldActor.traits.Get<Shroud>().UpdateActor(self);
-			}
-		}
-	}
-}
+#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.Traits
+{
+	class RevealsShroudInfo : ITraitInfo
+	{
+		public readonly int Range = 0;	
+		public object Create(ActorInitializer init) { return new RevealsShroud(this); }
+	}
+
+	class RevealsShroud : ITick
+	{
+		RevealsShroudInfo Info;
+		int2 previousLocation;
+		
+		public RevealsShroud(RevealsShroudInfo info)
+		{
+			Info = info;
+		}
+		
+		public void Tick(Actor self)
+		{	
+			if (!self.IsIdle && previousLocation != self.Location)
+			{
+				previousLocation = self.Location;
+				self.World.WorldActor.traits.Get<Shroud>().UpdateActor(self);
+			}
+		}
+		
+		public int RevealRange { get { return Info.Range; } }
+	}
+}

OpenRA.Game/Traits/Selectable.cs

@@ -8,6 +8,10 @@
  */
 #endregion
 
+using System.Drawing;
+using OpenRA.Graphics;
+using System.Linq;
+
 namespace OpenRA.Traits
 {
 	public class SelectableInfo : TraitInfo<Selectable>
@@ -19,5 +23,160 @@ namespace OpenRA.Traits
 		public readonly float Radius = 10;
 	}
 
-	public class Selectable {}
+	public class Selectable : IPostRenderSelection
+	{
+		// depends on the order of pips in TraitsInterfaces.cs!
+		static readonly string[] pipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray" };
+		static readonly string[] tagStrings = { "", "tag-fake", "tag-primary" };
+		
+		public void RenderAfterWorld (Actor self)
+		{
+			var bounds = self.GetBounds(true);
+
+			var xy = new float2(bounds.Left, bounds.Top);
+			var Xy = new float2(bounds.Right, bounds.Top);
+			var xY = new float2(bounds.Left, bounds.Bottom);
+			var XY = new float2(bounds.Right, bounds.Bottom);
+
+			DrawSelectionBox(self, xy, Xy, xY, XY, Color.White);
+			DrawHealthBar(self, xy, Xy);
+			DrawControlGroup(self, xy);
+			DrawPips(self, xY);
+			DrawTags(self, new float2(.5f * (bounds.Left + bounds.Right), bounds.Top));
+			DrawUnitPath(self);
+		}
+		
+		void DrawSelectionBox(Actor self, float2 xy, float2 Xy, float2 xY, float2 XY, Color c)
+		{
+			Game.Renderer.LineRenderer.DrawLine(xy, xy + new float2(4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xy, xy + new float2(0, 4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(Xy, Xy + new float2(-4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(Xy, Xy + new float2(0, 4), c, c);
+
+			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(0, -4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(-4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(0, -4), c, c);
+		}
+		
+		void DrawHealthBar(Actor self, float2 xy, float2 Xy)
+		{
+			var health = self.traits.GetOrDefault<Health>();
+			if (self.IsDead() || health == null)
+				return;
+			
+			var c = Color.Gray;
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), xy + new float2(0, -4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(Xy + new float2(0, -2), Xy + new float2(0, -4), c, c);
+
+			var healthColor = (health.DamageState == DamageState.Critical) ? Color.Red :
+							  (health.DamageState == DamageState.Heavy) ? Color.Yellow : Color.LimeGreen;
+				
+			var healthColor2 = Color.FromArgb(
+				255,
+				healthColor.R / 2,
+				healthColor.G / 2,
+				healthColor.B / 2);
+
+			var z = float2.Lerp(xy, Xy, health.HPFraction);
+
+			Game.Renderer.LineRenderer.DrawLine(z + new float2(0, -4), Xy + new float2(0, -4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(z + new float2(0, -2), Xy + new float2(0, -2), c, c);
+
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -3), z + new float2(0, -3), healthColor, healthColor);
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), z + new float2(0, -2), healthColor2, healthColor2);
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), healthColor2, healthColor2);
+		}
+
+		void DrawControlGroup(Actor self, float2 basePosition)
+		{
+			var group = self.World.Selection.GetControlGroupForActor(self);
+			if (group == null) return;
+
+			var pipImages = new Animation("pips");
+			pipImages.PlayFetchIndex("groups", () => (int)group);
+			pipImages.Tick();
+			Game.Renderer.SpriteRenderer.DrawSprite(pipImages.Image, basePosition + new float2(-8, 1), "chrome");
+		}
+
+		void DrawPips(Actor self, float2 basePosition)
+		{
+			if (self.Owner != self.World.LocalPlayer) return;
+			
+			// If a mod wants to implement a unit with multiple pip sources, then they are placed on multiple rows
+			var pipxyBase = basePosition + new float2(-12, -7); // Correct for the offset in the shp file
+			var pipxyOffset = new float2(0, 0); // Correct for offset due to multiple columns/rows
+
+			foreach (var pips in self.traits.WithInterface<IPips>())
+			{
+				foreach (var pip in pips.GetPips(self))
+				{
+					if (pipxyOffset.X+5 > self.GetBounds(false).Width)
+					{
+						pipxyOffset.X = 0;
+						pipxyOffset.Y -= 4;
+					}
+					var pipImages = new Animation("pips");
+					pipImages.PlayRepeating(pipStrings[(int)pip]);
+					Game.Renderer.SpriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, "chrome");
+					pipxyOffset += new float2(4, 0);
+				}
+				// Increment row
+				pipxyOffset.X = 0;
+				pipxyOffset.Y -= 5;
+			}
+		}
+		
+		void DrawTags(Actor self, float2 basePosition)
+		{
+			if (self.Owner != self.World.LocalPlayer) return;
+			
+			// If a mod wants to implement a unit with multiple tags, then they are placed on multiple rows
+			var tagxyBase = basePosition + new float2(-16, 2); // Correct for the offset in the shp file
+			var tagxyOffset = new float2(0, 0); // Correct for offset due to multiple rows
+
+			foreach (var tags in self.traits.WithInterface<ITags>())
+			{
+				foreach (var tag in tags.GetTags())
+				{
+					if (tag == TagType.None)
+						continue;
+						
+					var tagImages = new Animation("pips");
+					tagImages.PlayRepeating(tagStrings[(int)tag]);
+					Game.Renderer.SpriteRenderer.DrawSprite(tagImages.Image, tagxyBase + tagxyOffset, "chrome");
+					
+					// Increment row
+					tagxyOffset.Y += 8;
+				}
+			}
+		}
+		
+		void DrawUnitPath(Actor self)
+		{
+			if (!Game.world.LocalPlayer.PlayerActor.traits.Get<DeveloperMode>().PathDebug) return;
+			
+			var mobile = self.traits.GetOrDefault<IMove>();
+			if (mobile != null)
+			{
+				var alt = new float2(0, -mobile.Altitude);
+				var path = mobile.GetCurrentPath(self);
+				var start = self.CenterLocation + alt;
+
+				var c = Color.Green;
+
+				foreach (var step in path)
+				{
+					var stp = step + alt;
+					Game.Renderer.LineRenderer.DrawLine(stp + new float2(-1, -1), stp + new float2(-1, 1), c, c);
+					Game.Renderer.LineRenderer.DrawLine(stp + new float2(-1, 1), stp + new float2(1, 1), c, c);
+					Game.Renderer.LineRenderer.DrawLine(stp + new float2(1, 1), stp + new float2(1, -1), c, c);
+					Game.Renderer.LineRenderer.DrawLine(stp + new float2(1, -1), stp + new float2(-1, -1), c, c);
+					Game.Renderer.LineRenderer.DrawLine(start, stp, c, c);
+					start = stp;
+				}
+			}
+		}
+		
+	}
 }

OpenRA.Game/Traits/SupportPower.cs

@@ -69,6 +69,7 @@ namespace OpenRA.Traits
 			
 			if (IsAvailable && (!Info.RequiresPower || IsPowered()))
 			{
+				if (Game.LobbyInfo.GlobalSettings.AllowCheats && self.traits.Get<DeveloperMode>().FastCharge) RemainingTime = 0;
 				if (RemainingTime > 0) --RemainingTime;
 				if (!notifiedCharging)
 				{

OpenRA.Game/Traits/Targetable.cs

@@ -1,23 +1,26 @@
-#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.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
-using System;
-using OpenRA.FileFormats;
+using System.Drawing;
+using OpenRA.Graphics;
+using System.Linq;
 
-namespace MapConverter
+namespace OpenRA.Traits
 {
-	class MainClass
+	public class TargetableInfo : TraitInfo<Targetable>
 	{
-		public static void Main (string[] args)
-		{
-			new MapConverter(args);
-		}
+		public readonly string[] TargetTypes = {};
+	}
+
+	public class Targetable
+	{
+		
 	}
 }

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -15,8 +15,6 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Traits
 {
-	public enum DamageState { Normal, Half, Dead };
-	
 	// depends on the order of pips in WorldRenderer.cs!
 	public enum PipType { Transparent, Green, Yellow, Red, Gray };
 	public enum TagType { None, Fake, Primary };
@@ -28,6 +26,7 @@ namespace OpenRA.Traits
 		public WarheadInfo Warhead;
 		public int Damage;
 		public DamageState DamageState;
+		public DamageState PreviousDamageState;
 		public bool DamageStateChanged;
 	}
 
@@ -35,25 +34,30 @@ namespace OpenRA.Traits
 	public interface IRender { IEnumerable<Renderable> Render(Actor self); }
 	public interface IIssueOrder { Order IssueOrder( Actor self, int2 xy, MouseInput mi, Actor underCursor ); }
 	public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
-	public interface IProvideCursor { string CursorForOrderString(string s, Actor a, int2 location); }
+	public interface IOrderCursor { string CursorForOrder(Actor self, Order order); }
+	public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }
 
 	public interface INotifySold { void Selling( Actor self );  void Sold( Actor self ); }
 	public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
 	public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
-	public interface INotifyProduction { void UnitProduced(Actor self, Actor other); }
-	public interface INotifyCapture { void OnCapture(Actor self, Actor captor); }
+	public interface INotifyProduction { void UnitProduced(Actor self, Actor other, int2 exit); }
+	public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
 	public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
 	public interface INotifyEnterCell { void OnEnterCell(Actor self, int2 cell); }
-	public interface IProvideHazard { IEnumerable<HazardLayer.Hazard> HazardCells(Actor self); }
-	public interface IAvoidHazard { string Type { get; } }
 	public interface IStoreOre { int Capacity { get; }}
 
-	public interface ITerrainTypeModifier { string GetTerrainType(int2 cell); }
-	public interface ITerrainCost { float GetTerrainCost(int2 cell, Actor forActor); }
-
 	public interface IDisable { bool Disabled { get; } }
 	public interface IExplodeModifier { bool ShouldExplode(Actor self); }
+	public interface INudge { void OnNudge(Actor self, Actor nudger); }
 
+	public interface IRadarSignature
+	{
+		IEnumerable<int2> RadarSignatureCells(Actor self);
+		Color RadarSignatureColor(Actor self);
+	}
+	
+	public interface IVisibilityModifier { bool IsVisible(Actor self); }
+	public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
 	public interface IOccupySpace
 	{
 		int2 TopLeft { get; }
@@ -94,13 +98,26 @@ namespace OpenRA.Traits
 	public interface IPaletteModifier { void AdjustPalette(Bitmap b); }
 	public interface IPips { IEnumerable<PipType> GetPips(Actor self); }
 	public interface ITags { IEnumerable<TagType> GetTags(); }
-	public interface IMove
+
+	public interface ITeleportable /* crap name! */
 	{
 		bool CanEnterCell(int2 location);
+		void SetPosition(Actor self, int2 cell);
+	}
+
+	public interface IMove : ITeleportable
+	{
 		float MovementCostForCell(Actor self, int2 cell);
 		float MovementSpeedForCell(Actor self, int2 cell);
 		IEnumerable<float2> GetCurrentPath(Actor self);
-		void SetPosition(Actor self, int2 cell);
+		int Altitude { get; set; }
+	}
+	
+	public interface IFacing
+	{
+		int ROT { get; }
+		int Facing { get; set; }
+		int InitialFacing { get; }
 	}
 	
 	public interface IOffsetCenterLocation { float2 CenterOffset { get; } }
@@ -150,19 +167,36 @@ namespace OpenRA.Traits
 		void Cancel(Actor self);
 	}
 
-	public interface IChromeButton
-	{
-		string Image { get; }
-		bool Enabled { get; }
-		bool Pressed { get; }
-		void OnClick();
-		string Description { get; }
-		string LongDesc { get; }
-	}
-
 	public interface IRenderOverlay { void Render(); }
 	public interface INotifyIdle { void Idle(Actor self); }
 
-	public interface IVictoryConditions { bool HasLost { get; } bool HasWon { get; } }
 	public interface IBlocksBullets { }
+
+	public interface IPostRenderSelection { void RenderAfterWorld(Actor self); }
+	public interface IPreRenderSelection { void RenderBeforeWorld(Actor self); }
+
+	public struct Target		// a target: either an actor, or a fixed location.
+	{
+		Actor actor;
+		float2 pos;
+		bool valid;
+
+		public static Target FromActor(Actor a) { return new Target { actor = a, valid = true }; }
+		public static Target FromPos(float2 p) { return new Target { pos = p, valid = true }; }
+		public static Target FromCell(int2 c) { return new Target { pos = Util.CenterOfCell(c), valid = true }; }
+		public static Target FromOrder(Order o)
+		{
+			return o.TargetActor != null 
+				? Target.FromActor(o.TargetActor) 
+				: Target.FromCell(o.TargetLocation);
+		}
+
+		public static readonly Target None = new Target();
+
+		public bool IsValid { get { return valid && (actor == null || actor.IsInWorld); } }
+		public float2 CenterLocation { get { return actor != null ? actor.CenterLocation : pos.ToInt2(); } }
+
+		public Actor Actor { get { return actor; } }
+		public bool IsActor { get { return actor != null; } }
+	}
 }

OpenRA.Game/Traits/Turreted.cs

@@ -10,12 +10,12 @@
 
 namespace OpenRA.Traits
 {
-	class TurretedInfo : ITraitInfo
+	public class TurretedInfo : ITraitInfo
 	{
 		public readonly int ROT = 255;
 		public readonly int InitialFacing = 128;
 
-		public object Create(ActorInitializer init) { return new Turreted(init.self); }
+		public object Create(ActorInitializer init) { return new Turreted(init.self, this); }
 	}
 
 	public class Turreted : ITick
@@ -23,16 +23,20 @@ namespace OpenRA.Traits
 		[Sync]
 		public int turretFacing = 0;
 		public int? desiredFacing;
-
-		public Turreted(Actor self)
+		TurretedInfo info;
+		IFacing facing;
+		
+		public Turreted(Actor self, TurretedInfo info)
 		{
-			turretFacing = self.Info.Traits.Get<TurretedInfo>().InitialFacing;
+			this.info = info;
+			turretFacing = info.InitialFacing;
+			facing = self.traits.GetOrDefault<IFacing>();
 		}
 
 		public void Tick( Actor self )
 		{
-			var df = desiredFacing ?? ( self.traits.Contains<Unit>() ? self.traits.Get<Unit>().Facing : turretFacing );
-			Util.TickFacing(ref turretFacing, df, self.Info.Traits.Get<TurretedInfo>().ROT);
+			var df = desiredFacing ?? ( facing != null ? facing.Facing : turretFacing );
+			turretFacing = Util.TickFacing(turretFacing, df, info.ROT);
 		}
 	}
 }

OpenRA.Game/Traits/Unit.cs

@@ -1,39 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-namespace OpenRA.Traits
-{
-	public class UnitInfo : OwnedActorInfo, ITraitInfo
-	{
-		public readonly int InitialFacing = 128;
-		public readonly int ROT = 255;
-		public readonly int Speed = 1;
-
-		public object Create( ActorInitializer init ) { return new Unit( init.self ); }
-	}
-
-	public class Unit : INotifyDamage
-	{
-		[Sync]
-		public int Facing;
-		[Sync]
-		public int Altitude;
-
-		public Unit(Actor self) { }
-
-		public void Damaged(Actor self, AttackInfo e)
-		{
-			var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
-			if (e.DamageState == DamageState.Dead)
-					Sound.PlayToPlayer(self.Owner,
-						self.Info.Traits.Get<OwnedActorInfo>().WaterBound ? eva.NavalUnitLost : eva.UnitLost);
-		}
-	}
-}

OpenRA.Game/Traits/Util.cs

@@ -17,16 +17,16 @@ namespace OpenRA.Traits
 {
 	public static class Util
 	{
-		public static void TickFacing( ref int facing, int desiredFacing, int rot )
+		public static int TickFacing( int facing, int desiredFacing, int rot )
 		{
 			var leftTurn = ( facing - desiredFacing ) & 0xFF;
 			var rightTurn = ( desiredFacing - facing ) & 0xFF;
 			if( Math.Min( leftTurn, rightTurn ) < rot )
-				facing = desiredFacing & 0xFF;
+				return desiredFacing & 0xFF;
 			else if( rightTurn < leftTurn )
-				facing = ( facing + rot ) & 0xFF;
+				return ( facing + rot ) & 0xFF;
 			else
-				facing = ( facing - rot ) & 0xFF;
+				return ( facing - rot ) & 0xFF;
 		}
 
 		static float2[] fvecs = Graphics.Util.MakeArray<float2>( 32,

OpenRA.Game/Traits/World/AircraftInfluence.cs

@@ -1,87 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using OpenRA.FileFormats;
-
-namespace OpenRA.Traits
-{
-	public class AircraftInfluenceInfo : ITraitInfo
-	{
-		public object Create( ActorInitializer init ) { return new AircraftInfluence( init.world ); }
-	}
-
-	public class AircraftInfluence : ITick
-	{
-		List<Actor>[,] influence;
-		Map map;
-
-		public AircraftInfluence( World world )
-		{
-			map = world.Map;
-			influence = new List<Actor>[world.Map.MapSize.X, world.Map.MapSize.Y];
-			for (int i = 0; i < world.Map.MapSize.X; i++)
-				for (int j = 0; j < world.Map.MapSize.Y; j++)
-					influence[ i, j ] = new List<Actor>();
-
-			world.ActorRemoved += a => Remove( a, a.traits.GetOrDefault<IOccupyAir>() );
-		}
-
-		public void Tick( Actor self )
-		{
-			SanityCheck( self );
-		}
-
-		[Conditional( "SANITY_CHECKS" )]
-		void SanityCheck( Actor self )
-		{
-			for( int x = 0 ; x < self.World.Map.MapSize.X ; x++ )
-				for( int y = 0 ; y < self.World.Map.MapSize.Y ; y++ )
-					if( influence[ x, y ] != null )
-						foreach (var a in influence[ x, y ])
-							if (!a.traits.Get<IOccupyAir>().OccupiedAirCells().Contains( new int2( x, y ) ) )
-								throw new InvalidOperationException( "AIM: Sanity check failed A" );
-
-			foreach( var t in self.World.Queries.WithTraitMultiple<IOccupyAir>() )
-				foreach( var cell in t.Trait.OccupiedAirCells() )
-					if (!influence[cell.X, cell.Y].Contains(t.Actor))
-						throw new InvalidOperationException( "AIM: Sanity check failed B" );
-		}
-
-		Actor[] noActors = { };
-		public IEnumerable<Actor> GetUnitsAt( int2 a )
-		{
-			if (!map.IsInMap(a)) return noActors;
-			return influence[ a.X, a.Y ];
-		}
-
-		public void Add( Actor self, IOccupyAir unit )
-		{
-			foreach( var c in unit.OccupiedAirCells() )
-				influence[c.X, c.Y].Add(self);
-		}
-
-		public void Remove( Actor self, IOccupyAir unit )
-		{
-			if (unit != null)
-				foreach (var c in unit.OccupiedAirCells())
-					influence[c.X, c.Y].Remove(self);
-		}
-
-		public void Update(Actor self, IOccupyAir unit)
-		{
-			Remove(self, unit);
-			if (!self.IsDead) Add(self, unit);
-		}
-	}
-}

OpenRA.Game/Traits/World/BibLayer.cs

@@ -25,7 +25,6 @@ namespace OpenRA.Traits
 
 	class BibLayer: IRenderOverlay, ILoadWorldHook
 	{		
-		SpriteRenderer spriteRenderer;
 		World world;
 		BibLayerInfo info;
 		
@@ -34,7 +33,6 @@ namespace OpenRA.Traits
 		
 		public BibLayer(Actor self, BibLayerInfo info)
 		{
-			spriteRenderer = Game.renderer.SpriteRenderer;
 			this.info = info;
 			bibSprites = info.BibTypes.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray();
 			
@@ -90,7 +88,7 @@ namespace OpenRA.Traits
 					var t = new int2(x, y);
 					if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(t) || tiles[x,y].type == 0) continue;
 
-					spriteRenderer.DrawSprite(bibSprites[tiles[x, y].type - 1][tiles[x, y].image],
+					Game.Renderer.SpriteRenderer.DrawSprite(bibSprites[tiles[x, y].type - 1][tiles[x, y].image],
 						Game.CellSize * t, "terrain");
 				}
 		}

OpenRA.Game/Traits/World/GlobalDefaults.cs

@@ -1,91 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-// THIS STUFF NEEDS TO GO DIE IN A FIRE.
-
-namespace OpenRA.Traits
-{
-	public class GlobalDefaultsInfo : TraitInfo<GlobalDefaults>
-	{
-		/* Special Weapons */
-		public readonly float GapRegenInterval = 0.1f;
-		public readonly int BadgerBombCount = 1;
-
-		/* Chrono Side Effects */
-		public readonly float QuakeChance = 0.2f;
-		public readonly float QuakeDamage = 0.33f;		/* percent */
-		public readonly float VortexChance = 0.2f;
-		public readonly int VortexDamage = 200;
-		public readonly int VortexRange = 10;
-		public readonly int VortexSpeed = 10;
-		
-		/* Repair & Refit */
-		public readonly float RefundPercent = 0.5f;
-		public readonly float ReloadRate = 0.04f;
-		public readonly float RepairPercent = 0.2f;
-		public readonly float RepairRate = 0.016f;
-		public readonly int RepairStep = 7;
-
-		
-		/* Combat & Damage */
-		public readonly float TurboBoost = 1.5f;
-		public readonly float BallisticScatter = 1.0f;
-		public readonly float ExpSpread = 0.3f;
-		public readonly int FireSupress = 1;
-		public readonly float HomingScatter = 2.0f;
-		public readonly int MaxDamage = 1000;
-		public readonly int MinDamage = 1;
-		public readonly bool OreExplosive = false;
-		public readonly bool PlayerAutoCrush = false;
-		public readonly bool PlayerReturnFire = false;
-		public readonly bool PlayerScatter = false;
-		public readonly bool TreeTargeting = false;
-		public readonly int Incoming = 10;
-		
-		/* Income & Production */
-		public readonly float BuildupTime = 0.06f;
-		public readonly float OreTruckRate = 1;
-		public readonly bool SeparateAircraft = false;
-		public readonly float SurvivorRate = 0.4f;
-		
-		/* Audo/Visual Map Controls */
-		public readonly bool AllyReveal = true;
-		public readonly float ConditionRed = 0.25f;
-		public readonly float ConditionYellow = 0.5f;
-		public readonly int DropZoneRadius = 4;
-		public readonly bool EnemyHealth = true;
-		public readonly int Gravity = 3;
-		public readonly float IdleActionFrequency = 0.1f;
-		public readonly float MessageDelay = 0.6f;
-		public readonly float MovieTime = 0.06f;
-		public readonly bool NamedCivilians = false;
-		public readonly float SavourDelay = 0.03f;
-		
-		public readonly int SpeakDelay = 2;
-		public readonly int TimerWarning = 2;
-		public readonly bool FlashLowPower = true;
-
-		/* Computer & Movement Controls */
-		public readonly bool CurleyShuffle = false;
-		public readonly float BaseBias = 2.0f;
-		public readonly float BaseDefenseDelay = 0.25f;
-		public readonly float CloseEnough = 2.75f;
-		public readonly int DamageDelay = 1;
-		public readonly int GameSpeeBias = 1;
-		public readonly int LZScanRadius = 16;
-		public readonly bool MineAware = true;
-		public readonly float Stray = 2.0f;
-		public readonly float SuspendDelay = 2.0f;
-		public readonly int SuspendPriority = 20;
-		public readonly float TeamDelay = 0.6f;
-	}
-
-	public class GlobalDefaults {}
-}

OpenRA.Game/Traits/World/HazardLayer.cs

@@ -1,75 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.FileFormats;
-
-namespace OpenRA.Traits
-{
-	public class HazardLayerInfo : ITraitInfo
-	{
-		public object Create( ActorInitializer init ) { return new HazardLayer( init.world ); }
-	}
-
-	public class HazardLayer : ITerrainCost
-	{
-		List<Pair<Actor, Hazard>>[,] hazards;
-
-		public HazardLayer( World world )
-		{
-			hazards = new List<Pair<Actor, Hazard>>[world.Map.MapSize.X, world.Map.MapSize.Y];
-			for (int i = 0; i < world.Map.MapSize.X; i++)
-				for (int j = 0; j < world.Map.MapSize.Y; j++)
-					hazards[ i, j ] = new List<Pair<Actor, Hazard>>();
-
-			world.ActorRemoved += a => Remove( a, a.traits.GetOrDefault<IProvideHazard>() );
-		}
-
-		public float GetTerrainCost(int2 p, Actor forActor)
-		{
-			var avoid = forActor.traits.WithInterface<IAvoidHazard>().Select(h => h.Type).ToList();
-			
-			var intensity = hazards[p.X,p.Y].Where(a => avoid.Contains(a.Second.type))
-											.Select(b => b.Second.intensity)
-											.Sum();			
-
-			return intensity;
-		}
-		
-		public void Add( Actor self, IProvideHazard hazard )
-		{
-			foreach( var h in hazard.HazardCells(self) )
-			{
-				hazards[h.location.X, h.location.Y].Add(Pair.New(self, h));
-			}
-		}
-
-		public void Remove( Actor self, IProvideHazard hazard )
-		{
-			if (hazard != null)
-				foreach (var h in hazard.HazardCells(self))
-					hazards[h.location.X, h.location.Y].Remove(Pair.New(self,h));
-		}
-
-		public void Update(Actor self, IProvideHazard hazard)
-		{
-			Remove(self, hazard);
-			if (!self.IsDead) Add(self, hazard);
-		}
-		
-		public struct Hazard
-		{
-			public int2 location;
-			public string type;
-			public float intensity;
-		}
-	}
-}

OpenRA.Game/Traits/World/ResourceLayer.cs

@@ -17,18 +17,12 @@ namespace OpenRA.Traits
 {
 	public class ResourceLayerInfo : TraitInfo<ResourceLayer> { }
 
-	public class ResourceLayer: IRenderOverlay, ILoadWorldHook, ITerrainTypeModifier
-	{		
-		SpriteRenderer sr;
+	public class ResourceLayer: IRenderOverlay, ILoadWorldHook
+	{		
 		World world;
 
 		public ResourceType[] resourceTypes;
 		CellContents[,] content;
-
-		public ResourceLayer()
-		{
-			sr = Game.renderer.SpriteRenderer;
-		}
 		
 		public void Render()
 		{
@@ -50,7 +44,7 @@ namespace OpenRA.Traits
 
 					var c = content[x, y];
 					if (c.image != null)
-						sr.DrawSprite(c.image[c.density],
+						Game.Renderer.SpriteRenderer.DrawSprite(c.image[c.density],
 							Game.CellSize * new int2(x, y),
 							c.type.info.Palette);
 				}
@@ -79,17 +73,12 @@ namespace OpenRA.Traits
 			for (int x = map.XOffset; x < map.XOffset + map.Width; x++)
 				for (int y = map.YOffset; y < map.YOffset + map.Height; y++)
 					if (content[x, y].type != null)
+					{
 						content[x, y].density = GetIdealDensity(x, y);
+						w.Map.CustomTerrain[x, y] = content[x, y].type.info.TerrainType;
+					}
 		}
-		
-		public string GetTerrainType(int2 cell)
-		{
-			if (content[cell.X,cell.Y].type == null)
-				return null;
-			
-			return content[cell.X,cell.Y].type.info.TerrainType;
-		}
-				
+
 		Sprite[] ChooseContent(ResourceType t)
 		{
 			return t.info.Sprites[world.SharedRandom.Next(t.info.Sprites.Length)];
@@ -126,6 +115,8 @@ namespace OpenRA.Traits
 			content[i, j].density = Math.Min(
 				content[i, j].image.Length - 1, 
 				content[i, j].density + n);
+			
+			world.Map.CustomTerrain[i,j] = t.info.TerrainType;
 		}
 
 		public bool IsFull(int i, int j) { return content[i, j].density == content[i, j].image.Length - 1; }
@@ -139,6 +130,7 @@ namespace OpenRA.Traits
 			{
 				content[p.X, p.Y].type = null;
 				content[p.X, p.Y].image = null;
+				world.Map.CustomTerrain[p.X, p.Y] = null;
 			}
 			return type;
 		}

OpenRA.Game/Traits/World/Shroud.cs

@@ -14,6 +14,7 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.GameRules;
+using OpenRA.Traits;
 
 namespace OpenRA.Traits
 {
@@ -63,7 +64,11 @@ namespace OpenRA.Traits
 
 		void AddActor(Actor a)
 		{
-			if (a.Owner == null || a.Owner != a.Owner.World.LocalPlayer) return;
+			if (!a.traits.Contains<RevealsShroud>())
+				return;
+						
+			if (a.Owner == null || a.Owner.World.LocalPlayer == null 
+			    || a.Owner.Stances[a.Owner.World.LocalPlayer] != Stance.Ally) return;
 
 			if (vis.ContainsKey(a))
 			{
@@ -73,7 +78,7 @@ namespace OpenRA.Traits
 
 			var v = new ActorVisibility
 			{
-				range = a.Info.Traits.Get<OwnedActorInfo>().Sight,
+				range = a.traits.Get<RevealsShroud>().RevealRange,
 				vis = GetVisOrigins(a).ToArray()
 			};
 
@@ -96,6 +101,24 @@ namespace OpenRA.Traits
 
 			Dirty();
 		}
+		
+		public void UpdatePlayerStance(World w, Player player, Stance oldStance, Stance newStance)
+		{
+			if (oldStance == newStance)
+				return;
+			
+			// No longer our ally; remove unit vis
+			if (oldStance == Stance.Ally)
+			{
+				var toRemove = new List<Actor>(vis.Select(a => a.Key).Where(a => a.Owner == player));
+				foreach (var a in toRemove)
+					RemoveActor(a);
+			}
+			// Is now our ally; add unit vis
+			if (newStance == Stance.Ally)
+				foreach (var a in w.Queries.OwnedBy[player])
+					AddActor(a);
+		}
 
 		public static IEnumerable<int2> GetVisOrigins(Actor a)
 		{
@@ -130,7 +153,9 @@ namespace OpenRA.Traits
 
 		public void UpdateActor(Actor a)
 		{
-			if (a.Owner == null || a.Owner != a.Owner.World.LocalPlayer) return;
+			if (a.Owner == null || a.Owner.World.LocalPlayer == null 
+			    || a.Owner.Stances[a.Owner.World.LocalPlayer] != Stance.Ally) return;
+
 			RemoveActor(a); AddActor(a);
 		}
 

OpenRA.Game/Traits/World/SmudgeLayer.cs

@@ -27,14 +27,12 @@ namespace OpenRA.Traits
 	public class SmudgeLayer: IRenderOverlay, ILoadWorldHook
 	{		
 		public SmudgeLayerInfo Info;
-		SpriteRenderer spriteRenderer;
 		TileReference<byte,byte>[,] tiles;
 		Sprite[][] smudgeSprites;
 		World world;
 
 		public SmudgeLayer(SmudgeLayerInfo info)
 		{
-			spriteRenderer = Game.renderer.SpriteRenderer;
 			this.Info = info;
 			smudgeSprites = Info.Types.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray();
 		}
@@ -86,7 +84,7 @@ namespace OpenRA.Traits
 					var t = new int2(x, y);
 					if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(t) || tiles[x,y].type == 0) continue;
 	
-					spriteRenderer.DrawSprite(smudgeSprites[tiles[x,y].type- 1][tiles[x,y].image],
+					Game.Renderer.SpriteRenderer.DrawSprite(smudgeSprites[tiles[x,y].type- 1][tiles[x,y].image],
 						Game.CellSize * t, "terrain");
 				}
 		}

OpenRA.Game/Traits/World/UnitInfluence.cs

@@ -65,6 +65,11 @@ namespace OpenRA.Traits
 			return influence[ a.X, a.Y ];
 		}
 
+		public bool AnyUnitsAt(int2 a)
+		{
+			return /*map.IsInMap(a) && */influence[a.X, a.Y].Count > 0;
+		}
+
 		public void Add( Actor self, IOccupySpace unit )
 		{
 			foreach( var c in unit.OccupiedCells() )
@@ -81,7 +86,7 @@ namespace OpenRA.Traits
 		public void Update(Actor self, IOccupySpace unit)
 		{
 			Remove(self, unit);
-			if (!self.IsDead) Add(self, unit);
+			if (!self.IsDead()) Add(self, unit);
 		}
 	}
 }