fix utility elevation

TODO: Parse the yaml to disable menubar only if running fullscreen, register openra:// urls.

.gitignore

@@ -44,6 +44,9 @@ packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
 temp.c
 temp.o
 temp.s
-
+OpenRA.Launcher.Mac/build/
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 *.config
 *.resources

AUTHORS

@@ -8,3 +8,4 @@ The OpenRA developers are:
 	* Alli Witheford
 	* Joakim Lindberg
 	* Andrew Riedi
+	* Tim Mylemans

CHANGELOG

@@ -0,0 +1,500 @@
+Pending for Next Release (as of 1ee788f0958c641cfdec5f44b63ac5bdbbdda6d1):
+	Engine:
+		Informative drop messages - user is notified of kick vs game has started vs server unavailable
+		Fixed render errors with the build palette on the first game tick
+		Improved sync check performance
+		Shp writing capabilities for mod tools
+		Fixed desync due to floating point calculations in unit facing
+		Fixed idle animations
+		Removed launchers on all platforms
+		Asset download/install is now performed ingame
+		Mod selector is now available from the main menu
+		Fixed `lock teams' checkbox
+		Lots of misc. engine refactoring
+		Fixed exploit allowing stance changes when teams are locked
+		Fix crash when capturing last enemy silo
+		Fix units continuing to attack a building after it has been captured
+		Fix floating point issues with missiles (manifests as broken torpedos in ra)
+		Fix location calculation for flying units (manifests as invincible helicopters in cnc)
+		Infantry stack 5-to-a-cell like the original games
+		Craters and scorches smoke for a limited time
+		
+	C&C:
+		Fixed commando c4
+		Fixed Airfield production notification ("Reinforcements have arrived")
+		Fixed palette bugs with Oil Derricks and walls
+		Fixed tech tree bugs after capturing enemy productions structures
+		"Repairing" eva
+		Proper "pop up" SAM sites. Closed SAMs receive a 50% armor bonus.
+		SAM sites require power to operate
+		Advanced Guard Tower requires power to operate
+		Support structures no longer grant build radius
+		Lower Barracks/Hand health
+		Increase Weapons Factory health
+		Increase rocket bike damage
+	
+	RA:
+		Game assets can be installed from one of the Red Alert cds
+		"Repairing" eva
+		GPS is now shared between allies
+		Submarines are no longer visible to everyone
+		Fixed paradrop flare, spyplane from capturing KOTH points
+		Map: Nuclear Winter (nudalz, ra)
+		Map: Seaside (nudalz, ra)
+		
+	Editor:
+		Ability to switch mods after launch
+		Refactor hardcoded tools into a generic interface
+
+
+20110109
+	Launchers:
+	    New GTK based launcher for linux.
+	    Mod version, version check, and MOTD moved from the main menu into the launchers.
+	    Fixes for non-standard mono installations under OSX.
+	    Fixes for filepaths with spaces under OSX.
+
+	Map Editor / Maps:
+	    Fixed crash when using floodfill.
+	    New map format (version 4). Open and resave maps with the editor to upgrade them.
+	    Added support for compressed (.oramap or .zip) maps.
+	    Removed .uid files from maps -- compute the hash on demand now.
+
+	General:
+	    Mod versions are checked when joining a server. Clients with a different game version / wrong mods will not be able to join.
+	    Added 'Stop' command on 'S'.
+	    Stop units from autotargeting walls.
+	    Added different pip colour for gems vs ore.
+	    Fixed several exploits in support powers.
+	    Continue to show selected units when firing special powers.
+	    Fixed palette effects (nuke, chronoshift) being applied to fog / shroud.
+	    Added a replay viewer.
+	    Fixed building previews being rendered below bridges.
+	    Forced the AI to leave gaps between its buildings.
+	    Fixed captured buildings still drawing power from the original owner.
+	    Fixed various crashes in the editor when trying to make a new map.
+	    Support multiple bot types; added another bot difficulty.
+	    Removed option to not save syncreports.
+	    Fixed desync related to aircraft.
+	    Fixed sync not being checked on World traits.
+	    Pick a random available door on production structures with more than one (barracks, subpens, etc).
+	    Fixed some rare Harvester-related crashes.
+	    Added labels to the perf graph.
+	    Locked teams by default.
+	    Fixed "No games found" not being displayed when there was an in-progress (hidden) game detected.
+	    Added support for multiple shellmaps. Chooses randomly.
+	    Fixed dropdowns possibly getting stuck open when the host force-starts the game.
+	    Improved scrollpanels - added scrollbars and mousewheel support.
+	    Fixed potential desyncs in building refund calculation and unit repair.
+	    Added black outline to text drawn over the world, so it can be seen in all cases.
+	    Many performance improvements.
+
+	C&C:
+	    Fixed footprint of ATWR.
+	    Improved harvester docking.
+	    Made Oil Derricks capturable.
+	    Fixed nuke detonation sound.
+
+	RA:
+	    Fixed Tanya not having the correct pip color.
+	    Fixed helicopters spawning in the wrong place.
+	    Fixed Spy-related crashes when disguising as civilians.
+	    Allow using C4 on friendly buildings.
+	    Improved harvester docking.
+	    Added proper shareable/revokable GPS.
+	    Nerf 1tnk hard.
+	    Increase cost of 2tnk slightly, but increase its HP too.
+	    Require power to operate SAM sites.
+	    Fixed missing tooltips for SHOK and TTNK.
+	    Fixed chronoshift power requiring two clicks to cancel.
+	    Fixed desync related to chronoshift.
+	    Fixed bogus bottom-left spawnpoint on Central Conflict.
+	    Production tabs with an item ready now light up yellow.
+	    Fixed crash when a WEAP is half-destroyed before it finishes deploying.
+
+
+20101202
+	General:
+	    New launcher for Windows and OS X (Linux coming in a later release) for downloading and installing mods, and launching the game.
+	    Disable Surrender button when you win or lose.
+	    Fix Minimap orders outside viewport.
+	    Render building previews when placing a structure.
+	    Buttons offset their contents when pressed.
+	    Dropdown listboxes in the game lobby and diplomacy panel.
+	    Allow moving the cursor and editing anywhere in textfields.
+	    Don't render things outside the map.
+	    Render selection boxes / health bars, target lines above everything else
+	    Show "cannot move here" cursor when mousing over invalid terrain under the fog, or outside the map.
+	    Remove move flashes (they are obsoleted by target lines).
+	    Buildings are always visible under fog.
+	    Captured refineries no longer give cash to the original owner.
+	    New rally point artwork.
+	    Fix broken airstrike / parabomb special powers.
+	    Fix diplomacy cycling shroud exploit.
+	    Change the .rpm package to target Fedora.
+	    Fixed idle animations
+
+	RA:
+	    Added "A Path Beyond" map
+	    Fix crash when selling iron curtained buildings.
+	    Don't stack multiple Invuln render effect on an actor.
+	    Fix exploit in Iron Curtain, Chronosphere, Nuke.
+	    Fix paradrop flare remaining forever if drop plane is killed.
+	    Area of effect Iron Curtain.
+	    Area of effect Chronoshift.
+	    Remove sandbag in water of "Equal Opportunity" map.
+	    Allow chronoshifted and paradropped units to collect crates.
+	    Fixed medic crash.
+	    Removed end of game crash.
+	    Fix dog attack.
+	    Missile silo requires power but can be powered down.
+	    Fix shellmap low power and invalid gap generator position.
+	    Removed Naval Transport until it's cargo capabilities are fixed
+
+	CNC:
+	    Fix exploit in Ion Cannon, Nuke.
+	    Add some basic scripting to the shellmap.
+	    Fix invulnerable stealth tanks.
+	    Oil derricks spurt fire when killed.
+	    New load screen (unfinished).
+	    Fix observers.
+	    Helicopters automatically target enemy units
+
+	Engine:
+	    Refactored Orders to use less network bandwidth and remove duplication.
+	    Dump available extensions to graphics.log when GL Renderer fails to init.
+	    Fix Makefile constantly rebuilding, and refactor for readability.
+	    Display soft shroud around edge of map instead of hard border.
+	    Standardise engine naming of Theatre -> Tileset.
+	    Refactor map size queries to all use Map.Bounds.
+	    Move all widget delegate into the RA mod dll.
+	    Renamed ListBoxWidget -> ScrollPanelWidget.
+	    Fix ScrollPanelWidget scrolling beyond the start by 1 velocity tick.
+	    Removed duplication from target lines.
+	    Extensive refactoring of shroud.
+	    Refactor Scale trait to a property on Render*.
+	    Refactor idle behavior
+
+
+20101121-2
+	Bug fixes:
+	    Fixed Tesla causing an out of memory exception
+	    Fixed Tesla animations.
+	    All players can now see AI players in lobby.
+	    Weapon factory sell animation now plays correctly.
+	    Utility app now extracts downloaded content packages properly.
+	    Fixed helicopters landing in silly places.
+
+	New Features:
+	    New default renderer using GLSL instead of CG. Removes the dependency on the CG toolkit and fixes issues with Radeon graphics cards using latest drivers.
+	    Order queuing with <shift>
+	    Unlimited power option in dev mode.
+	    New King of the Hill game mode with two maps: Crossroads and Island Hoppers
+	    Smoke trails for damaged aircraft.
+
+
+20101107
+    Fix Engineer/Tanya/etc refusing to enter buildings in 2010-11-06.
+
+
+20101106
+	Bug Fixes:
+	    Fix crash when hosting a second game.
+	    Fixed exploit where you could place a building anywhere.
+	    Fix aircraft, infantry becoming invincible in some circumstances.
+	    Fix a common aircraft desync.
+	    Unmuted the shellmap; it's now at 25% volume.
+
+	Balance Changes:
+	    reduce cooldown on Chronosphere to 2 minutes (was 4 minutes)
+	    reduce cooldown on Iron Curtain to 2 minutes (was 6 minutes)
+	    reduce invulnerable time on Iron Curtain the 30 seconds (was 45 seconds)
+	    reduce anti-ground damage of rocket soldier to 50 (was 60) and anti-air damage to 40 (was 50)
+
+
+
+20101025
+    Fix crash in C&C when harvesters return to the refinery (sorry guys)
+    Fix crash in both mods when transports unload
+    Fix ore/tiberium growth not working correctly
+    Fix graphical glitches on screenshake, etc
+    Add contrails to RA planes
+    Added plane crashes in RA
+    Added explosions on impact for all RA aircraft
+    Added more scripting to the RA shellmap
+    Fix Tesla not doing the correct amount of damage
+    Lots of internal cleanup
+
+
+
+20101023
+	New C&C Maps:
+	    Into the River Below (6p)
+	    Algernon (4p)
+	    Wargames (4p)
+	    Yellowstone II (4p)
+
+	Bug Fixes:
+	    Client disconnects no longer "double-quit".
+	    Units can no longer move over certain water tiles.
+	    Checks for destroyed actors to ensure they don't try to perform actions after death.
+	    Loose files in mod folders take priority over ones in .mix packages.
+	    Fixes for syncing in replays.
+	    Fix Iron Curtain.
+	    Fixes for units entering a building from the east or south
+	    MOTD no longer spits out garbage when behind a proxy needing web authentication.
+
+	RA Balance Tweaks:
+	    Airfield cost reduced from 1100 to 300
+	    Yak cost increased from 800 to 1000
+	    Mig cost increased from 1200 to 2000
+	    Helipad cost reduced from 1500 to 300
+	    Longbow cost increased from 1200 to 2000
+	    Hind cost increased from 1200 to 1500
+	    Anti-air gun range increased from 6 to 10, spread increased from 3 to 5
+	    Flack truck range increased from 6 to 8, spread increased from 3 to 5
+
+
+20101017
+    Fix crash when repair indicator was visible, but the building got destroyed or sold
+    Fix crash if an actor got destroyed twice (blown up & sold, etc)
+    Fix putting units back in BADR and C17.
+    Fix C&C crates being invisible
+    Fix bogus overlapping of MINE with ore trucks
+    Add MCV, napalm, nuke crates to C&C.
+    Fix "(dead)" tags in chat
+    Mute shellmap combat
+    Fix FMV player
+    Fix bug in voice system which made it impossible to add extra sides (thanks raminator)
+    Fixed bogus Missile Silo cameo from RA
+    Fixed engineer goldwrench cursors being reversed
+    Add support for actors that give the owner a small flow of cash (to be used with Oil Derricks)
+    Make teamchat toggle more flexible
+    Fix cloakable units being untargetable while uncloaked (thanks pdovy)
+    Fix crash when clicking `repair` with no MCV
+    Fix unit crates spawning in inappropriate places
+    Updated 'The Sentinel' map
+    Add base cycling (backspace) in C&C (it previously worked only in RA)
+    Fix planes getting stuck on the edge of the map
+    Fix explosions in air being drawn at ground level
+    Allow map slots to disallow bots
+    Allow map slots to enforce race/color selection
+    Replace C&C LST art (thanks, KatzSmile)
+    Push HackyAI setup into system.yaml, fix HackyAI for C&C
+    Reduce effectiveness of RA GUN vs unarmored
+    Improved mod content download infrastructure for Linux
+    Nerf C&C Orca slightly
+    Nerf speed of C&C bggy/jeep/bike/apc
+    Add new C&C 1v1 map: 'Chokepoint' (thanks Tiberian)
+    Reduce bandwidth usage in multiplayer (1/2)
+    Fix version string showing up twice in bottom-right corner after a game
+    Buff arty damage slightly
+    Nerf V2 reload slightly
+    Add trails to C&C SAM missiles
+    Increase speed of most C&C AA missiles
+    Reduce power requirement for RA AFLD from 50 to 20
+
+
+20101013
+    Fix crash when ordering a helicopter to move while it was falling out of the sky
+    Add blue tiberium
+    Fix aircraft not showing up on radar
+    Fix canceling of production not quite working (would cancel 2 if one was half-built)
+    Fix base-cycling for mac
+    Fix leaks between shellmap world and ingame world
+    Fix crash when the network connection is lost
+    Run the shellmap behind the lobby
+    Fix host not being able to teamchat
+    Declaring war automatically breaks the alliance in both directions
+    Aircraft can attack from their airfields correctly now
+    Attack move added ('A' and then left-click)
+    Add Tiberian's 'The Sentinel' 1v1 C&C map
+    Show the server name in the lobby dialog title
+    Random actually means random
+    Fix crash when destroying a Refinery with docked harvester
+    Add pchote's 'Tundra' 1v1 C&C SNOW! map
+    Lots of internal engine improvements
+
+
+20101009
+    Fix 64bit Linux compatibility
+    Nerf C&C Attack Bike
+    Show mod info in server browser
+    Show MOTD in the main menu
+    Fixed exploit with selling walls
+    Fixed auto-attack not working properly
+    Add an example mod, which adds a single unit to RA.
+    Fix dogs eating walls
+    Fix crash on destroying ore storage buildings
+    Fix Obelisk missing moving target
+    Ban cloak crates for infantry
+    Add nuke "bad" crate
+    Prevent aircraft from firing while landed
+    Reduce nuke charge time from 13min to 9min
+    Reduce parabombs charge time to 1min
+    Add support for minimum ranges on weapons
+    Add support for excluding specific actor types from picking up certain crates
+    FIx silent nukes in RA if they didn't hit a building
+    Fix all AI players getting the same color
+    Fix AI players getting the same team setting as the host
+    Fix AI attacking each other
+    Prevent most awful-looking colors
+    Remove most of the debug spam for aircraft
+    Increase construction yard health (50% in RA, 25% in CNC)
+    AI players now build defenses
+    AI players no longer attack with medics (e1/e2/e3/1tnk/2tnk/3tnk)
+    Much improved order targeting system
+    Add crash animations for helicopters
+    Nerf Hind chainguns
+    Reduce cost of Cruisers from 3.2k to 2.4k
+    Fix CNC airdrop planes getting stuck if the Airfield goes away
+    Fix phantom voices for dead units in control groups
+    Fix dogs sometimes not killing infantry
+    Fix scroll jumping if opposite scroll inputs were applied
+    Fix bogus targeting lines being drawn to 0,0 sometimes
+    Fix VS2010 compatibility
+    Fix the game getting screwed up when people leave
+
+
+20101002
+    Fix various crashes
+    Fix CNC AI never building anything (it's still crap, but at least it does *something*)
+    Added shader fallbacks for Cg-2.1
+    Fix editor crashing on File->Open on Windows
+    Added scroll speed control (thanks, Gecko)
+
+
+20100922 through 20100922-4
+    Allow queueing of buildings when a building is ready to place
+    Change the pathfinder to use integers instead of floating point (fixes desync)
+    Create ui widgets on demand instead of at gamestart
+    Begin refactoring activity queuing for cleaner code
+    Reenable crates
+    Remove desync debug logging
+    Fix editor crash
+    Fix crash when a building being repaired is killed
+
+
+
+20100921 through 20100921-6
+    Add yet more logging to search for the packaged build desync
+
+
+20100920 through 20100920-7
+    Fix crash when building cnc weapons factory
+    Fix crash when harvester and refinery are killed by the same bullet (eg nuke)
+    Move several traits from engine into ra mod
+    Fix several editor bugs
+    Add a lot more logging to search for the packaged build desync
+
+
+20100919-2
+    Fix crash when un/deploying a damaged mcv
+
+
+20100919
+    Cache the power state of buildings for large performance gains
+    Changes to sync logging for large performance gains
+    Changes to shroud and ore rendering for large performace gains
+    Changes to renderer to fix several z-order bugs
+    Fix osx version string
+    Rename Repeat -> Loop in the music player
+    Fix team selection in the game lobby
+    Don't change production tab when selecting enemy structures
+
+
+20100918-2 through 20100918-4
+    Fix crashes in the map editor
+    Include menu and desktop shortcuts to the RPM package
+    Add debugging to track down a desync between packaged versions on .net vs packaged versions on mono
+
+
+20100918
+    Fixed lots of crashes
+    AI only tries to attack players that exist (and not itself)
+    Fixed speed of idle animations
+    Fixed exploit with A10 (infinite napalm)
+    Fixed exploits with remote building capturing/destroying
+    Added ability to change tilesize per-mod
+    Fixed delivering ore to an ally's proc
+    Fixed dog attacking ground forever (banned)
+    Fixed most z-order bugs
+    Fixed lots of editor usability problems
+    Fixed bogus XML generated by TSB
+    Added notification when cheats are used
+    Fixed exploit with reverse enter-transport order (didn't check if the passenger was compatible)
+    Fixed a bunch of techtree bugs
+    Fixed walkability of north rivermouth template in RA.
+    Added ability to export minimap as PNG from the editor
+
+
+20100914
+    Infantry idle sequences for ra mod
+    Enable music player by default (requires scores.mix to be installed manually)
+    Flak truck for soviets in ra mod
+    Give dog a selection voice
+    Only scroll when the game window is focused
+    Fixed cursor/order bugs (includes force-fire c4 on allied structures, harvesting ore under shroud, move orders for aircraft, etc)
+    Fixed a collection of crashes related to dead actors
+    Fixed broken rpm package
+    Create Debian packages
+
+
+20100910-2
+    Fixed attacking helipads
+    Deployed more mirrors
+    Added idle animations in C&C
+    Fixed an issue with the sidebar palette in C&C Desert
+    Integrated Jk's C&C Snow theater
+    Go back to classic C&C refinery model
+    Improve building explosions
+    Add nuke flash to C&C
+    Fix crash when losing FACT with a building ready to place
+    Remove unused MIX files
+    Add support for custom armor types
+    Adjust bounding boxes on vehicles
+    Windows installer prompts to install .NET if you don't have it
+    Windows installer remembers previous location for upgrades
+    Fix various crashes when refineries going away
+    Fix serious performace issue -- Actor leak when failing to spawn units
+    Add support for mobile production units
+    Remove splash damage from Tiberium
+    Fix a crash with actors dying with a projectile in-flight
+    Correctly clean up cargo when a transport dies
+    Fix client crash when the server disconnects
+    Right-clicking on a valid passenger with a transport loads cargo
+    Added zoom to editor
+    Convert sequences to yaml
+    Clean up the mod folders
+    Add a shellmap for C&C
+    Make pathfinder work with a MobileInfo rather than a live actor
+    Add a loadscreen for C&C
+    Correctly back up MIX files when upgrading windows installs
+
+
+20100907
+    Changed MiG prerequisites to AFLD+STEK
+    Removed KENN, build DOG directly from BARR now
+    Chronotank can only teleport when fully charged
+    Improved OpenGL error logging
+    Fixed targeting of FIX
+    Fixed crash when an engineer is trying to repair a building, but it dies/gets sold/etc.
+    Added muzzle flashes to Yak and Hind chainguns
+    Fixed bounding boxes on some units
+    Fixed accuracy of Tesla weapons
+    Changed ownership of GUN and GTWR in CNC to both
+    Fixed crash on destroying things that have a building reserved
+    If ordered to move to an unpathable cell, move somewhere nearby that is pathable instead
+    Fixed RPM linux package
+
+
+20100906-2
+    Shows game version in main menu screen for windows and linux
+
+
+20100906
+    Improvements to Render performance
+    Improved debugging for performance issues
+    "Give Exploration" developer-mode option
+    Check for .net framework on windows install
+    Allow the viewport to scroll past the map edge to prevent ui from blocking buildings

HACKING

@@ -68,7 +68,7 @@ to flush the renderer (if you want to see anything).
 UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be 
 able to save values changed in game into settings.ini (not yet implemented)
 
-Bugs: There is a list of known bugs and features at http://red-bull.ijw.co.nz:3690/OpenRA .
+Bugs: There is a list of known bugs and features at http://bugs.open-ra.org/ .
 
 We also have a website at http://www.open-ra.org/ . 
 
@@ -76,7 +76,7 @@ Our IRC channel is #openra on irc.freenode.net .
 
 As far as using git, get your own repository on github. You probably want to set up the gitbot
 to spam irc when you make commits (its nice to know). Push your changes into your git 
-repository, and it will/might :P be merged into chrisforbes/OpenRA . 
+repository, and it will/might :P be merged into http://github.com/OpenRA/OpenRA . 
 See http://help.github.com/ for working with GitHub and see http://progit.org/ for working 
 with Git.
 

INSTALL

@@ -37,7 +37,11 @@ These need to be copied into the mods/cnc/packages/ directory.
 If you have a case-sensitive filesystem you must change the filenames to
 lower case.
 
+The files can be downloaded from:
+http://open-ra.org/get-dependency.php?file=ra-packages for the Red Alert files and
+http://open-ra.org/get-dependency.php?file=cnc-packages for the Command & Conquer files.
 
+Alternatively:
 Red Alert and C&C have been released by EA Games as freeware. They can be
 downloaded from http://www.commandandconquer.com/classic
 Unfortunately the installer is 16-bit and so won’t run on 64-bit operating
@@ -55,8 +59,7 @@ WINDOWS:
 * .NET Framework >= 3.5-SP1
 	(http://www.microsoft.com/downloads/details.aspx?FamilyID=AB99342F-5D1A-413D-8319-81DA479AB0D7&displaylang=en)
 * Tao Framework >= 2.1.0
-	(http://sourceforge.net/projects/taoframework/)
-	(required libs: Tao.OpenGL, Tao.Cg, Tao.Platform.Windows)
+	This is now bundled with OpenRA, copy the files in thirdparty/Tao to the game root directory.
 * OpenAL >= 1.1
 	(http://connect.creativelabs.com/openal/Downloads/oalinst.zip)
 * Cg Toolkit >= 2.2
@@ -83,8 +86,8 @@ UBUNTU (substitute comparable packages for other linux distros):
 OpenRA is incompatible with Compiz, please disable desktop effects when trying
 to run OpenRA or the game will crash.
 
-You will need to copy the Tao dependencies (.dll and .config) from the
-thirdparty/Tao directory into the game root, or install them permanently into
+You will need to copy the third party dependencies (.dll and .config) from the
+thirdparty and thirdparty/Tao directories into the game root, or install them permanently into
 your GAC with the following script
 
 #!/bin/sh
@@ -93,6 +96,7 @@ gacutil -i thirdparty/Tao/Tao.OpenGl.dll
 gacutil -i thirdparty/Tao/Tao.OpenAl.dll
 gacutil -i thirdparty/Tao/Tao.Sdl.dll
 gacutil -i thirdparty/Tao/Tao.FreeType.dll
+gacutil -i thirdparty/ICSharpCode.SharpZipLib.dll
 
 To compile OpenRA, run `make' from the command line.
 Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert

Makefile

@@ -1,7 +1,191 @@
-CSC     = gmcs
-CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
-DEFINE  = DEBUG;TRACE
-PROGRAMS	=fileformats gl game ra cnc seqed editor ralint filex tsbuild utility
+CSC         = gmcs
+CSFLAGS     = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
+DEFINE      = DEBUG;TRACE
+COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll
+PHONY		= core tools package all mods clean distclean
+
+.SUFFIXES:
+core: game renderers mod_ra mod_cnc
+tools: editor ralint seqed filex tsbuild utility
+package: fixheader core editor utility
+mods: mod_ra mod_cnc
+all: core tools
+clean: 
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+distclean: clean
+
+#
+# Core binaries
+#
+fileformats_SRCS	= $(shell find OpenRA.FileFormats/ -iname '*.cs')
+fileformats_TARGET	= OpenRA.FileFormats.dll
+#fileformats_DEPS	= fixheader
+fileformats_KIND	= library
+fileformats_LIBS	= $(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll System.Windows.Forms.dll
+PROGRAMS 			= fileformats
+fileformats: $(fileformats_TARGET)
+
+game_SRCS			= $(shell find OpenRA.Game/ -iname '*.cs')
+game_TARGET			= OpenRA.Game.exe
+game_KIND			= winexe
+game_DEPS			= $(fileformats_TARGET) 
+game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
+						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
+game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
+PROGRAMS 			+= game
+game: $(game_TARGET)
+
+#
+# Renderer dlls
+#
+rcg_SRCS			= $(shell find OpenRA.Renderer.Cg/ -iname '*.cs')
+rcg_TARGET			= OpenRA.Renderer.Cg.dll
+rcg_KIND			= library
+rcg_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rcg_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+					$(rcg_DEPS) $(game_TARGET)
+
+rgl_SRCS			= $(shell find OpenRA.Renderer.Gl/ -iname '*.cs')
+rgl_TARGET			= OpenRA.Renderer.Gl.dll
+rgl_KIND			= library
+rgl_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rgl_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+					$(rgl_DEPS) $(game_TARGET)
+
+rnull_SRCS			= $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
+rnull_TARGET		= OpenRA.Renderer.Null.dll
+rnull_KIND			= library
+rnull_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rnull_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+					$(rnull_DEPS) $(game_TARGET)
+PROGRAMS 			+= rcg rgl rnull
+renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET)
+
+#
+# Official Mods
+#
+# Red Alert
+mod_ra_SRCS			= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
+mod_ra_TARGET		= mods/ra/OpenRA.Mods.RA.dll
+mod_ra_KIND			= library
+mod_ra_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+mod_ra_LIBS			= $(COMMON_LIBS) $(mod_ra_DEPS)
+PROGRAMS 			+= mod_ra
+mod_ra: $(mod_ra_TARGET)
+#	mono RALint.exe ra
+
+# Command and Conquer
+mod_cnc_SRCS		= $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
+mod_cnc_TARGET		= mods/cnc/OpenRA.Mods.Cnc.dll
+mod_cnc_KIND		= library
+mod_cnc_DEPS		= $(fileformats_TARGET) $(game_TARGET) $(mod_ra_TARGET)
+mod_cnc_LIBS		= $(COMMON_LIBS) $(mod_cnc_DEPS)
+PROGRAMS 			+= mod_cnc
+mod_cnc: $(mod_cnc_TARGET)
+#	mono RALint.exe cnc
+
+#
+# Tools
+#
+# Sequence editor (defunct)
+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
+PROGRAMS 			+= seqed
+SequenceEditor.Form1.resources:
+	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
+seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
+
+# Map Editor
+editor_SRCS			= $(shell find OpenRA.Editor/ -iname '*.cs')
+editor_TARGET		= OpenRA.Editor.exe
+editor_KIND			= winexe
+editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
+editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
+PROGRAMS 			+= editor
+OpenRA.Editor.MapSelect.resources:
+	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
+OpenRA.Editor.Form1.resources:
+	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
+editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
+
+# Analyses mod yaml for easy to detect errors
+ralint_SRCS			= $(shell find RALint/ -iname '*.cs')
+ralint_TARGET		= RALint.exe
+ralint_KIND			= exe
+ralint_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+ralint_LIBS			= $(COMMON_LIBS) $(ralint_DEPS)
+PROGRAMS 			+= ralint
+ralint: $(ralint_TARGET)
+
+# Extracts files from packages (mixfiles, zips, etc)
+filex_SRCS			= $(shell find FileExtractor/ -iname '*.cs')
+filex_TARGET		= FileExtractor.exe
+filex_KIND			= exe
+filex_DEPS			= $(fileformats_TARGET)
+filex_LIBS			= $(COMMON_LIBS) $(filex_DEPS)
+PROGRAMS 			+= filex
+filex: $(filex_TARGET)
+
+# Builds and exports tilesets from a bitmap
+tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_TARGET		= TilesetBuilder.exe
+tsbuild_KIND		= winexe
+tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
+tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
+PROGRAMS 			+= tsbuild
+OpenRA.TilesetBuilder.Form1.resources:
+	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
+tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
+
+#
+# Launchers / Utilities
+#
+# Patches binary headers to work around a mono bug
+fixheader: packaging/fixheader.cs
+	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
+PHONY += fixheader
+
+# Backend for the launcher apps - queries game/mod info and applies actions to an install
+utility_SRCS		= $(shell find OpenRA.Utility/ -iname '*.cs')
+utility_TARGET		= OpenRA.Utility.exe
+utility_KIND		= exe
+utility_DEPS        = $(fileformats_TARGET) $(game_TARGET)
+utility_LIBS        = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll System.Windows.Forms.dll
+PROGRAMS 			+= utility
+utility: $(utility_TARGET)
+
+.PHONY: $(PHONY) $(PROGRAMS)
+
+#
+# Generate build rules for each target defined above in PROGRAMS
+#
+define BUILD_ASSEMBLY
+
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
+	@echo CSC $$(@)
+	@$(CSC) $$($(1)_LIBS:%=-r:%) \
+		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
+		-define:"$(DEFINE)" \
+		-t:"$$($(1)_KIND)" \
+		$$($(1)_EXTRA) \
+		$$($(1)_SRCS)
+	@test -e fixheader.exe && mono fixheader.exe $$(@) || ``
+endef
+
+$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
+
+
+#
+# Install / Uninstall for *nix
+#
 prefix = /usr/local
 datarootdir = $(prefix)/share
 datadir = $(datarootdir)
@@ -10,103 +194,15 @@ BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
 INSTALL_DIR = $(DESTDIR)$(datadir)/openra
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
-
-COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
-
-fileformats_SRCS	=	$(shell find OpenRA.FileFormats/ -iname '*.cs')
-fileformats_TARGET	=	OpenRA.FileFormats.dll
-fileformats_KIND	=	library
-fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll thirdparty/WindowsBase.dll
-
-gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
-gl_TARGET			= OpenRA.Gl.dll
-gl_KIND				= library
-gl_DEPS				= $(fileformats_TARGET) $(game_TARGET)
-gl_LIBS				= $(COMMON_LIBS) System.Windows.Forms.dll \
-						thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-						$(gl_DEPS) $(game_TARGET)
-
-game_SRCS			=	$(shell find OpenRA.Game/ -iname '*.cs')
-game_TARGET			= OpenRA.Game.exe
-game_KIND			= winexe
-game_DEPS			= $(fileformats_TARGET) 
-game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
-						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
-game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
-
-ra_SRCS				=	$(shell find OpenRA.Mods.RA/ -iname '*.cs')
-ra_TARGET			=	mods/ra/OpenRA.Mods.RA.dll
-ra_KIND				=	library
-ra_DEPS				= $(fileformats_TARGET) $(game_TARGET)
-ra_LIBS				= $(COMMON_LIBS) $(ra_DEPS)
-
-cnc_SRCS			=	$(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-cnc_TARGET			=	mods/cnc/OpenRA.Mods.Cnc.dll
-cnc_KIND			=	library
-cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
-cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)
-
-seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
-seqed_TARGET		= SequenceEditor.exe
-seqed_KIND			= winexe
-seqed_DEPS			= $(fileformats_TARGET)
-seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
-seqed_EXTRA			= -resource:SequenceEditor.Form1.resources
-
-editor_SRCS			= $(shell find OpenRA.Editor/ -iname '*.cs')
-editor_TARGET		= OpenRA.Editor.exe
-editor_KIND			= winexe
-editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
-editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
-
-ralint_SRCS		= $(shell find RALint/ -iname '*.cs')
-ralint_TARGET	= RALint.exe
-ralint_KIND		= exe
-ralint_DEPS		= $(fileformats_TARGET) $(game_TARGET)
-ralint_LIBS		= $(COMMON_LIBS) $(ralint_DEPS)
-
-filex_SRCS		= $(shell find FileExtractor/ -iname '*.cs')
-filex_TARGET	= FileExtractor.exe
-filex_KIND		= exe
-filex_DEPS		= $(fileformats_TARGET)
-filex_LIBS		= $(COMMON_LIBS) $(filex_DEPS)
-
-tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET		= TilesetBuilder.exe
-tsbuild_KIND		= winexe
-tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
-tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
-tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
-
-utility_SRCS		= $(shell find OpenRA.Utility/ -iname '*.cs')
-utility_TARGET		= OpenRA.Utility.exe
-utility_KIND		= exe
-utility_DEPS        = $(fileformats_TARGET) thirdparty/ICSharpCode.SharpZipLib.dll
-utility_LIBS        = $(COMMON_LIBS) $(utility_DEPS)
-
-
-# -platform:x86
-
-.SUFFIXES:
-.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex utility
-
-game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(utility_TARGET)
-
-clean: 
-	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
-
-distclean: clean
-
-CORE = fileformats gl game editor utility
+CORE = fileformats rcg rgl rnull game editor utility
 
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
-		
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
-	@$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc
+	@$(INSTALL_PROGRAM) $(mod_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
@@ -115,9 +211,9 @@ install: all
 	@cp -r mods/cnc/sequences $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/tilesets $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/uibits $(INSTALL_DIR)/mods/cnc
-	
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
-	@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(INSTALL_DIR)/mods/ra
+
 	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/bits $(INSTALL_DIR)/mods/ra
@@ -125,70 +221,20 @@ install: all
 	@cp -r mods/ra/rules $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/tilesets $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/uibits $(INSTALL_DIR)/mods/ra
-	
-	@cp -r shaders $(INSTALL_DIR)
+
+	@cp -r glsl $(INSTALL_DIR)
+	@cp -r cg $(INSTALL_DIR)
 	@cp *.ttf $(INSTALL_DIR)
 	@cp --parents -r thirdparty/Tao $(INSTALL_DIR)
-	@$(INSTALL_PROGRAM) thirdparty/WindowsBase.dll $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
-	@-$(INSTALL_PROGRAM) VERSION $(INSTALL_DIR)
-	
+
 	@echo "#!/bin/sh" > openra
 	@echo "cd "$(datadir)"/openra" >> openra
 	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=~/.openra \"$$""@\"" >> openra
+
 	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
-		
-	@echo "OpenRA is now installed. You will now want to download"
-	@echo "http://open-ra.org/get-dependency.php?file=ra-packages and"
-	@echo "http://open-ra.org/get-dependency.php?file=cnc-packages"
-	@echo "and extract their contents to"
-	@echo "$(INSTALL_DIR)/mods/ra/packages and "
-	@echo "$(INSTALL_DIR)/mods/cnc/packages respectively."
-	@echo "It is also advised to install the contents of $(INSTALL_DIR)/thirdparty to the Mono Global Assembly Cache \
-	with gacutil."
 
 uninstall:
 	@-rm -r $(INSTALL_DIR)
 	@-rm $(DESTDIR)$(bindir)/openra
-
-mod_ra: $(ra_TARGET) $(ralint_TARGET)
-	mono RALint.exe ra
-mod_cnc: $(cnc_TARGET) $(ralint_TARGET)
-	mono RALint.exe cnc
-mods: mod_ra mod_cnc
-
-OpenRA.Editor.MapSelect.resources:
-	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
-
-OpenRA.Editor.Form1.resources:
-	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
-editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
-ralint: $(ralint_TARGET)
-seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
-SequenceEditor.Form1.resources:
-	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
-filex: $(filex_TARGET)
-tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
-OpenRA.TilesetBuilder.Form1.resources:
-	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
-tools: editor ralint seqed filex tsbuild
-all: game tools
-
-fixheader: packaging/fixheader.cs
-	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
-
-define BUILD_ASSEMBLY
-
-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader
-	@echo CSC $$(@)
-	@$(CSC) $$($(1)_LIBS:%=-r:%) \
-		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
-		-define:"$(DEFINE)" \
-		-t:"$$($(1)_KIND)" \
-		$$($(1)_EXTRA) \
-		$$($(1)_SRCS)
-	@mono fixheader.exe $$(@)
-endef
-
-$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))

OpenRA.Editor/ActorTemplate.cs

@@ -18,7 +18,7 @@ namespace OpenRA.Editor
 	{
 		public Bitmap Bitmap;
 		public ActorInfo Info;
-		public bool Centered;
+		public EditorAppearanceInfo Appearance;
 	}
 
 	class BrushTemplate

OpenRA.Editor/ActorTool.cs

@@ -0,0 +1,55 @@
+#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 SGraphics = System.Drawing.Graphics;
+
+namespace OpenRA.Editor
+{
+	class ActorTool : ITool
+	{
+		ActorTemplate Actor;
+		public ActorTool(ActorTemplate actor) { this.Actor = actor; }
+
+		public void Preview(Surface surface, SGraphics g)
+		{
+			/* todo: include the player 
+				* in the brush so we can color new buildings too */
+
+			surface.DrawActor(g, surface.GetBrushLocation(), Actor, null);
+		}
+
+		public void Apply(Surface surface)
+		{
+			if (surface.Map.Actors.Any(a => a.Value.Location() == surface.GetBrushLocation()))
+				return;
+
+			var owner = "Neutral";
+			var id = NextActorName(surface);
+			surface.Map.Actors[id] = new ActorReference(Actor.Info.Name.ToLowerInvariant())
+			{
+				new LocationInit( surface.GetBrushLocation() ),
+				new OwnerInit( owner)
+			};
+		}
+
+		string NextActorName(Surface surface)
+		{
+			var id = 0;
+			for (; ; )
+			{
+				var possible = "Actor{0}".F(id++);
+				if (!surface.Map.Actors.ContainsKey(possible)) return possible;
+			}
+		}
+	}
+}

OpenRA.Editor/BrushTool.cs

@@ -0,0 +1,124 @@
+#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.Windows.Forms;
+using OpenRA.FileFormats;
+
+using SGraphics = System.Drawing.Graphics;
+
+namespace OpenRA.Editor
+{
+	class BrushTool : ITool
+	{
+		BrushTemplate Brush;
+
+		public BrushTool(BrushTemplate brush) { this.Brush = brush; }
+
+		public void Apply(Surface surface)
+		{
+			// change the bits in the map
+			var tile = surface.TileSet.Tiles[Brush.N];
+			var template = surface.TileSet.Templates[Brush.N];
+			var pos = surface.GetBrushLocation();
+
+			if (surface.GetModifiers() == Keys.Shift)
+			{
+				FloodFillWithBrush(surface, pos);
+				return;
+			}
+
+			for (var u = 0; u < template.Size.X; u++)
+				for (var v = 0; v < template.Size.Y; v++)
+				{
+					if (surface.Map.IsInMap(new int2(u, v) + pos))
+					{
+						var z = u + v * template.Size.X;
+						if (tile.TileBitmapBytes[z] != null)
+							surface.Map.MapTiles[u + pos.X, v + pos.Y] =
+								new TileReference<ushort, byte>
+								{
+									type = Brush.N,
+									index = template.PickAny ? byte.MaxValue : (byte)z,
+									image = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z,
+								};
+
+						var ch = new int2((pos.X + u) / Surface.ChunkSize, (pos.Y + v) / Surface.ChunkSize);
+						if (surface.Chunks.ContainsKey(ch))
+						{
+							surface.Chunks[ch].Dispose();
+							surface.Chunks.Remove(ch);
+						}
+					}
+				}
+		}
+
+		public void Preview(Surface surface, SGraphics g)
+		{
+			g.DrawImage(Brush.Bitmap,
+					surface.TileSet.TileSize * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X,
+					surface.TileSet.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
+					Brush.Bitmap.Width * surface.Zoom,
+					Brush.Bitmap.Height * surface.Zoom);
+		}
+
+		void FloodFillWithBrush(Surface s, int2 pos)
+		{
+			var queue = new Queue<int2>();
+			var replace = s.Map.MapTiles[pos.X, pos.Y];
+			var touched = new bool[s.Map.MapSize.X, s.Map.MapSize.Y];
+
+			Action<int, int> MaybeEnqueue = (x, y) =>
+			{
+				if (s.Map.IsInMap(x, y) && !touched[x, y])
+				{
+					queue.Enqueue(new int2(x, y));
+					touched[x, y] = true;
+				}
+			};
+
+			queue.Enqueue(pos);
+			while (queue.Count > 0)
+			{
+				var p = queue.Dequeue();
+				if (!s.Map.MapTiles[p.X, p.Y].Equals(replace))
+					continue;
+
+				var a = FindEdge(s, p, new int2(-1, 0), replace);
+				var b = FindEdge(s, p, new int2(1, 0), replace);
+
+				for (var x = a.X; x <= b.X; x++)
+				{
+					s.Map.MapTiles[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, image = (byte)0, index = (byte)0 };
+					if (s.Map.MapTiles[x, p.Y - 1].Equals(replace))
+						MaybeEnqueue(x, p.Y - 1);
+					if (s.Map.MapTiles[x, p.Y + 1].Equals(replace))
+						MaybeEnqueue(x, p.Y + 1);
+				}
+			}
+
+			/* todo: optimize */
+			foreach (var ch in s.Chunks.Values) ch.Dispose();
+			s.Chunks.Clear();
+		}
+
+		int2 FindEdge(Surface s, int2 p, int2 d, TileReference<ushort, byte> replace)
+		{
+			for (; ; )
+			{
+				var q = p + d;
+				if (!s.Map.IsInMap(q)) return p;
+				if (!s.Map.MapTiles[q.X, q.Y].Equals(replace)) return p;
+				p = q;
+			}
+		}
+	}
+}

OpenRA.Editor/Form1.Designer.cs

@@ -40,6 +40,10 @@
 			this.actorPalette = new System.Windows.Forms.FlowLayoutPanel();
 			this.tabPage3 = new System.Windows.Forms.TabPage();
 			this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.surface1 = new OpenRA.Editor.Surface();
+			this.tt = new System.Windows.Forms.ToolTip(this.components);
+			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+			this.splitContainer3 = new System.Windows.Forms.SplitContainer();
 			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
 			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -54,7 +58,7 @@
 			this.mnuExport = new System.Windows.Forms.ToolStripMenuItem();
 			this.mnuMinimapToPNG = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-			this.exotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.exitToolStripMenuItem = 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();
@@ -62,10 +66,11 @@
 			this.spawnpointsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.layersFloaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.tt = new System.Windows.Forms.ToolTip(this.components);
-			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
-			this.splitContainer3 = new System.Windows.Forms.SplitContainer();
-			this.surface1 = new OpenRA.Editor.Surface();
+			this.toolStripComboBox1 = new System.Windows.Forms.ToolStripComboBox();
+			this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+			this.toolStripStatusLabelFiller = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusLabelMousePosition = new System.Windows.Forms.ToolStripStatusLabel();
 			this.splitContainer1.Panel1.SuspendLayout();
 			this.splitContainer1.Panel2.SuspendLayout();
 			this.splitContainer1.SuspendLayout();
@@ -77,10 +82,11 @@
 			this.tabPage1.SuspendLayout();
 			this.tabPage2.SuspendLayout();
 			this.tabPage3.SuspendLayout();
-			this.menuStrip1.SuspendLayout();
 			this.splitContainer3.Panel1.SuspendLayout();
 			this.splitContainer3.Panel2.SuspendLayout();
 			this.splitContainer3.SuspendLayout();
+			this.menuStrip1.SuspendLayout();
+			this.statusStrip1.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// splitContainer1
@@ -115,7 +121,7 @@
 			// 
 			this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
 			this.splitContainer2.Size = new System.Drawing.Size(198, 744);
-			this.splitContainer2.SplitterDistance = 182;
+			this.splitContainer2.SplitterDistance = 164;
 			this.splitContainer2.TabIndex = 1;
 			// 
 			// pmMiniMap
@@ -125,7 +131,7 @@
 			this.pmMiniMap.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.pmMiniMap.Location = new System.Drawing.Point(0, 0);
 			this.pmMiniMap.Name = "pmMiniMap";
-			this.pmMiniMap.Size = new System.Drawing.Size(198, 182);
+			this.pmMiniMap.Size = new System.Drawing.Size(198, 164);
 			this.pmMiniMap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 			this.pmMiniMap.TabIndex = 1;
 			this.pmMiniMap.TabStop = false;
@@ -142,7 +148,7 @@
 			this.tabControl1.Name = "tabControl1";
 			this.tabControl1.Padding = new System.Drawing.Point(6, 0);
 			this.tabControl1.SelectedIndex = 0;
-			this.tabControl1.Size = new System.Drawing.Size(198, 558);
+			this.tabControl1.Size = new System.Drawing.Size(198, 576);
 			this.tabControl1.TabIndex = 0;
 			// 
 			// tabPage1
@@ -151,7 +157,7 @@
 			this.tabPage1.Location = new System.Drawing.Point(4, 20);
 			this.tabPage1.Name = "tabPage1";
 			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-			this.tabPage1.Size = new System.Drawing.Size(190, 534);
+			this.tabPage1.Size = new System.Drawing.Size(190, 552);
 			this.tabPage1.TabIndex = 0;
 			this.tabPage1.Text = "Templates";
 			this.tabPage1.UseVisualStyleBackColor = true;
@@ -163,7 +169,7 @@
 			this.tilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tilePalette.Location = new System.Drawing.Point(3, 3);
 			this.tilePalette.Name = "tilePalette";
-			this.tilePalette.Size = new System.Drawing.Size(184, 528);
+			this.tilePalette.Size = new System.Drawing.Size(184, 546);
 			this.tilePalette.TabIndex = 1;
 			// 
 			// tabPage2
@@ -172,7 +178,7 @@
 			this.tabPage2.Location = new System.Drawing.Point(4, 20);
 			this.tabPage2.Name = "tabPage2";
 			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-			this.tabPage2.Size = new System.Drawing.Size(190, 534);
+			this.tabPage2.Size = new System.Drawing.Size(190, 552);
 			this.tabPage2.TabIndex = 1;
 			this.tabPage2.Text = "Actors";
 			this.tabPage2.UseVisualStyleBackColor = true;
@@ -184,7 +190,7 @@
 			this.actorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.actorPalette.Location = new System.Drawing.Point(3, 3);
 			this.actorPalette.Name = "actorPalette";
-			this.actorPalette.Size = new System.Drawing.Size(184, 528);
+			this.actorPalette.Size = new System.Drawing.Size(184, 546);
 			this.actorPalette.TabIndex = 2;
 			// 
 			// tabPage3
@@ -192,7 +198,7 @@
 			this.tabPage3.Controls.Add(this.resourcePalette);
 			this.tabPage3.Location = new System.Drawing.Point(4, 20);
 			this.tabPage3.Name = "tabPage3";
-			this.tabPage3.Size = new System.Drawing.Size(190, 534);
+			this.tabPage3.Size = new System.Drawing.Size(190, 552);
 			this.tabPage3.TabIndex = 2;
 			this.tabPage3.Text = "Resources";
 			this.tabPage3.UseVisualStyleBackColor = true;
@@ -204,18 +210,60 @@
 			this.resourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.resourcePalette.Location = new System.Drawing.Point(0, 0);
 			this.resourcePalette.Name = "resourcePalette";
-			this.resourcePalette.Size = new System.Drawing.Size(190, 534);
+			this.resourcePalette.Size = new System.Drawing.Size(190, 552);
 			this.resourcePalette.TabIndex = 3;
 			// 
+			// surface1
+			// 
+			this.surface1.BackColor = System.Drawing.Color.Black;
+			this.surface1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.surface1.Location = new System.Drawing.Point(0, 0);
+			this.surface1.Name = "surface1";
+			this.surface1.Size = new System.Drawing.Size(783, 744);
+			this.surface1.TabIndex = 5;
+			this.surface1.Text = "surface1";
+			// 
+			// tt
+			// 
+			this.tt.ShowAlways = true;
+			// 
+			// saveFileDialog
+			// 
+			this.saveFileDialog.DefaultExt = "*.png";
+			this.saveFileDialog.Filter = "PNG Image (*.png)|";
+			this.saveFileDialog.Title = "Export minimap to PNG";
+			// 
+			// splitContainer3
+			// 
+			this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+			this.splitContainer3.IsSplitterFixed = true;
+			this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer3.Name = "splitContainer3";
+			this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+			// 
+			// splitContainer3.Panel1
+			// 
+			this.splitContainer3.Panel1.Controls.Add(this.menuStrip1);
+			// 
+			// splitContainer3.Panel2
+			// 
+			this.splitContainer3.Panel2.Controls.Add(this.splitContainer1);
+			this.splitContainer3.Size = new System.Drawing.Size(985, 773);
+			this.splitContainer3.SplitterDistance = 25;
+			this.splitContainer3.TabIndex = 6;
+			// 
 			// menuStrip1
 			// 
 			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.mapToolStripMenuItem,
-            this.toolsToolStripMenuItem});
+            this.toolsToolStripMenuItem,
+            this.toolStripComboBox1,
+            this.toolStripLabel1});
 			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
 			this.menuStrip1.Name = "menuStrip1";
-			this.menuStrip1.Size = new System.Drawing.Size(985, 24);
+			this.menuStrip1.Size = new System.Drawing.Size(985, 27);
 			this.menuStrip1.TabIndex = 1;
 			this.menuStrip1.Text = "menuStrip1";
 			// 
@@ -231,9 +279,9 @@
             this.toolStripMenuItem1,
             this.mnuExport,
             this.toolStripSeparator3,
-            this.exotToolStripMenuItem});
+            this.exitToolStripMenuItem});
 			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-			this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+			this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 23);
 			this.fileToolStripMenuItem.Text = "&File";
 			// 
 			// newToolStripMenuItem
@@ -260,6 +308,7 @@
 			// 
 			// saveToolStripMenuItem
 			// 
+			this.saveToolStripMenuItem.Enabled = false;
 			this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
 			this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
 			this.saveToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
@@ -268,6 +317,7 @@
 			// 
 			// saveAsToolStripMenuItem
 			// 
+			this.saveAsToolStripMenuItem.Enabled = false;
 			this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
 			this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.saveAsToolStripMenuItem.Text = "Save &As...";
@@ -313,23 +363,24 @@
 			// 
 			// mnuMinimapToPNG
 			// 
+			this.mnuMinimapToPNG.Enabled = false;
 			this.mnuMinimapToPNG.Image = ((System.Drawing.Image)(resources.GetObject("mnuMinimapToPNG.Image")));
 			this.mnuMinimapToPNG.Name = "mnuMinimapToPNG";
 			this.mnuMinimapToPNG.Size = new System.Drawing.Size(163, 22);
 			this.mnuMinimapToPNG.Text = "Minimap to PNG";
-			this.mnuMinimapToPNG.Click += new System.EventHandler(this.mnuMinimapToPNG_Click);
+			this.mnuMinimapToPNG.Click += new System.EventHandler(this.ExportMinimap);
 			// 
 			// toolStripSeparator3
 			// 
 			this.toolStripSeparator3.Name = "toolStripSeparator3";
 			this.toolStripSeparator3.Size = new System.Drawing.Size(120, 6);
 			// 
-			// exotToolStripMenuItem
+			// exitToolStripMenuItem
 			// 
-			this.exotToolStripMenuItem.Name = "exotToolStripMenuItem";
-			this.exotToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
-			this.exotToolStripMenuItem.Text = "E&xit";
-			this.exotToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked);
+			this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
+			this.exitToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+			this.exitToolStripMenuItem.Text = "E&xit";
+			this.exitToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked);
 			// 
 			// mapToolStripMenuItem
 			// 
@@ -339,11 +390,12 @@
             this.toolStripSeparator4,
             this.spawnpointsToolStripMenuItem});
 			this.mapToolStripMenuItem.Name = "mapToolStripMenuItem";
-			this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+			this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 23);
 			this.mapToolStripMenuItem.Text = "&Map";
 			// 
 			// propertiesToolStripMenuItem
 			// 
+			this.propertiesToolStripMenuItem.Enabled = false;
 			this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image")));
 			this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
 			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
@@ -352,6 +404,7 @@
 			// 
 			// resizeToolStripMenuItem
 			// 
+			this.resizeToolStripMenuItem.Enabled = false;
 			this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image")));
 			this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem";
 			this.resizeToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
@@ -365,6 +418,7 @@
 			// 
 			// spawnpointsToolStripMenuItem
 			// 
+			this.spawnpointsToolStripMenuItem.Enabled = false;
 			this.spawnpointsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("spawnpointsToolStripMenuItem.Image")));
 			this.spawnpointsToolStripMenuItem.Name = "spawnpointsToolStripMenuItem";
 			this.spawnpointsToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
@@ -376,7 +430,7 @@
 			this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.layersFloaterToolStripMenuItem});
 			this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-			this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+			this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 23);
 			this.toolsToolStripMenuItem.Text = "Tools";
 			this.toolsToolStripMenuItem.Visible = false;
 			// 
@@ -387,51 +441,50 @@
 			this.layersFloaterToolStripMenuItem.Text = "Layers floater";
 			this.layersFloaterToolStripMenuItem.Click += new System.EventHandler(this.layersFloaterToolStripMenuItem_Click);
 			// 
-			// tt
+			// toolStripComboBox1
 			// 
-			this.tt.ShowAlways = true;
+			this.toolStripComboBox1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.toolStripComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.toolStripComboBox1.Name = "toolStripComboBox1";
+			this.toolStripComboBox1.Size = new System.Drawing.Size(121, 23);
 			// 
-			// saveFileDialog
+			// toolStripLabel1
 			// 
-			this.saveFileDialog.DefaultExt = "*.png";
-			this.saveFileDialog.Filter = "PNG Image (*.png)|";
-			this.saveFileDialog.Title = "Export minimap to PNG";
+			this.toolStripLabel1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.toolStripLabel1.Name = "toolStripLabel1";
+			this.toolStripLabel1.Size = new System.Drawing.Size(71, 20);
+			this.toolStripLabel1.Text = "Active Mod:";
 			// 
-			// splitContainer3
+			// statusStrip1
 			// 
-			this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-			this.splitContainer3.IsSplitterFixed = true;
-			this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-			this.splitContainer3.Name = "splitContainer3";
-			this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelFiller,
+            this.toolStripStatusLabelMousePosition});
+			this.statusStrip1.Location = new System.Drawing.Point(0, 751);
+			this.statusStrip1.Name = "statusStrip1";
+			this.statusStrip1.Size = new System.Drawing.Size(985, 22);
+			this.statusStrip1.TabIndex = 7;
+			this.statusStrip1.Text = "statusStrip1";
 			// 
-			// splitContainer3.Panel1
+			// toolStripStatusLabelFiller
 			// 
-			this.splitContainer3.Panel1.Controls.Add(this.menuStrip1);
+			this.toolStripStatusLabelFiller.Name = "toolStripStatusLabelFiller";
+			this.toolStripStatusLabelFiller.Size = new System.Drawing.Size(948, 17);
+			this.toolStripStatusLabelFiller.Spring = true;
 			// 
-			// splitContainer3.Panel2
+			// toolStripStatusLabelMousePosition
 			// 
-			this.splitContainer3.Panel2.Controls.Add(this.splitContainer1);
-			this.splitContainer3.Size = new System.Drawing.Size(985, 773);
-			this.splitContainer3.SplitterDistance = 25;
-			this.splitContainer3.TabIndex = 6;
-			// 
-			// surface1
-			// 
-			this.surface1.BackColor = System.Drawing.Color.Black;
-			this.surface1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.surface1.Location = new System.Drawing.Point(0, 0);
-			this.surface1.Name = "surface1";
-			this.surface1.Size = new System.Drawing.Size(783, 744);
-			this.surface1.TabIndex = 5;
-			this.surface1.Text = "surface1";
+			this.toolStripStatusLabelMousePosition.Name = "toolStripStatusLabelMousePosition";
+			this.toolStripStatusLabelMousePosition.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+			this.toolStripStatusLabelMousePosition.Size = new System.Drawing.Size(22, 17);
+			this.toolStripStatusLabelMousePosition.Text = "0,0";
 			// 
 			// Form1
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(985, 773);
+			this.Controls.Add(this.statusStrip1);
 			this.Controls.Add(this.splitContainer3);
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.KeyPreview = true;
@@ -439,9 +492,9 @@
 			this.Name = "Form1";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
 			this.Text = "OpenRA Editor";
-			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp);
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing);
 			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);
+			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp);
 			this.splitContainer1.Panel1.ResumeLayout(false);
 			this.splitContainer1.Panel2.ResumeLayout(false);
 			this.splitContainer1.ResumeLayout(false);
@@ -453,13 +506,16 @@
 			this.tabPage1.ResumeLayout(false);
 			this.tabPage2.ResumeLayout(false);
 			this.tabPage3.ResumeLayout(false);
-			this.menuStrip1.ResumeLayout(false);
-			this.menuStrip1.PerformLayout();
 			this.splitContainer3.Panel1.ResumeLayout(false);
 			this.splitContainer3.Panel1.PerformLayout();
 			this.splitContainer3.Panel2.ResumeLayout(false);
 			this.splitContainer3.ResumeLayout(false);
+			this.menuStrip1.ResumeLayout(false);
+			this.menuStrip1.PerformLayout();
+			this.statusStrip1.ResumeLayout(false);
+			this.statusStrip1.PerformLayout();
 			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
@@ -475,32 +531,37 @@
 		private System.Windows.Forms.TabPage tabPage3;
         private System.Windows.Forms.FlowLayoutPanel resourcePalette;
 		private Surface surface1;
+        private System.Windows.Forms.PictureBox pmMiniMap;
+		private System.Windows.Forms.SplitContainer splitContainer2;
+		private System.Windows.Forms.SaveFileDialog saveFileDialog;
+		private System.Windows.Forms.SplitContainer splitContainer3;
+		private System.Windows.Forms.StatusStrip statusStrip1;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelMousePosition;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelFiller;
 		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 openToolStripMenuItem;
 		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.ToolStripMenuItem mnuExport;
+		private System.Windows.Forms.ToolStripMenuItem mnuMinimapToPNG;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+		private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem mapToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem resizeToolStripMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
 		private System.Windows.Forms.ToolStripMenuItem spawnpointsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem layersFloaterToolStripMenuItem;
-        private System.Windows.Forms.PictureBox pmMiniMap;
-        private System.Windows.Forms.SplitContainer splitContainer2;
-        private System.Windows.Forms.ToolStripMenuItem mnuExport;
-        private System.Windows.Forms.ToolStripMenuItem mnuMinimapToPNG;
-		private System.Windows.Forms.SaveFileDialog saveFileDialog;
-		private System.Windows.Forms.SplitContainer splitContainer3;
+		private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem layersFloaterToolStripMenuItem;
+		private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+		private System.Windows.Forms.ToolStripComboBox toolStripComboBox1;
 
 	}
 }

OpenRA.Editor/Form1.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -29,13 +28,34 @@ namespace OpenRA.Editor
 
 			currentMod = mods.FirstOrDefault() ?? "ra";
 
-			Text = "OpenRA Editor (mod:{0})".F(currentMod);
-
-			Game.modData = new ModData(currentMod);
-
-			Rules.LoadRules(Game.modData.Manifest, new Map());
-
+			toolStripComboBox1.Items.AddRange(Mod.AllMods.Keys.ToArray());
+			
+			toolStripComboBox1.SelectedIndexChanged += (_, e) => 
+			{
+				tilePalette.SuspendLayout();
+				actorPalette.SuspendLayout();
+				resourcePalette.SuspendLayout();
+				tilePalette.Controls.Clear();
+				actorPalette.Controls.Clear();
+				resourcePalette.Controls.Clear();
+				tilePalette.ResumeLayout();
+				actorPalette.ResumeLayout();
+				resourcePalette.ResumeLayout();
+				surface1.Bind(null, null, null);
+				pmMiniMap.Image = null;
+				currentMod = toolStripComboBox1.SelectedItem as string;
+				
+				Text = "OpenRA Editor (mod:{0})".F(currentMod);
+				Game.modData = new ModData(currentMod);
+				FileSystem.LoadFromManifest(Game.modData.Manifest);
+				Rules.LoadRules(Game.modData.Manifest, new Map());
+				loadedMapName = null;
+			};
+			
+			toolStripComboBox1.SelectedItem = currentMod;
+			
 			surface1.AfterChange += OnMapChanged;
+			surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
 		}
 
 		void OnMapChanged()
@@ -58,10 +78,8 @@ namespace OpenRA.Editor
 
 			loadedMapName = mapname;
 
-			Game.modData = new ModData(currentMod);
-
 			// load the map
-			var map = new Map(new Folder(mapname));
+			var map = new Map(mapname);
 
 			// upgrade maps that have no player definitions. editor doesnt care,
 			// but this breaks the game pretty badly.
@@ -81,9 +99,6 @@ namespace OpenRA.Editor
 			resourcePalette.Controls.Clear();
 
 			loadedMapName = null;
-
-			Game.modData = new ModData(currentMod);
-
 			PrepareMapResources(Game.modData.Manifest, map);
 
 			MakeDirty();
@@ -93,7 +108,7 @@ namespace OpenRA.Editor
 		void PrepareMapResources(Manifest manifest, Map map)
 		{
 			Rules.LoadRules(manifest, map);
-			tileset = Rules.TileSets[map.Theater];
+			tileset = Rules.TileSets[map.Tileset];
 			tileset.LoadTiles();
 			var palette = new Palette(FileSystem.Open(tileset.Palette), true);
 
@@ -116,7 +131,7 @@ namespace OpenRA.Editor
 					};
 
 					var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
-					ibox.Click += (_, e) => surface1.SetBrush(brushTemplate);
+					ibox.Click += (_, e) => surface1.SetTool(new BrushTool(brushTemplate));
 
 					var template = t.Value;
 					tilePalette.Controls.Add(ibox);
@@ -149,7 +164,7 @@ namespace OpenRA.Editor
 					};
 
 
-					ibox.Click += (_, e) => surface1.SetActor(template);
+					ibox.Click += (_, e) => surface1.SetTool(new ActorTool(template));
 
 					actorPalette.Controls.Add(ibox);
 
@@ -182,7 +197,7 @@ namespace OpenRA.Editor
 
 
 
-					ibox.Click += (_, e) => surface1.SetResource(template);
+					ibox.Click += (_, e) => surface1.SetTool(new ResourceTool(template));
 
 					resourcePalette.Controls.Add(ibox);
 
@@ -203,7 +218,15 @@ namespace OpenRA.Editor
 				p.Visible = true;
 				p.ResumeLayout();
 			}
+
 			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
+
+			propertiesToolStripMenuItem.Enabled = true;
+			resizeToolStripMenuItem.Enabled = true;
+			spawnpointsToolStripMenuItem.Enabled = true;
+			saveToolStripMenuItem.Enabled = true;
+			saveAsToolStripMenuItem.Enabled = true;
+			mnuMinimapToPNG.Enabled = true;	// todo: what is this VB naming bullshit doing here?
 		}
 
 		void ResizeClicked(object sender, EventArgs e)
@@ -212,16 +235,18 @@ namespace OpenRA.Editor
 			{
 				rd.width.Value = surface1.Map.MapSize.X;
 				rd.height.Value = surface1.Map.MapSize.Y;
-				rd.cordonLeft.Value = surface1.Map.TopLeft.X;
-				rd.cordonTop.Value = surface1.Map.TopLeft.Y;
-				rd.cordonRight.Value = surface1.Map.BottomRight.X;
-				rd.cordonBottom.Value = surface1.Map.BottomRight.Y;
+				rd.cordonLeft.Value = surface1.Map.Bounds.Left;
+				rd.cordonTop.Value = surface1.Map.Bounds.Top;
+				rd.cordonRight.Value = surface1.Map.Bounds.Right;
+				rd.cordonBottom.Value = surface1.Map.Bounds.Bottom;
 
 				if (DialogResult.OK != rd.ShowDialog())
 					return;
 
-				surface1.Map.TopLeft = new int2((int)rd.cordonLeft.Value, (int)rd.cordonTop.Value);
-				surface1.Map.BottomRight = new int2((int)rd.cordonRight.Value, (int)rd.cordonBottom.Value);
+				surface1.Map.ResizeCordon((int)rd.cordonLeft.Value,
+									   (int)rd.cordonTop.Value,
+									   (int)rd.cordonRight.Value,
+									   (int)rd.cordonBottom.Value);
 
 				if ((int)rd.width.Value != surface1.Map.MapSize.X || (int)rd.height.Value != surface1.Map.MapSize.Y)
 				{
@@ -248,11 +273,8 @@ namespace OpenRA.Editor
 
 		void SaveAsClicked(object sender, EventArgs e)
 		{
-			using (var nms = new MapSelect())
+			using (var nms = new MapSelect(currentMod))
 			{
-				nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
-				.Aggregate(Path.Combine);
-
 				nms.txtNew.ReadOnly = false;
 				nms.btnOk.Text = "Save";
 				nms.txtNew.Text = "unnamed";
@@ -263,18 +285,8 @@ namespace OpenRA.Editor
 					if (nms.txtNew.Text == "")
 						nms.txtNew.Text = "unnamed";
 
-					string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
-					loadedMapName = mapfoldername;
-
-					try
-					{
-						Directory.CreateDirectory(mapfoldername);
-					}
-					catch (Exception ed)
-					{
-						MessageBox.Show("Directory creation failed: {0}", ed.ToString());
-					}
-
+					// TODO: Allow the user to choose map format (directory vs oramap)
+					loadedMapName = Path.Combine(nms.MapFolderPath, nms.txtNew.Text + ".oramap");
 					SaveClicked(sender, e);
 				}
 			}
@@ -282,20 +294,14 @@ namespace OpenRA.Editor
 
 		void OpenClicked(object sender, EventArgs e)
 		{
-			using (var nms = new MapSelect())
+			using (var nms = new MapSelect(currentMod))
 			{
-				nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
-				.Aggregate(Path.Combine);
-
 				nms.txtNew.ReadOnly = true;
 				nms.txtPathOut.ReadOnly = true;
 				nms.btnOk.Text = "Open";
 
 				if (DialogResult.OK == nms.ShowDialog())
-				{
-					string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
-					LoadMap(mapfoldername);
-				}
+					LoadMap(nms.txtNew.Tag as string);
 			}
 		}
 
@@ -309,12 +315,11 @@ namespace OpenRA.Editor
 
 				if (DialogResult.OK == nmd.ShowDialog())
 				{
-					var map = new Map(nmd.theater.SelectedItem as string);
+					var map = Map.FromTileset(nmd.theater.SelectedItem as string);
 
 					map.Resize((int)nmd.width.Value, (int)nmd.height.Value);
-
-					map.TopLeft = new int2((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value);
-					map.BottomRight = new int2((int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
+					map.ResizeCordon((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value,
+						(int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
 					map.Players.Add("Neutral", new PlayerReference("Neutral", Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
 					NewMap(map);
 				}
@@ -329,6 +334,7 @@ namespace OpenRA.Editor
 				pd.desc.Text = surface1.Map.Description;
 				pd.author.Text = surface1.Map.Author;
 				pd.selectable.Checked = surface1.Map.Selectable;
+				pd.useAsShellmap.Checked = surface1.Map.UseAsShellmap;
 
 				if (DialogResult.OK != pd.ShowDialog())
 					return;
@@ -337,10 +343,11 @@ namespace OpenRA.Editor
 				surface1.Map.Description = pd.desc.Text;
 				surface1.Map.Author = pd.author.Text;
 				surface1.Map.Selectable = pd.selectable.Checked;
+				surface1.Map.UseAsShellmap = pd.useAsShellmap.Checked;
 			}
 		}
 
-		void SpawnPointsClicked(object sender, EventArgs e) { surface1.SetWaypoint(new WaypointTemplate()); }
+		void SpawnPointsClicked(object sender, EventArgs e) { surface1.SetTool(new WaypointTool(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; }
 
@@ -355,7 +362,7 @@ namespace OpenRA.Editor
 			using (var ofd = new OpenFileDialog { Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
 				if (DialogResult.OK == ofd.ShowDialog())
 				{
-					Directory.SetCurrentDirectory( currentDirectory );
+					Directory.SetCurrentDirectory(currentDirectory);
 					/* massive hack: we should be able to call NewMap() with the imported Map object,
 					 * but something's not right internally in it, unless loaded via the real maploader */
 
@@ -394,31 +401,13 @@ namespace OpenRA.Editor
 			pb.Show();
 		}
 
-        private void mnuMinimapToPNG_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                saveFileDialog.InitialDirectory = new string[] { Environment.CurrentDirectory, "maps" }
-.Aggregate(Path.Combine);
-            
-            FileInfo file = new FileInfo(loadedMapName + ".png");
-            string name = file.Name;
-            saveFileDialog.FileName = name;
+		void ExportMinimap(object sender, EventArgs e)
+		{
+			saveFileDialog.InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps");
+			saveFileDialog.FileName = Path.ChangeExtension(loadedMapName, ".png");
 
-            saveFileDialog.ShowDialog();
-            if (saveFileDialog.FileName == "")
-            {
-                saveFileDialog.FileName = name;
-            }
-            else
-            {
-                Bitmap png = new Bitmap(pmMiniMap.Image);
-
-                png.Save(saveFileDialog.FileName, System.Drawing.Imaging.ImageFormat.Png); 
-            }
-            
-            }
-            catch { }
-        }
+			if (DialogResult.OK == saveFileDialog.ShowDialog())
+				pmMiniMap.Image.Save(saveFileDialog.FileName);
+		}
 	}
 }

OpenRA.Editor/Form1.resx

@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>76, 17</value>
+  </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>198, 17</value>
   </metadata>
@@ -305,11 +311,8 @@
         vP+uv56/AehVvkSccelEAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>76, 17</value>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>313, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>45</value>

OpenRA.Editor/ITool.cs

@@ -8,10 +8,13 @@
  */
 #endregion
 
-namespace OpenRA.Traits.Activities
+using SGraphics = System.Drawing.Graphics;
+
+namespace OpenRA.Editor
 {
-	public class Idle : CancelableActivity
+	interface ITool
 	{
-		public override IActivity Tick(Actor self) { return NextActivity; }
+		void Apply(Surface surface);
+		void Preview(Surface surface, SGraphics g);
 	}
 }

OpenRA.Editor/LegacyMapImporter.cs

@@ -10,14 +10,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
-using OpenRA;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using System.Drawing;
-using System.Globalization;
 
 namespace OpenRA.Editor
 {
@@ -83,6 +82,7 @@ namespace OpenRA.Editor
 //			{"scrate","crate"},
 		};
 		
+		// todo: fix this -- will have bitrotted pretty badly.
 		static Dictionary<string,Pair<Color,Color>> namedColorMapping = new Dictionary<string, Pair<Color, Color>>()
 		{
 			{"gold",Pair.New(Color.FromArgb(246,214,121),Color.FromArgb(40,32,8))},
@@ -408,7 +408,7 @@ namespace OpenRA.Editor
 				};
 				
 				if (section == "INFANTRY")
-					actor.Add(new SubcellInit(int.Parse(parts[4])));
+					actor.Add(new SubCellInit(int.Parse(parts[4])));
 				
 				Map.Actors.Add("Actor" + ActorCount++,actor);
 					

OpenRA.Editor/MapSelect.Designer.cs

@@ -256,7 +256,7 @@
 			this.lblTheater.Name = "lblTheater";
 			this.lblTheater.Size = new System.Drawing.Size(47, 13);
 			this.lblTheater.TabIndex = 11;
-			this.lblTheater.Text = "Theater:";
+			this.lblTheater.Text = "Tileset:";
 			// 
 			// txtAuthor
 			// 

OpenRA.Editor/MapSelect.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
+using System.Linq;
 
 namespace OpenRA.Editor
 {
@@ -10,21 +11,25 @@ namespace OpenRA.Editor
     {
         public string MapFolderPath;
 
-        public MapSelect()
+        public MapSelect(string currentMod)
         {
-            InitializeComponent();
+            MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+				.Aggregate(Path.Combine);
+			
+			InitializeComponent();
 			MapIconsList.Images.Add(pictureBox1.Image);
         }
 
         void MapSelect_Load(object sender, EventArgs e)
         {
-            DirectoryInfo directory = new DirectoryInfo(MapFolderPath);
-            DirectoryInfo[] directories = directory.GetDirectories();
             MapList.Items.Clear();
             txtPathOut.Text = MapFolderPath;
-            foreach (DirectoryInfo subDirectory in directories)
+			
+            foreach (var map in ModData.FindMapsIn(MapFolderPath))
             {
-                ListViewItem map1 = new ListViewItem(subDirectory.Name);
+                ListViewItem map1 = new ListViewItem();
+				map1.Tag = map;
+				map1.Text = Path.GetFileNameWithoutExtension(map);
                 map1.ImageIndex = 0;
                 MapList.Items.Add(map1);
             }
@@ -39,12 +44,15 @@ namespace OpenRA.Editor
             if (MapList.SelectedItems.Count == 1)
             {
                 txtNew.Text = MapList.SelectedItems[0].Text;
-                var map = new Map(new Folder(Path.Combine(MapFolderPath, MapList.SelectedItems[0].Text)));
+				txtNew.Tag = MapList.SelectedItems[0].Tag;
+
+				var map = new Map(txtNew.Tag as string);
                 txtTitle.Text = map.Title;
                 txtAuthor.Text = map.Author;
-                txtTheater.Text = map.Theater;
+                txtTheater.Text = map.Tileset;
                 txtDesc.Text = map.Description;
 				pbMinimap.Image = null;
+				
                 try
                 {
 					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -221,7 +221,7 @@
 			this.label4.Name = "label4";
 			this.label4.Size = new System.Drawing.Size(44, 13);
 			this.label4.TabIndex = 14;
-			this.label4.Text = "Theater";
+			this.label4.Text = "Tileset";
 			// 
 			// theater
 			// 

OpenRA.Editor/OpenRA.Editor.csproj

@@ -13,8 +13,6 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
-    <StartupObject>
-    </StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,12 +54,15 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ActorTemplate.cs" />
+    <Compile Include="ActorTool.cs" />
+    <Compile Include="BrushTool.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="ITool.cs" />
     <Compile Include="LegacyMapImporter.cs" />
     <Compile Include="MapSelect.cs">
       <SubType>Form</SubType>
@@ -132,9 +133,11 @@
     <Compile Include="ResizeDialog.Designer.cs">
       <DependentUpon>ResizeDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="ResourceTool.cs" />
     <Compile Include="Surface.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="WaypointTool.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Editor/Program.cs

@@ -11,6 +11,8 @@
 using System;
 using System.Globalization;
 using System.Windows.Forms;
+using System.Linq;
+using System.IO;
 
 namespace OpenRA.Editor
 {
@@ -19,11 +21,32 @@ namespace OpenRA.Editor
 		[STAThread]
 		static void Main( string[] args )
 		{
+			if (args.Length >= 2 && args[0] == "--convert")
+			{
+				Game.modData = new ModData(args[1]);
+				Rules.LoadRules(Game.modData.Manifest, new Map());
+				UpgradeMaps(args[1]);
+				return;
+			}
+			
 			Application.CurrentCulture = CultureInfo.InvariantCulture;
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
 
 			Application.Run(new Form1(args));
 		}
+		
+		static void UpgradeMaps(string mod)
+		{
+			var MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", mod, "maps" }
+				.Aggregate(Path.Combine);
+			
+			foreach (var path in ModData.FindMapsIn(MapFolderPath))
+            {
+                var map = new Map(path);
+				map.Save(path+".oramap");
+            }
+		}
+		
 	}
 }

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -28,119 +28,131 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.title = new System.Windows.Forms.TextBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.desc = new System.Windows.Forms.TextBox();
-			this.selectable = new System.Windows.Forms.CheckBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.author = new System.Windows.Forms.TextBox();
-			this.SuspendLayout();
-			// 
-			// button2
-			// 
-			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(196, 193);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 14;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			// 
-			// button1
-			// 
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(277, 193);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 15;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 50);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 16;
-			this.label1.Text = "Title";
-			// 
-			// title
-			// 
-			this.title.Location = new System.Drawing.Point(66, 47);
-			this.title.Name = "title";
-			this.title.Size = new System.Drawing.Size(286, 20);
-			this.title.TabIndex = 17;
-			// 
-			// label2
-			// 
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(12, 76);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(32, 13);
-			this.label2.TabIndex = 16;
-			this.label2.Text = "Desc";
-			// 
-			// desc
-			// 
-			this.desc.Location = new System.Drawing.Point(66, 73);
-			this.desc.Name = "desc";
-			this.desc.Size = new System.Drawing.Size(286, 20);
-			this.desc.TabIndex = 17;
-			// 
-			// selectable
-			// 
-			this.selectable.AutoSize = true;
-			this.selectable.Location = new System.Drawing.Point(118, 138);
-			this.selectable.Name = "selectable";
-			this.selectable.Size = new System.Drawing.Size(130, 17);
-			this.selectable.TabIndex = 18;
-			this.selectable.Text = "Show in Map Chooser";
-			this.selectable.UseVisualStyleBackColor = true;
-			// 
-			// label3
-			// 
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(12, 102);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(38, 13);
-			this.label3.TabIndex = 16;
-			this.label3.Text = "Author";
-			// 
-			// author
-			// 
-			this.author.Location = new System.Drawing.Point(66, 99);
-			this.author.Name = "author";
-			this.author.Size = new System.Drawing.Size(286, 20);
-			this.author.TabIndex = 17;
-			// 
-			// PropertiesDialog
-			// 
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(370, 228);
-			this.Controls.Add(this.selectable);
-			this.Controls.Add(this.author);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.desc);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.title);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "PropertiesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "PropertiesDialog";
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.button2 = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.title = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.desc = new System.Windows.Forms.TextBox();
+            this.selectable = new System.Windows.Forms.CheckBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.author = new System.Windows.Forms.TextBox();
+            this.useAsShellmap = new System.Windows.Forms.CheckBox();
+            this.SuspendLayout();
+            // 
+            // button2
+            // 
+            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.button2.Location = new System.Drawing.Point(196, 193);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 23);
+            this.button2.TabIndex = 14;
+            this.button2.Text = "OK";
+            this.button2.UseVisualStyleBackColor = true;
+            // 
+            // button1
+            // 
+            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.button1.Location = new System.Drawing.Point(277, 193);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 15;
+            this.button1.Text = "Cancel";
+            this.button1.UseVisualStyleBackColor = true;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 50);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(27, 13);
+            this.label1.TabIndex = 16;
+            this.label1.Text = "Title";
+            // 
+            // title
+            // 
+            this.title.Location = new System.Drawing.Point(66, 47);
+            this.title.Name = "title";
+            this.title.Size = new System.Drawing.Size(286, 20);
+            this.title.TabIndex = 17;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 76);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(32, 13);
+            this.label2.TabIndex = 16;
+            this.label2.Text = "Desc";
+            // 
+            // desc
+            // 
+            this.desc.Location = new System.Drawing.Point(66, 73);
+            this.desc.Name = "desc";
+            this.desc.Size = new System.Drawing.Size(286, 20);
+            this.desc.TabIndex = 17;
+            // 
+            // selectable
+            // 
+            this.selectable.AutoSize = true;
+            this.selectable.Location = new System.Drawing.Point(118, 138);
+            this.selectable.Name = "selectable";
+            this.selectable.Size = new System.Drawing.Size(130, 17);
+            this.selectable.TabIndex = 18;
+            this.selectable.Text = "Show in Map Chooser";
+            this.selectable.UseVisualStyleBackColor = true;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(12, 102);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(38, 13);
+            this.label3.TabIndex = 16;
+            this.label3.Text = "Author";
+            // 
+            // author
+            // 
+            this.author.Location = new System.Drawing.Point(66, 99);
+            this.author.Name = "author";
+            this.author.Size = new System.Drawing.Size(286, 20);
+            this.author.TabIndex = 17;
+            // 
+            // checkBox1
+            // 
+            this.useAsShellmap.AutoSize = true;
+            this.useAsShellmap.Location = new System.Drawing.Point(118, 161);
+            this.useAsShellmap.Name = "checkBox1";
+            this.useAsShellmap.Size = new System.Drawing.Size(105, 17);
+            this.useAsShellmap.TabIndex = 18;
+            this.useAsShellmap.Text = "Use as Shellmap";
+            this.useAsShellmap.UseVisualStyleBackColor = true;
+            // 
+            // PropertiesDialog
+            // 
+            this.AcceptButton = this.button2;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.button1;
+            this.ClientSize = new System.Drawing.Size(370, 228);
+            this.Controls.Add(this.useAsShellmap);
+            this.Controls.Add(this.selectable);
+            this.Controls.Add(this.author);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.desc);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.title);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.button2);
+            this.Controls.Add(this.button1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Name = "PropertiesDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "PropertiesDialog";
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -155,5 +167,6 @@
 		public System.Windows.Forms.CheckBox selectable;
 		private System.Windows.Forms.Label label3;
 		public System.Windows.Forms.TextBox author;
+        public System.Windows.Forms.CheckBox useAsShellmap;
 	}
 }

OpenRA.Editor/RenderUtils.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using OpenRA.FileFormats;
@@ -17,19 +18,34 @@ namespace OpenRA.Editor
 {
 	static class RenderUtils
 	{
+		public static ColorPalette MakeSystemPalette(Palette p)
+		{
+			ColorPalette pal;
+			using (var b = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
+				pal = b.Palette;
+			
+			for (var i = 0; i < 256; i++)
+				pal.Entries[i] = p.GetColor(i);
+			return pal;
+		}
+
 		public static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
 		{
 			var template = ts.Templates[n];
 			var tile = ts.Tiles[n];
 
-			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y);
+			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y,
+				PixelFormat.Format8bppIndexed);
+
+			bitmap.Palette = MakeSystemPalette(p);
+
 			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
 			unsafe
 			{
-				int* q = (int*)data.Scan0.ToPointer();
-				var stride = data.Stride >> 2;
+				byte* q = (byte*)data.Scan0.ToPointer();
+				var stride = data.Stride;
 
 				for (var u = 0; u < template.Size.X; u++)
 					for (var v = 0; v < template.Size.Y; v++)
@@ -38,13 +54,13 @@ namespace OpenRA.Editor
 							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
 							for (var i = 0; i < ts.TileSize; i++)
 								for (var j = 0; j < ts.TileSize; j++)
-									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = p.GetColor(rawImage[i + ts.TileSize * j]).ToArgb();
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = rawImage[i + ts.TileSize * j];
 						}
 						else
 						{
 							for (var i = 0; i < ts.TileSize; i++)
 								for (var j = 0; j < ts.TileSize; j++)
-									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = Color.Transparent.ToArgb();
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = 0;
 						}
 			}
 
@@ -56,18 +72,21 @@ namespace OpenRA.Editor
 		{
 			var frame = shp[0];
 
-			var bitmap = new Bitmap(shp.Width, shp.Height);
+			var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
+
+			bitmap.Palette = MakeSystemPalette(p);
+
 			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
 			unsafe
 			{
-				int* q = (int*)data.Scan0.ToPointer();
-				var stride2 = data.Stride >> 2;
+				byte* q = (byte*)data.Scan0.ToPointer();
+				var stride2 = data.Stride;
 
 				for (var i = 0; i < shp.Width; i++)
 					for (var j = 0; j < shp.Height; j++)
-						q[j * stride2 + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+						q[j * stride2 + i] = frame.Image[i + shp.Width * j];
 			}
 
 			bitmap.UnlockBits(data);
@@ -77,14 +96,9 @@ namespace OpenRA.Editor
 		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
 		{
 			var ri = info.Traits.Get<RenderSimpleInfo>();
-			string image = null;
-			if (ri.OverrideTheater != null)
-				for (int i = 0; i < ri.OverrideTheater.Length; i++)
-					if (ri.OverrideTheater[i] == tileset.Id)
-						image = ri.OverrideImage[i];
-
-			image = image ?? ri.Image ?? info.Name;
-			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+            var image = RenderSimple.GetImage(info, tileset.Id);
+			
+            using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
 			{
 				var shp = new ShpReader(s);
 				var bitmap = RenderShp(shp, p);
@@ -102,7 +116,12 @@ namespace OpenRA.Editor
 				}
 				catch { }
 
-				return new ActorTemplate { Bitmap = bitmap, Info = info, Centered = !info.Traits.Contains<BuildingInfo>() };
+				return new ActorTemplate
+				{
+					Bitmap = bitmap,
+					Info = info,
+					Appearance = info.Traits.GetOrDefault<EditorAppearanceInfo>()
+				};
 			}
 		}
 
@@ -114,18 +133,19 @@ namespace OpenRA.Editor
 				var shp = new ShpReader(s);
 				var frame = shp[shp.ImageCount - 1];
 
-				var bitmap = new Bitmap(shp.Width, shp.Height);
+				var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
+				bitmap.Palette = MakeSystemPalette(p);
 				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
 				unsafe
 				{
-					int* q = (int*)data.Scan0.ToPointer();
-					var stride = data.Stride >> 2;
+					byte* q = (byte*)data.Scan0.ToPointer();
+					var stride = data.Stride;
 
 					for (var i = 0; i < shp.Width; i++)
 						for (var j = 0; j < shp.Height; j++)
-							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+							q[j * stride + i] = frame.Image[i + shp.Width * j];
 				}
 
 				bitmap.UnlockBits(data);

OpenRA.Editor/ResourceTool.cs

@@ -0,0 +1,51 @@
+#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 SGraphics = System.Drawing.Graphics;
+
+namespace OpenRA.Editor
+{
+	class ResourceTool : ITool
+	{
+		ResourceTemplate Resource;
+
+		public ResourceTool(ResourceTemplate resource) { Resource = resource; }
+
+		public void Apply(Surface surface)
+		{
+			surface.Map.MapResources[surface.GetBrushLocation().X, surface.GetBrushLocation().Y]
+				= new TileReference<byte, byte>
+				{
+					type = (byte)Resource.Info.ResourceType,
+					index = (byte)random.Next(Resource.Info.SpriteNames.Length),
+					image = (byte)Resource.Value
+				};
+
+			var ch = new int2((surface.GetBrushLocation().X) / Surface.ChunkSize, 
+				(surface.GetBrushLocation().Y) / Surface.ChunkSize);
+
+			if (surface.Chunks.ContainsKey(ch))
+			{
+				surface.Chunks[ch].Dispose();
+				surface.Chunks.Remove(ch);
+			}
+		}
+
+		public void Preview(Surface surface, SGraphics g)
+		{
+			surface.DrawImage(g, Resource.Bitmap, surface.GetBrushLocation(), false, null);
+		}
+
+		Random random = new Random();
+	}
+}

OpenRA.Editor/Surface.cs

@@ -15,6 +15,9 @@ using System.Drawing.Imaging;
 using System.Linq;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
+using OpenRA.Traits;
+
+using SGraphics = System.Drawing.Graphics;
 
 namespace OpenRA.Editor
 {
@@ -23,34 +26,34 @@ namespace OpenRA.Editor
 		public Map Map { get; private set; }
 		public TileSet TileSet { get; private set; }
 		public Palette Palette { get; private set; }
-		int2 Offset;
+		public int2 Offset;
 
-		float Zoom = 1.0f;
+		public int2 GetOffset() { return Offset; }
 
-		BrushTemplate Brush;
-		ActorTemplate Actor;
-		ResourceTemplate Resource;
-		WaypointTemplate Waypoint;
+		public float Zoom = 1.0f;
 
+		ITool Tool;
+		
 		public bool IsPanning;
 		public event Action AfterChange = () => { };
+		public event Action<string> MousePositionChanged = _ => { };
 
 		Dictionary<string, ActorTemplate> ActorTemplates = new Dictionary<string, ActorTemplate>();
 		Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
 
+		public Keys GetModifiers() { return ModifierKeys; }
+
 		public void Bind(Map m, TileSet ts, Palette p)
 		{
 			Map = m;
 			TileSet = ts;
 			Palette = p;
-			Brush = null;
+			PlayerPalettes = null;
 			Chunks.Clear();
+			Tool = null;
 		}
 
-		public void SetBrush(BrushTemplate brush) { Actor = null; Brush = brush; Resource = null; Waypoint = null; }
-		public void SetActor(ActorTemplate actor) { Brush = null; Actor = actor; Resource = null; Waypoint = null; }
-		public void SetResource(ResourceTemplate resource) { Brush = null; Actor = null; Resource = resource; Waypoint = null; }
-		public void SetWaypoint(WaypointTemplate waypoint) { Brush = null; Actor = null; Resource = null; Waypoint = waypoint; }
+		public void SetTool(ITool tool) { Tool = tool; }
 
 		public void BindActorTemplates(IEnumerable<ActorTemplate> templates)
 		{
@@ -62,7 +65,7 @@ namespace OpenRA.Editor
 			ResourceTemplates = templates.ToDictionary(a => a.Info.ResourceType);
 		}
 
-		Dictionary<int2, Bitmap> Chunks = new Dictionary<int2, Bitmap>();
+		public Dictionary<int2, Bitmap> Chunks = new Dictionary<int2, Bitmap>();
 
 		public Surface()
 			: base()
@@ -120,6 +123,7 @@ namespace OpenRA.Editor
 
 			var oldMousePos = MousePos;
 			MousePos = new int2(e.Location);
+			MousePositionChanged(GetBrushLocation().ToString());
 
 			if (e.Button == MouseButtons.Middle || (e.Button != MouseButtons.None && IsPanning))
 				Scroll(oldMousePos - MousePos);
@@ -135,110 +139,6 @@ namespace OpenRA.Editor
 			}
 		}
 
-		void FloodFillWithBrush(int2 pos)
-		{
-			var queue = new Queue<int2>();
-			var replace = Map.MapTiles[pos.X, pos.Y];
-
-			queue.Enqueue(pos);
-			while (queue.Count > 0)
-			{
-				var p = queue.Dequeue();
-				if (!Map.MapTiles[p.X, p.Y].Equals(replace))
-					continue;
-
-				var a = FindEdge(p, new int2(-1, 0), replace);
-				var b = FindEdge(p, new int2(1, 0), replace);
-
-				for (var x = a.X; x <= b.X; x++)
-				{
-					Map.MapTiles[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, image = (byte)0, index = (byte)0 };
-					if (Map.MapTiles[x, p.Y - 1].Equals(replace) && Map.IsInMap(x, p.Y - 1))
-						queue.Enqueue(new int2(x, p.Y - 1));
-					if (Map.MapTiles[x, p.Y + 1].Equals(replace) && Map.IsInMap(x, p.Y + 1))
-						queue.Enqueue(new int2(x, p.Y + 1));
-				}
-			}
-
-			/* todo: optimize */
-			foreach (var ch in Chunks.Values) ch.Dispose();
-			Chunks.Clear();
-
-			AfterChange();
-		}
-
-		int2 FindEdge(int2 p, int2 d, TileReference<ushort, byte> replace)
-		{
-			for (; ; )
-			{
-				var q = p+d;
-				if (!Map.IsInMap(q)) return p;
-				if (!Map.MapTiles[q.X, q.Y].Equals(replace)) return p;
-				p = q;
-			}
-		}
-
-		void DrawWithBrush()
-		{
-			// change the bits in the map
-			var tile = TileSet.Tiles[Brush.N];
-			var template = TileSet.Templates[Brush.N];
-			var pos = GetBrushLocation();
-
-			if (ModifierKeys == Keys.Shift)
-			{
-				FloodFillWithBrush(pos);
-				return;
-			}
-
-			for (var u = 0; u < template.Size.X; u++)
-				for (var v = 0; v < template.Size.Y; v++)
-				{
-					if (Map.IsInMap(new int2(u, v) + pos))
-					{
-						var z = u + v * template.Size.X;
-						if (tile.TileBitmapBytes[z] != null)
-							Map.MapTiles[u + pos.X, v + pos.Y] =
-								new TileReference<ushort, byte>
-								{
-									type = Brush.N,
-									index = template.PickAny ? byte.MaxValue : (byte)z,
-									image = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4)*4) : (byte)z,
-								};
-
-						var ch = new int2((pos.X + u) / ChunkSize, (pos.Y + v) / ChunkSize);
-						if (Chunks.ContainsKey(ch))
-						{
-							Chunks[ch].Dispose();
-							Chunks.Remove(ch);
-						}
-					}
-				}
-
-			AfterChange();
-		}
-
-		int wpid;
-		string NextWpid()
-		{
-			for (; ; )
-			{
-				var a = "wp{0}".F(wpid++);
-				if (!Map.Waypoints.ContainsKey(a))
-					return a;
-			}
-		}
-
-		void DrawWithWaypoint()
-		{
-			var k = Map.Waypoints.FirstOrDefault(a => a.Value == GetBrushLocation());
-			if (k.Key != null) Map.Waypoints.Remove(k.Key);
-
-			Map.Waypoints.Add(NextWpid(), GetBrushLocation());
-
-			AfterChange();
-		}
-
 		void Erase()
 		{
 			// Crash preventing
@@ -250,11 +150,8 @@ namespace OpenRA.Editor
 				BrushLocation.Y < 0)
 				return;
 
-			Actor = null;
-			Brush = null;
-			Resource = null;
-			Waypoint = null;
-
+			Tool = null;
+			
 			var key = Map.Actors.FirstOrDefault(a => a.Value.Location() == BrushLocation);
 			if (key.Key != null) Map.Actors.Remove(key.Key);
 
@@ -277,58 +174,7 @@ namespace OpenRA.Editor
 
 		void Draw()
 		{
-			if (Brush != null) DrawWithBrush();
-			if (Actor != null) DrawWithActor();
-			if (Resource != null) DrawWithResource();
-			if (Waypoint != null) DrawWithWaypoint();
-
-			AfterChange();
-		}
-
-		int id;
-		string NextActorName()
-		{
-			for (; ; )
-			{
-				var possible = "Actor{0}".F(id++);
-				if (!Map.Actors.ContainsKey(possible)) return possible;
-			}
-		}
-
-		void DrawWithActor()
-		{
-			if (Map.Actors.Any(a => a.Value.Location() == GetBrushLocation()))
-				return;
-
-			var owner = "Neutral";
-			var id = NextActorName();
-			Map.Actors[id] = new ActorReference(Actor.Info.Name.ToLowerInvariant())
-			{
-				new LocationInit( GetBrushLocation() ),
-				new OwnerInit( owner)
-			};
-
-			AfterChange();
-		}
-
-		System.Random r = new System.Random();
-		void DrawWithResource()
-		{
-			Map.MapResources[GetBrushLocation().X, GetBrushLocation().Y]
-				= new TileReference<byte, byte>
-				{
-					type = (byte)Resource.Info.ResourceType,
-					index = (byte)r.Next(Resource.Info.SpriteNames.Length),
-					image = (byte)Resource.Value
-				};
-
-			var ch = new int2((GetBrushLocation().X) / ChunkSize, (GetBrushLocation().Y) / ChunkSize);
-			if (Chunks.ContainsKey(ch))
-			{
-				Chunks[ch].Dispose();
-				Chunks.Remove(ch);
-			}
-
+			if (Tool != null) Tool.Apply(this);
 			AfterChange();
 		}
 
@@ -347,7 +193,7 @@ namespace OpenRA.Editor
 			Invalidate();
 		}
 
-		const int ChunkSize = 8;		// 8x8 chunks ==> 192x192 bitmaps.
+		public const int ChunkSize = 8;		// 8x8 chunks ==> 192x192 bitmaps.
 
 		Bitmap RenderChunk(int u, int v)
 		{
@@ -400,84 +246,104 @@ namespace OpenRA.Editor
 			return bitmap;
 		}
 
-		int2 GetBrushLocation()
+		public int2 GetBrushLocation()
 		{
 			var vX = (int)Math.Floor((MousePos.X - Offset.X) / Zoom);
 			var vY = (int)Math.Floor((MousePos.Y - Offset.Y) / Zoom);
 			return new int2(vX / TileSet.TileSize, vY / TileSet.TileSize);
 		}
 
-		void DrawActor(System.Drawing.Graphics g, int2 p, ActorTemplate t)
+		public void DrawActor(SGraphics g, int2 p, ActorTemplate t, ColorPalette cp)
 		{
-			float OffsetX = t.Centered ? t.Bitmap.Width / 2 - TileSet.TileSize/2 : 0;
-			float DrawX = TileSet.TileSize * p.X * Zoom + Offset.X - OffsetX;
-
-			float OffsetY = t.Centered ? t.Bitmap.Height / 2 - TileSet.TileSize/2 : 0;
-			float DrawY = TileSet.TileSize * p.Y * Zoom + Offset.Y - OffsetY;
-
-			float width = t.Bitmap.Width * Zoom;
-			float height = t.Bitmap.Height * Zoom;
-			RectangleF sourceRect = new RectangleF(0, 0, t.Bitmap.Width, t.Bitmap.Height);
-			RectangleF destRect = new RectangleF(DrawX, DrawY, width, height);
-			g.DrawImage(t.Bitmap, destRect, sourceRect, GraphicsUnit.Pixel);
+			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
+			DrawImage(g, t.Bitmap, p, centered, cp);
 		}
 
-		void DrawImage(System.Drawing.Graphics g, Bitmap bmp, int2 location)
+		float2 GetDrawPosition(int2 location, Bitmap bmp, bool centered)
 		{
-			float OffsetX = bmp.Width / 2 - TileSet.TileSize / 2;
+			float OffsetX = centered ? bmp.Width / 2 - TileSet.TileSize / 2 : 0;
 			float DrawX = TileSet.TileSize * location.X * Zoom + Offset.X - OffsetX;
 
-			float OffsetY = bmp.Height / 2 - TileSet.TileSize / 2;
+			float OffsetY = centered ? bmp.Height / 2 - TileSet.TileSize / 2 : 0;
 			float DrawY = TileSet.TileSize * location.Y * Zoom + Offset.Y - OffsetY;
 
-			float width = bmp.Width * Zoom;
-			float height = bmp.Height * Zoom;
-			RectangleF sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
-			RectangleF destRect = new RectangleF(DrawX, DrawY, width, height);
+			return new float2(DrawX, DrawY);
+		}
+
+		public void DrawImage(SGraphics g, Bitmap bmp, int2 location, bool centered, ColorPalette cp)
+		{
+			var drawPos = GetDrawPosition(location, bmp, centered);
+
+			var sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
+			var destRect = new RectangleF(drawPos.X, drawPos.Y, bmp.Width * Zoom, bmp.Height * Zoom);
+
+			var restorePalette = bmp.Palette;
+			if (cp != null) bmp.Palette = cp;
 			g.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
+			if (cp != null) bmp.Palette = restorePalette;
 		}
 
 		void DrawActorBorder(System.Drawing.Graphics g, int2 p, ActorTemplate t)
 		{
-			float OffsetX = t.Centered ? t.Bitmap.Width / 2 - TileSet.TileSize / 2 : 0;
-			float DrawX = TileSet.TileSize * p.X * Zoom + Offset.X - OffsetX;
-
-			float OffsetY = t.Centered ? t.Bitmap.Height / 2 - TileSet.TileSize / 2 : 0;
-			float DrawY = TileSet.TileSize * p.Y * Zoom + Offset.Y - OffsetY;
-
+			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
+			var drawPos = GetDrawPosition(p, t.Bitmap, centered);
+			
 			g.DrawRectangle(CordonPen,
-				DrawX, DrawY,
+				drawPos.X, drawPos.Y,
 				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);
 		}
 
+		ColorPalette GetPaletteForPlayer(string name)
+		{
+			var pr = Map.Players[name];
+			var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
+			var remap = new PlayerColorRemap(pr.ColorRamp, pcpi.PaletteFormat);
+			return RenderUtils.MakeSystemPalette(new Palette(Palette, remap));
+		}
+
+		Cache<string, ColorPalette> PlayerPalettes;
+
+		ColorPalette GetPaletteForActor(ActorReference ar)
+		{
+			if (PlayerPalettes == null)
+				PlayerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayer);
+
+			var ownerInit = ar.InitDict.GetOrDefault<OwnerInit>();
+			if (ownerInit == null)
+				return null;
+
+			return PlayerPalettes[ownerInit.PlayerName];
+		}
+
 		protected override void OnPaint(PaintEventArgs e)
 		{
 			if (Map == null) return;
 			if (TileSet == null) return;
 
-			for( var u = 0; u < Map.MapSize.X; u += ChunkSize )
+			for (var u = 0; u < Map.MapSize.X; u += ChunkSize)
 				for (var v = 0; v < Map.MapSize.Y; v += ChunkSize)
 				{
-					var x = new int2(u/ChunkSize,v/ChunkSize);
+					var x = new int2(u / ChunkSize, v / ChunkSize);
 					if (!Chunks.ContainsKey(x)) Chunks[x] = RenderChunk(u / ChunkSize, v / ChunkSize);
 
 					Bitmap bmp = Chunks[x];
 
-					float DrawX = TileSet.TileSize* 1f * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
-					float DrawY = TileSet.TileSize * 1f * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
+					float DrawX = TileSet.TileSize * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
+					float DrawY = TileSet.TileSize * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
 					RectangleF sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
 					RectangleF destRect = new RectangleF(DrawX, DrawY, bmp.Width * Zoom, bmp.Height * Zoom);
 					e.Graphics.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
 				}
 
 			e.Graphics.DrawRectangle(CordonPen,
-				Map.XOffset * TileSet.TileSize * Zoom + Offset.X,
-				Map.YOffset * TileSet.TileSize * Zoom + Offset.Y,
-				Map.Width * TileSet.TileSize * Zoom,
-				Map.Height * TileSet.TileSize * Zoom);
+				Map.Bounds.Left * TileSet.TileSize * Zoom + Offset.X,
+				Map.Bounds.Top * TileSet.TileSize * Zoom + Offset.Y,
+				Map.Bounds.Width * TileSet.TileSize * Zoom,
+				Map.Bounds.Height * TileSet.TileSize * Zoom);
 
 			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],
+					GetPaletteForActor(ar.Value));
 
 			foreach (var wp in Map.Waypoints)
 				e.Graphics.DrawRectangle(Pens.LimeGreen,
@@ -485,26 +351,10 @@ namespace OpenRA.Editor
 					TileSet.TileSize * wp.Value.Y * Zoom + Offset.Y + 4,
 					(TileSet.TileSize - 8) * Zoom, (TileSet.TileSize - 8) * Zoom);
 
-			if (Brush != null)
-				e.Graphics.DrawImage(Brush.Bitmap,
-					TileSet.TileSize * GetBrushLocation().X * Zoom + Offset.X,
-					TileSet.TileSize * GetBrushLocation().Y * Zoom + Offset.Y,
-					Brush.Bitmap.Width * Zoom,
-					Brush.Bitmap.Height * Zoom);
-
-			if (Actor != null)
-				DrawActor(e.Graphics, GetBrushLocation(), Actor);
-
-			if (Resource != null)
-				DrawImage(e.Graphics, Resource.Bitmap, GetBrushLocation());
-
-			if (Waypoint != null)
-				e.Graphics.DrawRectangle(Pens.LimeGreen,
-					TileSet.TileSize * GetBrushLocation().X * Zoom + Offset.X + 4,
-					TileSet.TileSize * GetBrushLocation().Y * Zoom + Offset.Y + 4,
-					(TileSet.TileSize - 8) * Zoom, (TileSet.TileSize - 8) * Zoom);
-
-			if (Brush == null && Actor == null && Resource == null)
+			if (Tool != null)
+				Tool.Preview(this, e.Graphics);
+				
+			if (Tool == null)
 			{
 				var x = Map.Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
 				if (x.Key != null)

OpenRA.Editor/WaypointTool.cs

@@ -0,0 +1,51 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using System.Linq;
+
+using SGraphics = System.Drawing.Graphics;
+
+namespace OpenRA.Editor
+{
+	class WaypointTool : ITool
+	{
+		WaypointTemplate Waypoint;
+
+		public WaypointTool(WaypointTemplate waypoint) { Waypoint = waypoint; }
+
+		public void Apply(Surface surface)
+		{
+			var k = surface.Map.Waypoints.FirstOrDefault(a => a.Value == surface.GetBrushLocation());
+			if (k.Key != null) surface.Map.Waypoints.Remove(k.Key);
+
+			surface.Map.Waypoints.Add(NextWpid(surface), surface.GetBrushLocation());
+		}
+
+		public void Preview(Surface surface, SGraphics g)
+		{
+			g.DrawRectangle(Pens.LimeGreen,
+					surface.TileSet.TileSize * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X + 4,
+					surface.TileSet.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y + 4,
+					(surface.TileSet.TileSize - 8) * surface.Zoom, (surface.TileSet.TileSize - 8) * surface.Zoom);
+		}
+
+		public string NextWpid(Surface surface)
+		{
+			int wpid = 0;
+			for (; ; )
+			{
+				var a = "wp{0}".F(wpid++);
+				if (!surface.Map.Waypoints.ContainsKey(a))
+					return a;
+			}
+		}
+	}
+}

OpenRA.FileFormats/ColorHSLR.cs

@@ -0,0 +1,64 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+
+namespace OpenRA.FileFormats
+{
+    public struct ColorRamp
+    {
+        public byte H,S,L,R;
+
+        public ColorRamp(byte h, byte s, byte l, byte r)
+        {
+            H = h; S = s; L = l; R = r;
+        }
+
+        /* returns a color along the Lum ramp */
+        public Color GetColor( float t )
+        {
+            return ColorFromHSL( H / 255f, S / 255f, float2.Lerp( L / 255f, L*R / (255f * 255f), t ) );
+        }
+
+        public override string ToString()
+        {
+            return "{0},{1},{2},{3}".F(H, S, L, R);
+        }
+
+        // hk is hue in the range [0,1] instead of [0,360]
+		public static Color ColorFromHSL(float hk, float s, float l)
+		{
+			// Convert from HSL to RGB
+			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
+			var p = 2 * l - q;
+
+			float[] trgb = { hk + 1 / 3.0f,
+							  hk,
+							  hk - 1/3.0f };
+			float[] rgb = { 0, 0, 0 };
+
+			for (int k = 0; k < 3; k++)
+			{
+				while (trgb[k] < 0) trgb[k] += 1.0f;
+				while (trgb[k] > 1) trgb[k] -= 1.0f;
+			}
+
+			for (int k = 0; k < 3; k++)
+			{
+				if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
+				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
+				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
+				else { rgb[k] = p; }
+			}
+
+			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
+		}
+    }
+}

OpenRA.FileFormats/CompressedPackage.cs

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

OpenRA.FileFormats/Exts.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -23,10 +24,10 @@ namespace OpenRA
 			return string.Format(fmt, args);
 		}
 
-		public static void Do<T>( this IEnumerable<T> e, Action<T> fn )
+		public static void Do<T>(this IEnumerable<T> e, Action<T> fn)
 		{
-			foreach( var ee in e )
-				fn( ee );
+			foreach (var ee in e)
+				fn(ee);
 		}
 
 		public static IEnumerable<string> GetNamespaces(this Assembly a)
@@ -74,16 +75,16 @@ namespace OpenRA
 			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
 		}
 
-		public static T[] GetCustomAttributes<T>( this MemberInfo mi, bool inherit )
+		public static T[] GetCustomAttributes<T>(this MemberInfo mi, bool inherit)
 			where T : class
 		{
-			return (T[])mi.GetCustomAttributes( typeof( T ), inherit );
+			return (T[])mi.GetCustomAttributes(typeof(T), inherit);
 		}
 
-		public static T[] GetCustomAttributes<T>( this ParameterInfo mi )
+		public static T[] GetCustomAttributes<T>(this ParameterInfo mi)
 			where T : class
 		{
-			return (T[])mi.GetCustomAttributes( typeof( T ), true );
+			return (T[])mi.GetCustomAttributes(typeof(T), true);
 		}
 
 		public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
@@ -95,5 +96,15 @@ namespace OpenRA
 			else
 				return val;
 		}
+
+		public static bool Contains(this Rectangle r, int2 p)
+		{
+			return r.Contains(p.ToPoint());
+		}
+
+		public static bool Contains(this RectangleF r, int2 p)
+		{
+			return r.Contains(p.ToPointF());
+		}
 	}
 }

OpenRA.FileFormats/FieldLoader.cs

@@ -105,6 +105,14 @@ namespace OpenRA.FileFormats
 				return InvalidValueAction(x,fieldType, field);
 			}
 
+			else if (fieldType == typeof(decimal))
+			{
+				decimal res;
+				if (decimal.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
+					return res * (x.Contains( '%' ) ? 0.01m : 1m);
+				return InvalidValueAction(x,fieldType, field);
+			}
+
 			else if (fieldType == typeof(string))
 				return x;
 
@@ -118,45 +126,58 @@ namespace OpenRA.FileFormats
 				return InvalidValueAction(x,fieldType, field);
 			}
 
-			else if (fieldType.IsEnum)
-			{
-				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
-					return InvalidValueAction(x,fieldType, field);
-				return Enum.Parse(fieldType, x, true);
-			}
+            else if (fieldType == typeof(ColorRamp))
+            {
+                var parts = x.Split(',');
+                if (parts.Length == 4)
+                    return new ColorRamp(
+                        (byte)int.Parse(parts[0]).Clamp(0, 255),
+                        (byte)int.Parse(parts[1]).Clamp(0, 255),
+                        (byte)int.Parse(parts[2]).Clamp(0, 255),
+                        (byte)int.Parse(parts[3]).Clamp(0, 255));
 
-			else if (fieldType == typeof(bool))
-				return ParseYesNo(x, fieldType, field);
+                return InvalidValueAction(x, fieldType, field);
+            }
 
-			else if (fieldType.IsArray)
-			{
-				if (x == null)
-					return Array.CreateInstance(fieldType.GetElementType(), 0);
+            else if (fieldType.IsEnum)
+            {
+                if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
+                    return InvalidValueAction(x, fieldType, field);
+                return Enum.Parse(fieldType, x, true);
+            }
 
-				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            else if (fieldType == typeof(bool))
+                return ParseYesNo(x, fieldType, field);
 
-				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
-				for (int i = 0; i < parts.Length; i++)
-					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
-				return ret;
-			}
-			else if (fieldType == typeof(int2))
-			{
-				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
-			}
-			else if (fieldType == typeof(float2))
-			{
-				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				float xx = 0;
-				float yy = 0;
-				float res;
-				if (float.TryParse(parts[0].Replace("%",""), out res))
-					xx = res * (parts[0].Contains( '%' ) ? 0.01f : 1f);
-				if (float.TryParse(parts[1].Replace("%",""), out res))
-					yy = res * (parts[1].Contains( '%' ) ? 0.01f : 1f);
-				return new float2(xx,yy);
-			}
+            else if (fieldType.IsArray)
+            {
+                if (x == null)
+                    return Array.CreateInstance(fieldType.GetElementType(), 0);
+
+                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+                var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
+                for (int i = 0; i < parts.Length; i++)
+                    ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
+                return ret;
+            }
+            else if (fieldType == typeof(int2))
+            {
+                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
+            }
+            else if (fieldType == typeof(float2))
+            {
+                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                float xx = 0;
+                float yy = 0;
+                float res;
+                if (float.TryParse(parts[0].Replace("%", ""), out res))
+                    xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
+                if (float.TryParse(parts[1].Replace("%", ""), out res))
+                    yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
+                return new float2(xx, yy);
+            }
 
 			UnknownFieldAction("[Type] {0}".F(x),fieldType);
 			return null;
@@ -254,6 +275,11 @@ namespace OpenRA.FileFormats
 					FormatValue( o, f ) ) ).ToList() );
 		}
 
+		public static MiniYamlNode SaveField(object o, string field)
+		{
+			return new MiniYamlNode(field, FieldSaver.FormatValue( o, o.GetType().GetField(field) ));
+		}
+		
 		public static string FormatValue(object o, FieldInfo f)
 		{
 			var v = f.GetValue(o);

OpenRA.FileFormats/FileFormats/Blast.cs

@@ -0,0 +1,274 @@
+#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.
+ *
+ * This file is based on the blast routines (version 1.1 by Mark Adler) 
+ * included in zlib/contrib
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public static class Blast
+	{
+		public static readonly int MAXBITS = 13; // maximum code length
+		public static readonly int MAXWIN = 4096; // maximum window size
+		
+		static byte[] litlen = new byte[] {
+			11, 124, 8, 7, 28, 7, 188, 13, 76, 4,
+			10, 8, 12, 10, 12, 10, 8, 23, 8, 9,
+			7, 6, 7, 8, 7, 6, 55, 8, 23, 24,
+			12, 11, 7, 9, 11, 12, 6, 7, 22, 5,
+			7, 24, 6, 11, 9, 6, 7, 22, 7, 11,
+			38, 7, 9, 8, 25, 11, 8, 11, 9, 12,
+			8, 12, 5, 38, 5, 38, 5, 11, 7, 5,
+			6, 21, 6, 10, 53, 8, 7, 24, 10, 27,
+			44, 253, 253, 253, 252, 252, 252, 13, 12, 45,
+			12, 45, 12, 61, 12, 45, 44, 173
+		};
+
+		// bit lengths of length codes 0..15
+		static byte[] lenlen = new byte[] { 2, 35, 36, 53, 38, 23 };
+
+		// bit lengths of distance codes 0..63
+		static byte[] distlen = new byte[] { 2, 20, 53, 230, 247, 151, 248 };
+
+		// base for length codes
+		static short[] lengthbase = new short[] {
+			3, 2, 4, 5, 6, 7, 8, 9, 10, 12,
+			16, 24, 40, 72, 136, 264
+		};
+
+		// extra bits for length codes
+		static byte[] extra = new byte[] {
+			0, 0, 0, 0, 0, 0, 0, 0, 1, 2,
+			3, 4, 5, 6, 7, 8
+		};
+		
+		static Huffman litcode = new Huffman(litlen, litlen.Length, 256);
+		static Huffman lencode = new Huffman(lenlen, lenlen.Length, 16);
+		static Huffman distcode = new Huffman(distlen, distlen.Length, 64);
+		
+		// Decode PKWare Compression Library stream.
+		public static byte[] Decompress(byte[] src)
+		{
+			BitReader br = new BitReader(src);
+			
+			// Are literals coded?
+			int coded = br.ReadBits(8);
+			
+			if (coded < 0 || coded > 1)
+				throw new NotImplementedException("Invalid datastream");
+			bool EncodedLiterals = (coded == 1);
+			
+			// log2(dictionary size) - 6
+			int dict = br.ReadBits(8);
+			if (dict < 4 || dict > 6)
+				throw new InvalidDataException("Invalid dictionary size");	
+			
+			// output state
+			ushort next = 0; // index of next write location in out[]
+			bool first = true; // true to check distances (for first 4K)
+			byte[] outBuffer = new byte[MAXWIN]; // output buffer and sliding window
+			var ms = new MemoryStream();
+
+			// decode literals and length/distance pairs
+			do
+			{
+				// length/distance pair
+				if (br.ReadBits(1) == 1)
+				{
+					// Length
+					int symbol = Decode(lencode, br);
+					int len = lengthbase[symbol] + br.ReadBits(extra[symbol]);
+					if (len == 519) // Magic number for "done"
+					{
+						for (int i = 0; i < next; i++)
+							ms.WriteByte(outBuffer[i]);
+						break;
+					}
+					
+					// Distance
+					symbol = len == 2 ? 2 : dict;
+					int dist = Decode(distcode, br) << symbol;
+					dist += br.ReadBits(symbol);
+					dist++;
+					
+					if (first && dist > next)
+						throw new InvalidDataException("Attempt to jump before data");
+					
+					// copy length bytes from distance bytes back
+					do
+					{
+						int dest = next;
+						int source = dest - dist;
+						
+						int copy = MAXWIN;
+						if (next < dist)
+						{
+							source += copy;
+							copy = dist;
+						}
+						
+						copy -= next;
+						if (copy > len)
+							copy = len;
+						
+						len -= copy;
+						next += (ushort)copy;
+						Array.Copy(outBuffer, source, outBuffer, dest, copy);
+						
+						// Flush window to outstream
+						if (next == MAXWIN)
+						{
+							for (int i = 0; i < next; i++)
+								ms.WriteByte(outBuffer[i]);
+							next = 0;
+							first = false;
+						}
+					} while (len != 0);
+				}
+				else // literal value
+				{
+					int symbol = EncodedLiterals ? Decode(litcode, br) : br.ReadBits(8);
+					outBuffer[next++] = (byte)symbol;
+					if (next == MAXWIN)
+					{
+						for (int i = 0; i < next; i++)
+							ms.WriteByte(outBuffer[i]);
+						next = 0;
+						first = false;
+					}
+				}
+			} while (true);
+			
+			return ms.ToArray();
+		}
+		
+		// Decode a code using huffman table h.  
+		private static int Decode(Huffman h, BitReader br)
+		{
+			int code = 0; // len bits being decoded
+			int first = 0; // first code of length len
+			int index = 0; // index of first code of length len in symbol table
+			short next = 1;
+			while (true)
+			{
+				code |= br.ReadBits(1) ^ 1; // invert code
+				int count = h.Count[next++];
+				if (code < first + count)
+					return h.Symbol[index + (code - first)];
+
+				index += count;
+				first += count;
+				first <<= 1;
+				code <<= 1;
+			}
+		}
+	}
+	
+	class BitReader
+	{
+		readonly byte[] src;
+        int offset = 0;
+		int bitBuffer = 0;
+		int bitCount = 0;
+
+		public BitReader(byte[] src)
+		{
+            this.src = src;
+		}
+		
+		public int ReadBits(int count)
+		{
+			int ret = 0;
+			int filled = 0;
+			while (filled < count)
+			{
+				if (bitCount == 0)
+				{
+					bitBuffer = src[offset++];
+					bitCount = 8;
+				}
+				
+				ret |= (bitBuffer & 1) << filled;
+				bitBuffer >>= 1;
+				bitCount--;
+				filled++;
+			}
+			return ret;
+		}
+	}
+
+	/*
+	 * Given a list of repeated code lengths rep[0..n-1], where each byte is a
+	 * count (high four bits + 1) and a code length (low four bits), generate the
+	 * list of code lengths.  This compaction reduces the size of the object code.
+	 * Then given the list of code lengths length[0..n-1] representing a canonical
+	 * Huffman code for n symbols, construct the tables required to decode those
+	 * codes.  Those tables are the number of codes of each length, and the symbols
+	 * sorted by length, retaining their original order within each length.
+	 */
+	class Huffman
+	{
+		public short[] Count; // number of symbols of each length
+		public short[] Symbol; // canonically ordered symbols
+
+		public Huffman(byte[] rep, int n, short SymbolCount)
+		{
+			short[] length = new short[256]; // code lengths
+			int s = 0; // current symbol
+			
+			// convert compact repeat counts into symbol bit length list
+			foreach (byte code in rep)
+			{
+				int num = (code >> 4) + 1; // Number of codes (top four bits plus 1)
+				byte len = (byte)(code & 15); // Code length (low four bits)
+				do
+				{
+					length[s++] = len;
+				} while (--num > 0);
+			}
+			n = s;
+			
+			// count number of codes of each length
+			Count = new short[Blast.MAXBITS + 1];
+			for (int i = 0; i < n; i++)
+				Count[length[i]]++;
+			
+			// no codes!
+			if (Count[0] == n)
+				return;
+			
+			// check for an over-subscribed or incomplete set of lengths
+			int left = 1; // one possible code of zero length
+			for (int len = 1; len <= Blast.MAXBITS; len++)
+			{
+				left <<= 1;
+				// one more bit, double codes left
+				left -= Count[len];
+				// deduct count from possible codes
+				if (left < 0)
+					throw new InvalidDataException ("over subscribed code set");
+			}
+			
+			// generate offsets into symbol table for each length for sorting
+			short[] offs = new short[Blast.MAXBITS + 1];
+			for (int len = 1; len < Blast.MAXBITS; len++)
+				offs[len + 1] = (short)(offs[len] + Count[len]);
+			
+			// put symbols in table sorted by length, by symbol order within each length
+			Symbol = new short[SymbolCount];
+			for (short i = 0; i < n; i++)
+				if (length[i] != 0)
+					Symbol[offs[length[i]]++] = i;
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Format80.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using System.IO;
 
 namespace OpenRA.FileFormats
 {
@@ -35,6 +36,8 @@ namespace OpenRA.FileFormats
             Array.Copy(src, this.offset, dest, offset, count);
             this.offset += count;
         }
+
+		public int Remaining() { return src.Length - offset; }
     }
 
 	public static class Format80
@@ -121,5 +124,27 @@ namespace OpenRA.FileFormats
 				}
 			}
 		}
+
+		public static byte[] Encode(byte[] src)
+		{
+			/* quick & dirty format80 encoder -- only uses raw copy operator, terminated with a zero-run. */
+			/* this does not produce good compression, but it's valid format80 */
+			
+			var ctx = new FastByteReader(src);
+			var ms = new MemoryStream();
+
+			do
+			{
+				var len = Math.Min(ctx.Remaining(), 0x3F);
+				ms.WriteByte((byte)(0x80 | len));
+				while (len-- > 0)
+					ms.WriteByte(ctx.ReadByte());
+			}
+			while (!ctx.Done());
+
+			ms.WriteByte(0x80);	// terminator -- 0-length run.
+
+			return ms.ToArray();
+		}
 	}
 }

OpenRA.FileFormats/Filesystem/FileSystem.cs

@@ -12,12 +12,14 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Linq;
 
 namespace OpenRA.FileFormats
 {
 	public static class FileSystem
 	{
 		static List<IFolder> mountedFolders = new List<IFolder>();
+		public static string SpecialPackageRoot = "";
 
 		static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
 
@@ -33,22 +35,50 @@ namespace OpenRA.FileFormats
 			}
 		}
 
+		static int order = 0;
+
 		static IFolder OpenPackage(string filename)
 		{
-			if (filename.EndsWith(".mix"))
-				return new Package(filename);
-			else if (filename.EndsWith(".zip"))
-				return new CompressedPackage(filename);
-			else
-				return new Folder(filename);
+            return OpenPackage(filename, order++);
 		}
 
+		public static IFolder CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
+        {
+			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
+                return new MixFile(filename, order, content);
+            else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+                return new ZipFile(filename, order, content);
+            else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+                return new ZipFile(filename, order, content);
+            else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+                throw new NotImplementedException("Creating .Z archives is unsupported");
+            else
+                return new Folder(filename, order, content);
+        }
+		
+        public static IFolder OpenPackage(string filename, int order)
+        {
+            if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
+                return new MixFile(filename, order);
+            else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+                return new ZipFile(filename, order);
+            else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+                return new ZipFile(filename, order);
+            else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+                return new InstallShieldPackage(filename, order);
+            else
+                return new Folder(filename, order);
+        }
+
 		public static void Mount(string name)
 		{
-			name = name.ToLowerInvariant();
 			var optional = name.StartsWith("~");
 			if (optional) name = name.Substring(1);
-
+			
+			// paths starting with $ are relative to SpecialPackageRoot
+			if (name.StartsWith("$"))
+				name = SpecialPackageRoot+name.Substring(1);
+			
 			var a = (Action)(() => FileSystem.MountInner(OpenPackage(name)));
 
 			if (optional)
@@ -64,6 +94,16 @@ namespace OpenRA.FileFormats
 			allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
 		}
 
+		public static bool Unmount(IFolder mount)
+		{
+			return (mountedFolders.RemoveAll(f => f == mount) > 0);
+		}
+
+		public static void Mount(IFolder mount)
+		{
+			if (!mountedFolders.Contains(mount)) mountedFolders.Add(mount);
+		}
+
 		public static void LoadFromManifest( Manifest manifest )
 		{
 			UnmountAll();
@@ -73,9 +113,14 @@ namespace OpenRA.FileFormats
 
 		static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
 		{
-			foreach( var folder in index[ PackageEntry.HashFilename( filename ) ] )
-				if (folder.Exists(filename))
-					return folder.GetContent(filename);
+			var folder = index[PackageEntry.HashFilename(filename)]
+				.Where(x => x.Exists(filename))
+				.OrderBy(x => x.Priority)
+				.FirstOrDefault();
+
+			if (folder != null)
+				return folder.GetContent(filename);
+
 			return null;
 		}
 
@@ -88,11 +133,13 @@ namespace OpenRA.FileFormats
 					return ret;
 			}
 
-			foreach( IFolder folder in mountedFolders )
-			{
-				if (folder.Exists(filename))
-					return folder.GetContent(filename);
-			}
+			var folder = mountedFolders
+				.Where(x => x.Exists(filename))
+				.OrderByDescending(x => x.Priority)
+				.FirstOrDefault();
+
+			if (folder != null)
+				return folder.GetContent(filename);
 
 			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
 		}

OpenRA.FileFormats/Filesystem/Folder.cs

@@ -0,0 +1,73 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using System;
+
+namespace OpenRA.FileFormats
+{
+	public class Folder : IFolder
+	{
+		readonly string path;
+
+		int priority;
+
+		// Create a new folder package
+		public Folder(string path, int priority, Dictionary<string, byte[]> contents)
+		{
+			this.path = path;
+			this.priority = priority;
+			if (Directory.Exists(path))
+				Directory.Delete(path);
+			
+			Write(contents);
+		}
+		
+		public Folder(string path, int priority)
+		{
+			this.path = path;
+			this.priority = priority;
+			if (!Directory.Exists(path))
+				Directory.CreateDirectory(path);
+		}
+
+		public Stream GetContent(string filename)
+		{
+			try { return File.OpenRead( Path.Combine( path, filename ) ); }
+			catch { return null; }
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
+				yield return PackageEntry.HashFilename( Path.GetFileName(filename) );
+		}
+		
+		public bool Exists(string filename)
+		{
+			return File.Exists(Path.Combine(path,filename));
+		}
+
+
+		public int Priority
+		{
+			get { return priority; }
+		}
+		
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			foreach (var file in contents)
+				using (var dataStream = File.Create(Path.Combine(path, file.Key)))
+					using (var writer = new BinaryWriter(dataStream))
+				       writer.Write(file.Value);
+		}
+	}
+}

OpenRA.FileFormats/Filesystem/InstallShieldPackage.cs

@@ -0,0 +1,126 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class InstallShieldPackage : IFolder
+	{
+		readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
+		readonly Stream s;
+		readonly long dataStart = 255;
+		int priority;
+
+		public InstallShieldPackage(string filename, int priority)
+		{
+			this.priority = priority;
+			s = FileSystem.Open(filename);
+
+			// Parse package header
+			BinaryReader reader = new BinaryReader(s);
+			uint signature = reader.ReadUInt32();
+			if (signature != 0x8C655D13)
+				throw new InvalidDataException("Not an Installshield package");
+			
+			reader.ReadBytes(8);
+			/*var FileCount = */reader.ReadUInt16();
+			reader.ReadBytes(4);
+			/*var ArchiveSize = */reader.ReadUInt32();
+			reader.ReadBytes(19);
+			var TOCAddress = reader.ReadInt32();
+			reader.ReadBytes(4);
+			var DirCount = reader.ReadUInt16();
+			
+			// Parse the directory list
+			s.Seek(TOCAddress, SeekOrigin.Begin);
+			BinaryReader TOCreader = new BinaryReader(s);
+			for (var i = 0; i < DirCount; i++)
+				ParseDirectory(TOCreader);
+		}
+
+		void ParseDirectory(BinaryReader reader)
+		{
+			// Parse directory header
+			var FileCount = reader.ReadUInt16();
+			var ChunkSize = reader.ReadUInt16();
+			var NameLength = reader.ReadUInt16();
+			reader.ReadChars(NameLength); //var DirName = new String(reader.ReadChars(NameLength));
+			
+			// Skip to the end of the chunk
+			reader.ReadBytes(ChunkSize - NameLength - 6);
+			
+			// Parse files
+			for (var i = 0; i < FileCount; i++)
+				ParseFile(reader);
+		}
+		
+		uint AccumulatedData = 0;
+		void ParseFile(BinaryReader reader)
+		{
+			reader.ReadBytes(7);
+			var CompressedSize = reader.ReadUInt32();
+			reader.ReadBytes(12);
+			var ChunkSize = reader.ReadUInt16();
+			reader.ReadBytes(4);
+			var NameLength = reader.ReadByte();
+			var FileName = new String(reader.ReadChars(NameLength));
+
+			var hash = PackageEntry.HashFilename(FileName);
+			index.Add(hash, new PackageEntry(hash,AccumulatedData, CompressedSize));
+			AccumulatedData += CompressedSize;
+			
+			// Skip to the end of the chunk
+			reader.ReadBytes(ChunkSize - NameLength - 30);
+		}
+		
+		public Stream GetContent(uint hash)
+		{
+			PackageEntry e;
+			if (!index.TryGetValue(hash, out e))
+				return null;
+
+			s.Seek( dataStart + e.Offset, SeekOrigin.Begin );
+			byte[] data = new byte[ e.Length ];
+			s.Read( data, 0, (int)e.Length );
+			
+			return new MemoryStream(Blast.Decompress(data));
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return GetContent(PackageEntry.HashFilename(filename));
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			return index.Keys;
+		}
+		
+		public bool Exists(string filename)
+		{
+			return index.ContainsKey(PackageEntry.HashFilename(filename));
+		}
+
+
+		public int Priority
+		{
+			get { return 2000 + priority; }
+		}
+		
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			throw new NotImplementedException("Cannot save InstallShieldPackages.");
+		}
+	}
+}

OpenRA.FileFormats/Filesystem/MixFile.cs

@@ -20,17 +20,32 @@ namespace OpenRA.FileFormats
 		Stream GetContent(string filename);
 		bool Exists(string filename);
 		IEnumerable<uint> AllFileHashes();
+		void Write(Dictionary<string, byte[]> contents);
+		int Priority { get; }
 	}
 
-	public class Package : IFolder
+	public class MixFile : IFolder
 	{
 		readonly Dictionary<uint, PackageEntry> index;
 		readonly bool isRmix, isEncrypted;
 		readonly long dataStart;
 		readonly Stream s;
-
-		public Package(string filename)
+		int priority;
+		
+		// Create a new MixFile
+		public MixFile(string filename, int priority, Dictionary<string, byte[]> contents)
 		{
+			this.priority = priority;
+			if (File.Exists(filename))
+				File.Delete(filename);
+			
+			s = File.Create(filename);
+			Write(contents);
+		}
+
+		public MixFile(string filename, int priority)
+		{
+			this.priority = priority;
 			s = FileSystem.Open(filename);
 
 			BinaryReader reader = new BinaryReader(s);
@@ -149,6 +164,51 @@ namespace OpenRA.FileFormats
 		{
 			return index.ContainsKey(PackageEntry.HashFilename(filename));
 		}
+
+
+		public int Priority
+		{
+			get { return 1000 + priority; }
+		}
+		
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			// Cannot modify existing mixfile - rename existing file and
+			// create a new one with original content plus modifications
+			FileSystem.Unmount(this);
+			
+			// TODO: Add existing data to the contents list
+			if (index.Count > 0)
+				throw new NotImplementedException("Updating mix files unfinished");
+		
+			// Construct a list of entries for the file header
+			uint dataSize = 0;
+			var items = new List<PackageEntry>();
+			foreach (var kv in contents)
+			{
+				uint length = (uint)kv.Value.Length;
+				uint hash = PackageEntry.HashFilename(Path.GetFileName(kv.Key));
+				items.Add(new PackageEntry(hash, dataSize, length));
+				dataSize += length;
+			}
+
+			// Write the new file
+			s.Seek(0,SeekOrigin.Begin);
+			using (var writer = new BinaryWriter(s))
+			{
+				// Write file header
+				writer.Write((ushort)items.Count);
+				writer.Write(dataSize);
+				foreach (var item in items)
+					item.Write(writer);
+
+				writer.Flush();
+
+				// Copy file data
+				foreach (var file in contents)
+					s.Write(file.Value);
+			}
+		}
 	}
 
 	[Flags]

OpenRA.FileFormats/Filesystem/ZipFile.cs

@@ -0,0 +1,117 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using ICSharpCode.SharpZipLib.Zip;
+using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
+
+namespace OpenRA.FileFormats
+{
+	public class ZipFile : IFolder
+	{
+		string filename;
+		SZipFile pkg;
+		int priority;
+
+		public ZipFile(string filename, int priority)
+		{
+			this.filename = filename;
+			this.priority = priority;
+			try
+			{
+				// pull the file into memory, dont keep it open.
+				pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
+			}
+			catch (ZipException e)
+			{
+				Log.Write("debug", "Couldn't load zip file: {0}", e.Message);
+			}
+		}
+
+		// Create a new zip with the specified contents
+		public ZipFile(string filename, int priority, Dictionary<string, byte[]> contents)
+		{
+			this.priority = priority;
+			this.filename = filename;
+
+			if (File.Exists(filename))
+				File.Delete(filename);
+			
+			pkg = SZipFile.Create(filename);
+			Write(contents);
+		}
+
+		public Stream GetContent(string filename)
+		{
+
+			using (var z = pkg.GetInputStream(pkg.GetEntry(filename)))
+			{
+				var ms = new MemoryStream();
+				int bufSize = 2048;
+				byte[] buf = new byte[bufSize];
+				while ((bufSize = z.Read(buf, 0, buf.Length)) > 0)
+					ms.Write(buf, 0, bufSize);
+
+				ms.Seek(0, SeekOrigin.Begin);
+				return ms;
+			}
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			foreach(ZipEntry entry in pkg)
+				yield return PackageEntry.HashFilename(entry.Name);
+		}
+		
+		public bool Exists(string filename)
+		{
+			return pkg.GetEntry(filename) != null;
+		}
+
+		public int Priority
+		{
+			get { return 500 + priority; }
+		}
+		
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			pkg.Close();
+
+			pkg = SZipFile.Create(filename);
+
+			pkg.BeginUpdate();
+			// TODO: Clear existing content?
+
+			foreach (var kvp in contents)
+				pkg.Add(new StaticMemoryDataSource(kvp.Value), kvp.Key);
+
+			pkg.CommitUpdate();
+
+			pkg.Close();
+
+			pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
+		}
+	}
+
+	class StaticMemoryDataSource : IStaticDataSource
+	{
+		byte[] data;
+		public StaticMemoryDataSource (byte[] data)
+		{
+			this.data = data;
+		}
+		
+		public Stream GetSource()
+		{
+			return new MemoryStream(data);
+		}
+	}
+}

OpenRA.FileFormats/Folder.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
-
-using System.Collections.Generic;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public class Folder : IFolder
-	{
-		readonly string path;
-
-		public Folder(string path) { this.path = path; }
-
-		public Stream GetContent(string filename)
-		{
-			try { return File.OpenRead( Path.Combine( path, filename ) ); }
-			catch { return null; }
-		}
-
-		public IEnumerable<uint> AllFileHashes()
-		{
-			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
-				yield return PackageEntry.HashFilename( filename );
-		}
-		
-		public bool Exists(string filename)
-		{
-			return File.Exists(Path.Combine(path,filename));
-		}
-	}
-}

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -33,14 +33,12 @@ namespace OpenRA.FileFormats.Graphics
 		IIndexBuffer CreateIndexBuffer( int length );
 		ITexture CreateTexture( Bitmap bitmap );
 		ITexture CreateTexture();
-		IShader CreateShader( Stream stream );
+		IShader CreateShader( string name );
 
 		Size WindowSize { get; }
 
-		void Begin();
-		void End();
 		void Clear( Color color );
-		void Present();
+		void Present( IInputHandler inputHandler );
 
 		void DrawIndexedPrimitives( PrimitiveType type, Range<int> vertexRange, Range<int> indexRange );
 		void DrawIndexedPrimitives( PrimitiveType type, int vertexPool, int numPrimitives );

OpenRA.FileFormats/Graphics/IInputHandler.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 
@@ -9,16 +9,32 @@
 #endregion
 
 using System;
-using System.Windows.Forms;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace OpenRA
 {
+	public interface IInputHandler
+	{
+		void ModifierKeys( Modifiers mods );
+		void OnKeyInput( KeyInput input );
+		void OnMouseInput( MouseInput input );
+	}
+
 	public struct MouseInput
 	{
 		public MouseInputEvent Event;
-		public int2 Location;
 		public MouseButton Button;
+		public int2 Location;
 		public Modifiers Modifiers;
+
+		public MouseInput( MouseInputEvent ev, MouseButton button, int2 location, Modifiers mods )
+		{
+			this.Event = ev;
+			this.Button = button;
+			this.Location = location;
+			this.Modifiers = mods;
+		}
 	}
 
 	public enum MouseInputEvent { Down, Move, Up };
@@ -26,19 +42,21 @@ namespace OpenRA
 	[Flags]
 	public enum MouseButton
 	{
-		None = (int)MouseButtons.None,
-		Left = (int)MouseButtons.Left,
-		Right = (int)MouseButtons.Right,
-		Middle = (int)MouseButtons.Middle,
+		None = 0,
+		Left = 1,
+		Right = 2,
+		Middle = 4,
+		WheelDown = 8,
+		WheelUp = 16
 	}
 
 	[Flags]
 	public enum Modifiers
 	{
-		None = (int)Keys.None,
-		Shift = (int)Keys.Shift,
-		Alt = (int)Keys.Alt,
-		Ctrl = (int)Keys.Control,
+		None = 0,
+		Shift = 1,
+		Alt = 2,
+		Ctrl = 4,
 	}
 
 	public enum KeyInputEvent { Down, Up };

OpenRA.FileFormats/Graphics/ShpReader.cs

@@ -26,6 +26,8 @@ namespace OpenRA.FileFormats
 
 		public byte[] Image;
 
+		public ImageHeader() { }
+
 		public ImageHeader( BinaryReader reader )
 		{
 			Offset = reader.ReadUInt32();
@@ -35,6 +37,15 @@ namespace OpenRA.FileFormats
 			RefOffset = reader.ReadUInt16();
 			RefFormat = (Format)reader.ReadUInt16();
 		}
+
+		public static readonly int SizeOnDisk = 8;
+
+		public void WriteTo(BinaryWriter writer)
+		{
+			writer.Write(Offset | ((uint)Format << 24));
+			writer.Write((ushort)RefOffset);
+			writer.Write((ushort)RefFormat);
+		}
 	}
 
 	public enum Format

OpenRA.FileFormats/Graphics/ShpWriter.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	// format80-only SHP writer
+
+	public static class ShpWriter
+	{
+		public static void Write(Stream s, int width, int height, IEnumerable<byte[]> frames)
+		{
+			var compressedFrames = frames.Select(f => Format80.Encode(f)).ToArray();
+
+			// note: end-of-file and all-zeroes headers
+			var dataOffset = 14 + (compressedFrames.Length + 2) * ImageHeader.SizeOnDisk;
+
+			using (var bw = new BinaryWriter(s))
+			{
+				bw.Write((ushort)compressedFrames.Length);
+				bw.Write((ushort)0);	// unused
+				bw.Write((ushort)0);	// unused
+				bw.Write((ushort)width);
+				bw.Write((ushort)height);
+				bw.Write((uint)0);		// unused
+
+				foreach (var f in compressedFrames)
+				{
+					var ih = new ImageHeader { Format = Format.Format80, Offset = (uint)dataOffset };
+					dataOffset += f.Length;
+
+					ih.WriteTo(bw);
+				}
+
+				var eof = new ImageHeader { Offset = (uint)dataOffset };
+				eof.WriteTo(bw);
+
+				var allZeroes = new ImageHeader { };
+				allZeroes.WriteTo(bw);
+
+				foreach (var f in compressedFrames)
+					bw.Write(f);
+			}
+		}
+	}
+}

OpenRA.FileFormats/HttpUtil.cs

@@ -0,0 +1,97 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace OpenRA.FileFormats
+{
+	public static class HttpUtil
+	{
+		public static byte[] DownloadData(string url, Action<int, int> f, int chunkSize)
+		{
+			var uri = new Uri(url);
+			var ip = Dns.GetHostEntry(uri.DnsSafeHost).AddressList[0];
+
+			using (var s = new TcpClient())
+			{
+				s.Connect(new IPEndPoint(ip, uri.Port));
+				var ns = s.GetStream();
+				var sw = new StreamWriter(ns);
+
+				sw.Write("GET {0} HTTP/1.0\r\nHost:{1}\r\n\r\n", uri.PathAndQuery, uri.Host);
+				sw.Flush();
+
+				var br = new BinaryReader(ns);
+				var contentLength = 0;
+				var offset = 0;
+				for (; ; )
+				{
+					var result = br.ReadLine();
+					var kv = result.Split(new string[] { ": " }, StringSplitOptions.RemoveEmptyEntries);
+
+					if (result == "")
+					{
+						/* data follows the blank line */
+
+						if (contentLength > 0)
+						{
+							if (f != null)
+								f(offset, contentLength);
+
+							var data = new byte[contentLength];
+							while (offset < contentLength)
+							{
+								var thisChunk = Math.Min(contentLength - offset, chunkSize);
+								br.Read(data, offset, thisChunk);
+								offset += thisChunk;
+								if (f != null)
+									f(offset, contentLength);
+							}
+							s.Close();
+							return data;
+						}
+						else
+						{
+							s.Close();
+							return new byte[] { };
+						}
+					}
+					else if (kv[0] == "Content-Length")
+						contentLength = int.Parse(kv[1]);
+				}
+			}
+		}
+
+		public static byte[] DownloadData(string url, Action<int, int> f)
+		{
+			return DownloadData(url, f, 4096);
+		}
+
+		public static byte[] DownloadData(string url)
+		{
+			return DownloadData(url, null);
+		}
+
+		static string ReadLine(this BinaryReader br)
+		{
+			var sb = new StringBuilder();
+			char c;
+			while ((c = br.ReadChar()) != '\n')
+				if (c != '\r' && c != '\n')
+					sb.Append(c);
+
+			return sb.ToString();
+		}
+	}
+}

OpenRA.FileFormats/Manifest.cs

@@ -18,11 +18,10 @@ namespace OpenRA.FileFormats
 	public class Manifest
 	{
 		public readonly string[]
-			Mods, Folders, Packages, Rules,
+			Mods, Folders, Packages, Rules, ServerTraits,
 			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
 			Weapons, Voices, Music, Movies, TileSets;
-
-		public readonly string ShellmapUid, LoadScreen;
+		public readonly string LoadScreen;
 		public readonly int TileSize = 24;
 
 		public Manifest(string[] mods)
@@ -36,6 +35,7 @@ namespace OpenRA.FileFormats
 			Folders = YamlList(yaml, "Folders");
 			Packages = YamlList(yaml, "Packages");
 			Rules = YamlList(yaml, "Rules");
+			ServerTraits = YamlList(yaml, "ServerTraits");
 			Sequences = YamlList(yaml, "Sequences");
 			Cursors = YamlList(yaml, "Cursors");
 			Chrome = YamlList(yaml, "Chrome");
@@ -47,7 +47,6 @@ namespace OpenRA.FileFormats
 			Movies = YamlList(yaml, "Movies");
 			TileSets = YamlList(yaml, "TileSets");
 
-			ShellmapUid = yaml.First( x => x.Key == "ShellmapUid" ).Value.Value;
 			LoadScreen = yaml.First( x => x.Key == "LoadScreen" ).Value.Value;
 			
 			if (yaml.FirstOrDefault( x => x.Key == "TileSize" ) != null)

OpenRA.FileFormats/Map/MapStub.cs

@@ -12,18 +12,22 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Security.Cryptography;
 
 namespace OpenRA.FileFormats
 {
 	public class MapStub
 	{
-		public IFolder Package { get; protected set; }
+		protected IFolder Container;
+		public string Path {get; protected set;}
 		
 		// Yaml map data
 		public string Uid { get; protected set; }
-		[FieldLoader.Load] public bool Selectable;
+		[FieldLoader.Load] public bool Selectable;
+        [FieldLoader.Load] public bool UseAsShellmap;
 
 		[FieldLoader.Load] public string Title;
+		[FieldLoader.Load] public string Type = "Conquest";
 		[FieldLoader.Load] public string Description;
 		[FieldLoader.Load] public string Author;
 		[FieldLoader.Load] public int PlayerCount;
@@ -35,19 +39,33 @@ namespace OpenRA.FileFormats
 		
 		[FieldLoader.Load] public int2 TopLeft;
 		[FieldLoader.Load] public int2 BottomRight;
-		public int Width { get { return BottomRight.X - TopLeft.X; } }
-		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
+		public Rectangle Bounds;
 		
-		public MapStub() {} // Hack for the editor - not used for anything important
-		public MapStub(IFolder package)
+		public MapStub() {} // Hack for the editor - not used for anything important
+		
+		public MapStub(string path)
 		{
-			Package = package;
-			var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
+			Path = path;
+			Container = FileSystem.OpenPackage(path, int.MaxValue);
+			var yaml = MiniYaml.FromStream(Container.GetContent("map.yaml"));
 			FieldLoader.Load( this, new MiniYaml( null, yaml ) );
-			
-			Uid = Package.GetContent("map.uid").ReadAllText();
+			
+			Bounds = Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y);
+            Uid = ComputeHash();
 		}
 
+        string ComputeHash()
+        {
+            // UID is calculated by taking an SHA1 of the yaml and binary data
+            // Read the relevant data into a buffer
+            var data = Container.GetContent("map.yaml").ReadAllBytes()
+                .Concat(Container.GetContent("map.bin").ReadAllBytes()).ToArray();
+
+            // Take the SHA1
+            using (var csp = SHA1.Create())
+                return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
+        }
+
 		static object LoadWaypoints( MiniYaml y )
 		{
 			var ret = new Dictionary<string, int2>();

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -8,7 +8,8 @@
  */
 #endregion
 
-using System.Drawing;
+using System.Drawing;
+using System;
 
 namespace OpenRA.FileFormats
 {
@@ -28,6 +29,7 @@ namespace OpenRA.FileFormats
 		public bool LockColor = false;
 		public Color Color = Color.FromArgb(238,238,238);
 		public Color Color2 = Color.FromArgb(44,28,24);
+        public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
 		
 		public int InitialCash = 0;
 		public string[] Allies = {};

OpenRA.FileFormats/MiniYaml.cs

@@ -225,7 +225,7 @@ namespace OpenRA.FileFormats
 		{
 			return string.Join("\n", y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
 		}
-
+		
 		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
 		{
 			foreach (var kv in y)

OpenRA.FileFormats/Mod.cs

@@ -12,7 +12,7 @@ namespace OpenRA.FileFormats
 		public string Description;
 		public string Version;
 		public string Author;
-		public string[] RequiresMods;
+		public string Requires;
 		public bool Standalone = false;
 
 		public static readonly Dictionary<string, Mod> AllMods = ValidateMods(Directory.GetDirectories("mods").Select(x => x.Substring(5)).ToArray());
@@ -27,9 +27,7 @@ namespace OpenRA.FileFormats
 
 				var yaml = new MiniYaml(null, MiniYaml.FromFile("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"));
 				if (!yaml.NodesDict.ContainsKey("Metadata"))
-				{
 					continue;
-				}
 
 				ret.Add(m, FieldLoader.Load<Mod>(yaml.NodesDict["Metadata"]));
 			}

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -45,6 +45,7 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
       <SpecificVersion>False</SpecificVersion>
@@ -53,23 +54,28 @@
     <Reference Include="WindowsBase">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ColorHSLR.cs" />
     <Compile Include="Evaluator.cs" />
     <Compile Include="Exts.cs" />
     <Compile Include="FieldLoader.cs" />
-    <Compile Include="FileSystem.cs" />
-    <Compile Include="Folder.cs" />
     <Compile Include="Graphics\IGraphicsDevice.cs" />
+    <Compile Include="Graphics\IInputHandler.cs" />
+    <Compile Include="Graphics\ShpWriter.cs" />
     <Compile Include="Graphics\Vertex.cs" />
+    <Compile Include="HttpUtil.cs" />
     <Compile Include="Manifest.cs" />
     <Compile Include="MiniYaml.cs" />
     <Compile Include="Mod.cs" />
     <Compile Include="PackageEntry.cs" />
-    <Compile Include="Package.cs" />
-    <Compile Include="PackageWriter.cs" />
     <Compile Include="Palette.cs" />
     <Compile Include="PlayerColorRemap.cs" />
+    <Compile Include="Primitives\ActionQueue.cs" />
     <Compile Include="Primitives\DisposableAction.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Thirdparty\Random.cs" />
@@ -99,8 +105,13 @@
     <Compile Include="Map\MapStub.cs" />
     <Compile Include="Map\SmudgeReference.cs" />
     <Compile Include="Map\PlayerReference.cs" />
-    <Compile Include="CompressedPackage.cs" />
     <Compile Include="Graphics\VqaReader.cs" />
+    <Compile Include="Filesystem\MixFile.cs" />
+    <Compile Include="Filesystem\FileSystem.cs" />
+    <Compile Include="Filesystem\Folder.cs" />
+    <Compile Include="Filesystem\InstallShieldPackage.cs" />
+    <Compile Include="FileFormats\Blast.cs" />
+    <Compile Include="Filesystem\ZipFile.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

OpenRA.FileFormats/PackageWriter.cs

@@ -1,48 +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.IO;
-
-namespace OpenRA.FileFormats
-{
-	public static class PackageWriter
-	{
-		public static void CreateMix(string filename, List<string> contents)
-		{
-			// Construct a list of entries for the file header
-			uint dataSize = 0;
-			var items = new List<PackageEntry>();
-			foreach (var file in contents)
-			{
-				uint length = (uint)new FileInfo(file).Length;
-				uint hash = PackageEntry.HashFilename(Path.GetFileName(file));
-				items.Add(new PackageEntry(hash, dataSize, length));
-				dataSize += length;
-			}
-
-			using (var s = File.Create(filename))
-			using (var writer = new BinaryWriter(s))
-			{
-				// Write file header
-				writer.Write((ushort)items.Count);
-				writer.Write(dataSize);
-				foreach (var item in items)
-					item.Write(writer);
-
-				writer.Flush();
-
-				// Copy file data
-				foreach (var file in contents)
-					s.Write(File.ReadAllBytes(file));
-			}
-		}
-	}
-}

OpenRA.FileFormats/PlayerColorRemap.cs

@@ -21,8 +21,11 @@ namespace OpenRA.FileFormats
 	{
 		Dictionary<int, Color> remapColors;
 
-		public PlayerColorRemap(Color c1, Color c2, PaletteFormat fmt)
+		public PlayerColorRemap(ColorRamp c, PaletteFormat fmt)
 		{
+            var c1 = c.GetColor(0);
+            var c2 = c.GetColor(1); /* temptemp: this can be expressed better */
+
 			var baseIndex = (fmt == PaletteFormat.cnc) ? 0xb0 : (fmt == PaletteFormat.d2k) ? 240 : 80;
 			var ramp = (fmt == PaletteFormat.cnc)
 				? new[] { 0, 2, 4, 6, 8, 10, 13, 15, 1, 3, 5, 7, 9, 11, 12, 14 }
@@ -32,7 +35,7 @@ namespace OpenRA.FileFormats
 				.ToDictionary(u => u.First, u => u.Second);
 		}
 
-		static Color ColorLerp(float t, Color c1, Color c2)
+		public static Color ColorLerp(float t, Color c1, Color c2)
 		{
 			return Color.FromArgb(255,
 				(int)(t * c2.R + (1 - t) * c1.R),
@@ -46,34 +49,5 @@ namespace OpenRA.FileFormats
 			return remapColors.TryGetValue(index, out c) 
 				? c : original;
 		}
-
-		// hk is hue in the range [0,1] instead of [0,360]
-		public static Color ColorFromHSL(float hk, float s, float l)
-		{
-			// Convert from HSL to RGB
-			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
-			var p = 2 * l - q;
-
-			float[] trgb = { hk + 1 / 3.0f,
-							  hk,
-							  hk - 1/3.0f };
-			float[] rgb = { 0, 0, 0 };
-
-			for (int k = 0; k < 3; k++)
-			{
-				while (trgb[k] < 0) trgb[k] += 1.0f;
-				while (trgb[k] > 1) trgb[k] -= 1.0f;
-			}
-
-			for (int k = 0; k < 3; k++)
-			{
-				if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
-				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
-				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
-				else { rgb[k] = p; }
-			}
-
-			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
-		}
 	}
 }

OpenRA.FileFormats/Primitives/ActionQueue.cs

@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA.FileFormats
+{
+	/// <summary>
+	/// A thread-safe action queue, suitable for passing units of work between threads.
+	/// </summary>
+	public class ActionQueue
+	{
+		object syncRoot = new object();
+		Action actions = () => { };
+
+		public void Add(Action a)
+		{
+			lock (syncRoot)
+				actions += a;
+		}
+
+		public void PerformActions()
+		{
+			Action a;
+			lock (syncRoot)
+			{
+				a = actions; 
+				actions = () => { };
+			}
+			a();
+		}
+	}
+}

OpenRA.FileFormats/Primitives/float2.cs

@@ -62,7 +62,8 @@ namespace OpenRA
 				Constrain(Y, min.Y, max.Y));
 		}
 
-		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+        public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+        public static float2 operator *(float2 b, float a) { return new float2(a * b.X, a * b.Y); }
 		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
 		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
 

OpenRA.FileFormats/Primitives/int2.cs

@@ -27,6 +27,8 @@ namespace OpenRA
 		public static int2 operator *(int2 b, int a) { return new int2(a * b.X, a * b.Y); }
 		public static int2 operator /(int2 a, int b) { return new int2(a.X / b, a.Y / b); }
 
+		public static int2 operator -(int2 a) { return new int2(-a.X, -a.Y); }
+
 		public static bool operator ==(int2 me, int2 other) { return (me.X == other.X && me.Y == other.Y); }
 		public static bool operator !=(int2 me, int2 other) { return !(me == other); }
 
@@ -70,5 +72,14 @@ namespace OpenRA
 		{
 			return a + ( b - a ) * mul / div;
 		}
+		
+		public int2 Clamp(Rectangle r)
+		{
+			return new int2(Math.Min(r.Right, Math.Max(X, r.Left)),
+			                Math.Min(r.Bottom, Math.Max(Y, r.Top)));
+		}
+		
+		public static int Dot(int2 a, int2 b) { return a.X * b.X + a.Y * b.Y; }
+
 	}
 }

OpenRA.Game/Actor.cs

@@ -27,11 +27,11 @@ namespace OpenRA
 		public readonly uint ActorID;
 
 		public int2 Location { get { return Trait<IOccupySpace>().TopLeft; } }
-		public float2 CenterLocation { get { return Trait<IHasLocation>().PxPosition; } }
+		public int2 CenterLocation { get { return Trait<IHasLocation>().PxPosition; } }
 		[Sync]
 		public Player Owner;
 
-		IActivity currentActivity;
+		private IActivity currentActivity;
 		public Group Group;
 
 		internal Actor(World world, string name, TypeDictionary initDict )
@@ -61,40 +61,23 @@ namespace OpenRA
 
 				// auto size from render
 				var firstSprite = TraitsImplementing<IRender>().SelectMany(x => x.Render(this)).FirstOrDefault();
-				if (firstSprite.Sprite == null) return float2.Zero;
-				return firstSprite.Sprite.size;
+				if (firstSprite.Sprite == null) return float2.Zero;
+                return firstSprite.Sprite.size * firstSprite.Scale;
 			});
 		}
 
 		public void Tick()
 		{
-			var wasIdle = currentActivity is Idle;
-			while (currentActivity != null)
-			{
-				var a = currentActivity;
-				
-				var sw = new Stopwatch();
-				currentActivity = a.Tick(this) ?? new Idle();
-				var dt = sw.ElapsedTime();
-				if(dt > Game.Settings.Debug.LongTickThreshold)
-					Log.Write("perf", "[{2}] Activity: {0} ({1:0.000} ms)", a, dt * 1000, Game.LocalTick);
-				
-				if (a == currentActivity) break;
+			if (currentActivity == null)
+				foreach (var ni in TraitsImplementing<INotifyIdle>())
+					ni.TickIdle(this);
 
-				if (currentActivity is Idle)
-				{
-					if (!wasIdle)
-						foreach (var ni in TraitsImplementing<INotifyIdle>())
-							ni.Idle(this);
-
-					break;
-				}
-			}
+			currentActivity = Util.RunActivity( this, currentActivity );
 		}
 
 		public bool IsIdle
 		{
-			get { return currentActivity == null || currentActivity is Idle; }
+			get { return currentActivity == null; }
 		}
 
         OpenRA.FileFormats.Lazy<float2> Size;
@@ -105,27 +88,39 @@ namespace OpenRA
 			var sprites = TraitsImplementing<IRender>().SelectMany(x => x.Render(this));
 			return mods.Aggregate(sprites, (m, p) => p.ModifyRender(this, m));
 		}
-
+		
+		// When useAltitude = true, the bounding box is extended
+		// vertically to altitude = 0 to support FindUnitsInCircle queries
+		// When false, the bounding box is given for the actor
+		// at its current altitude
 		public RectangleF GetBounds(bool useAltitude)
 		{
-			var si = Info.Traits.GetOrDefault<SelectableInfo>();
-
 			var size = Size.Value;
-			var loc = CenterLocation - 0.5f * size;
+			var loc = CenterLocation - 0.5f * size;
 			
+			var si = Info.Traits.GetOrDefault<SelectableInfo>();
 			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
 				loc += new float2(si.Bounds[2], si.Bounds[3]);
 
-			if (useAltitude)
-			{
-				var move = TraitOrDefault<IMove>();
-				if (move != null) loc -= new float2(0, move.Altitude);
+			var move = TraitOrDefault<IMove>();
+			if (move != null)
+			{
+				loc -= new float2(0, move.Altitude);
+				if (useAltitude)
+					size = new float2(size.X, size.Y + move.Altitude);
 			}
-
+		
 			return new RectangleF(loc.X, loc.Y, size.X, size.Y);
 		}
 
-		public bool IsInWorld { get; internal set; }
+		public bool IsInWorld { get; internal set; }
+
+		public void QueueActivity( bool queued, IActivity nextActivity )
+		{
+			if( !queued )
+				CancelActivity();
+			QueueActivity( nextActivity );
+		}
 
 		public void QueueActivity( IActivity nextActivity )
 		{
@@ -141,7 +136,6 @@ namespace OpenRA
 				currentActivity.Cancel( this );
 		}
 
-		// For pathdebug, et al
 		public IActivity GetCurrentActivity()
 		{
 			return currentActivity;
@@ -194,12 +188,24 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask( w =>
 			{
-				if (Destroyed || !IsInWorld) return;
+				if (Destroyed) return;
 
 				World.Remove( this );
 				World.traitDict.RemoveActor( this );
 				Destroyed = true;
 			} );
 		}
+
+		// todo: move elsewhere.
+		public void ChangeOwner(Player newOwner)
+		{
+			World.AddFrameEndTask(w =>
+			{
+				// momentarily remove from world so the ownership queries don't get confused
+				w.Remove(this);
+				Owner = newOwner;
+				w.Add(this);
+			});
+		}
 	}
 }

OpenRA.Game/ActorReference.cs

@@ -23,9 +23,6 @@ namespace OpenRA.FileFormats
 
 		public ActorReference( string type, Dictionary<string, MiniYaml> inits )
 		{
-			if (Rules.Info != null && !Rules.Info.ContainsKey(type))
-				throw new InvalidDataException("Unknown actor: `{0}'".F(type));
-			
 			Type = type;
 			InitDict = new TypeDictionary();
 			foreach( var i in inits )

OpenRA.Game/Cursor.cs

@@ -20,9 +20,9 @@ namespace OpenRA
 			sequence = CursorProvider.GetCursorSequence(cursor);
 		}
 		
-		public void Draw(WorldRenderer wr, int frame, float2 pos)
+		public void Draw(int frame, float2 pos)
 		{
-			sequence.GetSprite(frame).DrawAt(wr, pos - sequence.Hotspot, sequence.Palette);
+			sequence.GetSprite(frame).DrawAt(pos - sequence.Hotspot, Game.modData.Palette.GetPaletteIndex(sequence.Palette));
 		}
 	}
 }

OpenRA.Game/Effects/MoveFlash.cs

@@ -1,46 +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 OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Effects
-{
-	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;
-			anim.PlayThen( "idle", 
-				() => world.AddFrameEndTask( 
-					w => w.Remove( this ) ) );
-		}
-
-		public void Tick( World world ) { anim.Tick(); }
-
-		public IEnumerable<Renderable> Render()
-		{
-			yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "shadow", (int)pos.Y);
-		}
-	}
-}

OpenRA.Game/Exts.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Support;
-using OpenRA.Traits;
 
 namespace OpenRA
 {

OpenRA.Game/Game.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.GameRules;
@@ -28,6 +29,8 @@ namespace OpenRA
 {
 	public static class Game
 	{
+		public static Utilities Utilities;
+		
 		public static int CellSize { get { return modData.Manifest.TileSize; } }
 
 		public static ModData modData;
@@ -37,51 +40,70 @@ namespace OpenRA
 		public static Settings Settings;
 
 		internal static OrderManager orderManager;
+		static Server.Server server;
 
 		public static XRandom CosmeticRandom = new XRandom();	// not synced
 
 		public static Renderer Renderer;
 		public static bool HasInputFocus = false;
 		
-		public static void MoveViewport(int2 loc)
+		public static void MoveViewport(float2 loc)
 		{
 			viewport.Center(loc);
 		}
 
-		internal static void JoinServer(string host, int port)
+		public static void JoinServer(string host, int port)
 		{
-			if (orderManager != null) orderManager.Dispose();
-
 			var replayFilename = ChooseReplayFilename();
 			string path = Path.Combine( Game.SupportDir, "Replays" );
 			if( !Directory.Exists( path ) ) Directory.CreateDirectory( path );
 			var replayFile = File.Create( Path.Combine( path, replayFilename ) );
 
-			orderManager = new OrderManager( host, port, new ReplayRecorderConnection( new NetworkConnection( host, port ), replayFile ) );
+			JoinInner(new OrderManager(host, port, 
+				new ReplayRecorderConnection(new NetworkConnection(host, port), replayFile)));
+		}		
+
+		static string ChooseReplayFilename()
+		{
+			return DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddTHHmmssZ.rep");
+		}
+
+		static void JoinInner(OrderManager om)
+		{
+			if (orderManager != null) orderManager.Dispose();
+			orderManager = om;
 			lastConnectionState = ConnectionState.PreConnecting;
 			ConnectionStateChanged(orderManager);
 		}
 
-		static string ChooseReplayFilename()
+		public static void JoinReplay(string replayFile)
 		{
-			return DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddThhmmssZ.rep");
+			JoinInner(new OrderManager("<no server>", -1, new ReplayConnection(replayFile)));
 		}
 
 		static void JoinLocal()
 		{
-			if (orderManager != null) orderManager.Dispose();
-			orderManager = new OrderManager("<no server>", -1, new EchoConnection());
-			lastConnectionState = ConnectionState.PreConnecting;
-			ConnectionStateChanged( orderManager );
+			JoinInner(new OrderManager("<no server>", -1, new EchoConnection()));
 		}
 
-		internal static int RenderFrame = 0;
-		internal static int LocalTick { get { return orderManager.LocalFrameNumber; } }
+		public static int RenderFrame = 0;
+		public static int NetFrameNumber { get { return orderManager.NetFrameNumber; } }
+		public static int LocalTick { get { return orderManager.LocalFrameNumber; } }
 		const int NetTickScale = 3;		// 120ms net tick for 40ms local tick
 
-		internal static event Action<OrderManager> ConnectionStateChanged = _ => { };
+		public static event Action<OrderManager> ConnectionStateChanged = _ => { };
 		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
 		public static int LocalClientId { get { return orderManager.Connection.LocalClientId; } }
+		
+		
+		// Hacky workaround for orderManager visibility
+		public static Widget OpenWindow(World world, string widget)
+		{
+			return Widget.OpenWindow(widget, new Dictionary<string,object>{{ "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer }});
+		}
+
+		static ActionQueue afterTickActions = new ActionQueue();
+		public static void RunAfterTick(Action a) { afterTickActions.Add(a); }
 
 		static void Tick( OrderManager orderManager, Viewport viewPort )
 		{
@@ -92,22 +114,22 @@ namespace OpenRA
 			}
 
 			Tick( orderManager );
-			if( orderManager.world != worldRenderer.world )
+			if( worldRenderer != null && orderManager.world != worldRenderer.world )
 				Tick( worldRenderer.world.orderManager );
 
 			using (new PerfSample("render"))
 			{
 				++RenderFrame;
-				viewport.DrawRegions(worldRenderer);
+				viewport.DrawRegions(worldRenderer, new DefaultInputHandler( orderManager.world ));
 				Sound.SetListenerPosition(viewport.Location + .5f * new float2(viewport.Width, viewport.Height));
 			}
 
 			PerfHistory.items["render"].Tick();
 			PerfHistory.items["batches"].Tick();
-			PerfHistory.items["text"].Tick();
-			PerfHistory.items["cursor"].Tick();
 
 			MasterServerQuery.Tick();
+
+			afterTickActions.PerformActions();
 		}
 
 		private static void Tick( OrderManager orderManager )
@@ -125,34 +147,37 @@ namespace OpenRA
 					Sound.Tick();
 					Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate(); } );
 
-					var isNetTick = LocalTick % NetTickScale == 0;
-
-					if( !isNetTick || orderManager.IsReadyForNextFrame )
+					if (world != null)
 					{
-						++orderManager.LocalFrameNumber;
+						var isNetTick = LocalTick % NetTickScale == 0;
 
-						Log.Write( "debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local" );
+						if (!isNetTick || orderManager.IsReadyForNextFrame)
+						{
+							++orderManager.LocalFrameNumber;
 
-						if( isNetTick ) orderManager.Tick();
+							Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
 
-						Sync.CheckSyncUnchanged(world, () =>
-							{
-								world.OrderGenerator.Tick(world);
-								world.Selection.Tick(world);
-							});
-						
-						world.Tick();
-						worldRenderer.Tick();
+							if (isNetTick) orderManager.Tick();
 
-						PerfHistory.Tick();
+
+							Sync.CheckSyncUnchanged(world, () =>
+								{
+									world.OrderGenerator.Tick(world);
+									world.Selection.Tick(world);
+								});
+
+							world.Tick();
+
+							PerfHistory.Tick();
+						}
+						else
+							if (orderManager.NetFrameNumber == 0)
+								orderManager.LastTickTime = Environment.TickCount;
 					}
-					else
-						if( orderManager.NetFrameNumber == 0 )
-							orderManager.LastTickTime = Environment.TickCount;
 				}
 		}
 
-		internal static event Action LobbyInfoChanged = () => { };
+		public static event Action LobbyInfoChanged = () => { };
 
 		internal static void SyncLobbyInfo()
 		{
@@ -166,7 +191,7 @@ namespace OpenRA
 			BeforeGameStart();
 
 			var map = modData.PrepareMap(mapUID);
-			viewport = new Viewport(new float2(Renderer.Resolution), map.TopLeft, map.BottomRight, Renderer);
+			viewport = new Viewport(new int2(Renderer.Resolution), map.Bounds, Renderer);
 			orderManager.world = new World(modData.Manifest, map, orderManager);
 			worldRenderer = new WorldRenderer(orderManager.world);
 
@@ -174,43 +199,24 @@ namespace OpenRA
 			Widget.SelectedWidget = null;
 
 			orderManager.LocalFrameNumber = 0;
-
 			orderManager.StartGame();
 			worldRenderer.RefreshPalette();
 			AfterGameStart( orderManager.world );
 		}
 
-		public static void DispatchMouseInput(MouseInputEvent ev, MouseEventArgs e, Modifiers modifierKeys)
-		{
-			Sync.CheckSyncUnchanged( orderManager.world, () =>
-			{
-				var mi = new MouseInput
-				{
-					Button = (MouseButton)(int)e.Button,
-					Event = ev,
-					Location = new int2( e.Location ),
-					Modifiers = modifierKeys,
-				};
-				Widget.HandleInput( mi );
-			} );
-		}
-
 		public static bool IsHost
 		{
 			get { return orderManager.Connection.LocalClientId == 0; }
 		}
-
-		public static void HandleKeyEvent(KeyInput e)
+		
+		public static Dictionary<String, Mod> CurrentMods
 		{
-			Sync.CheckSyncUnchanged( orderManager.world, () =>
-			{
-				Widget.HandleKeyPress( e );
-			} );
+			get { return Mod.AllMods.Where( k => orderManager.LobbyInfo.GlobalSettings.Mods.Contains( k.Key )).ToDictionary( k => k.Key, k => k.Value ); }
 		}
 
 		static Modifiers modifiers;
 		public static Modifiers GetModifierKeys() { return modifiers; }
-		public static void HandleModifierKeys(Modifiers mods) {	modifiers = mods; }
+		internal static void HandleModifierKeys(Modifiers mods) { modifiers = mods; }
 
 		internal static void Initialize(Arguments args)
 		{
@@ -220,12 +226,11 @@ namespace OpenRA
 												+ Path.DirectorySeparatorChar + "OpenRA";
 
 			SupportDir = args.GetValue("SupportDir", defaultSupport);
+			FileSystem.SpecialPackageRoot = args.GetValue("SpecialPackageRoot", "");
+			
+			Utilities = new Utilities(args.GetValue("UtilityPath", "OpenRA.Utility.exe"));
+			
 			Settings = new Settings(SupportDir + "settings.yaml", args);
-
-			// force master server upgrade -- remove once everyone is switched over.
-			if (Settings.Server.MasterServer == "http://open-ra.org/master/")
-				Settings.Server.MasterServer = "http://master.open-ra.org/";
-
 			Settings.Save();
 
 			Log.LogPath = SupportDir + "Logs" + Path.DirectorySeparatorChar;
@@ -242,56 +247,62 @@ namespace OpenRA
 			foreach(var mod in Mod.AllMods)
 				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
 			
-			// Discard any invalid mods
-			var mods = Settings.Game.Mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
-			Console.WriteLine("Loading mods: {0}",string.Join(",",mods));
+			Sound.Create();
+			InitializeWithMods(Settings.Game.Mods);
+		}
+		
+		public static void InitializeWithMods(string[] mods)
+		{
+			// Clear static state if we have switched mods
+			LobbyInfoChanged = () => {};
+			AddChatLine = (a,b,c) => {};
+			worldRenderer = null;
+			if (server != null)
+				server.Shutdown();
+			if (orderManager != null)
+				orderManager.Dispose();
 			
-			modData = new ModData( mods );
+			// Discard any invalid mods
+			var mm = mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
+			Console.WriteLine("Loading mods: {0}",string.Join(",",mm));
+			Settings.Game.Mods = mm;
+			Settings.Save();
 			
 			Sound.Initialize();
+			
+			modData = new ModData( mm );
+			modData.LoadInitialAssets();
+			
+			
 			PerfHistory.items["render"].hasNormalTick = false;
 			PerfHistory.items["batches"].hasNormalTick = false;
-			PerfHistory.items["text"].hasNormalTick = false;
-			PerfHistory.items["cursor"].hasNormalTick = false;
 
-			
 			JoinLocal();
-			StartGame(modData.Manifest.ShellmapUid);
-
-			Game.ConnectionStateChanged += orderManager =>
-			{
-				Widget.CloseWindow();
-				switch( orderManager.Connection.ConnectionState )
-				{
-					case ConnectionState.PreConnecting:
-						Widget.OpenWindow("MAINMENU_BG");
-						break;
-					case ConnectionState.Connecting:
-						Widget.OpenWindow( "CONNECTING_BG",
-							new Dictionary<string, object> { { "host", orderManager.Host }, { "port", orderManager.Port } } );
-						break;
-					case ConnectionState.NotConnected:
-						Widget.OpenWindow( "CONNECTION_FAILED_BG",
-							new Dictionary<string, object> { { "host", orderManager.Host }, { "port", orderManager.Port } } );
-						break;
-					case ConnectionState.Connected:
-						var lobby = Widget.OpenWindow( "SERVER_LOBBY", new Dictionary<string, object> { { "orderManager", orderManager } } );
-						lobby.GetWidget<ChatDisplayWidget>("CHAT_DISPLAY").ClearChat();
-						lobby.GetWidget("CHANGEMAP_BUTTON").Visible = true;
-						lobby.GetWidget("LOCKTEAMS_CHECKBOX").Visible = true;
-						lobby.GetWidget("DISCONNECT_BUTTON").Visible = true;
-						//r.GetWidget("INGAME_ROOT").GetWidget<ChatDisplayWidget>("CHAT_DISPLAY").ClearChat();	
-						break;
-				}
-			};
-
-			modData.WidgetLoader.LoadWidget( new Dictionary<string,object>(), Widget.RootWidget, "PERF_BG" );
-			Widget.OpenWindow("MAINMENU_BG");
-
+			viewport = new Viewport(new int2(Renderer.Resolution), Rectangle.Empty, Renderer);
+			
+			Widget.RootWidget.RemoveChildren();
+			modData.WidgetLoader.LoadWidget( new Dictionary<string,object>(), Widget.RootWidget, "INIT_SETUP" );
+		}
+		
+		public static void LoadShellMap()
+		{
+			StartGame(ChooseShellmap());
 			Game.orderManager.LastTickTime = Environment.TickCount;
 		}
+		
+        static string ChooseShellmap()
+        {
+            var shellmaps =  modData.AvailableMaps
+                .Where(m => m.Value.UseAsShellmap);
+			
+			if (shellmaps.Count() == 0)
+				throw new InvalidDataException("No valid shellmaps available");
+			
+			return shellmaps.Random(CosmeticRandom).Key;
+        }
 
 		static bool quit;
+		public static event Action OnQuit = () => {};
 		internal static void Run()
 		{
 			while (!quit)
@@ -299,6 +310,7 @@ namespace OpenRA
 				Tick( orderManager, viewport );
 				Application.DoEvents();
 			}
+			OnQuit();
 		}
 
 		public static void Exit() { quit = true; }
@@ -312,8 +324,11 @@ namespace OpenRA
 
 		public static void Disconnect()
 		{
+			if (IsHost && server != null)
+				server.Shutdown();
+
 			orderManager.Dispose();
-			var shellmap = modData.Manifest.ShellmapUid;
+			var shellmap = ChooseShellmap();
 			JoinLocal();
 			StartGame(shellmap);
 
@@ -344,5 +359,11 @@ namespace OpenRA
 		{
 			return modData.ObjectCreator.CreateObject<T>( name );
 		}
+
+		public static void CreateAndJoinServer(Settings settings, string map)
+		{
+			server = new Server.Server(modData, settings, map);
+			JoinServer(IPAddress.Loopback.ToString(), settings.Server.ListenPort);
+		}
 	}
 }

OpenRA.Game/GameRules/ActorInfo.cs

@@ -66,21 +66,21 @@ namespace OpenRA
 			var ret = new List<ITraitInfo>();
 			var t = Traits.WithInterface<ITraitInfo>().ToList();
 			int index = 0;
-			while( t.Count != 0 )
+			while (t.Count != 0)
 			{
-				if( index >= t.Count )
-					throw new InvalidOperationException( "Trait prerequisites not satisfied (or prerequisite loop) Actor={0} Unresolved={1}".F(
-						Name, string.Join( ",", t.Select( x => x.GetType().Name ).ToArray())));
-
-				var prereqs = PrerequisitesOf( t[ index ] );
-				if( prereqs.Count == 0 || prereqs.All( n => ret.Any( x => x.GetType() == n || x.GetType().IsSubclassOf( n ) ) ) )
+				var prereqs = PrerequisitesOf(t[index]);
+				var unsatisfied = prereqs.Where(n => !ret.Any(x => x.GetType() == n || x.GetType().IsSubclassOf(n)));
+				if (!unsatisfied.Any())
 				{
-					ret.Add( t[ index ] );
-					t.RemoveAt( index );
+					ret.Add(t[index]);
+					t.RemoveAt(index);
 					index = 0;
 				}
-				else
-					++index;
+				else if (++index >= t.Count)
+					throw new InvalidOperationException("Trait prerequisites not satisfied (or prerequisite loop) Actor={0} Unresolved={1} Missing={2}".F(
+						Name,
+						string.Join(",", t.Select(x => x.GetType().Name).ToArray()),
+						string.Join(",", unsatisfied.Select(x => x.Name).ToArray())));
 			}
 
 			return ret;

OpenRA.Game/GameRules/Rules.cs

@@ -27,9 +27,10 @@ namespace OpenRA
 
 		public static void LoadRules(Manifest m, Map map)
 		{
+			// Added support to extend the list of rules (add it to m.LocalRules)
 			Info = LoadYamlRules(m.Rules, map.Rules, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
-			Weapons = LoadYamlRules(m.Weapons, new List<MiniYamlNode>(), (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
-			Voices = LoadYamlRules(m.Voices, new List<MiniYamlNode>(), (k, _) => new VoiceInfo(k.Value));
+			Weapons = LoadYamlRules(m.Weapons, map.Weapons, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+			Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new VoiceInfo(k.Value));
 			Music = LoadYamlRules(m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
 			Movies = LoadYamlRules(m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
 			

OpenRA.Game/GameRules/Settings.cs

@@ -15,6 +15,7 @@ using System.IO;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;
+using OpenRA.Server;
 
 namespace OpenRA.GameRules
 {
@@ -30,17 +31,18 @@ namespace OpenRA.GameRules
 	
 	public class DebugSettings
 	{
+		public bool BotDebug = false;
 		public bool PerfGraph = false;
-		public bool RecordSyncReports = true;
-		public bool ShowCollisions = false;
 		public float LongTickThreshold = 0.001f;
+        public bool SanityCheckUnsyncedCode = false;
 	}
-	
+
 	public class GraphicSettings
 	{
+		public string Renderer = "Gl";
 		public WindowMode Mode = WindowMode.PseudoFullscreen;
-		public int2 FullscreenSize = new int2(Screen.PrimaryScreen.Bounds.Width,Screen.PrimaryScreen.Bounds.Height);
-		public int2 WindowedSize = new int2(1024,768);
+		public int2 FullscreenSize = new int2(Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height);
+		public int2 WindowedSize = new int2(1024, 768);
 		public readonly int2 MinResolution = new int2(800, 600);
 	}
 	
@@ -56,8 +58,9 @@ namespace OpenRA.GameRules
 	public class PlayerSettings
 	{
 		public string Name = "Newbie";
-		public Color Color1 = Color.FromArgb(255,160,238);
-		public Color Color2 = Color.FromArgb(68,0,56);
+		[Obsolete] public Color Color1 = Color.FromArgb(255,160,238); 
+		[Obsolete] public Color Color2 = Color.FromArgb(68,0,56);
+        public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
 		public string LastServer = "localhost:1234";
 	}
 	
@@ -90,7 +93,7 @@ namespace OpenRA.GameRules
 		public ServerSettings Server = new ServerSettings();
 		public DebugSettings Debug = new DebugSettings();
 		
-		Dictionary<string, object> Sections;
+		public Dictionary<string, object> Sections;
 		public Settings(string file, Arguments args)
 		{			
 			SettingsFile = file;
@@ -104,6 +107,7 @@ namespace OpenRA.GameRules
 				{"Debug", Debug}
 			};
 			
+			
 			// Override fieldloader to ignore invalid entries
 			var err1 = FieldLoader.UnknownFieldAction;
 			var err2 = FieldLoader.InvalidValueAction;
@@ -115,7 +119,7 @@ namespace OpenRA.GameRules
 			
 			if (File.Exists(SettingsFile))
 			{
-				Console.WriteLine("Loading settings file {0}",SettingsFile);
+				//Console.WriteLine("Loading settings file {0}",SettingsFile);
 				var yaml = MiniYaml.DictFromFile(SettingsFile);
 				
 				foreach (var kv in Sections)

OpenRA.Game/Graphics/Animation.cs

@@ -56,13 +56,14 @@ namespace OpenRA.Graphics
 			PlayThen( sequenceName, () => PlayRepeating( CurrentSequence.Name ) );
 		}
 
-		public void ReplaceAnim(string sequenceName)
+		public bool ReplaceAnim(string sequenceName)
 		{
 			if (!HasSequence(sequenceName))
-				return;
+				return false;
 
 			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
 			frame %= CurrentSequence.Length;
+			return true;
 		}
 
 		public void PlayThen( string sequenceName, Action after )
@@ -124,14 +125,15 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public void ChangeImage(string newImage)
+		public void ChangeImage(string newImage, string newAnimIfMissing)
 		{
 			newImage = newImage.ToLowerInvariant();
 			
 			if (name != newImage)
 			{
 				name = newImage.ToLowerInvariant();
-				ReplaceAnim(CurrentSequence.Name);
+				if (!ReplaceAnim(CurrentSequence.Name))
+					ReplaceAnim(newAnimIfMissing);
 			}
 		}
 

OpenRA.Game/Graphics/CursorProvider.cs

@@ -20,33 +20,25 @@ namespace OpenRA.Graphics
 	public static class CursorProvider
 	{
 		static Dictionary<string, CursorSequence> cursors;
-
-		public static void Initialize(string[] sequenceFiles)
-		{
-			cursors = new Dictionary<string, CursorSequence>();
-			
-			foreach (var f in sequenceFiles)
-				LoadSequenceSource(f);
-		}
-
-		static void LoadSequenceSource(string filename)
-		{
-			XmlDocument document = new XmlDocument();
-			document.Load(FileSystem.Open(filename));
 				
-			foreach (XmlElement eCursor in document.SelectNodes("/sequences/cursor"))
-				LoadSequencesForCursor(eCursor);
+		public static void Initialize(string[] sequenceFiles)
+		{	
+			cursors = new Dictionary<string, CursorSequence>();
+			var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.Merge));
+			
+			foreach (var s in sequences.NodesDict["Palettes"].Nodes)
+				Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), false));
+
+			foreach (var s in sequences.NodesDict["Cursors"].Nodes)
+				LoadSequencesForCursor(s.Key, s.Value);
 		}
 
-		static void LoadSequencesForCursor(XmlElement eCursor)
+		static void LoadSequencesForCursor(string cursorSrc, MiniYaml cursor)
 		{
 			Game.modData.LoadScreen.Display();
-			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, palette, eSequence));
 
+			foreach (var sequence in cursor.Nodes)
+				cursors.Add(sequence.Key, new CursorSequence(cursorSrc, cursor.Value, sequence.Value));
 		}
 		
 		public static bool HasCursorSequence(string cursor)

OpenRA.Game/Graphics/CursorSequence.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Xml;
+using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
 {
@@ -25,24 +26,27 @@ namespace OpenRA.Graphics
 
 		Sprite[] sprites;
 
-		public CursorSequence(string cursorSrc, string palette, XmlElement e)
+		public CursorSequence(string cursorSrc, string palette, MiniYaml info)
 		{
 			sprites = Game.modData.CursorSheetBuilder.LoadAllSprites(cursorSrc);
+			var d = info.NodesDict;
 
-			start = int.Parse(e.GetAttribute("start"));
+			start = int.Parse(d["start"].Value);
 			this.palette = palette;
 			
-			if (e.GetAttribute("length") == "*" || e.GetAttribute("end") == "*")
+			if ((d.ContainsKey("length") && d["length"].Value == "*") || (d.ContainsKey("end") && d["end"].Value == "*"))
 				length = sprites.Length - start;
-			else if (e.HasAttribute("length"))
-				length = int.Parse(e.GetAttribute("length"));
-			else if (e.HasAttribute("end"))
-				length = int.Parse(e.GetAttribute("end")) - start;
+			else if (d.ContainsKey("length"))
+				length = int.Parse(d["length"].Value);
+			else if (d.ContainsKey("end"))
+				length = int.Parse(d["end"].Value) - start;
 			else
 				length = 1;
-
-			int.TryParse( e.GetAttribute("x"), out Hotspot.X );
-			int.TryParse( e.GetAttribute("y"), out Hotspot.Y );
+			
+			if (d.ContainsKey("x"))
+				int.TryParse(d["x"].Value, out Hotspot.X );
+			if (d.ContainsKey("y"))
+				int.TryParse(d["y"].Value, out Hotspot.Y );
 		}
 
 		public Sprite GetSprite(int frame)

OpenRA.Game/Graphics/CursorSheetBuilder.cs

@@ -27,7 +27,7 @@ namespace OpenRA.Graphics
 		}
 
 		Sprite[] LoadCursors(string filename)
-		{
+        {
 			try
 			{
 				var shp = new Dune2ShpReader(FileSystem.OpenWithExts(filename, exts));

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -17,7 +17,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
-	class HardwarePalette
+	public class HardwarePalette
 	{
 		public const int MaxPalettes = 64;
 		int allocated = 0;
@@ -26,7 +26,7 @@ namespace OpenRA.Graphics
 		Dictionary<string, Palette> palettes;
 		Dictionary<string, int> indices;
 		
-		public HardwarePalette(Map map)
+		public HardwarePalette()
 		{
 			palettes = new Dictionary<string, Palette>();
 			indices = new Dictionary<string, int>();
@@ -51,6 +51,9 @@ namespace OpenRA.Graphics
 		
 		public void AddPalette(string name, Palette p)
 		{
+			if (palettes.ContainsKey(name))
+				throw new InvalidOperationException("Palette {0} has already been defined".F(name));
+			
 			palettes.Add(name, p);
 			indices.Add(name, allocated++);
 		}

OpenRA.Game/Graphics/Minimap.cs

@@ -28,12 +28,12 @@ namespace OpenRA.Graphics
 		public static Bitmap TerrainBitmap(Map map, bool actualSize)
 		{
 			var tileset = Rules.TileSets[map.Tileset];
-			var width = map.Width;
-			var height = map.Height;
+			var width = map.Bounds.Width;
+			var height = map.Bounds.Height;
 			
 			if (!actualSize)
 			{
-				width = height = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+				width = height = Util.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			}
 			
 			Bitmap terrain = new Bitmap(width, height);
@@ -45,11 +45,11 @@ namespace OpenRA.Graphics
 			{
 				int* c = (int*)bitmapData.Scan0;
 
-				for (var x = 0; x < map.Width; x++)
-					for (var y = 0; y < map.Height; y++)
+				for (var x = 0; x < map.Bounds.Width; x++)
+					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;
+						var mapX = x + map.Bounds.Left;
+						var mapY = y + map.Bounds.Top;
 						var type = tileset.GetTerrainType(map.MapTiles[mapX, mapY]);
 						if (!tileset.Terrain.ContainsKey(type))
 							throw new InvalidDataException("Tileset {0} lacks terraintype {1}".F(tileset.Id, type));
@@ -75,11 +75,11 @@ namespace OpenRA.Graphics
 			{
 				int* c = (int*)bitmapData.Scan0;
 
-				for (var x = 0; x < map.Width; x++)
-					for (var y = 0; y < map.Height; y++)
+				for (var x = 0; x < map.Bounds.Width; x++)
+					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;	
+						var mapX = x + map.Bounds.Left;
+						var mapY = y + map.Bounds.Top;	
 						if (map.MapResources[mapX, mapY].type == 0)
 							continue;
 					
@@ -100,7 +100,7 @@ namespace OpenRA.Graphics
 		public static Bitmap CustomTerrainBitmap(World world)
 		{
 			var map = world.Map;
-			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			var size = Util.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			Bitmap bitmap = new Bitmap(size, size);
 			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
@@ -109,11 +109,11 @@ namespace OpenRA.Graphics
 			{
 				int* c = (int*)bitmapData.Scan0;
 
-				for (var x = 0; x < map.Width; x++)
-					for (var y = 0; y < map.Height; y++)
+				for (var x = 0; x < map.Bounds.Width; x++)
+					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;
+						var mapX = x + map.Bounds.Left;
+						var mapY = y + map.Bounds.Top;
 						var custom = map.CustomTerrain[mapX,mapY];
 						if (custom == null)
 							continue;
@@ -127,7 +127,7 @@ namespace OpenRA.Graphics
 		public static Bitmap ActorsBitmap(World world)
 		{	
 			var map = world.Map;
-			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			var size = Util.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			Bitmap bitmap = new Bitmap(size, size);
 			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
@@ -135,16 +135,16 @@ namespace OpenRA.Graphics
 			unsafe
 			{
 				int* c = (int*)bitmapData.Scan0;
-				
-				foreach (var t in world.Queries.WithTraitMultiple<IRadarSignature>())
+
+				foreach (var t in world.Queries.WithTrait<IRadarSignature>())
 				{
-					if (!t.Actor.IsVisible(world.LocalPlayer))
+					if (!world.LocalShroud.IsVisible(t.Actor))
 						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();
+							*(c + ((cell.Y - world.Map.Bounds.Top) * bitmapData.Stride >> 2) + cell.X - world.Map.Bounds.Left) = color.ToArgb();
 				}
 			}
 
@@ -155,26 +155,29 @@ namespace OpenRA.Graphics
 		public static Bitmap ShroudBitmap(World world)
 		{	
 			var map = world.Map;
-			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			var size = Util.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			Bitmap bitmap = new Bitmap(size, size);
+			if (world.LocalShroud.Disabled)
+				return bitmap;
+			
 			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++)
+				for (var x = 0; x < map.Bounds.Width; x++)
+					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;
-						if (!world.LocalPlayer.Shroud.IsExplored(mapX, mapY))
+						var mapX = x + map.Bounds.Left;
+						var mapY = y + map.Bounds.Top;
+						if (!world.LocalShroud.IsExplored(mapX, mapY))
 							*(c + (y * bitmapData.Stride >> 2) + x) = shroud;
-						else if (!world.LocalPlayer.Shroud.IsVisible(mapX,mapY))					
+						else if (!world.LocalShroud.IsVisible(mapX,mapY))					
 							*(c + (y * bitmapData.Stride >> 2) + x) = fog;
 					}
 			}

OpenRA.Game/Graphics/Renderer.cs

@@ -9,14 +9,13 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
-using OpenRA.FileFormats;
+using System.Windows.Forms;
 using OpenRA.FileFormats.Graphics;
 using OpenRA.Support;
-using System.Windows.Forms;
-using System.Collections.Generic;
 
 namespace OpenRA.Graphics
 {
@@ -36,7 +35,7 @@ namespace OpenRA.Graphics
 
 		public ITexture PaletteTexture;
 
-		public readonly SpriteFont RegularFont, BoldFont, TitleFont;
+        public readonly SpriteFont RegularFont, BoldFont, TitleFont, TinyFont;
 
 		internal const int TempBufferSize = 8192;
 		const int TempBufferCount = 8;
@@ -46,10 +45,10 @@ namespace OpenRA.Graphics
 
 		public Renderer()
 		{
-			SpriteShader = device.CreateShader(FileSystem.Open("shaders/world-shp.fx"));
-			LineShader = device.CreateShader(FileSystem.Open("shaders/line.fx"));
-			RgbaSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-rgba.fx"));
-			WorldSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-shp.fx"));
+			SpriteShader = device.CreateShader("world-shp");
+			LineShader = device.CreateShader("world-line");
+			RgbaSpriteShader = device.CreateShader("chrome-rgba");
+			WorldSpriteShader = device.CreateShader("chrome-shp");
 
 			SpriteRenderer = new SpriteRenderer( this, SpriteShader );
 			RgbaSpriteRenderer = new SpriteRenderer( this, RgbaSpriteShader );
@@ -59,6 +58,7 @@ namespace OpenRA.Graphics
 			RegularFont = new SpriteFont("FreeSans.ttf", 14);
 			BoldFont = new SpriteFont("FreeSansBold.ttf", 14);
 			TitleFont = new SpriteFont("titles.ttf", 48);
+            TinyFont = new SpriteFont("FreeSans.ttf", 10);
 
 			for( int i = 0 ; i < TempBufferCount ; i++ )
 			{
@@ -71,7 +71,6 @@ namespace OpenRA.Graphics
 
 		public void BeginFrame(float2 scroll)
 		{
-			device.Begin();
 			device.Clear(Color.Black);
 
 			float2 r1 = new float2(2f/Resolution.Width, -2f/Resolution.Height);
@@ -86,17 +85,16 @@ namespace OpenRA.Graphics
 		private void SetShaderParams( IShader s, float2 r1, float2 r2, float2 scroll )
 		{
 			s.SetValue( "Palette", PaletteTexture );
-			s.SetValue( "Scroll", scroll.X, scroll.Y );
+			s.SetValue( "Scroll", (int) scroll.X, (int) scroll.Y );
 			s.SetValue( "r1", r1.X, r1.Y );
 			s.SetValue( "r2", r2.X, r2.Y );
 			s.Commit();
 		}
 
-		public void EndFrame()
+		public void EndFrame( IInputHandler inputHandler )
 		{
 			Flush();
-			device.End();
-			device.Present();
+			device.Present( inputHandler );
 		}
 
 		public void DrawBatch<T>(IVertexBuffer<T> vertices, IIndexBuffer indices,
@@ -135,14 +133,14 @@ namespace OpenRA.Graphics
 		internal static void Initialize( OpenRA.FileFormats.Graphics.WindowMode windowMode )
 		{
 			var resolution = GetResolution( windowMode );
-			device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRA.Gl.dll" ) ), resolution.Width, resolution.Height, windowMode, false );
+			device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRA.Renderer.{0}.dll".F(Game.Settings.Graphics.Renderer) ) ), resolution.Width, resolution.Height, windowMode, false );
 		}
 
 		static Size GetResolution(WindowMode windowmode)
 		{
-			var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
+			var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
 			var customSize = (windowmode == WindowMode.Windowed) ? Game.Settings.Graphics.WindowedSize : Game.Settings.Graphics.FullscreenSize;
-			
+			
 			if (customSize.X > 0 && customSize.Y > 0)
 			{
 				desktopResolution.Width = customSize.X;

OpenRA.Game/Graphics/Sequence.cs

@@ -33,7 +33,7 @@ namespace OpenRA.Graphics
 			Name = name;
 			var d = info.NodesDict;
 			
-			sprites = SpriteSheetBuilder.LoadAllSprites(string.IsNullOrEmpty(srcOverride) ? unit : srcOverride );
+			sprites = Game.modData.SpriteLoader.LoadAllSprites(string.IsNullOrEmpty(srcOverride) ? unit : srcOverride );
 			start = int.Parse(d["Start"].Value);
 
 			if (!d.ContainsKey("Length"))

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Xml;
 using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
@@ -21,15 +20,13 @@ namespace OpenRA.Graphics
 	{
 		static Dictionary<string, Dictionary<string, Sequence>> units;
 
-		public static void Initialize(string[] sequenceFiles)
+		public static void Initialize(string[] sequenceFiles, List<MiniYamlNode> sequenceNodes)
 		{
 			units = new Dictionary<string, Dictionary<string, Sequence>>();
 			if (sequenceFiles.Length == 0)
 				return;
 
-			var sequences = sequenceFiles
-				.Select(s => MiniYaml.FromFile(s))
-				.Aggregate(MiniYaml.Merge);
+			var sequences = sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(sequenceNodes, MiniYaml.Merge);
 
 			foreach (var s in sequences)
 				LoadSequencesForUnit(s.Key, s.Value);
@@ -58,8 +55,12 @@ namespace OpenRA.Graphics
 			try { return units[unitName][sequenceName]; }
 			catch (KeyNotFoundException)
 			{
-				throw new InvalidOperationException(
-					"Unit `{0}` does not have a sequence `{1}`".F(unitName, sequenceName));
+				if (units.ContainsKey(unitName))
+					throw new InvalidOperationException(
+						"Unit `{0}` does not have a sequence `{1}`".F(unitName, sequenceName));
+				else
+					throw new InvalidOperationException(
+						"Unit `{0}` does not have any sequences defined.".F(unitName));
 			}
 		}
 

OpenRA.Game/Graphics/ShroudRenderer.cs

@@ -0,0 +1,161 @@
+#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;
+
+namespace OpenRA.Graphics
+{
+	public class ShroudRenderer
+	{
+		Traits.Shroud shroud;
+		Sprite[] shadowBits = Game.modData.SpriteLoader.LoadAllSprites("shadow");
+		Sprite[,] sprites, fogSprites;
+		
+		bool dirty = true;
+		Map map;
+
+		public ShroudRenderer(World world)
+		{
+			this.shroud = world.LocalShroud;
+			this.map = world.Map;
+			
+			sprites = new Sprite[map.MapSize.X, map.MapSize.Y];
+			fogSprites = new Sprite[map.MapSize.X, map.MapSize.Y];
+			shroud.Dirty += () => dirty = true;
+		}
+
+		static readonly byte[][] SpecialShroudTiles =
+		{
+			new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+			new byte[] { 32, 32, 25, 25, 19, 19, 20, 20 },
+			new byte[] { 33, 33, 33, 33, 26, 26, 26, 26, 21, 21, 21, 21, 23, 23, 23, 23 },
+			new byte[] { 36, 36, 36, 36, 30, 30, 30, 30 },
+			new byte[] { 34, 16, 34, 16, 34, 16, 34, 16, 27, 22, 27, 22, 27, 22, 27, 22 },
+			new byte[] { 44 },
+			new byte[] { 37, 37, 37, 37, 37, 37, 37, 37, 31, 31, 31, 31, 31, 31, 31, 31 },
+			new byte[] { 40 },
+			new byte[] { 35, 24, 17, 18 },
+			new byte[] { 39, 39, 29, 29 },
+			new byte[] { 45 },
+			new byte[] { 43 },
+			new byte[] { 38, 28 },
+			new byte[] { 42 },
+			new byte[] { 41 },
+			new byte[] { 46 },
+		};
+				
+		Sprite ChooseShroud(int i, int j)
+		{
+			if( !shroud.IsExplored( i, j ) ) return shadowBits[ 0xf ];
+
+			// bits are for unexploredness: up, right, down, left
+			var v = 0;
+			// bits are for unexploredness: TL, TR, BR, BL
+			var u = 0;
+
+			if( !shroud.IsExplored( i, j - 1 ) ) { v |= 1; u |= 3; }
+			if( !shroud.IsExplored( i + 1, j ) ) { v |= 2; u |= 6; }
+			if( !shroud.IsExplored( i, j + 1 ) ) { v |= 4; u |= 12; }
+			if( !shroud.IsExplored( i - 1, j ) ) { v |= 8; u |= 9; }
+
+			var uSides = u;
+
+			if( !shroud.IsExplored( i - 1, j - 1 ) ) u |= 1;
+			if( !shroud.IsExplored( i + 1, j - 1 ) ) u |= 2;
+			if( !shroud.IsExplored( i + 1, j + 1 ) ) u |= 4;
+			if( !shroud.IsExplored( i - 1, j + 1 ) ) u |= 8;
+
+			return shadowBits[ SpecialShroudTiles[ u ^ uSides ][ v ] ];
+		}
+				
+		Sprite ChooseFog(int i, int j)
+		{
+			if (!shroud.IsVisible(i,j)) return shadowBits[0xf];
+			if (!shroud.IsExplored(i, j)) return shadowBits[0xf];
+
+			// bits are for unexploredness: up, right, down, left
+			var v = 0;
+			// bits are for unexploredness: TL, TR, BR, BL
+			var u = 0;
+
+			if (!shroud.IsVisible(i, j - 1)) { v |= 1; u |= 3; }
+			if (!shroud.IsVisible(i + 1, j)) { v |= 2; u |= 6; }
+			if (!shroud.IsVisible(i, j + 1)) { v |= 4; u |= 12; }
+			if (!shroud.IsVisible(i - 1, j)) { v |= 8; u |= 9; }
+
+			var uSides = u;
+
+			if (!shroud.IsVisible(i - 1, j - 1)) u |= 1;
+			if (!shroud.IsVisible(i + 1, j - 1)) u |= 2;
+			if (!shroud.IsVisible(i + 1, j + 1)) u |= 4;
+			if (!shroud.IsVisible(i - 1, j + 1)) u |= 8;
+
+			return shadowBits[SpecialShroudTiles[u ^ uSides][v]];
+		}
+
+		internal void Draw( WorldRenderer wr )
+		{			
+			if (dirty)
+			{
+				dirty = false;
+				for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
+					for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
+						sprites[i, j] = ChooseShroud(i, j);
+				
+				for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
+					for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
+						fogSprites[i, j] = ChooseFog(i, j);
+			}
+
+			var clipRect = Game.viewport.WorldBounds(wr.world);
+			DrawShroud( wr, clipRect, fogSprites, "fog" );
+			DrawShroud( wr, clipRect, sprites, "shroud" );
+		}
+
+		void DrawShroud( WorldRenderer wr, Rectangle clip, Sprite[,] s, string pal )
+		{
+			var shroudPalette = wr.GetPaletteIndex(pal);
+
+			for (var j = clip.Top; j < clip.Bottom; j++)
+			{
+				var starti = clip.Left;
+				var last = shadowBits[0x0f];
+				for (var i = clip.Left; i < clip.Right; i++)
+				{
+					if ((s[i, j] == shadowBits[0x0f] && last == shadowBits[0x0f])
+						|| (s[i, j] == shadowBits[0] && last == shadowBits[0]))
+						continue;
+
+					if (starti != i)
+					{
+						s[starti, j].DrawAt(
+							Game.CellSize * new float2(starti, j),
+							shroudPalette,
+							new float2(Game.CellSize * (i - starti), Game.CellSize));
+						starti = i + 1;
+					}
+
+					s[i, j].DrawAt(
+						Game.CellSize * new float2(i, j),
+						shroudPalette);
+					starti = i + 1;
+					last = s[i, j];
+				}
+
+				if (starti < clip.Right)
+					s[starti, j].DrawAt(
+						Game.CellSize * new float2(starti, j),
+						shroudPalette,
+						new float2(Game.CellSize * (clip.Right - starti), Game.CellSize));
+			}
+		}
+	}
+}

OpenRA.Game/Graphics/Sprite.cs

@@ -60,6 +60,11 @@ namespace OpenRA.Graphics
 			Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, this.size );
 		}
 
+        public void DrawAt(float2 location, int paletteIndex, float scale)
+        {
+            Game.Renderer.SpriteRenderer.DrawSprite(this, location, paletteIndex, this.size * scale);
+        }
+
 		public void DrawAt( float2 location, int paletteIndex, float2 size )
 		{
 			Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, size );

OpenRA.Game/Graphics/SpriteFont.cs

@@ -69,6 +69,19 @@ namespace OpenRA.Graphics
 			}
 		}
 
+        public void DrawTextWithContrast(string text, float2 location, Color fg, Color bg, int offset)
+        {
+            if (offset > 0)
+            {
+                DrawText(text, location + new float2(-offset, 0), bg);
+                DrawText(text, location + new float2(offset, 0), bg);
+                DrawText(text, location + new float2(0, -offset), bg);
+                DrawText(text, location + new float2(0, offset), bg);
+            }
+
+            DrawText(text, location, fg);
+        }
+
 		public int2 Measure(string text)
 		{
 			return new int2((int)text.Split( '\n' ).Max( s => s.Sum(a => glyphs[Pair.New(a, Color.White)].Advance)), text.Split('\n').Count()*size);

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -13,23 +13,25 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
 {
-	public static class SpriteSheetBuilder
+	public class SpriteLoader
 	{
-		public static void Initialize( TileSet tileset )
+		public SpriteLoader( string[] exts, SheetBuilder sheetBuilder )
 		{
-			exts = tileset.Extensions;
+			SheetBuilder = sheetBuilder;			
+			this.exts = exts;
 			sprites = new Cache<string, Sprite[]>( LoadSprites );
 		}
 
-		static Cache<string, Sprite[]> sprites;
-		static string[] exts;
+        readonly SheetBuilder SheetBuilder;
+		readonly Cache<string, Sprite[]> sprites;
+		readonly string[] exts;
 
-		static Sprite[] LoadSprites(string filename)
+		Sprite[] LoadSprites(string filename)
 		{
 			var shp = new ShpReader(FileSystem.OpenWithExts(filename, exts));
-			return shp.Select(a => Game.modData.SheetBuilder.Add(a.Image, shp.Size)).ToArray();
+			return shp.Select(a => SheetBuilder.Add(a.Image, shp.Size)).ToArray();
 		}
 
-		public static Sprite[] LoadAllSprites(string filename) { return sprites[filename]; }
+		public Sprite[] LoadAllSprites(string filename) { return sprites[filename]; }
 	}
 }

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -34,20 +34,21 @@ namespace OpenRA.Graphics
 			var tileMapping = new Cache<TileReference<ushort,byte>, Sprite>(
 				x => Game.modData.SheetBuilder.Add(world.TileSet.GetBytes(x), tileSize));
 
-			Vertex[] vertices = new Vertex[4 * map.Height * map.Width];
-			ushort[] indices = new ushort[6 * map.Height * map.Width];
+			Vertex[] vertices = new Vertex[4 * map.Bounds.Height * map.Bounds.Width];
+			ushort[] indices = new ushort[6 * map.Bounds.Height * map.Bounds.Width];
 
-			terrainSheet = tileMapping[map.MapTiles[map.TopLeft.X, map.TopLeft.Y]].sheet;
+			terrainSheet = tileMapping[map.MapTiles[map.Bounds.Left, map.Bounds.Top]].sheet;
 
 			int nv = 0;
 			int ni = 0;
-			for( int j = map.TopLeft.Y ; j < map.BottomRight.Y; j++ )
-				for( int i = map.TopLeft.X ; i < map.BottomRight.X; i++ )
+			
+			for( int j = map.Bounds.Top; j < map.Bounds.Bottom; j++ )
+				for( int i = map.Bounds.Left; i < map.Bounds.Right; i++ )
 				{
 					Sprite tile = tileMapping[map.MapTiles[i, j]];
 					// TODO: The zero below should explicitly refer to the terrain palette, but this code is called
 					// before the palettes are created. Therefore assumes that "terrain" is the first palette to be defined
-					Util.FastCreateQuad(vertices, indices, Game.CellSize * new float2(i, j), tile, 0, nv, ni, tile.size);
+					Util.FastCreateQuad(vertices, indices, Game.CellSize * new float2(i, j), tile, Game.modData.Palette.GetPaletteIndex("terrain"), nv, ni, tile.size);
 					nv += 4;
 					ni += 6;
 					
@@ -64,28 +65,28 @@ namespace OpenRA.Graphics
 
 		public void Draw( WorldRenderer wr, Viewport viewport )
 		{
-			int indicesPerRow = map.Width * 6;
-			int verticesPerRow = map.Width * 4;
+			int indicesPerRow = map.Bounds.Width * 6;
+			int verticesPerRow = map.Bounds.Width * 4;
 
 			int visibleRows = (int)(viewport.Height * 1f / Game.CellSize + 2);
 
-			int firstRow = (int)(viewport.Location.Y * 1f / Game.CellSize - map.YOffset);
+			int firstRow = (int)(viewport.Location.Y * 1f / Game.CellSize - map.Bounds.Top);
 			int lastRow = firstRow + visibleRows;
 
-			if (lastRow < 0 || firstRow > map.Height)
+			if (lastRow < 0 || firstRow > map.Bounds.Height)
 				return;
 
 			if (firstRow < 0) firstRow = 0;
-			if (lastRow > map.Height) lastRow = map.Height;
+			if (lastRow > map.Bounds.Height) lastRow = map.Bounds.Height;
 
-			if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.Disabled && world.LocalPlayer.Shroud.Bounds.HasValue)
+			if (world.LocalPlayer != null && !world.LocalShroud.Disabled && world.LocalShroud.Bounds.HasValue)
 			{
-				var r = world.LocalPlayer.Shroud.Bounds.Value;
-				if (firstRow < r.Top - map.YOffset)
-					firstRow = r.Top - map.YOffset;
+				var r = world.LocalShroud.Bounds.Value;
+				if (firstRow < r.Top - map.Bounds.Top)
+					firstRow = r.Top - map.Bounds.Top;
 
-				if (firstRow > r.Bottom - map.YOffset)
-					firstRow = r.Bottom - map.YOffset;
+				if (firstRow > r.Bottom - map.Bounds.Top)
+					firstRow = r.Bottom - map.Bounds.Top;
 			}
 
 			if( lastRow < firstRow ) lastRow = firstRow;

OpenRA.Game/Graphics/Viewport.cs

@@ -11,23 +11,21 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Graphics
 {
 	public class Viewport
 	{
-		readonly float2 screenSize;
-		float2 scrollPosition;
+		readonly int2 screenSize;
+		int2 scrollPosition;
 		readonly Renderer renderer;
-		readonly int2 mapStart;
-		readonly int2 mapEnd;
+		readonly Rectangle adjustedMapBounds;
 
 		public float2 Location { get { return scrollPosition; } }
 
-		public int Width { get { return (int)screenSize.X; } }
-		public int Height { get { return (int)screenSize.Y; } }
+		public int Width { get { return screenSize.X; } }
+		public int Height { get { return screenSize.Y; } }
 
 		float cursorFrame = 0f;
 
@@ -41,7 +39,8 @@ namespace OpenRA.Graphics
 		
 		public void Scroll(float2 delta, bool ignoreBorders)
 		{
-			float2 newScrollPosition = scrollPosition + delta;
+			var d = delta.ToInt2();
+			var newScrollPosition = scrollPosition + d;
 			
 			if(!ignoreBorders)
 				newScrollPosition = this.NormalizeScrollPosition(newScrollPosition);
@@ -49,64 +48,48 @@ namespace OpenRA.Graphics
 			scrollPosition = newScrollPosition;
 		}
 		
-		private float2 NormalizeScrollPosition(float2 newScrollPosition)
+		private int2 NormalizeScrollPosition(int2 newScrollPosition)
 		{
-			float2 topLeftBorder = (Game.CellSize* mapStart).ToFloat2();
-			float2 bottomRightBorder = (Game.CellSize* mapEnd).ToFloat2();
-		  
-			if(newScrollPosition.Y < topLeftBorder.Y - screenSize.Y/2)
-				newScrollPosition.Y = topLeftBorder.Y - screenSize.Y/2;
-			if(newScrollPosition.X < topLeftBorder.X - screenSize.X/2)
-				newScrollPosition.X = topLeftBorder.X - screenSize.X/2;
-			if(newScrollPosition.Y > bottomRightBorder.Y - screenSize.Y/2)
-				newScrollPosition.Y = bottomRightBorder.Y - screenSize.Y/2;
-			if(newScrollPosition.X > bottomRightBorder.X - screenSize.X/2)
-				newScrollPosition.X = bottomRightBorder.X - screenSize.X/2;
-			
-			return newScrollPosition;
+			return newScrollPosition.Clamp(adjustedMapBounds);
 		}
 		
 		public ScrollDirection GetBlockedDirections()
 		{
-			int2 topLeftBorder = (Game.CellSize* mapStart);
-			int2 bottomRightBorder = (Game.CellSize* mapEnd);
-			
 			ScrollDirection blockedDirections = ScrollDirection.None;
-			
-			if(scrollPosition.Y <= topLeftBorder.Y - screenSize.Y/2)
+			if(scrollPosition.Y <= adjustedMapBounds.Top)
 				blockedDirections = blockedDirections.Set(ScrollDirection.Up, true);
-			if(scrollPosition.X <= topLeftBorder.X - screenSize.X/2)
+			if(scrollPosition.X <= adjustedMapBounds.Left)
 				blockedDirections = blockedDirections.Set(ScrollDirection.Left, true);
-			if(scrollPosition.Y >= bottomRightBorder.Y - screenSize.Y/2)
+			if(scrollPosition.Y >= adjustedMapBounds.Bottom)
 				blockedDirections = blockedDirections.Set(ScrollDirection.Down, true);
-		  	if(scrollPosition.X >= bottomRightBorder.X - screenSize.X/2)
+		  	if(scrollPosition.X >= adjustedMapBounds.Right)
 				blockedDirections = blockedDirections.Set(ScrollDirection.Right, true);
 			
 			return blockedDirections;
 		}
 
-		public Viewport(float2 screenSize, int2 mapStart, int2 mapEnd, Renderer renderer)
+		public Viewport(int2 screenSize, Rectangle mapBounds, Renderer renderer)
 		{
 			this.screenSize = screenSize;
 			this.renderer = renderer;
-			this.mapStart = mapStart;
-			this.mapEnd = mapEnd;
-
-			this.scrollPosition = Game.CellSize* mapStart;
+			this.adjustedMapBounds = new Rectangle(Game.CellSize*mapBounds.X - screenSize.X/2,
+			                                       Game.CellSize*mapBounds.Y - screenSize.Y/2,
+			                                       Game.CellSize*mapBounds.Width,
+			                                       Game.CellSize*mapBounds.Height);
+			this.scrollPosition = new int2(adjustedMapBounds.Location) + new int2(adjustedMapBounds.Size)/2;
 		}
 		
-		public void DrawRegions( WorldRenderer wr )
+		public void DrawRegions( WorldRenderer wr, IInputHandler inputHandler )
 		{
 			renderer.BeginFrame(scrollPosition);
-			wr.Draw();
-
-			Widget.DoDraw( wr );
-
+			if (wr != null)
+				wr.Draw();
+			
+			Widget.DoDraw();
 			var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-			var c = new Cursor(cursorName);
-			c.Draw(wr, (int)cursorFrame, Viewport.LastMousePos + Location); 
+			new Cursor(cursorName).Draw((int)cursorFrame, Viewport.LastMousePos + Location); 
 
-			renderer.EndFrame();
+			renderer.EndFrame( inputHandler );
 		}
 
 		public void Tick()
@@ -123,37 +106,52 @@ namespace OpenRA.Graphics
 			return ViewToWorld(mi.Location);
 		}
 		
-		public void Center(int2 loc)
+		public void Center(float2 loc)
 		{
-			scrollPosition = this.NormalizeScrollPosition(Game.CellSize*loc - .5f * new float2(Width, Height));
+			scrollPosition = this.NormalizeScrollPosition((Game.CellSize*loc - screenSize / 2).ToInt2());
 		}
 
 		public void Center(IEnumerable<Actor> actors)
 		{
 			if (!actors.Any()) return;
 
-			var avgPos = (1f / actors.Count()) * actors
+			var avgPos = actors
 				.Select(a => a.CenterLocation)
-				.Aggregate((a, b) => a + b);
-
-			scrollPosition = this.NormalizeScrollPosition((avgPos - .5f * new float2(Width, Height)));
-		}
-
-		public Rectangle ShroudBounds( World world )
-		{
-			var localPlayer = world.LocalPlayer;
-			if( localPlayer == null ) return world.Map.Bounds;
-			if( localPlayer.Shroud.Disabled ) return world.Map.Bounds;
-			if( !localPlayer.Shroud.Bounds.HasValue ) return world.Map.Bounds;
-			return Rectangle.Intersect( localPlayer.Shroud.Bounds.Value, world.Map.Bounds );
+				.Aggregate((a, b) => a + b) / actors.Count();
+			scrollPosition = this.NormalizeScrollPosition((avgPos - screenSize / 2));
 		}
 		
-		public Rectangle ViewBounds()
+		public Rectangle ViewBounds(World world)
 		{
-			int2 boundary = new int2(1,1); // Add a curtain of cells around the viewport to account for rounding errors
-			var tl = ViewToWorld(int2.Zero).ToInt2() - boundary;
-			var br = ViewToWorld(new int2(Width, Height)).ToInt2() + boundary;
-			return Rectangle.FromLTRB(tl.X, tl.Y, br.X, br.Y);
+			var r = WorldBounds(world);
+			var left = (int)(Game.CellSize * r.Left - Game.viewport.Location.X);
+			var top = (int)(Game.CellSize * r.Top - Game.viewport.Location.Y);
+			var right = left + (int)(Game.CellSize * r.Width);
+			var bottom = top + (int)(Game.CellSize * r.Height);
+			
+			if (left < 0) left = 0;
+			if (top < 0) top = 0;
+			if (right > Game.viewport.Width) right = Game.viewport.Width;
+			if (bottom > Game.viewport.Height) bottom = Game.viewport.Height;
+			return new Rectangle(left, top, right - left, bottom - top);
+		}
+
+		int2 cachedScroll = new int2(int.MaxValue, int.MaxValue);
+		Rectangle cachedRect;
+		
+		public Rectangle WorldBounds(World world)
+		{
+			if (cachedScroll != scrollPosition)
+			{
+				int2 boundary = new int2(1,1); // Add a curtain of cells around the viewport to account for rounding errors
+				var tl = ViewToWorld(int2.Zero).ToInt2() - boundary;
+				var br = ViewToWorld(new int2(Width, Height)).ToInt2() + boundary;
+				cachedRect = Rectangle.Intersect(Rectangle.FromLTRB(tl.X, tl.Y, br.X, br.Y), world.Map.Bounds);
+				cachedScroll = scrollPosition;
+			}
+			
+			var b = world.LocalShroud.Bounds;
+			return (b.HasValue) ? Rectangle.Intersect(cachedRect, b.Value) : cachedRect;
 		}
 	}
 }

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -21,19 +21,21 @@ namespace OpenRA.Graphics
 	{
 		public readonly World world;
 		internal readonly TerrainRenderer terrainRenderer;
+		internal readonly ShroudRenderer shroudRenderer;
+
 		public readonly UiOverlay uiOverlay;
 		internal readonly HardwarePalette palette;
 
 		internal WorldRenderer(World world)
 		{
 			this.world = world;
-
-			terrainRenderer = new TerrainRenderer(world, this);
-			uiOverlay = new UiOverlay();
-			palette = new HardwarePalette(world.Map);
-
+			this.palette = Game.modData.Palette;
 			foreach( var pal in world.traitDict.ActorsWithTraitMultiple<IPalette>( world ) )
 				pal.Trait.InitPalette( this );
+			
+			terrainRenderer = new TerrainRenderer(world, this);
+			shroudRenderer = new ShroudRenderer(world);
+			uiOverlay = new UiOverlay();
 		}
 		
 		public int GetPaletteIndex(string name) { return palette.GetPaletteIndex(name); }
@@ -48,32 +50,9 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		Rectangle GetBoundsRect()
+		IEnumerable<Renderable> SpritesToRender()
 		{
-			if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.Disabled && world.LocalPlayer.Shroud.Bounds.HasValue)
-			{
-				var r = world.LocalPlayer.Shroud.Bounds.Value;
-
-				var left = (int)(Game.CellSize * r.Left - Game.viewport.Location.X);
-				var top = (int)(Game.CellSize * r.Top - Game.viewport.Location.Y);
-				var right = left + (int)(Game.CellSize * r.Width);
-				var bottom = top + (int)(Game.CellSize * r.Height);
-
-				if (left < 0) left = 0;
-				if (top < 0) top = 0;
-				if (right > Game.viewport.Width) right = Game.viewport.Width;
-				if (bottom > Game.viewport.Height) bottom = Game.viewport.Height;
-
-				return new Rectangle(left, top, right - left, bottom - top);
-			}
-			else
-				return new Rectangle(0, 0, Game.viewport.Width, Game.viewport.Height);
-		}
-
-		Renderable[] worldSprites = { };
-		public void Tick()
-		{
-			var bounds = GetBoundsRect();
+			var bounds = Game.viewport.ViewBounds(world);
 			var comparer = new SpriteComparer();
 
 			bounds.Offset((int)Game.viewport.Location.X, (int)Game.viewport.Location.Y);
@@ -87,31 +66,52 @@ namespace OpenRA.Graphics
 
 			var effects = world.Effects.SelectMany(e => e.Render());
 
-			worldSprites = renderables.Concat(effects).ToArray();
+			return renderables.Concat(effects);
 		}
 
 		public void Draw()
 		{
 			RefreshPalette();
-			var bounds = GetBoundsRect();
+			var bounds = Game.viewport.ViewBounds(world);
 			Game.Renderer.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
 
 			terrainRenderer.Draw(this, Game.viewport);
+			foreach (var a in world.traitDict.ActorsWithTraitMultiple<IRenderAsTerrain>(world))
+				foreach (var r in a.Trait.RenderAsTerrain(a.Actor))
+					r.Sprite.DrawAt(r.Pos, this.GetPaletteIndex(r.Palette), r.Scale);
 
+			foreach (var a in world.Selection.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
+						t.RenderBeforeWorld(this, a);
+			
+			Game.Renderer.Flush();
+			
 			if (world.OrderGenerator != null)
 				world.OrderGenerator.RenderBeforeWorld(this, world);
+
+            foreach (var image in SpritesToRender() )
+                image.Sprite.DrawAt(image.Pos, this.GetPaletteIndex(image.Palette), image.Scale);
+		    uiOverlay.Draw(this, world);
 
-			foreach( var image in worldSprites )
-				image.Sprite.DrawAt( image.Pos, this.GetPaletteIndex( image.Palette ) );
-			uiOverlay.Draw(this, world);
+			// added for contrails
+			foreach (var a in world.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPostRender>())
+						t.RenderAfterWorld(this, a);
 
 			if (world.OrderGenerator != null)
 				world.OrderGenerator.RenderAfterWorld(this, world);
 
-			if (world.LocalPlayer != null)
-				world.LocalPlayer.Shroud.Draw( this );
-
+			shroudRenderer.Draw( this );
 			Game.Renderer.DisableScissor();
+			
+			foreach (var a in world.Selection.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
+						t.RenderAfterWorld(this, a);
+
+			Game.Renderer.Flush();
 		}
 
 		void DrawBox(RectangleF r, Color color)
@@ -125,23 +125,9 @@ namespace OpenRA.Graphics
 			Game.Renderer.LineRenderer.DrawLine(a, a + c, color, color);
 		}
 
-		void DrawBins(RectangleF bounds)
-		{
-			DrawBox(bounds, Color.Red);
-			if (world.LocalPlayer != null)
-				DrawBox(world.LocalPlayer.Shroud.Bounds.Value, Color.Blue);
-
-			for (var j = 0; j < world.Map.MapSize.Y;
-				j += world.WorldActor.Info.Traits.Get<SpatialBinsInfo>().BinSize)
-			{
-				Game.Renderer.LineRenderer.DrawLine(new float2(0, j * Game.CellSize), new float2(world.Map.MapSize.X * Game.CellSize, j * Game.CellSize), Color.Black, Color.Black);
-				Game.Renderer.LineRenderer.DrawLine(new float2(j * Game.CellSize, 0), new float2(j * Game.CellSize, world.Map.MapSize.Y * Game.CellSize), Color.Black, Color.Black);
-			}
-		}
-
 		public void DrawSelectionBox(Actor selectedUnit, Color c)
 		{
-			var bounds = selectedUnit.GetBounds(true);
+			var bounds = selectedUnit.GetBounds(false);
 
 			var xy = new float2(bounds.Left, bounds.Top);
 			var Xy = new float2(bounds.Right, bounds.Top);
@@ -179,7 +165,7 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public void DrawRangeCircle(Color c, float2 location, int range)
+		public void DrawRangeCircle(Color c, float2 location, float range)
 		{
 			var prev = location + Game.CellSize * range * float2.FromAngle(0);
 			for (var i = 1; i <= 32; i++)

OpenRA.Game/InputHandler.cs

@@ -0,0 +1,52 @@
+#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.Widgets;
+
+namespace OpenRA
+{
+	public class NullInputHandler : IInputHandler
+	{
+		// ignore all input
+		public void ModifierKeys( Modifiers mods ) { }
+		public void OnKeyInput( KeyInput input ) { }
+		public void OnMouseInput( MouseInput input ) { }
+	}
+
+	public class DefaultInputHandler : IInputHandler
+	{
+		readonly World world;
+		public DefaultInputHandler( World world )
+		{
+			this.world = world;
+		}
+
+		public void ModifierKeys( Modifiers mods )
+		{
+			Game.HandleModifierKeys( mods );
+		}
+
+		public void OnKeyInput( KeyInput input )
+		{
+			Sync.CheckSyncUnchanged( world, () =>
+			{
+				Widget.HandleKeyPress( input );
+			} );
+		}
+
+		public void OnMouseInput( MouseInput input )
+		{
+			Sync.CheckSyncUnchanged( world, () =>
+			{
+				Widget.HandleInput( input );
+			} );
+		}
+	}
+}

OpenRA.Game/Map.cs

@@ -16,6 +16,7 @@ using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
 using OpenRA.FileFormats;
+using System.Text;
 
 namespace OpenRA
 {
@@ -27,50 +28,53 @@ namespace OpenRA
 		public Dictionary<string, PlayerReference> Players = new Dictionary<string, PlayerReference>();
 		public Dictionary<string, ActorReference> Actors = new Dictionary<string, ActorReference>();
 		public List<SmudgeReference> Smudges = new List<SmudgeReference>();
-
-		// Rules overrides
+
+		// Rules overrides
 		public List<MiniYamlNode> Rules = new List<MiniYamlNode>();
 
+		// Sequences overrides
+		public List<MiniYamlNode> Sequences = new List<MiniYamlNode>();
+
+		// Weapon overrides
+		public List<MiniYamlNode> Weapons = new List<MiniYamlNode>();
+
+		// Voices overrides
+		public List<MiniYamlNode> Voices = new List<MiniYamlNode>();
+
 		// Binary map data
 		public byte TileFormat = 1;
 		[FieldLoader.Load] public int2 MapSize;
 
-
 		public TileReference<ushort, byte>[,] MapTiles;
 		public TileReference<byte, byte>[,] MapResources;
 		public string [,] CustomTerrain;
 
-		// Temporary compat hacks
-		public int XOffset { get { return TopLeft.X; } }
-		public int YOffset { get { return TopLeft.Y; } }
-		public string Theater { get { return Tileset; } }
-		public Rectangle Bounds { get { return Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y); } }
-
 		public Map()
 		{
 			// Do nothing; not a valid map (editor hack)
 		}
 		
-		public Map(string tileset)
+		public static Map FromTileset(string tileset)
 		{
-			MapSize = new int2(1, 1);
-			Tileset = tileset;
-			MapResources = new TileReference<byte, byte>[1, 1];
-			
-			var tile = OpenRA.Rules.TileSets[Tileset].Templates.First();
-			MapTiles = new TileReference<ushort, byte>[1, 1] 
+			var tile = OpenRA.Rules.TileSets[tileset].Templates.First();
+			Map map = new Map()
+			{
+				Title = "Name your map here",
+				Description = "Describe your map here",
+				Author = "Your name here",
+				MapSize = new int2(1, 1),
+				PlayerCount = 0,
+				Tileset = tileset,
+				MapResources = new TileReference<byte, byte>[1, 1],
+				MapTiles = new TileReference<ushort, byte>[1, 1] 
 				{ { new TileReference<ushort, byte> { 
 					type = tile.Key, 
 					image = (byte)(tile.Value.PickAny ? 0xffu : 0), 
-					index = (byte)(tile.Value.PickAny ? 0xffu : 0) } } };
-
-			PlayerCount = 0;
-			TopLeft = new int2(0, 0);
-			BottomRight = new int2(0, 0);
-
-			Title = "Name your map here";
-			Description = "Describe your map here";
-			Author = "Your name here";
+					index = (byte)(tile.Value.PickAny ? 0xffu : 0) }
+				} },
+			};
+			
+			return map;
 		}
 
 		class Format2ActorReference
@@ -80,11 +84,11 @@ namespace OpenRA
 			public int2 Location = int2.Zero;
 			public string Owner = null;
 		}
-
-		public Map(IFolder package)
-			: base(package)
+		
+		public Map(string path)
+			: base(path)
 		{
-			var yaml = new MiniYaml( null, MiniYaml.FromStream( Package.GetContent( "map.yaml" ) ) );
+			var yaml = new MiniYaml( null, MiniYaml.FromStream( Container.GetContent( "map.yaml" ) ) );
 
 			// 'Simple' metadata
 			FieldLoader.Load( this, yaml );
@@ -135,6 +139,7 @@ namespace OpenRA
 					} break;
 
 				case 3:
+                case 4:
 					{
 						foreach (var kv in yaml.NodesDict["Players"].NodesDict)
 						{
@@ -164,7 +169,16 @@ namespace OpenRA
 					};
 					Players.Add(p.Name, p);
 				}
-			}
+			}
+
+            // Color1/Color2 -> ColorRamp
+            if (MapFormat == 3)
+                foreach (var mp in Players)
+                    mp.Value.ColorRamp = new ColorRamp(
+                        (byte)((mp.Value.Color.GetHue() / 360.0f) * 255),
+                        (byte)(mp.Value.Color.GetSaturation() * 255),
+                        (byte)(mp.Value.Color.GetBrightness() * 255),
+                        (byte)(mp.Value.Color2.GetBrightness() * 255));
 
 			// Smudges
 			foreach (var kv in yaml.NodesDict["Smudges"].NodesDict)
@@ -177,20 +191,29 @@ namespace OpenRA
 			// Rules
 			Rules = yaml.NodesDict["Rules"].Nodes;
 
+			// Sequences
+			Sequences = (yaml.NodesDict.ContainsKey("Sequences")) ? yaml.NodesDict["Sequences"].Nodes : new List<MiniYamlNode>();
+
+			// Weapons
+			Weapons = (yaml.NodesDict.ContainsKey("Weapons")) ? yaml.NodesDict["Weapons"].Nodes : new List<MiniYamlNode>();
+			
+			// Voices
+			Voices = (yaml.NodesDict.ContainsKey("Voices")) ? yaml.NodesDict["Voices"].Nodes : new List<MiniYamlNode>();
+
 			CustomTerrain = new string[MapSize.X, MapSize.Y];			
 			LoadBinaryData();
 		}
 
-		public void Save(string filepath)
-		{
+		public void Save(string toPath)
+		{			
+			Console.WriteLine("Saving map to path {0}",toPath);
 			// Todo: save to a zip file in the support dir by default
-			Package = new Folder(filepath);
-			MapFormat = 3;
+			MapFormat = 4;
 			
 			var root = new List<MiniYamlNode>();
-			foreach (var field in new string[] {"Selectable", "MapFormat", "Title", "Description", "Author", "PlayerCount", "Tileset", "MapSize", "TopLeft", "BottomRight"})
+			foreach (var field in new string[] {"Selectable", "MapFormat", "Title", "Description", "Author", "PlayerCount", "Tileset", "MapSize", "TopLeft", "BottomRight", "UseAsShellmap", "Type"})
 			{
-				FieldInfo f = this.GetType().GetField(field);
+				var f = this.GetType().GetField(field);
 				if (f.GetValue(this) == null) continue;
 				root.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
 			}
@@ -205,13 +228,30 @@ namespace OpenRA
 					x.Key,
 					x.Value.Save() ) ).ToList() ) );
 
-			root.Add( new MiniYamlNode( "Waypoints", MiniYaml.FromDictionary<string, int2>( Waypoints ) ) );
-			root.Add( new MiniYamlNode( "Smudges", MiniYaml.FromList<SmudgeReference>( Smudges ) ) );
-			root.Add( new MiniYamlNode( "Rules", null, Rules ) );
-
-			SaveBinaryData(Path.Combine(filepath, "map.bin"));
-			root.WriteToFile(Path.Combine(filepath, "map.yaml"));
-			SaveUid(Path.Combine(filepath, "map.uid"));
+			root.Add(new MiniYamlNode("Waypoints", MiniYaml.FromDictionary<string, int2>( Waypoints )));
+			root.Add(new MiniYamlNode("Smudges", MiniYaml.FromList<SmudgeReference>( Smudges )));
+			root.Add(new MiniYamlNode("Rules", null, Rules));
+			root.Add(new MiniYamlNode("Sequences", null, Sequences));
+			root.Add(new MiniYamlNode("Weapons", null, Weapons));
+			root.Add(new MiniYamlNode("Voices", null, Voices));
+			
+			Dictionary<string, byte[]> entries = new Dictionary<string, byte[]>();
+			entries.Add("map.bin", SaveBinaryData());
+			var s = root.WriteToString();
+			entries.Add("map.yaml", Encoding.UTF8.GetBytes(s));
+			
+			// Saving the map to a new location
+			if (toPath != Path)
+			{
+				Path = toPath;
+				
+				// Create a new map package
+				// TODO: Add other files (resources, rules) to the entries list
+				Container = FileSystem.CreatePackage(Path, int.MaxValue, entries);
+			}
+			
+			// Update existing package
+			Container.Write(entries);
 		}
 
 		static byte ReadByte(Stream s)
@@ -232,7 +272,7 @@ namespace OpenRA
 
 		public void LoadBinaryData()
 		{
-			using (var dataStream = Package.GetContent("map.bin"))
+			using (var dataStream = Container.GetContent("map.bin"))
 			{
 				if (ReadByte(dataStream) != 1)
 					throw new InvalidDataException("Unknown binary map format");
@@ -264,9 +304,9 @@ namespace OpenRA
 			}
 		}
 
-		public void SaveBinaryData(string filepath)
+		public byte[] SaveBinaryData()
 		{
-			using (var dataStream = File.Create(filepath + ".tmp"))
+			MemoryStream dataStream = new MemoryStream();
 			using (var writer = new BinaryWriter(dataStream))
 			{
 				// File header consists of a version byte, followed by 2 ushorts for width and height
@@ -290,22 +330,7 @@ namespace OpenRA
 						writer.Write(MapResources[i, j].index);
 					}
 			}
-			File.Delete(filepath);
-			File.Move(filepath + ".tmp", filepath);
-		}
-
-		public void SaveUid(string filename)
-		{
-			// UID is calculated by taking an SHA1 of the yaml and binary data
-			// Read the relevant data into a buffer
-			var data = Package.GetContent("map.yaml").ReadAllBytes()
-				.Concat(Package.GetContent("map.bin").ReadAllBytes()).ToArray();
-
-			// Take the SHA1
-			using (var csp = SHA1.Create())
-				Uid = new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
-
-			File.WriteAllText(filename, Uid);
+			return dataStream.ToArray();
 		}
 
 		public bool IsInMap(int2 xy)
@@ -315,7 +340,7 @@ namespace OpenRA
 
 		public bool IsInMap(int x, int y)
 		{
-			return (x >= TopLeft.X && y >= TopLeft.Y && x < BottomRight.X && y < BottomRight.Y);
+			return Bounds.Contains(x,y);
 		}
 
 		static T[,] ResizeArray<T>(T[,] ts, T t, int width, int height)
@@ -334,5 +359,12 @@ namespace OpenRA
 			MapResources = ResizeArray(MapResources, MapResources[0, 0], width, height);
 			MapSize = new int2(width, height);
 		}
+		
+		public void ResizeCordon(int left, int top, int right, int bottom)
+		{
+			TopLeft = new int2(left, top);
+			BottomRight = new int2(right, bottom);
+			Bounds = Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y);
+		}
 	}
 }

OpenRA.Game/ModData.cs

@@ -1,79 +1,122 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Support;
-
-namespace OpenRA
-{
-	public class ModData
-	{
-		public readonly Manifest Manifest;
-		public readonly ObjectCreator ObjectCreator;
-		public readonly SheetBuilder SheetBuilder;
-		public readonly CursorSheetBuilder CursorSheetBuilder;
-		public readonly Dictionary<string, MapStub> AvailableMaps;
-		public readonly WidgetLoader WidgetLoader;
-		public ILoadScreen LoadScreen = null;
-		
-		public ModData( params string[] mods )
-		{		
-			Manifest = new Manifest( mods );
-			ObjectCreator = new ObjectCreator( Manifest );
-			LoadScreen = ObjectCreator.CreateObject<ILoadScreen>(Manifest.LoadScreen);
-			LoadScreen.Init();
-			LoadScreen.Display();
-			
-			FileSystem.LoadFromManifest( Manifest );
-			ChromeProvider.Initialize( Manifest.Chrome );
-			SheetBuilder = new SheetBuilder( TextureChannel.Red );
-			CursorSheetBuilder = new CursorSheetBuilder( this );
-			AvailableMaps = FindMaps( mods );
-			WidgetLoader = new WidgetLoader( this );
-		}
-		
-		// TODO: Do this nicer
-		Dictionary<string, MapStub> FindMaps(string[] mods)
-		{
-			var paths = new[] { "maps/" }.Concat(mods.Select(m => "mods/" + m + "/maps/"))
-				.Where(p => Directory.Exists(p))
-				.SelectMany(p => Directory.GetDirectories(p)).ToList();
-
-			return paths.Select(p => new MapStub(new Folder(p))).ToDictionary(m => m.Uid);
-		}
-		
-		string cachedTheatre = null;
-		public Map PrepareMap(string uid)
-		{
-			LoadScreen.Display();
-
-			if (!AvailableMaps.ContainsKey(uid))
-				throw new InvalidDataException("Invalid map uid: {0}".F(uid));
-			
-			var map = new Map(AvailableMaps[uid].Package);
-			
-			Rules.LoadRules(Manifest, map);
-			if (map.Theater != cachedTheatre)
-			{
-				SpriteSheetBuilder.Initialize( Rules.TileSets[map.Tileset] );
-				SequenceProvider.Initialize(Manifest.Sequences);
-				CursorProvider.Initialize(Manifest.Cursors);
-				cachedTheatre = map.Theater;
-			}
-			return map;
-		}
-	}
-	
-	public interface ILoadScreen { void Display(); void Init(); }
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA
+{
+	public class ModData
+	{
+		public readonly Manifest Manifest;
+		public readonly ObjectCreator ObjectCreator;
+		public Dictionary<string, MapStub> AvailableMaps {get; private set;}
+		public readonly WidgetLoader WidgetLoader;
+		public ILoadScreen LoadScreen = null;
+		public SheetBuilder SheetBuilder;
+		public CursorSheetBuilder CursorSheetBuilder;
+		public SpriteLoader SpriteLoader;
+		public HardwarePalette Palette { get; private set; }
+		IFolder previousMapMount = null;
+		
+		public ModData( params string[] mods )
+		{		
+			Manifest = new Manifest( mods );
+			ObjectCreator = new ObjectCreator( Manifest );
+			LoadScreen = ObjectCreator.CreateObject<ILoadScreen>(Manifest.LoadScreen);
+			LoadScreen.Init();
+			LoadScreen.Display();
+			WidgetLoader = new WidgetLoader( this );
+		}
+		
+		public void ReloadMaps()
+		{
+			AvailableMaps = FindMaps( Manifest.Mods );
+		}
+			
+		public void LoadInitialAssets()
+		{
+			// all this manipulation of static crap here is nasty and breaks 
+            // horribly when you use ModData in unexpected ways.
+			FileSystem.UnmountAll();
+			foreach (var dir in Manifest.Folders)
+				FileSystem.Mount(dir);
+			
+			ReloadMaps();
+			Palette = new HardwarePalette();
+			ChromeProvider.Initialize( Manifest.Chrome );
+			SheetBuilder = new SheetBuilder( TextureChannel.Red );
+			CursorSheetBuilder = new CursorSheetBuilder( this );
+			CursorProvider.Initialize(Manifest.Cursors);
+			Palette.Update(new IPaletteModifier[]{});
+		}
+
+		public Map PrepareMap(string uid)
+		{
+			LoadScreen.Display();
+			if (!AvailableMaps.ContainsKey(uid))
+				throw new InvalidDataException("Invalid map uid: {0}".F(uid));
+			var map = new Map(AvailableMaps[uid].Path);
+
+			// Maps may contain custom assets
+			// TODO: why are they lowest priority? they should be highest.
+			if (previousMapMount != null) FileSystem.Unmount(previousMapMount);
+			previousMapMount = FileSystem.OpenPackage(map.Path, int.MaxValue);
+			FileSystem.Mount(previousMapMount);
+			
+			// Reinit all our assets
+			LoadInitialAssets();
+			foreach (var pkg in Manifest.Packages)
+				FileSystem.Mount(pkg);
+		
+			Rules.LoadRules(Manifest, map);
+			SpriteLoader = new SpriteLoader( Rules.TileSets[map.Tileset].Extensions, SheetBuilder );
+			SequenceProvider.Initialize(Manifest.Sequences, map.Sequences);
+			
+			return map;
+		}
+		
+        public static IEnumerable<string> FindMapsIn(string dir)
+        {
+            string[] NoMaps = { };
+
+            if (!Directory.Exists(dir))
+                return NoMaps;
+
+            return Directory.GetDirectories(dir)
+                .Concat(Directory.GetFiles(dir, "*.zip"))
+                .Concat(Directory.GetFiles(dir, "*.oramap"));
+        }
+
+		Dictionary<string, MapStub> FindMaps(string[] mods)
+		{
+            var paths = mods.SelectMany(p => FindMapsIn("mods{0}{1}{0}maps{0}".F(Path.DirectorySeparatorChar, p)))
+				.Concat(mods.SelectMany(p => FindMapsIn("{1}maps{0}{2}{0}".F(Path.DirectorySeparatorChar, Game.SupportDir, p))));
+			
+			Dictionary<string, MapStub> ret = new Dictionary<string, MapStub>();
+			foreach (var path in paths)
+			{
+				var map = new MapStub(path);
+				if (ret.ContainsKey(map.Uid))
+					System.Console.WriteLine("Ignoring duplicate map: {0}", path);
+				else
+					ret.Add(map.Uid, map);
+			}
+			return ret;
+		}
+		
+	}
+	
+	public interface ILoadScreen { void Display(); void Init(); }
+}

OpenRA.Game/Network/Connection.cs

@@ -18,7 +18,7 @@ using OpenRA.Support;
 
 namespace OpenRA.Network
 {
-	enum ConnectionState
+    public enum ConnectionState
 	{
 		PreConnecting,
 		NotConnected,
@@ -26,7 +26,7 @@ namespace OpenRA.Network
 		Connected,
 	}
 
-	interface IConnection : IDisposable
+    public interface IConnection : IDisposable
 	{
 		int LocalClientId { get; }
 		ConnectionState ConnectionState { get; }
@@ -180,12 +180,14 @@ namespace OpenRA.Network
 				{
 					ms.Write( BitConverter.GetBytes( (int)q.Length ) );
 					ms.Write( q );
+					base.Send( q );
 				}
 				queuedSyncPackets.Clear();
 				ms.WriteTo(socket.GetStream());
 			}
 			catch (SocketException) { /* drop this on the floor; we'll pick up the disconnect from the reader thread */ }
 			catch (ObjectDisposedException) { /* ditto */ }
+			catch (InvalidOperationException) { /* ditto */ }
 		}
 
 		bool disposed = false;

OpenRA.Game/Network/FrameData.cs

@@ -25,14 +25,7 @@ namespace OpenRA.Network
 
 		public void ClientQuit( int clientId, int lastClientFrame )
 		{
-			if (clientQuitTimes.ContainsKey(clientId))
-			{
-				Game.Debug("Warning: double-quit from client {0}, frames {1},{2}",
-					clientId, clientQuitTimes[clientId], lastClientFrame);
-				return;
-			}
-
-			clientQuitTimes.Add( clientId, lastClientFrame );
+			clientQuitTimes[clientId] = lastClientFrame;
 		}
 
 		public void AddFrameOrders( int clientId, int frame, byte[] orders )

OpenRA.Game/Network/Handshake.cs

@@ -0,0 +1,73 @@
+#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.FileFormats;
+
+namespace OpenRA.Network
+{
+	public class HandshakeRequest
+	{
+		[FieldLoader.Load] public string[] Mods;
+		[FieldLoader.Load] public string Map;
+		
+		public string Serialize()
+		{
+			var data = new List<MiniYamlNode>();
+			data.Add(new MiniYamlNode("Handshake", FieldSaver.Save(this)));
+			return data.WriteToString();
+		}
+
+		public static HandshakeRequest Deserialize(string data)
+		{
+			var handshake = new HandshakeRequest();
+			FieldLoader.Load(handshake, MiniYaml.FromString(data).First().Value);
+			return handshake;
+		}
+	}
+	
+	public class HandshakeResponse
+	{
+		[FieldLoader.Load] public string[] Mods;
+		[FieldLoader.Load] public string Password;
+		public Session.Client Client;
+		
+		public string Serialize()
+		{
+			var data = new List<MiniYamlNode>();
+			data.Add( new MiniYamlNode( "Handshake", null,
+				new string[]{ "Mods", "Password" }.Select( p => FieldSaver.SaveField(this, p) ).ToList() ) );
+			data.Add(new MiniYamlNode("Client", FieldSaver.Save(Client)));
+			
+			return data.WriteToString();
+		}
+
+		public static HandshakeResponse Deserialize(string data)
+		{
+			var handshake = new HandshakeResponse();
+			handshake.Client = new Session.Client();
+			
+			var ys = MiniYaml.FromString(data);
+			foreach (var y in ys)
+				switch (y.Key)
+				{
+					case "Handshake":
+						FieldLoader.Load(handshake, y.Value);
+					break;
+					case "Client":
+						FieldLoader.Load(handshake.Client, y.Value);
+					break;
+				}
+			return handshake;
+		}
+	}
+}

OpenRA.Game/Network/Order.cs

@@ -11,23 +11,43 @@
 using System;
 using System.IO;
 using System.Linq;
+using OpenRA.Network;
 
 namespace OpenRA
 {
+	[Flags]
+	enum OrderFields : byte
+	{
+		TargetActor = 0x01, 
+		TargetLocation = 0x02, 
+		TargetString = 0x04, 
+		Queued = 0x08, 
+		ExtraLocation = 0x10,
+	}
+
+	static class OrderFieldsExts
+	{
+		public static bool HasField(this OrderFields of, OrderFields f)
+		{
+			return (of & f) != 0;
+		}
+	}
+
 	public sealed class Order
 	{
 		public readonly string OrderString;
 		public readonly Actor Subject;
-		public readonly Actor TargetActor;
-		public readonly int2 TargetLocation;
-		public readonly string TargetString;
 		public readonly bool Queued;
+		public Actor TargetActor;
+		public int2 TargetLocation;
+		public string TargetString;
+		public int2 ExtraLocation;
 		public bool IsImmediate;
 		
 		public Player Player { get { return Subject.Owner; } }
 
-		public Order(string orderString, Actor subject, 
-			Actor targetActor, int2 targetLocation, string targetString, bool queued)
+		Order(string orderString, Actor subject, 
+			Actor targetActor, int2 targetLocation, string targetString, bool queued, int2 extraLocation)
 		{
 			this.OrderString = orderString;
 			this.Subject = subject;
@@ -35,24 +55,15 @@ namespace OpenRA
 			this.TargetLocation = targetLocation;
 			this.TargetString = targetString;
 			this.Queued = queued;
+			this.ExtraLocation = extraLocation;
 		}
 
-		public Order(string orderString, Actor subject) 
-			: this(orderString, subject, null, int2.Zero, null, false) { }
-		public Order(string orderString, Actor subject, Actor targetActor)
-			: this(orderString, subject, targetActor, int2.Zero, null, false) { }
-		public Order(string orderString, Actor subject, int2 targetLocation)
-			: this(orderString, subject, null, targetLocation, null, false) { }
-		public Order(string orderString, Actor subject, int2 targetLocation, bool queued)
-			: this(orderString, subject, null, targetLocation, null, queued) { }
-		public Order(string orderString, Actor subject, string targetString)
-			: this(orderString, subject, null, int2.Zero, targetString, false) { }
-		public Order(string orderString, Actor subject, Actor targetActor, int2 targetLocation)
-			: this(orderString, subject, targetActor, targetLocation, null, false) { }
-		public Order(string orderString, Actor subject, Actor targetActor, string targetString)
-			: this(orderString, subject, targetActor, int2.Zero, targetString, false) { }
-		public Order(string orderString, Actor subject, int2 targetLocation, string targetString)
-			: this(orderString, subject, null, targetLocation, targetString, false) { }
+		// For scripting special powers
+		public Order() 
+			: this(null, null, null, int2.Zero, null, false, int2.Zero) { }
+		
+		public Order(string orderString, Actor subject, bool queued) 
+			: this(orderString, subject, null, int2.Zero, null, queued, int2.Zero) { }
 
 		public byte[] Serialize()
 		{
@@ -80,13 +91,25 @@ namespace OpenRA
 						w.Write( (byte)0xFF );
 						w.Write(OrderString);
 						w.Write(UIntFromActor(Subject));
-						w.Write(UIntFromActor(TargetActor));
-						w.Write(TargetLocation.X);
-						w.Write(TargetLocation.Y);
-						w.Write(TargetString != null);
+
+						OrderFields fields = 0;
+						if (TargetActor != null) fields |= OrderFields.TargetActor;
+						if (TargetLocation != int2.Zero) fields |= OrderFields.TargetLocation;
+						if (TargetString != null) fields |= OrderFields.TargetString;
+						if (Queued) fields |= OrderFields.Queued;
+						if (ExtraLocation != int2.Zero) fields |= OrderFields.ExtraLocation;
+
+						w.Write((byte)fields);
+
+						if (TargetActor != null)
+							w.Write(UIntFromActor(TargetActor));
+						if (TargetLocation != int2.Zero)
+							w.Write(TargetLocation);
 						if (TargetString != null)
 							w.Write(TargetString);
-						w.Write(Queued);
+						if (ExtraLocation != int2.Zero)
+							w.Write(ExtraLocation);
+
 						return ret.ToArray();
 					}
 			}
@@ -100,19 +123,19 @@ namespace OpenRA
 					{
 						var order = r.ReadString();
 						var subjectId = r.ReadUInt32();
-						var targetActorId = r.ReadUInt32();
-						var targetLocation = new int2(r.ReadInt32(), 0);
-						targetLocation.Y = r.ReadInt32();
-						var targetString = null as string;
-						if (r.ReadBoolean())
-							targetString = r.ReadString();
-						var queued = r.ReadBoolean();
+						var flags = (OrderFields)r.ReadByte();
+						
+						var targetActorId = flags.HasField(OrderFields.TargetActor) ?  r.ReadUInt32() : 0xffffffff;
+						var targetLocation = flags.HasField(OrderFields.TargetLocation) ? r.ReadInt2() : int2.Zero;
+						var targetString = flags.HasField(OrderFields.TargetString) ? r.ReadString() : null;
+						var queued = flags.HasField(OrderFields.Queued);
+						var extraLocation = flags.HasField(OrderFields.ExtraLocation) ? r.ReadInt2() : int2.Zero;
 
 						Actor subject, targetActor;
 						if( !TryGetActorFromUInt( world, subjectId, out subject ) || !TryGetActorFromUInt( world, targetActorId, out targetActor ) )
 							return null;
 
-						return new Order( order, subject, targetActor, targetLocation, targetString, queued);
+						return new Order( order, subject, targetActor, targetLocation, targetString, queued, extraLocation);
 					}
 
 				case 0xfe:
@@ -120,7 +143,7 @@ namespace OpenRA
 						var name = r.ReadString();
 						var data = r.ReadString();
 
-						return new Order( name, null, data ) { IsImmediate = true };
+						return new Order( name, null, false ) { IsImmediate = true, TargetString = data };
 					}
 
 				default:
@@ -130,9 +153,9 @@ namespace OpenRA
 		
 		public override string ToString()
 		{
-			return "OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." +
-				"\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n".F(
-			    		OrderString, Subject, TargetActor.Info.Name , TargetLocation, TargetString, IsImmediate, Player.PlayerName);
+			return ("OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." +
+				"\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n").F(
+				OrderString, Subject, TargetActor != null ? TargetActor.Info.Name : null , TargetLocation, TargetString, IsImmediate, Player != null ? Player.PlayerName : null);
 		}
 
 		static uint UIntFromActor(Actor a)
@@ -164,32 +187,37 @@ namespace OpenRA
 		// Now that Orders are resolved by individual Actors, these are weird; you unpack orders manually, but not pack them.
 		public static Order Chat(string text)
 		{
-			return new Order("Chat", null, text) { IsImmediate = true };
+			return new Order("Chat", null, false) { IsImmediate = true, TargetString = text};
 		}
 
 		public static Order TeamChat(string text)
 		{
-			return new Order("TeamChat", null, text) { IsImmediate = true };
+			return new Order("TeamChat", null, false) { IsImmediate = true, TargetString = text };
+		}
+		
+		public static Order HandshakeResponse(string text)
+		{
+			return new Order("HandshakeResponse", null, false) { IsImmediate = true, TargetString = text };
 		}
 		
 		public static Order Command(string text)
 		{
-			return new Order("Command", null, text) { IsImmediate = true };	
+			return new Order("Command", null, false) { IsImmediate = true, TargetString = text };
 		}
 
 		public static Order StartProduction(Actor subject, string item, int count)
 		{
-			return new Order("StartProduction", subject, new int2( count, 0 ), item );
+			return new Order("StartProduction", subject, false) { TargetLocation = new int2(count, 0), TargetString = item };
 		}
 
 		public static Order PauseProduction(Actor subject, string item, bool pause)
 		{
-			return new Order("PauseProduction", subject, new int2( pause ? 1 : 0, 0 ), item);
+			return new Order("PauseProduction", subject, false) { TargetLocation = new int2(pause ? 1 : 0, 0), TargetString = item };
 		}
 
 		public static Order CancelProduction(Actor subject, string item, int count)
 		{
-			return new Order("CancelProduction", subject, new int2( count, 0 ), item);
+			return new Order("CancelProduction", subject, false) { TargetLocation = new int2(count, 0), TargetString = item };
 		}
 	}
 }

OpenRA.Game/Network/OrderIO.cs

@@ -8,14 +8,12 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace OpenRA.Network
 {
-	static class OrderIO
+	public static class OrderIO
 	{
 		public static void Write(this Stream s, byte[] buf)
 		{
@@ -47,5 +45,18 @@ namespace OpenRA.Network
 			}
 			return ms.ToArray();
 		}
+
+		public static int2 ReadInt2(this BinaryReader r)
+		{
+			var x = r.ReadInt32();
+			var y = r.ReadInt32();
+			return new int2(x, y);
+		}
+
+		public static void Write(this BinaryWriter w, int2 p)
+		{
+			w.Write(p.X);
+			w.Write(p.Y);
+		}
 	}
 }

OpenRA.Game/Network/OrderManager.cs

@@ -16,7 +16,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Network
 {
-	class OrderManager : IDisposable
+    public class OrderManager : IDisposable
 	{
 		readonly SyncReport syncReport;
 		readonly FrameData frameData = new FrameData();
@@ -27,6 +27,7 @@ namespace OpenRA.Network
 
 		public readonly string Host;
 		public readonly int Port;
+		public string ServerError;
 
 		public int NetFrameNumber { get; private set; }
 		public int LocalFrameNumber;
@@ -132,8 +133,13 @@ namespace OpenRA.Network
 
 		void OutOfSync(int frame, int index)
 		{
-			var order = frameData.OrdersForFrame( world, frame ).ElementAt(index);
-			throw new InvalidOperationException("Out of sync in frame {0}.\n {1}".F(frame, order.Order.ToString()));
+			var orders = frameData.OrdersForFrame( world, frame );
+			
+			// Invalid index
+			if (index >= orders.Count())
+				OutOfSync(frame);
+			
+			throw new InvalidOperationException("Out of sync in frame {0}.\n {1}".F(frame, orders.ElementAt(index).Order.ToString()));
 		}
 		
 		void OutOfSync(int frame)

OpenRA.Game/Network/ReplayConnection.cs

@@ -6,7 +6,7 @@ using System.IO;
 
 namespace OpenRA.Network
 {
-	class ReplayConnection : IConnection
+	public class ReplayConnection : IConnection
 	{
 		//uint nextFrame = 1;
 		FileStream replayStream;
@@ -29,10 +29,23 @@ namespace OpenRA.Network
 		// do nothing; ignore locally generated orders
 		public void Send( int frame, List<byte[]> orders ) { }
 		public void SendImmediate( List<byte[]> orders ) { }
-		public void SendSync( int frame, byte[] syncData ) { }
+		public void SendSync( int frame, byte[] syncData )
+		{
+			var ms = new MemoryStream();
+			ms.Write( BitConverter.GetBytes( frame ) );
+			ms.Write( syncData );
+			sync.Add( ms.ToArray() );
+		}
+
+		List<byte[]> sync = new List<byte[]>();
 
 		public void Receive( Action<int, byte[]> packetFn )
 		{
+			while( sync.Count != 0 )
+			{
+				packetFn( LocalClientId, sync[ 0 ] );
+				sync.RemoveAt( 0 );
+			}
 			if( replayStream == null ) return;
 
 			var reader = new BinaryReader( replayStream );

OpenRA.Game/Network/Session.cs

@@ -21,27 +21,27 @@ namespace OpenRA.Network
 		public List<Slot> Slots = new List<Slot>();
 		public Global GlobalSettings = new Global();
 
-		public Client ClientWithIndex( int clientID )
+		public Client ClientWithIndex(int clientID)
 		{
-			return Clients.SingleOrDefault( c => c.Index == clientID );
+			return Clients.SingleOrDefault(c => c.Index == clientID);
 		}
 
-		public Client ClientInSlot( Slot slot )
+		public Client ClientInSlot(Slot slot)
 		{
-			return Clients.SingleOrDefault( c => c.Slot == slot.Index );
+			return Clients.SingleOrDefault(c => c.Slot == slot.Index);
 		}
 
 		public enum ClientState
 		{
 			NotReady,
-			Ready
+			Ready,
+			Disconnected = 1000
 		}
 
 		public class Client
 		{
 			public int Index;
-			public Color Color1;
-			public Color Color2;
+            public ColorRamp ColorRamp;
 			public string Country;
 			public int SpawnPoint;
 			public string Name;
@@ -55,8 +55,8 @@ namespace OpenRA.Network
 			public int Index;
 			public string Bot;	// trait name of the bot to initialize in this slot, or null otherwise.
 			public bool Closed;	// host has explicitly closed this slot.
-			public string MapPlayer;	// playerReference to bind against.
-			
+			public string MapPlayer;	// playerReference to bind against.
+			public bool Spectator = false; // Spectating or not
 			// todo: more stuff?
 		}
 
@@ -67,11 +67,11 @@ namespace OpenRA.Network
 			public string[] Mods = { "ra" };	// mod names
 			public int OrderLatency = 3;
 			public int RandomSeed = 0;
-			public bool LockTeams = false;	// don't allow team changes after game start.
+			public bool LockTeams = true;	// don't allow team changes after game start.
 			public bool AllowCheats = false;
 		}
 
-		public Session( string[] mods )
+		public Session(string[] mods)
 		{
 			this.GlobalSettings.Mods = mods.ToArray();
 		}
@@ -80,27 +80,27 @@ namespace OpenRA.Network
 		{
 			var clientData = new List<MiniYamlNode>();
 
-			foreach( var client in Clients )
-				clientData.Add( new MiniYamlNode( "Client@{0}".F( client.Index ), FieldSaver.Save( client ) ) );
+			foreach (var client in Clients)
+				clientData.Add(new MiniYamlNode("Client@{0}".F(client.Index), FieldSaver.Save(client)));
 
-			foreach( var slot in Slots )
-				clientData.Add( new MiniYamlNode( "Slot@{0}".F( slot.Index ), FieldSaver.Save( slot ) ) );
+			foreach (var slot in Slots)
+				clientData.Add(new MiniYamlNode("Slot@{0}".F(slot.Index), FieldSaver.Save(slot)));
 
-			clientData.Add( new MiniYamlNode( "GlobalSettings", FieldSaver.Save( GlobalSettings ) ) );
+			clientData.Add(new MiniYamlNode("GlobalSettings", FieldSaver.Save(GlobalSettings)));
 
 			return clientData.WriteToString();
 		}
 
 		public static Session Deserialize(string data)
 		{
-			var session = new Session( Game.Settings.Game.Mods );
+			var session = new Session(Game.Settings.Game.Mods);
 
 			var ys = MiniYaml.FromString(data);
 			foreach (var y in ys)
 			{
 				var yy = y.Key.Split('@');
 
-				switch( yy[0] )
+				switch (yy[0])
 				{
 					case "GlobalSettings":
 						FieldLoader.Load(session.GlobalSettings, y.Value);
@@ -111,7 +111,7 @@ namespace OpenRA.Network
 						break;
 
 					case "Slot":
-						session.Slots.Add(FieldLoader.Load<Session.Slot>(y.Value ));
+						session.Slots.Add(FieldLoader.Load<Session.Slot>(y.Value));
 						break;
 				}
 			}

OpenRA.Game/Network/SyncReport.cs

@@ -1,9 +1,14 @@
-using System;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
-using OpenRA.Support;
 
 namespace OpenRA.Network
 {
@@ -23,9 +28,6 @@ namespace OpenRA.Network
 		
 		internal void UpdateSyncReport()
 		{
-			if (!Game.Settings.Debug.RecordSyncReports)
-				return;
-			
 			GenerateSyncReport(syncReports[curIndex]);
 			curIndex = ++curIndex % numSyncReports;
 		}
@@ -35,7 +37,7 @@ namespace OpenRA.Network
 			report.Frame = orderManager.NetFrameNumber;
 			report.SyncedRandom = orderManager.world.SharedRandom.Last;
 			report.Traits.Clear();
-			foreach (var a in orderManager.world.Queries.WithTraitMultiple<object>())
+			foreach (var a in orderManager.world.Queries.WithTrait<ISync>())
 			{
 				var sync = Sync.CalculateSyncHash(a.Trait);
 				if (sync != 0)
@@ -43,7 +45,7 @@ namespace OpenRA.Network
 					{
 						ActorID = a.Actor.ActorID,
 						Type = a.Actor.Info.Name,
-						Owner = (a.Actor.Owner == null) ? "null" : a.Actor.Owner.InternalName,
+						Owner = (a.Actor.Owner == null) ? "null" : a.Actor.Owner.PlayerName,
 						Trait = a.Trait.GetType().Name,
 						Hash = sync
 					});

OpenRA.Game/Network/UnitOrders.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 
@@ -11,12 +11,14 @@
 using System.Drawing;
 using System.Linq;
 using OpenRA.Traits;
+using System;
+using OpenRA.FileFormats;
 
 namespace OpenRA.Network
 {
 	static class UnitOrders
 	{
-		static Player FindPlayerByClient( this World world, Session.Client c)
+		static Player FindPlayerByClient(this World world, Session.Client c)
 		{
 			/* todo: this is still a hack. 
 			 * the cases we're trying to avoid are the extra players on the host's client -- Neutral, other MapPlayers,
@@ -25,114 +27,168 @@ namespace OpenRA.Network
 				p => p.ClientIndex == c.Index && p.PlayerName == c.Name);
 		}
 
-		public static void ProcessOrder( OrderManager orderManager, World world, int clientId, Order order )
+		public static void ProcessOrder(OrderManager orderManager, World world, int clientId, Order order)
 		{
-			// Drop exploiting orders
-			if (order.Subject != null && order.Subject.Owner.ClientIndex != clientId)
+			if (world != null)
 			{
-				Game.Debug("Detected exploit order from {0}: {1}".F(clientId, order.OrderString));
-				return;
+				if (!world.WorldActor.TraitsImplementing<IValidateOrder>().All(vo =>
+					vo.OrderValidation(orderManager, world, clientId, order)))
+					return;
 			}
-			
-			switch( order.OrderString )
+
+			switch (order.OrderString)
 			{
-			case "Chat":
-				{
-					var client = orderManager.LobbyInfo.ClientWithIndex( clientId );
-					if (client != null)
+				case "Chat":
 					{
-						var player = world != null ? world.FindPlayerByClient(client) : null;
-						var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
-						Game.AddChatLine(client.Color1, client.Name+suffix, order.TargetString);
-					}
-					else
-						Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString);
-					break;
-				}
-			case "TeamChat":
-				{
-					var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
-					if (client != null)
-					{
-						if (world == null)
+						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
+						if (client != null)
 						{
-							if (client.Team == orderManager.LocalClient.Team)
-								Game.AddChatLine(client.Color1, client.Name + " (Team)",
-									order.TargetString);
+							var player = world != null ? world.FindPlayerByClient(client) : null;
+							var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
+							Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + suffix, order.TargetString);
 						}
 						else
+							Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString);
+						break;
+					}
+				case "Disconnected": /* reports that the target player disconnected */
+					{
+						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
+						if (client != null)
 						{
-							var player = world.FindPlayerByClient(client);
-							var display = player != null
-								&& (world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally
-									|| player.WinState == WinState.Lost);
+							client.State = Session.ClientState.Disconnected;
+						}
+						break;
+					}
+				case "TeamChat":
+					{
+						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
 
-							if (display)
+						if (client != null)
+						{
+							if (world == null)
 							{
-								var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : " (Team)";
-								Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString);
+								if (client.Team == orderManager.LocalClient.Team)
+                                    Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + " (Team)",
+													 order.TargetString);
+							}
+							else
+							{
+								var player = world.FindPlayerByClient(client);
+								var display = player != null
+											  &&
+											  (world.LocalPlayer != null &&
+											   player.Stances[world.LocalPlayer] == Stance.Ally
+											   || player.WinState == WinState.Lost);
+
+								if (display)
+								{
+									var suffix = (player != null && player.WinState == WinState.Lost)
+													 ? " (Dead)"
+													 : " (Team)";
+                                    Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + suffix, order.TargetString);
+								}
 							}
 						}
+						break;
 					}
-					break;
-				}
-			case "StartGame":
-				{
-					Game.AddChatLine(Color.White, "Server", "The game has started.");
-					Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map);
-					break;
-				}
-			case "SyncInfo":
-				{
-					orderManager.LobbyInfo = Session.Deserialize( order.TargetString );
-
-					//if( !world.GameHasStarted )
-					//    world.SharedRandom = new XRandom( LobbyInfo.GlobalSettings.RandomSeed );
-
-					//if (orderManager.Connection.ConnectionState == ConnectionState.Connected)
-					//    world.SetLocalPlayer(orderManager.Connection.LocalClientId);
-
-					if( orderManager.FramesAhead != orderManager.LobbyInfo.GlobalSettings.OrderLatency
-						&& !orderManager.GameStarted )
+				case "StartGame":
 					{
-						orderManager.FramesAhead = orderManager.LobbyInfo.GlobalSettings.OrderLatency;
-						Game.Debug( "Order lag is now {0} frames.".F( orderManager.LobbyInfo.GlobalSettings.OrderLatency ) );
+						Game.AddChatLine(Color.White, "Server", "The game has started.");
+						Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map);
+						break;
+					}
+				
+				case "HandshakeRequest":
+				{
+					var request = HandshakeRequest.Deserialize(order.TargetString);
+				
+					// Check that the map exists on the client
+					if (!Game.modData.AvailableMaps.ContainsKey(request.Map))
+						throw new InvalidOperationException("Missing map {0}".F(request.Map));
+					
+					var info = new Session.Client()
+					{
+						Name = Game.Settings.Player.Name,
+						ColorRamp = Game.Settings.Player.ColorRamp,
+						Country = "random",
+						SpawnPoint = 0,
+						Team = 0,
+						State = Session.ClientState.NotReady
+					};
+				
+					var localMods = orderManager.LobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m,Mod.AllMods[m].Version)).ToArray();
+					var response = new HandshakeResponse()
+					{
+						Client = info,
+						Mods = localMods,
+						Password = "Foo"
+					};
+				
+					orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize()));
+					break;
+				}
+				case "ServerError":
+					orderManager.ServerError = order.TargetString;
+				break;
+				case "SyncInfo":
+					{
+						orderManager.LobbyInfo = Session.Deserialize(order.TargetString);
+
+						if (orderManager.FramesAhead != orderManager.LobbyInfo.GlobalSettings.OrderLatency
+							&& !orderManager.GameStarted)
+						{
+							orderManager.FramesAhead = orderManager.LobbyInfo.GlobalSettings.OrderLatency;
+							Game.Debug(
+								"Order lag is now {0} frames.".F(orderManager.LobbyInfo.GlobalSettings.OrderLatency));
+						}
+						Game.SyncLobbyInfo();
+						break;
 					}
 
-					Game.SyncLobbyInfo();
-					break;
-				}
-			case "SetStance":
-				{
-					var targetPlayer = order.Player.World.players[order.TargetLocation.X];
-					var newStance = (Stance)order.TargetLocation.Y;
+				case "SetStance":
+					{
+						if (Game.orderManager.LobbyInfo.GlobalSettings.LockTeams)
+							return;
 
-					SetPlayerStance(world, order.Player, targetPlayer, newStance);
+						var targetPlayer = order.Player.World.players[order.TargetLocation.X];
+						var newStance = (Stance)order.TargetLocation.Y;
 
-					// automatically declare war reciprocally
-					if (newStance == Stance.Enemy)
-						SetPlayerStance(world, targetPlayer, order.Player, newStance);
+						SetPlayerStance(world, order.Player, targetPlayer, newStance);
 
-					Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F(
-						order.Player.PlayerName, targetPlayer.PlayerName, newStance));
-					break;
-				}
-			default:
-				{
-					if( !order.IsImmediate )
-						foreach (var t in order.Subject.TraitsImplementing<IResolveOrder>())
-							t.ResolveOrder(order.Subject, order);
-					break;
-				}
+						Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F(
+							order.Player.PlayerName, targetPlayer.PlayerName, newStance));
+				
+						// automatically declare war reciprocally
+						if (newStance == Stance.Enemy && targetPlayer.Stances[order.Player] == Stance.Ally)
+						{
+							SetPlayerStance(world, targetPlayer, order.Player, newStance);
+							Game.Debug("{0} has reciprocated",targetPlayer.PlayerName);
+						}
+
+						break;
+					}
+				default:
+					{
+						if( !order.IsImmediate )
+						{
+							var self = order.Subject;
+							var health = self.TraitOrDefault<Health>();
+							if( health == null || !health.IsDead )
+								foreach( var t in self.TraitsImplementing<IResolveOrder>() )
+									t.ResolveOrder( self, order );
+						}
+						break;
+					}
 			}
 		}
 
-		static void SetPlayerStance(World w, Player a, Player b, Stance s)
+		static void SetPlayerStance(World w, Player p, Player target, Stance s)
 		{
-			var oldStance = a.Stances[b];
-			a.Stances[b] = s;
-			if (b == w.LocalPlayer)
-				w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, b, oldStance, s);
+			var oldStance = p.Stances[target];
+			p.Stances[target] = s;
+			if (target == w.LocalPlayer)
+				w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, p, oldStance, s);
 		}
 	}
 }

OpenRA.Game/ObjectCreator.cs

@@ -1,9 +1,19 @@
-using System;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using OpenRA.FileFormats;
-using System.Collections.Generic;
 
 namespace OpenRA
 {
@@ -67,7 +77,9 @@ namespace OpenRA
 			{
 				var attrs = p[ i ].GetCustomAttributes<ParamAttribute>();
 				if( attrs.Length != 1 ) throw new InvalidOperationException( "ObjectCreator: argument in [UseCtor] doesn't have [Param]" );
-				a[ i ] = args[ attrs[ 0 ].ParamName ?? p[i].Name ];
+				var key = attrs[ 0 ].ParamName ?? p[i].Name;
+				if ( !args.ContainsKey(key) ) throw new InvalidOperationException("ObjectCreator: key `{0}' not found".F(key));
+				a[ i ] = args[ key ];
 			}
 			return ctor.Invoke( a );
 		}

OpenRA.Game/OpenRA.Game.csproj

@@ -79,22 +79,14 @@
     <Compile Include="Group.cs" />
     <Compile Include="Orders\GenericSelectTarget.cs" />
     <Compile Include="Server\ProtocolVersion.cs" />
-    <Compile Include="Traits\BaseBuilding.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
     <Compile Include="Traits\Player\PlayerResources.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\Delegates\ServerBrowserDelegate.cs" />
-    <Compile Include="Widgets\Delegates\SettingsMenuDelegate.cs" />
     <Compile Include="Widgets\MapPreviewWidget.cs" />
     <Compile Include="Widgets\WidgetUtils.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
     <Compile Include="Effects\FlashTarget.cs" />
-    <Compile Include="Effects\MoveFlash.cs" />
     <Compile Include="Exts.cs" />
     <Compile Include="GameRules\ActorInfo.cs" />
     <Compile Include="GameRules\VoiceInfo.cs" />
@@ -106,23 +98,19 @@
     <Compile Include="Network\Connection.cs" />
     <Compile Include="Network\OrderIO.cs" />
     <Compile Include="Network\OrderManager.cs" />
-    <Compile Include="PathSearch.cs" />
     <Compile Include="Selection.cs" />
     <Compile Include="Server\Connection.cs" />
     <Compile Include="Server\Exts.cs" />
     <Compile Include="Server\MasterServerQuery.cs" />
     <Compile Include="Server\Server.cs" />
     <Compile Include="Server\ServerOrder.cs" />
-    <Compile Include="ShroudRenderer.cs" />
     <Compile Include="Sound.cs" />
     <Compile Include="Support\PerfHistory.cs" />
     <Compile Include="Sync.cs" />
-    <Compile Include="Traits\CustomSellValue.cs" />
     <Compile Include="Traits\World\SpatialBins.cs" />
     <Compile Include="Traits\World\Country.cs" />
     <Compile Include="Actor.cs" />
     <Compile Include="Cursor.cs" />
-    <Compile Include="GameRules\Footprint.cs" />
     <Compile Include="GameRules\Rules.cs" />
     <Compile Include="Graphics\Animation.cs" />
     <Compile Include="Game.cs" />
@@ -130,36 +118,25 @@
     <Compile Include="Graphics\CursorSheetBuilder.cs" />
     <Compile Include="Graphics\LineRenderer.cs" />
     <Compile Include="Graphics\WorldRenderer.cs" />
-    <Compile Include="Traits\Activities\Idle.cs" />
-    <Compile Include="Traits\Activities\RemoveSelf.cs" />
-    <Compile Include="Traits\Activities\Sell.cs" />
     <Compile Include="Orders\IOrderGenerator.cs" />
     <Compile Include="Player.cs" />
     <Compile Include="Graphics\Sheet.cs" />
-    <Compile Include="PathFinder.cs" />
     <Compile Include="Graphics\Sequence.cs" />
     <Compile Include="Network\Order.cs" />
     <Compile Include="Graphics\SequenceProvider.cs" />
     <Compile Include="Graphics\SheetBuilder.cs" />
     <Compile Include="Graphics\HardwarePalette.cs" />
-    <Compile Include="MainWindow.cs">
-    </Compile>
     <Compile Include="Support\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Graphics\Renderer.cs" />
     <Compile Include="Graphics\Sprite.cs" />
     <Compile Include="Graphics\SpriteRenderer.cs" />
-    <Compile Include="Graphics\SpriteSheetBuilder.cs" />
+    <Compile Include="Graphics\SpriteLoader.cs" />
     <Compile Include="Graphics\TerrainRenderer.cs" />
-    <Compile Include="Traits\Activities\Move.cs" />
-    <Compile Include="Traits\Activities\Turn.cs" />
-    <Compile Include="Traits\Building.cs" />
-    <Compile Include="Traits\World\BuildingInfluence.cs" />
     <Compile Include="Traits\World\PlayerColorPalette.cs" />
     <Compile Include="Traits\World\ResourceLayer.cs" />
     <Compile Include="Traits\World\ResourceType.cs" />
     <Compile Include="Traits\Selectable.cs" />
-    <Compile Include="Traits\Mobile.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
     <Compile Include="Traits\World\UnitInfluence.cs" />
@@ -169,29 +146,22 @@
     <Compile Include="Graphics\Util.cs" />
     <Compile Include="Graphics\Viewport.cs" />
     <Compile Include="Orders\UnitOrderGenerator.cs" />
-    <Compile Include="Widgets\WorldTooltipWidget.cs" />
     <Compile Include="World.cs" />
     <Compile Include="WorldUtils.cs" />
     <Compile Include="Traits\Player\EvaAlerts.cs" />
     <Compile Include="Traits\World\ScreenShaker.cs" />
-    <Compile Include="Traits\LineBuild.cs" />
     <Compile Include="Widgets\WidgetLoader.cs" />
     <Compile Include="Widgets\ButtonWidget.cs" />
     <Compile Include="Widgets\Widget.cs" />
     <Compile Include="Widgets\BackgroundWidget.cs" />
     <Compile Include="Widgets\LabelWidget.cs" />
     <Compile Include="Widgets\CheckboxWidget.cs" />
-    <Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" />
     <Compile Include="Widgets\PerfGraphWidget.cs" />
-    <Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
-    <Compile Include="Widgets\Delegates\LobbyDelegate.cs" />
     <Compile Include="Widgets\ColorBlockWidget.cs" />
     <Compile Include="GameRules\MusicInfo.cs" />
     <Compile Include="Widgets\ImageWidget.cs" />
     <Compile Include="Widgets\TextFieldWidget.cs" />
     <Compile Include="Widgets\ChatDisplayWidget.cs" />
-    <Compile Include="Widgets\Delegates\MapChooserDelegate.cs" />
-    <Compile Include="Widgets\ListBoxWidget.cs" />
     <Compile Include="Widgets\SliderWidget.cs" />
     <Compile Include="Widgets\TimerWidget.cs" />
     <Compile Include="Widgets\ShpImageWidget.cs" />
@@ -200,18 +170,19 @@
     <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\Activities\Drag.cs" />
     <Compile Include="Widgets\VqaPlayerWidget.cs" />
-    <Compile Include="Widgets\Delegates\VideoPlayerDelegate.cs" />
     <Compile Include="GameRules\Settings.cs" />
     <Compile Include="Support\Arguments.cs" />
     <Compile Include="Traits\ActorStance.cs" />
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Graphics\CursorProvider.cs" />
-    <Compile Include="Traits\Player\TechTree.cs" />
-    <Compile Include="Traits\Player\PowerManager.cs" />
+    <Compile Include="Server\TraitInterfaces.cs" />
+    <Compile Include="Widgets\ScrollPanelWidget.cs" />
+    <Compile Include="Graphics\ShroudRenderer.cs" />
+    <Compile Include="Network\Handshake.cs" />
+    <Compile Include="Widgets\ProgressBarWidget.cs" />
+    <Compile Include="Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
@@ -220,6 +191,7 @@
     </ProjectReference>
     <Compile Include="ActorInitializer.cs" />
     <Compile Include="ActorReference.cs" />
+    <Compile Include="InputHandler.cs" />
     <Compile Include="ModData.cs" />
     <Compile Include="Map.cs" />
     <Compile Include="Network\FrameData.cs" />
@@ -227,11 +199,13 @@
     <Compile Include="Network\Session.cs" />
     <Compile Include="ObjectCreator.cs" />
     <Compile Include="Network\SyncReport.cs" />
+    <Compile Include="Traits\EditorAppearance.cs" />
+    <Compile Include="Traits\SubcellInit.cs" />
+    <Compile Include="Traits\Target.cs" />
+    <Compile Include="Traits\ValidateOrder.cs" />
     <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\SharesCell.cs" />
-    <Compile Include="Traits\Valued.cs" />
-    <Compile Include="Traits\World\BibLayer.cs" />
-    <Compile Include="Widgets\Delegates\DeveloperModeDelegate.cs" />
+    <Compile Include="Traits\Activities\CancelableActivity.cs" />
+    <Compile Include="Widgets\PasswordFieldWidget.cs" />
     <Compile Include="Widgets\ScrollingTextWidget.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -254,6 +228,9 @@
   <ItemGroup>
     <Content Include="OpenRA.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Widgets\Delegates\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -20,60 +20,54 @@ namespace OpenRA.Orders
 		readonly IEnumerable<Actor> subjects;
 		readonly string order;
 		readonly string cursor;
+		readonly MouseButton expectedButton;
 
-		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor)
+		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor, MouseButton button)
 		{
 			this.subjects = subjects;
 			this.order = order;
 			this.cursor = cursor;
+			expectedButton = button;
+		}
+
+		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor) 
+			: this(subjects, order, cursor, MouseButton.Left)
+		{
+			
 		}
 
 		public GenericSelectTarget(Actor subject, string order, string cursor)
+			: this(new Actor[] { subject }, order, cursor)
 		{
-			this.subjects = new Actor[] { subject };
-			this.order = order;
-			this.cursor = cursor;
+
+		}
+
+		public GenericSelectTarget(Actor subject, string order, string cursor, MouseButton button)
+			: this(new Actor[] { subject }, order, cursor, button)
+		{
+
 		}
 
 		public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
 		{
-			if (mi.Button == MouseButton.Right)
+			if (mi.Button != expectedButton)
 				world.CancelInputMode();
 			return OrderInner(world, xy, mi);
 		}
 
 		IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
 		{
-			if (mi.Button == MouseButton.Left && world.Map.IsInMap(xy))
+			if (mi.Button == expectedButton && world.Map.IsInMap(xy))
 			{
 				world.CancelInputMode();
 				foreach (var subject in subjects)
-					yield return new Order(order, subject, xy);
+					yield return new Order(order, subject, false) { TargetLocation = xy };
 			}
 		}
 
-		public virtual void Tick(World world) { }
-
-		public void RenderBeforeWorld(WorldRenderer wr, World world)
-		{
-			foreach (var a in world.Selection.Actors)
-				if (!a.Destroyed)
-					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
-						t.RenderBeforeWorld(wr, a);
-
-			Game.Renderer.Flush();
-		}
-
-		public void RenderAfterWorld(WorldRenderer wr, World world)
-		{
-			foreach (var a in world.Selection.Actors)
-				if (!a.Destroyed)
-					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
-						t.RenderAfterWorld(wr, a);
-
-			Game.Renderer.Flush();
-		}
-
+		public virtual void Tick(World world) { }
+		public void RenderBeforeWorld(WorldRenderer wr, World world) { }
+		public void RenderAfterWorld(WorldRenderer wr, World world) { }
 		public string GetCursor(World world, int2 xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
 	}
 
@@ -84,6 +78,9 @@ namespace OpenRA.Orders
 		public GenericSelectTargetWithBuilding(Actor subject, string order, string cursor)
 			: base(subject, order, cursor) { }
 
+		public GenericSelectTargetWithBuilding(Actor subject, string order, string cursor, MouseButton button)
+			: base(subject, order, cursor, button) { }
+
 		public override void Tick(World world)
 		{
 			var hasStructure = world.Queries.OwnedBy[world.LocalPlayer]

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -17,68 +17,106 @@ namespace OpenRA.Orders
 {
 	class UnitOrderGenerator : IOrderGenerator
 	{
-		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
-		{		
-			var underCursor = world.FindUnitsAtMouse(mi.Location)
-				.Where(a => a.Info.Traits.Contains<TargetableInfo>())
-				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
-				.FirstOrDefault();
-			
-			var orders = world.Selection.Actors
-				.Select(a => OrderForUnit(a, xy, mi, underCursor))
-				.Where(o => o != null)
-				.ToArray();
-
-			var actorsInvolved = orders.Select(o => o.self).Distinct();
-			if (actorsInvolved.Any())
-				yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor,
-					string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray()));
+		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
+		{
+		    var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                var customOrders = custom.Order(world, xy, mi);
 
-			foreach( var o in orders )
-				yield return CheckSameOrder( o.iot, o.trait.IssueOrder( o.self, o.iot, o.target ) );
+                foreach (var o in customOrders)
+                    yield return o;
+            }
+            else
+            {
+                var underCursor = world.FindUnitsAtMouse(mi.Location)
+                    .Where(a => a.HasTrait<ITargetable>())
+                    .OrderByDescending(
+                        a =>
+                        a.Info.Traits.Contains<SelectableInfo>()
+                            ? a.Info.Traits.Get<SelectableInfo>().Priority
+                            : int.MinValue)
+                    .FirstOrDefault();
+
+                var orders = world.Selection.Actors
+                    .Select(a => OrderForUnit(a, xy, mi, underCursor))
+                    .Where(o => o != null)
+                    .ToArray();
+
+                var actorsInvolved = orders.Select(o => o.self).Distinct();
+				if (actorsInvolved.Any())
+					yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
+					{
+						TargetString = string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray())
+					};
+                       
+
+                foreach (var o in orders)
+                    yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target, mi.Modifiers.HasModifier(Modifiers.Shift)));
+            }
 		}
 
-		public void Tick( World world ) {}
+		public void Tick( World world )
+        {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.Tick(world);
+            }
+		}
 
-		public void RenderBeforeWorld( WorldRenderer wr, World world )
-		{
-			foreach (var a in world.Selection.Actors)
-				if (!a.Destroyed)
-					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
-						t.RenderBeforeWorld( wr, a );
+		public void RenderBeforeWorld( WorldRenderer wr, World world )
+        {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.RenderBeforeWorld(wr, world);
+                return;
+            }
 
 			Game.Renderer.Flush();
 		}
 
-		public void RenderAfterWorld( WorldRenderer wr, World world )
-		{
-			foreach (var a in world.Selection.Actors)
-				if (!a.Destroyed)
-					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
-						t.RenderAfterWorld( wr, a );
-
+		public void RenderAfterWorld( WorldRenderer wr, World world )
+        {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.RenderAfterWorld(wr, world);
+                return;
+            }
+			
 			Game.Renderer.Flush();
 		}
 
-		public string GetCursor( World world, int2 xy, MouseInput mi )
-		{		
+		public string GetCursor( World world, int2 xy, MouseInput mi )
+		{
+			bool useSelect = false;
+
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+               return custom.GetCursor(world, xy, mi);
+            }
+
 			var underCursor = world.FindUnitsAtMouse(mi.Location)
-				.Where(a => a.Info.Traits.Contains<TargetableInfo>())
+				.Where(a => a.HasTrait<ITargetable>())
 				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
-				.FirstOrDefault();
-			
-			if( mi.Modifiers.HasModifier( Modifiers.Shift ) || !world.Selection.Actors.Any() )
-				if( underCursor != null )
-					return "select";
-			
+				.FirstOrDefault();
+
+
+			if (mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any())
+				if (underCursor != null)
+					useSelect = true;
+
 			var orders = world.Selection.Actors
 				.Select(a => OrderForUnit(a, xy, mi, underCursor))
 				.Where(o => o != null)
 				.ToArray();
 
-			if( orders.Length == 0 ) return "default";
+			if( orders.Length == 0 ) return (useSelect) ? "select" : "default";
 
-			return orders[ 0 ].cursor ?? "default";
+			return orders[0].cursor ?? ((useSelect) ? "select" : "default");
 		}
 
 		static UnitOrderResult OrderForUnit( Actor self, int2 xy, MouseInput mi, Actor underCursor )
@@ -86,19 +124,10 @@ namespace OpenRA.Orders
 			if (self.Owner != self.World.LocalPlayer)
 				return null;
 
-			if (!self.World.Map.IsInMap(xy.X, xy.Y))
-				return null;
 
 			if (self.Destroyed)
 				return null;
 
-			//var old = self.TraitsImplementing<IIssueOrder>()
-			//    .OrderByDescending( x => x.OrderPriority( self, xy, mi, underCursor ) )
-			//    .Select( x => x.IssueOrder( self, xy, mi, underCursor ) )
-			//    .FirstOrDefault( x => x != null );
-			//if( old != null )
-			//    return old;
-
 			if( mi.Button == MouseButton.Right )
 			{
 				var uim = self.World.WorldActor.Trait<UnitInfluence>();
@@ -111,9 +140,9 @@ namespace OpenRA.Orders
 
 					string cursor = null;
 					if( underCursor != null )
-						if( o.Order.CanTargetUnit( self, underCursor, mi.Modifiers.HasModifier( Modifiers.Ctrl ), mi.Modifiers.HasModifier( Modifiers.Alt ), ref cursor ) )
+						if (o.Order.CanTargetActor(self, underCursor, mi.Modifiers.HasModifier(Modifiers.Ctrl), mi.Modifiers.HasModifier(Modifiers.Alt), mi.Modifiers.HasModifier(Modifiers.Shift), ref cursor))
 							return new UnitOrderResult( self, o.Order, o.Trait, cursor, Target.FromActor( underCursor ) );
-					if( o.Order.CanTargetLocation( self, xy, actorsAt, mi.Modifiers.HasModifier( Modifiers.Ctrl ), mi.Modifiers.HasModifier( Modifiers.Alt ), ref cursor ) )
+					if (o.Order.CanTargetLocation(self, xy, actorsAt, mi.Modifiers.HasModifier(Modifiers.Ctrl), mi.Modifiers.HasModifier(Modifiers.Alt), mi.Modifiers.HasModifier(Modifiers.Shift), ref cursor))
 						return new UnitOrderResult( self, o.Order, o.Trait, cursor, Target.FromCell( xy ) );
 				}
 			}

OpenRA.Game/Player.cs

@@ -13,85 +13,80 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Network;
-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;
+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 WinState WinState = WinState.Undefined;
-
-		public readonly string Palette;
-		public readonly Color Color;
-		public readonly Color Color2;
-
-		public readonly string PlayerName;
-		public readonly string InternalName;
-		public readonly CountryInfo Country;
-		public readonly int Index;
+		public WinState WinState = WinState.Undefined;
+
+		public readonly string Palette;
+        public readonly ColorRamp ColorRamp;
+
+		public readonly string PlayerName;
+		public readonly string InternalName;
+		public readonly CountryInfo Country;
+		public readonly int Index;
 		public readonly bool NonCombatant = false;
 		public readonly int ClientIndex;
 		public readonly PlayerReference PlayerRef;
-		public bool IsBot;
-		
-		public ShroudRenderer Shroud;
-		public World World { get; private set; }
-
-		public Player( World world, PlayerReference pr, int index )
-		{
-			World = world;
-			Shroud = new ShroudRenderer(this, world.Map);
-			
-			Index = index;
-			Palette = "player"+index;
-
-			Color = pr.Color;
-			Color2 = pr.Color2;
-			ClientIndex = 0;		/* it's a map player, "owned" by host */
-			
-			PlayerName = InternalName = pr.Name;
-			NonCombatant = pr.NonCombatant;
-			Country = world.GetCountries()
+		public bool IsBot;
+
+		public Shroud Shroud { get { return World.LocalShroud; }}
+		public World World { get; private set; }
+
+		public Player(World world, PlayerReference pr, int index)
+		{
+			World = world;
+
+			Index = index;
+			Palette = "player" + index;
+
+			ColorRamp = pr.ColorRamp;
+			ClientIndex = 0;		/* it's a map player, "owned" by host */
+
+			PlayerName = InternalName = pr.Name;
+			NonCombatant = pr.NonCombatant;
+			Country = world.GetCountries()
 				.FirstOrDefault(c => pr.Race == c.Race)
 				?? world.GetCountries().Random(world.SharedRandom);
 
-			PlayerRef = pr;
-			
-			PlayerActor = world.CreateActor("Player", new TypeDictionary{ new OwnerInit( this ) });
-		}
-		
-		public Player( World world, Session.Client client, PlayerReference pr, int index )
-		{
-			World = world;
-			Shroud = new ShroudRenderer(this, world.Map);
-			
+			PlayerRef = pr;
+
+			PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });
+		}
+
+		public Player(World world, Session.Client client, PlayerReference pr, int index)
+		{
+			World = world;
 			Index = index;
-			Palette = "player"+index;
-			Color = client.Color1;
-			Color2 = client.Color2;
+			Palette = "player" + index;
+            ColorRamp = client.ColorRamp;
 			PlayerName = client.Name;
-			InternalName = pr.Name;
-			Country = world.GetCountries()
-				.FirstOrDefault(c => client != null && client.Country == c.Race)
+
+			InternalName = pr.Name;
+			Country = world.GetCountries()
+				.FirstOrDefault(c => client != null && client.Country == c.Race)
 				?? world.GetCountries().Random(world.SharedRandom);
 
 			ClientIndex = client.Index;
-			PlayerRef = pr;
-			
-			PlayerActor = world.CreateActor("Player", new TypeDictionary{ new OwnerInit( this ) });
-		}
-		
-		public void GiveAdvice(string advice)
-		{
-			Sound.PlayToPlayer(this, advice);
-		}
-
-		public Dictionary<Player, Stance> Stances = new Dictionary<Player, Stance>();
-	}
+			PlayerRef = pr;
+
+			PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });
+		}
+
+		public void GiveAdvice(string advice)
+		{
+			Sound.PlayToPlayer(this, advice);
+		}
+
+		public Dictionary<Player, Stance> Stances = new Dictionary<Player, Stance>();
+	}
 }

OpenRA.Game/Server/Connection.cs

@@ -15,7 +15,7 @@ using System.Net.Sockets;
 
 namespace OpenRA.Server
 {
-	class Connection
+	public class Connection
 	{
 		public Socket socket;
 		public List<byte> data = new List<byte>();
@@ -35,7 +35,7 @@ namespace OpenRA.Server
 			return result.ToArray();
 		}
 
-		bool ReadDataInner()
+		bool ReadDataInner( Server server )
 		{
 			var rx = new byte[1024];
 			var len = 0;
@@ -49,7 +49,7 @@ namespace OpenRA.Server
 					else
 					{
 						if (len == 0)
-							Server.DropClient(this, null);
+							server.DropClient(this);
 						break;
 					}
 						
@@ -57,7 +57,7 @@ namespace OpenRA.Server
 				catch (SocketException e)
 				{
 					if (e.SocketErrorCode == SocketError.WouldBlock) break;
-					Server.DropClient(this, e); 
+					server.DropClient(this); 
 					return false; 
 				}
 			}
@@ -65,9 +65,9 @@ namespace OpenRA.Server
 			return true;
 		}
 
-		public void ReadData()
+		public void ReadData( Server server )
 		{
-			if (ReadDataInner())
+			if (ReadDataInner(server))
 				while (data.Count >= ExpectLength)
 				{
 					var bytes = PopBytes(ExpectLength);
@@ -82,16 +82,16 @@ namespace OpenRA.Server
 
 						case ReceiveState.Data:
 							{
-								Server.DispatchOrders(this, Frame, bytes);
+								server.DispatchOrders(this, Frame, bytes);
 								MostRecentFrame = Frame;
 								ExpectLength = 8;
 								State = ReceiveState.Header;
 
-								Server.UpdateInFlightFrames(this);
+								server.UpdateInFlightFrames(this);
 							} break;
 					}
 				}
 		}}
 
-	enum ReceiveState { Header, Data };
+	public enum ReceiveState { Header, Data };
 }

OpenRA.Game/Server/MasterServerQuery.cs

@@ -18,7 +18,7 @@ using OpenRA.Widgets;
 
 namespace OpenRA.Server
 {
-	static class MasterServerQuery
+    public static class MasterServerQuery
 	{
 		public static event Action<GameServer[]> OnComplete = _ => { };
 		public static event Action<string> OnVersion = _ => { };
@@ -51,31 +51,6 @@ namespace OpenRA.Server
 			}).Start();
 		}
 
-		public static void GetMOTD(string masterServerUrl)
-		{
-			var motd = Widget.RootWidget.GetWidget<ScrollingTextWidget>("MOTD_SCROLLER");
-			
-			// Runs in a separate thread to prevent dns lookup hitches
-			new Thread(() =>
-			{
-				if (motd != null)
-				{
-					try
-					{
-						motd.SetText(GetData(new Uri(masterServerUrl + "motd.php?v=" + ClientVersion)));
-						motd.ResetScroll();
-					}
-					catch
-					{
-						motd.SetText("Welcome to OpenRA. MOTD unable to be loaded from server.");
-						motd.ResetScroll();
-					}
-				}
-
-				ev.Set();
-			}).Start();
-		}
-
 		public static void Tick()
 		{
 			if (ev.WaitOne(TimeSpan.FromMilliseconds(0))) 
@@ -87,29 +62,13 @@ namespace OpenRA.Server
 		static string GetData(Uri uri)
 		{
 			var wc = new WebClient();
+			wc.Proxy = null;
 			var data = wc.DownloadData(uri);
 			return Encoding.UTF8.GetString(data);
 		}
-
-		public static void GetCurrentVersion(string masterServerUrl)
-		{
-			new Thread(() =>
-				{
-					try
-					{
-						ServerVersion = GetData(new Uri(masterServerUrl + "VERSION"));
-					}
-					catch
-					{
-						ServerVersion = "";
-					}
-
-					ev2.Set();
-				}).Start();
-		}
 	}
 
-	class GameServer
+    public class GameServer
 	{
 		public readonly int Id = 0;
 		public readonly string Name = null;

OpenRA.Game/Server/ProtocolVersion.cs

@@ -13,6 +13,6 @@ namespace OpenRA.Server
 	public static class ProtocolVersion
 	{
 		// you *must* increment this whenever you make an incompatible protocol change
-		public static readonly int Version = 6;
+		public static readonly int Version = 7;
 	}
 }

OpenRA.Game/Server/Server.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -23,51 +22,54 @@ using OpenRA.Network;
 
 namespace OpenRA.Server
 {
-	static class Server
+	public class Server
 	{
-		static List<Connection> conns = new List<Connection>();
-		static TcpListener listener = null;
-		static Dictionary<int, List<Connection>> inFlightFrames
+		// Valid player connections
+		public List<Connection> conns = new List<Connection>();
+		
+		// Pre-verified player connections
+		public List<Connection> preConns = new List<Connection>();
+
+		TcpListener listener = null;
+		Dictionary<int, List<Connection>> inFlightFrames
 			= new Dictionary<int, List<Connection>>();
-		static Session lobbyInfo;
-		static bool GameStarted = false;
-		static string Name;
-		static int ExternalPort;
-		static int randomSeed;
+		
+		TypeDictionary ServerTraits = new TypeDictionary();
+		public Session lobbyInfo;
+		public bool GameStarted = false;
+		public string Name;
+		int randomSeed;
 
-		const int DownloadChunkInterval = 20000;
-		const int DownloadChunkSize = 16384;
+		public ModData ModData;
+		public Map Map;
 
-		const int MasterPingInterval = 60 * 3;	// 3 minutes. server has a 5 minute TTL for games, so give ourselves a bit
-												// of leeway.
-		static int lastPing = 0;
-		static bool isInternetServer;
-		static string masterServerUrl;
-		static bool isInitialPing;
-		static ModData ModData;
-		static Map Map;
-
-		public static void ServerMain(ModData modData, Settings settings, string map)
+		bool shutdown = false;
+		public void Shutdown()
+		{
+			shutdown = true;
+		}
+		
+		public Server(ModData modData, Settings settings, string map)
 		{
 			Log.AddChannel("server", "server.log");
 
-			isInitialPing = true;
-			Server.masterServerUrl = settings.Server.MasterServer;
-			isInternetServer = settings.Server.AdvertiseOnline;
 			listener = new TcpListener(IPAddress.Any, settings.Server.ListenPort);
 			Name = settings.Server.Name;
-			ExternalPort = settings.Server.ExternalPort;
 			randomSeed = (int)DateTime.Now.ToBinary();
 			ModData = modData;
 
+			foreach (var trait in modData.Manifest.ServerTraits)
+				ServerTraits.Add( modData.ObjectCreator.CreateObject<ServerTrait>(trait) );
+			
 			lobbyInfo = new Session( settings.Game.Mods );
 			lobbyInfo.GlobalSettings.RandomSeed = randomSeed;
 			lobbyInfo.GlobalSettings.Map = map;
 			lobbyInfo.GlobalSettings.AllowCheats = settings.Server.AllowCheats;
 			lobbyInfo.GlobalSettings.ServerName = settings.Server.Name;
 			
-			LoadMap();	// populates the Session's slots, too.
-			
+			foreach (var t in ServerTraits.WithInterface<INotifyServerStart>())
+				t.ServerStarted(this);
+						
 			Log.Write("server", "Initial mods: ");
 			foreach( var m in lobbyInfo.GlobalSettings.Mods )
 				Log.Write("server","- {0}", m);
@@ -85,102 +87,76 @@ namespace OpenRA.Server
 
 			new Thread( _ =>
 			{
+				var timeout = ServerTraits.WithInterface<ITick>().Min(t => t.TickTimeout);
 				for( ; ; )
 				{
 					var checkRead = new ArrayList();
 					checkRead.Add( listener.Server );
 					foreach( var c in conns ) checkRead.Add( c.socket );
-
-					Socket.Select( checkRead, null, null, MasterPingInterval * 10000 );
+					foreach( var c in preConns ) checkRead.Add( c.socket );
+					
+					Socket.Select( checkRead, null, null, timeout );
 
 					foreach( Socket s in checkRead )
 						if( s == listener.Server ) AcceptConnection();
-						else conns.Single( c => c.socket == s ).ReadData();
+						else if (preConns.Count > 0)
+						{
+							var p = preConns.SingleOrDefault( c => c.socket == s );
+							if (p != null) p.ReadData( this );
+						}
+						else if (conns.Count > 0) conns.Single( c => c.socket == s ).ReadData( this );
 
-					if (Environment.TickCount - lastPing > MasterPingInterval * 1000)
-						PingMasterServer();
-					else
-						lock (masterServerMessages)
-							while (masterServerMessages.Count > 0)
-								SendChat(null, masterServerMessages.Dequeue());
+					foreach (var t in ServerTraits.WithInterface<ITick>())
+						t.Tick(this);
 					
-					if (conns.Count() == 0)
-					{
-						listener.Stop();
-						GameStarted = false;
+					if (shutdown)
 						break;
-					}
 				}
+				
+				GameStarted = false;
+				foreach (var t in ServerTraits.WithInterface<INotifyServerShutdown>())
+					t.ServerShutdown(this);
+
+				preConns.Clear();
+				conns.Clear();
+				try { listener.Stop(); }
+				catch { }
 			} ) { IsBackground = true }.Start();
-
-
-		}
-
-		static Session.Slot MakeSlotFromPlayerReference(PlayerReference pr)
-		{
-			if (!pr.Playable) return null;
-			return new Session.Slot
-			{
-				MapPlayer = pr.Name,
-				Bot = null,	/* todo: allow the map to specify a bot class? */
-				Closed = false,
-			};
-		}
-
-		static void LoadMap()
-		{
-			Map = new Map(ModData.AvailableMaps[lobbyInfo.GlobalSettings.Map].Package);
-			lobbyInfo.Slots = Map.Players
-				.Select(p => MakeSlotFromPlayerReference(p.Value))
-				.Where(s => s != null)
-				.Select((s, i) => { s.Index = i; return s; })
-				.ToList();
 		}
 
 		/* lobby rework todo: 
-		 * 
-		 *	- auto-assign players to slots
-		 *	- show all the slots in the lobby ui.
-		 *	- rework the game start so we actually use the slots.
-		 *	- all players should be able to click an empty slot to move to it
-		 *	- host should be able to choose whether a slot is open/closed/bot, with
-		 *		potentially more than one choice of bot class.
-		 *	- host should be able to kick a client from the lobby by closing its slot.
-		 *	- change lobby commands so the host can configure bots, rather than
-		 *		just configuring itself.
 		 *	- "teams together" option for team games -- will eliminate most need
 		 *		for manual spawnpoint choosing.
-		 *	- pick sensible non-conflicting colors for bots.
+		 *	- 256 max players is a dirty hack
 		 */
-
-		static int ChooseFreePlayerIndex()
+		int ChooseFreePlayerIndex()
 		{
-			for (var i = 0; i < 8; i++)
-				if (conns.All(c => c.PlayerIndex != i))
+			for (var i = 0; i < 256; i++)
+				if (conns.All(c => c.PlayerIndex != i) && preConns.All(c => c.PlayerIndex != i))
 					return i;
 
-			throw new InvalidOperationException("Already got 8 players");
+			throw new InvalidOperationException("Already got 256 players");
 		}
 
-		static int ChooseFreeSlot()
+		void AcceptConnection()
 		{
-			return lobbyInfo.Slots.First(s => !s.Closed && s.Bot == null 
-				&& !lobbyInfo.Clients.Any( c => c.Slot == s.Index )).Index;
-		}
+			Socket newSocket = null;
 
-		static void AcceptConnection()
-		{
-			var newConn = new Connection { socket = listener.AcceptSocket() };
 			try
 			{
-				if (GameStarted)
-				{
-					Log.Write("server", "Rejected connection from {0}; game is already started.", 
-						newConn.socket.RemoteEndPoint);
-					newConn.socket.Close();
-					return;
-				}
+				if (!listener.Server.IsBound) return;
+				newSocket = listener.AcceptSocket();
+			}
+			catch
+			{
+				/* could have an exception here when listener 'goes away' when calling AcceptConnection! */
+				/* alternative would be to use locking but the listener doesnt go away without a reason */
+				return; 
+			}
 
+			var newConn = new Connection { socket = newSocket };
+			try
+			{
 				newConn.socket.Blocking = false;
 				newConn.socket.NoDelay = true;
 
@@ -188,56 +164,110 @@ namespace OpenRA.Server
 				newConn.PlayerIndex = ChooseFreePlayerIndex();
 				newConn.socket.Send(BitConverter.GetBytes(ProtocolVersion.Version));
 				newConn.socket.Send(BitConverter.GetBytes(newConn.PlayerIndex));
+				preConns.Add(newConn);
+				
+				// Dispatch a handshake order
+				var request = new HandshakeRequest()
+				{
+					Map = lobbyInfo.GlobalSettings.Map,
+					Mods = lobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m,Mod.AllMods[m].Version)).ToArray()
+				};
+				DispatchOrdersToClient(newConn, 0, 0, new ServerOrder("HandshakeRequest", request.Serialize()).Serialize());
+			}
+			catch (Exception) { DropClient(newConn); }
+		}
+		
+		void ValidateClient(Connection newConn, string data)
+		{
+			try
+			{
+				if (GameStarted)
+				{
+					Log.Write("server", "Rejected connection from {0}; game is already started.", 
+						newConn.socket.RemoteEndPoint);
+					
+					SendOrderTo(newConn, "ServerError", "The game has already started");
+					DropClient(newConn);
+					return;
+				}
+				
+				var handshake = HandshakeResponse.Deserialize(data);
+				var client = handshake.Client;
+				var mods = handshake.Mods;
+				
+				// Check that the client has compatable mods
+				var valid = mods.All( m => m.Contains('@')) && //valid format
+				            mods.Count() == Game.CurrentMods.Count() &&  //same number
+				            mods.Select( m => Pair.New(m.Split('@')[0], m.Split('@')[1])).All(kv => Game.CurrentMods.ContainsKey(kv.First) &&
+				     		(kv.Second == "{DEV_VERSION}" || Game.CurrentMods[kv.First].Version == "{DEV_VERSION}" || kv.Second == Game.CurrentMods[kv.First].Version));
+				if (!valid) 
+				{
+					Log.Write("server", "Rejected connection from {0}; mods do not match.", 
+						newConn.socket.RemoteEndPoint);
+					
+					SendOrderTo(newConn, "ServerError", "Your mods don't match the server");
+					DropClient(newConn);
+					return;
+				}
+				
+				// Promote connection to a valid client
+				preConns.Remove(newConn);
 				conns.Add(newConn);
 
-				var defaults = new GameRules.PlayerSettings();
-				
-				var client = new Session.Client()
-				{
-					Index = newConn.PlayerIndex,
-					Color1 = defaults.Color1,
-					Color2 = defaults.Color2,
-					Name = defaults.Name,
-					Country = "random",
-					State = Session.ClientState.NotReady,
-					SpawnPoint = 0,
-					Team = 0,
-					Slot = ChooseFreeSlot(),
-				};
+				// Enforce correct PlayerIndex and Slot
+				client.Index = newConn.PlayerIndex;
+				client.Slot = ChooseFreeSlot();
 				
 				var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == client.Slot );
-				if (slotData != null)
+				if (slotData != null && slotData.MapPlayer != null)
 					SyncClientToPlayerReference(client, Map.Players[slotData.MapPlayer]);
 				
 				lobbyInfo.Clients.Add(client);
-
+	
 				Log.Write("server", "Client {0}: Accepted connection from {1}",
 					newConn.PlayerIndex, newConn.socket.RemoteEndPoint);
-
 				SendChat(newConn, "has joined the game.");
-
+				
+				foreach (var t in ServerTraits.WithInterface<IClientJoined>())
+					t.ClientJoined(this, newConn);
+				
 				SyncLobbyInfo();
 			}
-			catch (Exception e) { DropClient(newConn, e); }
+			catch (Exception) { DropClient(newConn); }
 		}
 
-		public static void UpdateInFlightFrames(Connection conn)
+		int ChooseFreeSlot()
 		{
-			if (conn.Frame != 0)
-			{
-				if (!inFlightFrames.ContainsKey(conn.Frame))
-					inFlightFrames[conn.Frame] = new List<Connection> { conn };
-				else
-					inFlightFrames[conn.Frame].Add(conn);
+			return lobbyInfo.Slots.First(s => !s.Closed && s.Bot == null 
+				&& !lobbyInfo.Clients.Any( c => c.Slot == s.Index )).Index;
+		}
+		
+		
+		public static void SyncClientToPlayerReference(Session.Client c, PlayerReference pr)
+		{
+			if (pr == null)
+				return;
+			if (pr.LockColor)
+                c.ColorRamp = pr.ColorRamp;
+			if (pr.LockRace)
+				c.Country = pr.Race;
+		}
+		
+		public void UpdateInFlightFrames(Connection conn)
+		{
+			if (conn.Frame == 0)
+				return;
 
-				if (conns.All(c => inFlightFrames[conn.Frame].Contains(c)))
-				{
-					inFlightFrames.Remove(conn.Frame);
-				}
-			}
+			if (!inFlightFrames.ContainsKey(conn.Frame))
+				inFlightFrames[conn.Frame] = new List<Connection> { conn };
+			else
+				inFlightFrames[conn.Frame].Add(conn);
+
+			if (conns.All(c => inFlightFrames[conn.Frame].Contains(c)))
+				inFlightFrames.Remove(conn.Frame);
 		}
 
-		static void DispatchOrdersToClient(Connection c, int client, int frame, byte[] data)
+		void DispatchOrdersToClient(Connection c, int client, int frame, byte[] data)
 		{
 			try
 			{
@@ -248,10 +278,10 @@ namespace OpenRA.Server
 				ms.Write( data );
 				c.socket.Send( ms.ToArray() );
 			}
-			catch( Exception e ) { DropClient( c, e ); }
+			catch (Exception) { DropClient(c); }
 		}
 
-		public static void DispatchOrders(Connection conn, int frame, byte[] data)
+		public void DispatchOrders(Connection conn, int frame, byte[] data)
 		{
 			if (frame == 0 && conn != null)
 				InterpretServerOrders(conn, data);
@@ -263,7 +293,7 @@ namespace OpenRA.Server
 			}
 		}
 
-		static void InterpretServerOrders(Connection conn, byte[] data)
+		void InterpretServerOrders(Connection conn, byte[] data)
 		{
 			var ms = new MemoryStream(data);
 			var br = new BinaryReader(ms);
@@ -280,392 +310,117 @@ namespace OpenRA.Server
 			catch (EndOfStreamException) { }
 			catch (NotImplementedException) { }
 		}
-
-		static void SyncClientToPlayerReference(Session.Client c, PlayerReference pr)
-		{
-			if (pr.LockColor)
-			{
-				c.Color1 = pr.Color;
-				c.Color2 = pr.Color2;
-			}
-			if (pr.LockRace)
-				c.Country = pr.Race;
-		}
 		
-		static bool InterpretCommand(Connection conn, string cmd)
+		public void SendChatTo(Connection conn, string text)
 		{
-			var dict = new Dictionary<string, Func<string, bool>>
-			{
-				{ "ready",
-					s =>
-					{
-						// if we're downloading, we can't ready up.
-
-						var client = GetClient(conn);
-						if (client.State == Session.ClientState.NotReady)
-							client.State = Session.ClientState.Ready;
-						else if (client.State == Session.ClientState.Ready)
-							client.State = Session.ClientState.NotReady;
-
-						Log.Write("server", "Player @{0} is {1}",
-							conn.socket.RemoteEndPoint, client.State);
-
-						SyncLobbyInfo();
-						
-						if (conns.Count > 0 && conns.All(c => GetClient(c).State == Session.ClientState.Ready))
-							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();
-						return true;
-					}},
-				{ "name", 
-					s => 
-					{
-						Log.Write("server", "Player@{0} is now known as {1}", conn.socket.RemoteEndPoint, s);
-						GetClient(conn).Name = s;
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "lag",
-					s =>
-					{
-						int lag;
-						if (!int.TryParse(s, out lag)) { Log.Write("server", "Invalid order lag: {0}", s); return false; }
-
-						Log.Write("server", "Order lag is now {0} frames.", lag);
-
-						lobbyInfo.GlobalSettings.OrderLatency = lag;
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "race",
-					s => 
-					{					
-						GetClient(conn).Country = s;
-						SyncLobbyInfo();
-						return true;
-					}},	
-				{ "team",
-					s => 
-					{
-						int team;
-						if (!int.TryParse(s, out team)) { Log.Write("server", "Invalid team: {0}", s ); return false; }
-
-						GetClient(conn).Team = team;
-						SyncLobbyInfo();
-						return true;
-					}},	
-				{ "spawn",
-					s => 
-					{
-						int spawnPoint;
-						if (!int.TryParse(s, out spawnPoint) || spawnPoint < 0 || spawnPoint > 8) //TODO: SET properly!
-						{
-							Log.Write("server", "Invalid spawn point: {0}", s);
-							return false;
-						}
-						
-						if (lobbyInfo.Clients.Where( c => c != GetClient(conn) ).Any( c => (c.SpawnPoint == spawnPoint) && (c.SpawnPoint != 0) ))
-						{
-							SendChatTo( conn, "You can't be at the same spawn point as another player" );
-							return true;
-						}
-
-						GetClient(conn).SpawnPoint = spawnPoint;
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "color",
-					s =>
-					{
-						var c = s.Split(',').Select(cc => int.Parse(cc)).ToArray();
-						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;
-					}},
-				{ "slot",
-					s =>
-					{
-						int slot;
-						if (!int.TryParse(s, out slot)) { Log.Write("server", "Invalid slot: {0}", s ); return false; }
-
-						var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == slot );
-						if (slotData == null || slotData.Closed || slotData.Bot != null 
-							|| lobbyInfo.Clients.Any( c => c.Slot == slot ))
-							return false;
-
-						var cl = GetClient(conn);
-						cl.Slot = slot;
-						
-						SyncClientToPlayerReference(cl, Map.Players[slotData.MapPlayer]);
-						
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "slot_close",
-					s =>
-					{
-						int slot;
-						if (!int.TryParse(s, out slot)) { Log.Write("server", "Invalid slot: {0}", s ); return false; }
-
-						var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == slot );
-						if (slotData == null)
-							return false;
-
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can alter slots" );
-							return true;
-						}
-
-						slotData.Closed = true;
-						slotData.Bot = null;
-
-						/* kick any player that's in the slot */
-						var occupant = lobbyInfo.Clients.FirstOrDefault( c => c.Slot == slotData.Index );
-						if (occupant != null)
-						{
-							var occupantConn = conns.FirstOrDefault( c => c.PlayerIndex == occupant.Index );
-							if (occupantConn != null)
-								DropClient( occupantConn, new Exception() );
-						}
-
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "slot_open",
-					s =>
-					{
-						int slot;
-						if (!int.TryParse(s, out slot)) { Log.Write("server", "Invalid slot: {0}", s ); return false; }
-
-						var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == slot );
-						if (slotData == null)
-							return false;
-
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can alter slots" );
-							return true;
-						}
-
-						slotData.Closed = false;
-						slotData.Bot = null;
-
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "slot_bot",
-					s =>
-					{
-						var parts = s.Split(' ');
-
-						if (parts.Length != 2)
-						{
-							SendChatTo( conn, "Malformed slot_bot command" );
-							return true;
-						}
-
-						int slot;
-						if (!int.TryParse(parts[0], out slot)) { Log.Write("server", "Invalid slot: {0}", s ); return false; }
-
-						var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == slot );
-						if (slotData == null)
-							return false;
-
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can alter slots" );
-							return true;
-						}
-
-						slotData.Bot = parts[1];
-
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "map",
-					s =>
-					{
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can change the map" );
-							return true;
-						}
-						lobbyInfo.GlobalSettings.Map = s;			
-						LoadMap();
-
-						foreach(var client in lobbyInfo.Clients)
-						{
-							client.SpawnPoint = 0;
-							var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == client.Slot );
-							if (slotData != null)
-								SyncClientToPlayerReference(client, Map.Players[slotData.MapPlayer]);
-				
-							client.State = Session.ClientState.NotReady;
-						}
-						
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "mods",
-					s =>
-					{
-						var args = s.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-						lobbyInfo.GlobalSettings.Mods = args.GetRange(0,args.Count - 1).ToArray();
-						lobbyInfo.GlobalSettings.Map = args.Last();
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "lockteams",
-					s =>
-					{
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can set that option" );
-							return true;
-						}
-						
-						bool.TryParse(s, out lobbyInfo.GlobalSettings.LockTeams);
-						SyncLobbyInfo();
-						return true;
-					}},
-			};
-
-			var cmdName = cmd.Split(' ').First();
-			var cmdValue = string.Join(" ", cmd.Split(' ').Skip(1).ToArray());
-
-			Func<string,bool> a;
-			if (!dict.TryGetValue(cmdName, out a))
-				return false;
-
-			Log.Write("server", "Client {0} sent server command: {1}", conn.PlayerIndex, cmd );
-			return a(cmdValue);
+			SendOrderTo(conn, "Chat", text);
 		}
 
-		static void SendChatTo(Connection conn, string text)
+		public void SendOrderTo(Connection conn, string order, string data)
 		{
 			DispatchOrdersToClient(conn, 0, 0,
-				new ServerOrder("Chat", text).Serialize());
+				new ServerOrder(order, data).Serialize());
 		}
+		
+        public void SendChat(Connection asConn, string text)
+        {
+            DispatchOrders(asConn, 0, new ServerOrder("Chat", text).Serialize());
+        }
 
-		static void SendChat(Connection asConn, string text)
-		{
-			DispatchOrders(asConn, 0, new ServerOrder("Chat", text).Serialize());
-		}
+        public void SendDisconnected(Connection asConn)
+        {
+            DispatchOrders(asConn, 0, new ServerOrder("Disconnected", "").Serialize());
+        }
 
-		static void InterpretServerOrder(Connection conn, ServerOrder so)
+		void InterpretServerOrder(Connection conn, ServerOrder so)
 		{
 			switch (so.Name)
 			{
 				case "Command":
-				{
-					if(GameStarted)
-						SendChatTo(conn, "Cannot change state when game started.");
-					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))
+					bool handled = false;
+					foreach (var t in ServerTraits.WithInterface<IInterpretCommand>())
+						if ((handled = t.InterpretCommand(this, conn, GetClient(conn), so.Data)))
+							break;
+					
+					if (!handled)
 					{
-						Log.Write("server", "Bad server command: {0}", so.Data);
-						SendChatTo(conn, "Bad server command.");
-					};
-				}
-				break;
-
-				case "Chat": 
+						Log.Write("server", "Unknown server command: {0}", so.Data);
+						SendChatTo(conn, "Unknown server command: {0}".F(so.Data));
+					}
+				
+					break;
+				case "HandshakeResponse":
+					ValidateClient(conn, so.Data);					
+					break;
+				case "Chat":
 				case "TeamChat":
+					var fromClient = GetClient(conn);
+					var fromIndex = fromClient != null ? fromClient.Index : 0;
+
 					foreach (var c in conns.Except(conn).ToArray())
-						DispatchOrdersToClient(c, GetClient(conn).Index, 0, so.Serialize());
+						DispatchOrdersToClient(c, fromIndex, 0, so.Serialize());
 				break;
 			}
 		}
 
-		static Session.Client GetClient(Connection conn)
+		public Session.Client GetClient(Connection conn)
 		{
-			return lobbyInfo.Clients.First(c => c.Index == conn.PlayerIndex);
+			return lobbyInfo.ClientWithIndex(conn.PlayerIndex);
 		}
 
-		public static void DropClient(Connection toDrop, Exception e)
+		public void DropClient(Connection toDrop)
 		{
-			conns.Remove(toDrop);
-			SendChat(toDrop, "Connection Dropped");
+			if (preConns.Contains(toDrop))
+				preConns.Remove(toDrop);
+			else
+			{
+				conns.Remove(toDrop);
+				SendChat(toDrop, "Connection Dropped");
 
-			lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
+            	if (GameStarted)
+                	SendDisconnected(toDrop); /* Report disconnection */
 
-			DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } );
-			
-			if (conns.Count != 0)
-				SyncLobbyInfo();
+				lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
+				
+				DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } );
+
+				if (conns.Count != 0)
+					SyncLobbyInfo();
+			}			
+
+			try
+			{
+				toDrop.socket.Disconnect(false);
+			}
+			catch { }
 		}
 
-		static void SyncLobbyInfo()
+		public void SyncLobbyInfo()
 		{
 			if (!GameStarted)	/* don't do this while the game is running, it breaks things. */
 				DispatchOrders(null, 0,
 					new ServerOrder("SyncInfo", lobbyInfo.Serialize()).Serialize());
 
-			PingMasterServer();
+			foreach (var t in ServerTraits.WithInterface<INotifySyncLobbyInfo>())
+				t.LobbyInfoSynced(this);
 		}
-
-		static volatile bool isBusy;
-		static Queue<string> masterServerMessages = new Queue<string>();
-		static void PingMasterServer()
+		
+		public void StartGame()
 		{
-			if (isBusy || !isInternetServer) return;
+			GameStarted = true;
+			foreach( var c in conns )
+				foreach( var d in conns )
+					DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
 
-			lastPing = Environment.TickCount;
-			isBusy = true;
+			// Drop any unvalidated clients
+			foreach (var c in preConns)
+				DropClient(c);
+			
+			DispatchOrders(null, 0,
+				new ServerOrder("StartGame", "").Serialize());
 
-			Action a = () =>
-				{
-					try
-					{
-						var url = "ping.php?port={0}&name={1}&state={2}&players={3}&mods={4}&map={5}";
-						if (isInitialPing) url += "&new=1";
-
-						using (var wc = new WebClient())
-						{
-							 wc.DownloadData(
-								masterServerUrl + url.F(
-								ExternalPort, Uri.EscapeUriString(Name),
-								GameStarted ? 2 : 1,	// todo: post-game states, etc.
-								lobbyInfo.Clients.Count,
-								string.Join(",", lobbyInfo.GlobalSettings.Mods),
-								lobbyInfo.GlobalSettings.Map));
-
-							if (isInitialPing)
-							{
-								isInitialPing = false;
-								lock (masterServerMessages)
-									masterServerMessages.Enqueue("Master server communication established.");
-							}
-						}
-					}
-					catch(Exception ex)
-					{
-						Log.Write("server", ex.ToString());
-						lock( masterServerMessages )
-							masterServerMessages.Enqueue( "Master server communication failed." );
-					}
-
-					isBusy = false;
-				};
-
-			a.BeginInvoke(null, null);
+			foreach (var t in ServerTraits.WithInterface<IStartGame>())
+				t.GameStarted(this);
 		}
 	}
 }

OpenRA.Game/Server/TraitInterfaces.cs

@@ -0,0 +1,58 @@
+#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.Network;
+
+namespace OpenRA.Server
+{	
+	// Returns true if order is handled 
+	public interface IInterpretCommand { bool InterpretCommand(Server server, Connection conn, Session.Client client, string cmd); }
+	public interface INotifySyncLobbyInfo { void LobbyInfoSynced(Server server); }
+	public interface INotifyServerStart { void ServerStarted(Server server); }
+	public interface INotifyServerShutdown { void ServerShutdown(Server server); }
+	public interface IStartGame { void GameStarted(Server server); }
+	public interface IClientJoined { void ClientJoined(Server server, Connection conn); }
+	public interface ITick
+	{
+		void Tick(Server server);
+		int TickTimeout { get; }
+	}
+	
+	public abstract class ServerTrait {}
+	
+	public class DebugServerTrait : ServerTrait, IInterpretCommand, IStartGame, INotifySyncLobbyInfo, INotifyServerStart, INotifyServerShutdown
+	{		
+		public bool InterpretCommand(Server server, Connection conn, Session.Client client, string cmd)
+		{
+			Console.WriteLine("Server received command from player {1}: {0}",cmd, conn.PlayerIndex);
+			return false;
+		}
+		
+		public void GameStarted(Server server)
+		{
+			Console.WriteLine("GameStarted()");
+		}
+		
+		public void LobbyInfoSynced(Server server)
+		{
+			Console.WriteLine("LobbyInfoSynced()");
+		}
+		
+		public void ServerStarted(Server server)
+		{
+			Console.WriteLine("ServerStarted()");
+		}
+		
+		public void ServerShutdown(Server server)
+		{
+			Console.WriteLine("ServerShutdown()");
+		}
+	}
+}