Merge pull request #7722 from penev92/bleed_diplomacyWindow

Closes #7391

.gitattributes

@@ -1,4 +1,6 @@
 # Enforce LF normalization on Windows
+*.yaml eol=lf
+*.lua eol=lf
 * text=lf
 
 # Custom for Visual Studio

.gitignore

@@ -12,6 +12,12 @@ obj
 *.lastcodeanalysissucceeded
 _ReSharper.*/
 
+# movies
+*.vqa
+
+# archives
+*.mix
+
 # binaries
 mods/*/*.dll
 mods/*/*.mdb
@@ -22,6 +28,22 @@ mods/*/*.mdb
 /*.pdb
 /*.mdb
 /*.exe
+thirdparty/StyleCop*
+thirdparty/ICSharpCode.SharpZipLib.dll*
+thirdparty/MaxMind*
+thirdparty/RestSharp*
+thirdparty/Newtonsoft.Json*
+thirdparty/SharpFont*
+thirdparty/windows/freetype6.dll
+thirdparty/nunit*
+thirdparty/windows/SDL2.dll
+thirdparty/Mono.Nat.dll
+thirdparty/Moq.dll
+thirdparty/nuget.exe
+thirdparty/windows/lua51.dll
+thirdparty/windows/zlib1.dll
+thirdparty/windows/soft_oal.dll
+thirdparty/FuzzyLogicLibrary.dll
 
 # backup files by various editors
 *~
@@ -56,4 +78,9 @@ Lua-API.md
 *.html
 
 # StyleCop
-*.Cache
+*.Cache
+StyleCopViolations.xml
+
+# SublimeText
+*.sublime-project
+*.sublime-workspace

.travis.yml

@@ -1,21 +1,28 @@
 # Travis-CI Build for OpenRA
 # see travis-ci.org for details
 
-# Mono/.NET are not officially supported. The following is a workaround.
-language: c
+language: csharp
 
-# Make sure build dependencies are installed.
-install:
- - sudo apt-get install mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6
+# Use the Docker-based infrastructure
+sudo: false
 cache: apt
 
+# Environment variables
+env:
+  secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs="
+
 # Run the build script
 # call RALint to check for YAML errors
 script:
- - make dependencies
+ - travis_retry make cli-dependencies
  - make all
+ - make check
  - make test
 
+# Automatically update the trait documentation and Lua API
+after_success:
+ - test $TRAVIS_PULL_REQUEST == "false" && make docs && cd packaging && ./update-wiki.sh $TRAVIS_BRANCH; cd ..
+
 # Only watch the development branch and tagged release.
 branches:
  only:
@@ -35,12 +42,7 @@ notifications:
     skip_join: true
 
 before_deploy:
- - sudo apt-get install nsis markdown dpkg rpm libarchive-dev m4 fakeroot bsdtar
- - wget ftp://ftp.archlinux.org/other/pacman/pacman-4.0.3.tar.gz -O /tmp/pacman-4.0.3.tar.gz
- - pushd /tmp
- - tar -xzvf pacman-4.0.3.tar.gz
- - cd pacman-4.0.3 && ./configure --disable-doc --prefix=/usr && make && sudo make install
- - popd
+ - export PATH=$PATH:$HOME/usr/bin
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build
@@ -48,13 +50,10 @@ before_deploy:
 deploy:
   provider: releases
   api_key:
-    secure: "cMC68erxuf0jb4Pe0sOH4m1f7I2LWPUatD9BC0WeZ9PwTnWOzrm0hnjZIES4TTKVo8WIfZIiCfxpdAFeoh6bomG2MsKwSKMc8qHGhfNGqPnyzYh6zdPZaA+4Q3TDQI3DrziyDnQUFeH1h/7UZLDLxtDrOtcYcGdNg5VjvV9fJ7g="
+    secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
   file:
-    - build/OpenRA-${TRAVIS_TAG}.exe
     - build/OpenRA-${TRAVIS_TAG}.zip
     - build/openra_${DOTVERSION}_all.deb
-    - build/openra-${DOTVERSION}-1-any.pkg.tar.gz
-    - build/openra-${DOTVERSION}-1.noarch.rpm
   skip_cleanup: true
   on:
     all_branches: true

AUTHORS

@@ -5,6 +5,7 @@ The OpenRA developers are:
     * Chris Forbes (chrisf)
     * Curtis Shmyr (hamb)
     * Matthias Mailänder (Mailaender)
+    * Oliver Brakmann (obrakmann)
     * Paul Chote (pchote)
     * ScottNZ
 
@@ -17,27 +18,46 @@ Previous developers included:
     * Robert Pepperell (ytinasni)
 
 Also thanks to:
+    * Adam Valy (Tschokky)
     * Akseli Virtanen (RAGEQUIT)
+    * Alexander Fast (mizipzor)
+    * Allen262
     * Andrew Aldridge (i80and)
     * Andrew Perkins
     * Andrew Riedi
     * Andreas Beck (baxtor)
+    * Ang Soon Li (asl97)
+    * Arik Lirette (Angusm3)
     * Barnaby Smith (mvi)
     * Bellator
     * Braxton Williams (Buddytex)
     * Bugra Cuhadaroglu (BugraC)
     * Christer Ulfsparre (Holloweye)
+    * Chris Grant (Unit158)
     * Cody Brittain (Generalcamo)
     * D2k Sardaukar
     * Daniel Derejvanik (Harisson)
     * Danny Keary (Dan9550)
+    * David Jiménez (Rydra)
+    * David Russell (DavidARussell)
+    * DeadlySurprise
     * Erasmus Schroder (rasco)
+    * Eric Bajumpaa (SteelPhase)
     * Fahrradkette
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
+    * Glenn Martin Jensen (Baxxster)
+    * Gordon Martin (Happy0)
+    * Guido Lipke (LipkeGu)
+    * Huw Pascoe
+    * Ian T. Jacobsen (Smilex)
     * Igor Popov (ihptru)
+    * Imago
     * Iran
+    * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
+    * Jan-Willem Buurlage (jwbuurlage)
+    * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
     * Jes
     * Joakim Lindberg (booom3)
@@ -47,12 +67,18 @@ Also thanks to:
     * Kyrre Soerensen (zypres)
     * Lawrence Wang
     * Lesueur Benjamin (Valkirie)
+    * Lukas Franke (abcdefg30)
     * Maarten Meuris (Nyerguds)
     * Mark Olson (markolson)
+    * Matija Hustic (matija-hustic)
     * Matthew Gatland (mgatland)
     * Matthew Uzzell (MUzzell)
+    * Matthijs Benschop (Nerdie)
     * Max621
     * Max Ugrumov (katzsmile)
+    * Michael Sztolcman (s1w_)
+    * Mustafa Alperen Seki (MustaphaTR)
+    * Neil Shivkar (havok13888)
     * Nukem
     * Okunev Yu Dmitry (xaionaro)
     * Olaf van der Spek
@@ -68,16 +94,20 @@ Also thanks to:
     * Rikhardur Bjarni Einarsson (WolfGaming)
     * Sascha Biedermann (bidifx)
     * Sebastien Kerguen (xanax)
+    * Shawn Collins (UberWaffe)
     * Simon Verbeke (Saticmotion)
     * Taryn Hill (Phrohdoh)
     * Teemu Nieminen (Temeez)
     * Tim Mylemans (gecko)
     * Tirili
+    * Tom Roostan (RoosterDragon)
     * Tristan Keating (Kilkakon)
     * Tristan Mühlbacher (MicroBit)
     * Vladimir Komarov (VrKomarov)
     * Wuschel
-    * Ian T. Jacobsen (Smilex)
+
+Using GNU FreeFont distributed under the GNU GPL
+terms.
 
 Using Simple DirectMedia Layer distributed under
 the terms of the zlib license.
@@ -93,13 +123,6 @@ the Apache 2.0 license.
 Using GeoLite2 data created by MaxMind and
 distributed under the CC BY-SA 3.0 license.
 
-Using KopiLua created by Mark Feldman and
-maintained by Vinicius Jarina and distributed
-under the MIT license.
-
-Using NLua created by Vinicius Jarina and
-distributed under the MIT license.
-
 Using SharpFont created by Robert Rouhani and
 distributed under the MIT license.
 
@@ -109,6 +132,9 @@ MIT license.
 Using SDL2# created by Ethan Lee and released
 under the zlib license.
 
+Using Eluant created by Chris Howie and released
+under the MIT license.
+
 Using FuzzyLogicLibrary (fuzzynet) by Dmitry
 Kaluzhny and released under the GNU GPL terms.
 

CONTRIBUTING.md

@@ -18,4 +18,6 @@ Don't forget to add youself to [AUTHORS](https://github.com/OpenRA/OpenRA/blob/b
 
 Please propose a [CHANGELOG](https://github.com/OpenRA/OpenRA/wiki/CHANGELOG) entry in the pull-request comments.
 
-While your pull-request is in review it will be helpful if you join [IRC](irc://chat.freenode.net/openra) to discuss the changes.
+While your pull-request is in review it will be helpful if you join [IRC](irc://chat.freenode.net/openra) to discuss the changes.
+
+See also the in-depth guide on [contributing](https://github.com/OpenRA/OpenRA/wiki/Contributing) to the OpenRA project.

INSTALL.md

@@ -6,26 +6,24 @@ The following lists per-platform dependencies required to build from source.
 Windows
 =======
 
+* [Windows PowerShell >= 4.0](http://microsoft.com/powershell)
 * [.NET Framework >= 4.0 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=17113)
-* [SDL 2 (included)](http://www.libsdl.org/download-2.0.php)
-* [FreeType (included)](http://gnuwin32.sourceforge.net/packages/freetype.htm)
-* [zlib (included)](http://gnuwin32.sourceforge.net/packages/zlib.htm)
-* [OpenAL (included)](http://kcat.strangesoft.net/openal.html)
-* [liblua 5.1 (included)](http://luabinaries.sourceforge.net/download.html)
+* [SDL 2](http://www.libsdl.org/download-2.0.php) (included)
+* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included)
+* [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included)
+* [OpenAL](http://kcat.strangesoft.net/openal.html) (included)
+* [liblua 5.1](http://luabinaries.sourceforge.net/download.html) (included)
 
-To compile OpenRA, open the `OpenRA.sln` solution in the main folder,
-or build it from the command-line with MSBuild.
+You need to fetch the thirdparty dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places by typing `make dependencies` in a command terminal.
 
-Copy both the native DLLs from `.\thirdparty\windows`
-and the CLI images from `.\thirdparty` to the main folder.
+To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with MSBuild or use the Makefile analogue command `make all` scripted in PowerShell syntax.
 
-Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert
-or `OpenRA.Game.exe Game.Mod=cnc` for Tiberian Dawn.
+Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert or `OpenRA.Game.exe Game.Mod=cnc` for Tiberian Dawn.
 
 Linux
 =====
 
-Run `./configure` to map the native libraries to your system.
+Use `make dependencies` to map the native libraries to your system, fetch the remaining CLI dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places.
 
 To compile OpenRA, run `make all` from the command line.
 
@@ -37,7 +35,8 @@ Debian/Ubuntu
 -------------
 
 * mono-dmcs
-* libmono-winforms4.0-cil
+* libmono-system-windows-forms4.0-cil
+* nuget
 * cli-common-dev (>= 2.10)
 * libfreetype6
 * libopenal1
@@ -50,6 +49,7 @@ openSUSE
 --------
 
 * mono-devel
+* nuget
 * openal
 * freetype2
 * SDL2
@@ -62,6 +62,7 @@ Gentoo
 
 * dev-lang/mono
 * dev-dotnet/libgdiplus
+* dev-dotnet/nuget
 * media-libs/freetype:2
 * media-libs/libsdl2
 * media-libs/openal

Makefile

@@ -9,6 +9,9 @@
 # to check the official mods for erroneous yaml files, run:
 #   make test
 #
+# to check the official mod dlls for StyleCop violations, run:
+#   make check
+#
 # to generate documentation aimed at modders, run:
 #   make docs
 #
@@ -37,7 +40,7 @@
 CSC         = dmcs
 CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
 DEFINE      = DEBUG;TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll thirdparty/MaxMind.Db.dll thirdparty/MaxMind.GeoIP2.dll thirdparty/Eluant.dll
+COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll thirdparty/MaxMind.Db.dll thirdparty/MaxMind.GeoIP2.dll thirdparty/Eluant.dll
 
 
 
@@ -67,9 +70,8 @@ INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
-CORE = rsdl2 rnull game utility irc ralint
-TOOLS = editor tsbuild crashdialog
-
+CORE = rsdl2 rnull game utility
+TOOLS = editor crashdialog
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
 
@@ -86,14 +88,6 @@ game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS += game
 game: $(game_TARGET)
 
-irc_SRCS := $(shell find OpenRA.Irc/ -iname '*.cs')
-irc_TARGET = OpenRA.Irc.dll
-irc_KIND = library
-irc_DEPS = $(game_TARGET)
-irc_LIBS = $(COMMON_LIBS) $(irc_DEPS)
-PROGRAMS += irc
-irc: $(irc_TARGET)
-
 # Renderer dlls
 rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
 rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
@@ -109,17 +103,26 @@ rnull_LIBS = $(COMMON_LIBS) $(rnull_DEPS)
 PROGRAMS += rsdl2 rnull
 renderers: $(rsdl2_TARGET) $(rnull_TARGET)
 
+# Mods Common
+mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
+mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
+mod_common_KIND = library
+mod_common_DEPS = $(game_TARGET)
+mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/StyleCop.dll thirdparty/StyleCop.CSharp.dll thirdparty/StyleCop.CSharp.Rules.dll
+PROGRAMS += mod_common
+mod_common: $(mod_common_TARGET)
+
 ##### Official Mods #####
 
-STD_MOD_LIBS	= $(game_TARGET) thirdparty/KopiLua.dll thirdparty/NLua.dll
-STD_MOD_DEPS	= $(STD_MOD_LIBS) $(ralint_TARGET)
+STD_MOD_LIBS	= $(game_TARGET)
+STD_MOD_DEPS	= $(STD_MOD_LIBS)
 
 # 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 = $(STD_MOD_DEPS) $(irc_TARGET)
-mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(irc_TARGET)
+mod_ra_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
+mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_ra
 mod_ra: $(mod_ra_TARGET)
 
@@ -127,8 +130,8 @@ mod_ra: $(mod_ra_TARGET)
 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 = $(STD_MOD_DEPS) $(mod_ra_TARGET)
-mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
+mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
 PROGRAMS += mod_cnc
 mod_cnc: $(mod_cnc_TARGET)
 
@@ -136,8 +139,8 @@ mod_cnc: $(mod_cnc_TARGET)
 mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
 mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
 mod_d2k_KIND = library
-mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_ra_TARGET) $(mod_cnc_TARGET)
-mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
+mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET) $(mod_cnc_TARGET)
+mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
 PROGRAMS += mod_d2k
 mod_d2k: $(mod_d2k_TARGET)
 
@@ -145,8 +148,8 @@ mod_d2k: $(mod_d2k_TARGET)
 mod_ts_SRCS := $(shell find OpenRA.Mods.TS/ -iname '*.cs')
 mod_ts_TARGET = mods/ts/OpenRA.Mods.TS.dll
 mod_ts_KIND = library
-mod_ts_DEPS = $(STD_MOD_DEPS) $(mod_ra_TARGET)
-mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
+mod_ts_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
 PROGRAMS += mod_ts
 mod_ts: $(mod_ts_TARGET)
 
@@ -156,7 +159,7 @@ mod_ts: $(mod_ts_TARGET)
 editor_SRCS := $(shell find OpenRA.Editor/ -iname '*.cs')
 editor_TARGET = OpenRA.Editor.exe
 editor_KIND = winexe
-editor_DEPS = $(game_TARGET)
+editor_DEPS = $(game_TARGET) $(mod_common_TARGET)
 editor_LIBS = System.Windows.Forms.dll System.Data.dll System.Drawing.dll $(editor_DEPS) thirdparty/Eluant.dll
 editor_EXTRA = -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
 editor_FLAGS = -win32icon:OpenRA.Editor/OpenRA.Editor.Icon.ico
@@ -168,52 +171,69 @@ 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 OpenRA.Lint/ -iname '*.cs')
-ralint_TARGET = OpenRA.Lint.exe
-ralint_KIND = exe
-ralint_DEPS = $(game_TARGET)
-ralint_LIBS = $(COMMON_LIBS) $(ralint_DEPS)
-PROGRAMS += ralint
-ralint: $(ralint_TARGET)
+check: utility mods
+	@echo
+	@echo "Checking for code style violations in OpenRA.Game..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game
+	@echo
+	@echo "Checking for code style violations in OpenRA.Renderer.Null..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Null
+	@echo
+	@echo "Checking for code style violations in OpenRA.GameMonitor..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.GameMonitor
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.Common..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Common
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.RA..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.Cnc..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Cnc
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.D2k..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.D2k
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.TS..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS
+	@echo
+	@echo "Checking for code style violations in OpenRA.Editor..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Editor
+	@echo
+	@echo "Checking for code style violations in OpenRA.Renderer.Sdl2..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Sdl2
+	@echo
+	@echo "Checking for code style violations in OpenRA.Utility..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
+	@echo
+	@echo "Checking for code style violations in OpenRA.Test..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
 
-test:
-	@echo "OpenRA.Lint: checking Red Alert mod MiniYAML..."
-	@mono --debug OpenRA.Lint.exe --verbose ra
-	@echo "OpenRA.Lint: checking Tiberian Dawn mod MiniYAML..."
-	@mono --debug OpenRA.Lint.exe --verbose cnc
-	@echo "OpenRA.Lint: checking Dune 2000 mod MiniYAML..."
-	@mono --debug OpenRA.Lint.exe --verbose d2k
-	@echo "OpenRA.Lint: checking Tiberian Sun mod MiniYAML..."
-	@mono --debug OpenRA.Lint.exe --verbose ts
-
-# Builds and exports tilesets from a bitmap
-tsbuild_SRCS := $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET = OpenRA.TilesetBuilder.exe
-tsbuild_KIND = winexe
-tsbuild_DEPS = $(game_TARGET)
-tsbuild_LIBS = $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
-tsbuild_EXTRA = -resource:OpenRA.TilesetBuilder.FormBuilder.resources -resource:OpenRA.TilesetBuilder.FormNew.resources -resource:OpenRA.TilesetBuilder.Surface.resources
-PROGRAMS += tsbuild
-OpenRA.TilesetBuilder.FormBuilder.resources:
-	resgen2 OpenRA.TilesetBuilder/FormBuilder.resx OpenRA.TilesetBuilder.FormBuilder.resources 1> /dev/null
-OpenRA.TilesetBuilder.FormNew.resources:
-	resgen2 OpenRA.TilesetBuilder/frmNew.resx OpenRA.TilesetBuilder.FormNew.resources 1> /dev/null
-OpenRA.TilesetBuilder.Surface.resources:
-	resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null
-tsbuild: OpenRA.TilesetBuilder.FormBuilder.resources OpenRA.TilesetBuilder.FormNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET)
+test: utility mods
+	@echo
+	@echo "Testing Tiberian Sun mod MiniYAML..."
+	@mono --debug OpenRA.Utility.exe ts --check-yaml
+	@echo
+	@echo "Testing Dune 2000 mod MiniYAML..."
+	@mono --debug OpenRA.Utility.exe d2k --check-yaml
+	@echo
+	@echo "Testing Tiberian Dawn mod MiniYAML..."
+	@mono --debug OpenRA.Utility.exe cnc --check-yaml
+	@echo
+	@echo "Testing Red Alert mod MiniYAML..."
+	@mono --debug OpenRA.Utility.exe ra --check-yaml
 
 
 ##### Launchers / Utilities #####
 
-crashdialog_SRCS := $(shell find OpenRA.CrashDialog/ -iname '*.cs')
-crashdialog_TARGET = OpenRA.CrashDialog.exe
-crashdialog_KIND = exe
-crashdialog_DEPS = $(game_TARGET)
-crashdialog_LIBS = $(COMMON_LIBS) $(crashdialog_DEPS) System.Windows.Forms.dll
-crashdialog_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
-PROGRAMS += crashdialog
-crashdialog: $(crashdialog_TARGET)
+gamemonitor_SRCS := $(shell find OpenRA.GameMonitor/ -iname '*.cs')
+gamemonitor_TARGET = OpenRA.exe
+gamemonitor_KIND = winexe
+gamemonitor_DEPS = $(game_TARGET)
+gamemonitor_LIBS = $(COMMON_LIBS) $(gamemonitor_DEPS) System.Windows.Forms.dll
+gamemonitor_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
+PROGRAMS += gamemonitor
+gamemonitor: $(gamemonitor_TARGET)
 
 # Backend for the launcher apps - queries game/mod info and applies actions to an install
 utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
@@ -224,7 +244,6 @@ utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib
 PROGRAMS += utility
 utility: $(utility_TARGET)
 
-
 # Patches binary headers to work around a mono bug
 fixheader.exe: packaging/fixheader.cs
 	@echo CSC fixheader.exe
@@ -254,13 +273,13 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 #
 default: cli-dependencies core
 
-core: game renderers mods utility ralint
+core: game renderers mods utility
 
-tools: editor tsbuild crashdialog
+tools: editor gamemonitor
 
-package: dependencies core editor crashdialog docs version
+package: cli-dependencies core editor gamemonitor docs version
 
-mods: mod_ra mod_cnc mod_d2k mod_ts
+mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
 
 all: cli-dependencies core tools
 
@@ -270,19 +289,18 @@ clean:
 
 distclean: clean
 
-platformdeps = "linux"
-ifeq ($(shell uname),Darwin)
-	platformdeps = "osx"
-endif
-
 dependencies: cli-dependencies native-dependencies
 
+windows-dependencies:
+	cd thirdparty && ./fetch-thirdparty-deps-windows.sh && cd ..
+
 cli-dependencies:
+	cd thirdparty && ./fetch-thirdparty-deps.sh && cd ..
 	@ $(CP_R) thirdparty/*.dll .
 	@ $(CP_R) thirdparty/*.dll.config .
 
 native-dependencies:
-	@ $(CP_R) thirdparty/${platformdeps}/* .
+	@./configure
 
 version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml
 	@for i in $? ; do \
@@ -291,9 +309,9 @@ version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mo
 	done
 
 # Documentation (d2k depends on all mod libraries)
-docs: utility
-	@mono --debug OpenRA.Utility.exe --docs d2k > DOCUMENTATION.md
-	@mono --debug OpenRA.Utility.exe --lua-docs ra > Lua-API.md
+docs: utility mods
+	@mono --debug OpenRA.Utility.exe d2k --docs > DOCUMENTATION.md
+	@mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md
 
 install: install-core
 
@@ -307,6 +325,7 @@ install-core: default
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
 	@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
+	@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
 	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
 	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/cnc"
 	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
@@ -322,7 +341,6 @@ install-core: default
 
 	@$(CP_R) glsl "$(DATA_INSTALL_DIR)"
 	@$(CP_R) lua "$(DATA_INSTALL_DIR)"
-	@$(CP) *.ttf "$(DATA_INSTALL_DIR)"
 	@$(CP) SDL2-CS* "$(DATA_INSTALL_DIR)"
 	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
@@ -330,8 +348,6 @@ install-core: default
 	@$(INSTALL_PROGRAM) SharpFont.dll "$(DATA_INSTALL_DIR)"
 	@$(CP) SharpFont.dll.config "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Mono.Nat.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) KopiLua.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) NLua.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) MaxMind.GeoIP2.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)"
@@ -345,6 +361,7 @@ install-tools: tools
 	@-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
+	@$(RM) $(DATA_INSTALL_DIR)/OpenRA.TilesetBuilder.exe # TODO: won't work outside the source tree
 
 install-linux-icons:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
@@ -355,10 +372,24 @@ install-linux-desktop:
 	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
 
+install-linux-mime:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
+
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"
+
 install-linux-scripts:
 	@echo "#!/bin/sh" > openra
 	@echo 'cd "$(gameinstalldir)"' >> openra
-	@echo 'exec mono OpenRA.Game.exe "$$@"' >> openra
+	@echo 'mono OpenRA.Game.exe "$$@"' >> openra
+	@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
+	@echo 'then' >> openra
+	@echo 'ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."' >> openra
+	@echo '$$ZENITY --question --title "OpenRA" --text "OpenRA has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ' >> openra
+	@echo 'exit 1' >> openra
+	@echo 'fi' >> openra
+
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
 	@-$(RM) openra
@@ -383,6 +414,7 @@ uninstall:
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-editor.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
 
 help:
 	@echo to compile, run:

OpenRA.Editor/ActorPropertiesDialog.Designer.cs

@@ -1,4 +1,4 @@
-namespace OpenRA.Editor
+namespace OpenRA.Editor
 {
 	partial class ActorPropertiesDialog
 	{

OpenRA.Editor/ActorPropertiesDialog.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -11,7 +11,6 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Editor
 {

OpenRA.Editor/ActorTemplate.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/ActorTool.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -9,8 +9,6 @@
 #endregion
 
 using System.Linq;
-using OpenRA.FileFormats;
-
 using SGraphics = System.Drawing.Graphics;
 
 namespace OpenRA.Editor

OpenRA.Editor/BrushTool.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -11,8 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
-
 using SGraphics = System.Drawing.Graphics;
 
 namespace OpenRA.Editor
@@ -39,16 +37,15 @@ namespace OpenRA.Editor
 			for (var u = 0; u < template.Size.X; u++)
 				for (var v = 0; v < template.Size.Y; v++)
 				{
-					if (surface.Map.IsInMap(new CVec(u, v) + pos))
+					var cell = pos + new CVec(u, v);
+					if (surface.Map.Contains(cell))
 					{
 						var z = u + v * template.Size.X;
-						if (tile[z].Length > 0)
-							surface.Map.MapTiles.Value[u + pos.X, v + pos.Y] =
-								new TileReference<ushort, byte>
-								{
-									Type = brushTemplate.N,
-									Index = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z,
-								};
+						if (tile != null && tile[z].Length > 0)
+						{
+							var index = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z;
+							surface.Map.MapTiles.Value[cell] = new TerrainTile(brushTemplate.N, index);
+						}
 
 						var ch = new int2((pos.X + u) / Surface.ChunkSize, (pos.Y + v) / Surface.ChunkSize);
 						if (surface.Chunks.ContainsKey(ch))
@@ -64,7 +61,7 @@ namespace OpenRA.Editor
 		{
 			g.DrawImage(brushTemplate.Bitmap,
 					surface.TileSetRenderer.TileSize * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X,
-			        surface.TileSetRenderer.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
+					surface.TileSetRenderer.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
 					brushTemplate.Bitmap.Width * surface.Zoom,
 					brushTemplate.Bitmap.Height * surface.Zoom);
 		}
@@ -72,14 +69,15 @@ namespace OpenRA.Editor
 		void FloodFillWithBrush(Surface s, CPos pos)
 		{
 			var queue = new Queue<CPos>();
-			var replace = s.Map.MapTiles.Value[pos.X, pos.Y];
+			var replace = s.Map.MapTiles.Value[pos];
 			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])
+				var c = new CPos(x, y);
+				if (s.Map.Contains(c) && !touched[x, y])
 				{
-					queue.Enqueue(new CPos(x, y));
+					queue.Enqueue(c);
 					touched[x, y] = true;
 				}
 			};
@@ -88,7 +86,7 @@ namespace OpenRA.Editor
 			while (queue.Count > 0)
 			{
 				var p = queue.Dequeue();
-				if (s.Map.MapTiles.Value[p.X, p.Y].Type != replace.Type)
+				if (s.Map.MapTiles.Value[p].Type != replace.Type)
 					continue;
 
 				var a = FindEdge(s, p, new CVec(-1, 0), replace);
@@ -96,10 +94,10 @@ namespace OpenRA.Editor
 
 				for (var x = a.X; x <= b.X; x++)
 				{
-					s.Map.MapTiles.Value[x, p.Y] = new TileReference<ushort, byte> { Type = brushTemplate.N, Index = (byte)0 };
-					if (s.Map.MapTiles.Value[x, p.Y - 1].Type == replace.Type)
+					s.Map.MapTiles.Value[new CPos(x, p.Y)] = new TerrainTile(brushTemplate.N, (byte)0);
+					if (s.Map.MapTiles.Value[new CPos(x, p.Y - 1)].Type == replace.Type)
 						maybeEnqueue(x, p.Y - 1);
-					if (s.Map.MapTiles.Value[x, p.Y + 1].Type == replace.Type)
+					if (s.Map.MapTiles.Value[new CPos(x, p.Y + 1)].Type == replace.Type)
 						maybeEnqueue(x, p.Y + 1);
 				}
 			}
@@ -109,13 +107,13 @@ namespace OpenRA.Editor
 			s.Chunks.Clear();
 		}
 
-		static CPos FindEdge(Surface s, CPos p, CVec d, TileReference<ushort, byte> replace)
+		static CPos FindEdge(Surface s, CPos p, CVec d, TerrainTile replace)
 		{
 			for (;;)
 			{
 				var q = p + d;
-				if (!s.Map.IsInMap(q)) return p;
-				if (s.Map.MapTiles.Value[q.X, q.Y].Type != replace.Type) return p;
+				if (!s.Map.Contains(q)) return p;
+				if (s.Map.MapTiles.Value[q].Type != replace.Type) return p;
 				p = q;
 			}
 		}

OpenRA.Editor/ErrorListDialog.Designer.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/ErrorListDialog.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/Form1.Designer.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/Form1.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -46,11 +46,12 @@ namespace OpenRA.Editor
 				miniMapBox.Image = null;
 				currentMod = toolStripComboBox1.SelectedItem as string;
 
-				Game.modData = new ModData(currentMod);
-				GlobalFileSystem.LoadFromManifest(Game.modData.Manifest);
-				Program.Rules = Game.modData.RulesetCache.LoadDefaultRules();
+				Game.InitializeSettings(Arguments.Empty);
+				Game.ModData = new ModData(currentMod);
+				GlobalFileSystem.LoadFromManifest(Game.ModData.Manifest);
+				Program.Rules = Game.ModData.RulesetCache.LoadDefaultRules();
 
-				var mod = Game.modData.Manifest.Mod;
+				var mod = Game.ModData.Manifest.Mod;
 				Text = "{0} Mod Version: {1} - OpenRA Editor".F(mod.Title, mod.Version);
 
 				loadedMapName = null;
@@ -86,10 +87,17 @@ namespace OpenRA.Editor
 
 				// TODO: make this work properly
 				foreach (var init in Program.Rules.Actors[kv.Value.Type].GetInitKeys())
-					apd.AddRow(init.First,
+				{
+					var initName = init.First;
+					apd.AddRow(initName,
 						apd.MakeEditorControl(init.Second,
-							() => objSaved.NodesDict.ContainsKey(init.First) ? objSaved.NodesDict[init.First].Value : null,
+							() =>
+							{
+								var nodesDict = objSaved.ToDictionary();
+								return nodesDict.ContainsKey(initName) ? nodesDict[initName].Value : null;
+							},
 							_ => { }));
+				}
 
 				apd.ShowDialog();
 
@@ -121,7 +129,7 @@ namespace OpenRA.Editor
 			if (map.Players.Count == 0)
 				map.MakeDefaultPlayers();
 
-			PrepareMapResources(Game.modData, map);
+			PrepareMapResources(Game.ModData, map);
 
 			// Calculate total net worth of resources in cash
 			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
@@ -136,7 +144,7 @@ namespace OpenRA.Editor
 			resourcePalette.Controls.Clear();
 
 			loadedMapName = null;
-			PrepareMapResources(Game.modData, map);
+			PrepareMapResources(Game.ModData, map);
 
 			MakeDirty();
 		}
@@ -149,11 +157,11 @@ namespace OpenRA.Editor
 			tileset = Program.Rules.TileSets[map.Tileset];
 			tilesetRenderer = new TileSetRenderer(tileset, modData.Manifest.TileSize);
 			var shadowIndex = new int[] { 3, 4 };
-			var palette = new Palette(GlobalFileSystem.Open(tileset.Palette), shadowIndex);
+			var palette = new ImmutablePalette(GlobalFileSystem.Open(tileset.Palette), shadowIndex);
 
 			// required for desert terrain in RA
 			var playerPalette = tileset.PlayerPalette ?? tileset.Palette;
-			var shadowedPalette = new Palette(GlobalFileSystem.Open(playerPalette), shadowIndex);
+			var shadowedPalette = new ImmutablePalette(GlobalFileSystem.Open(playerPalette), shadowIndex);
 
 			surface1.Bind(map, tileset, tilesetRenderer, palette, shadowedPalette);
 
@@ -162,7 +170,7 @@ namespace OpenRA.Editor
 			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
 
 			var templateOrder = tileset.EditorTemplateOrder ?? new string[] { };
-			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category).OrderBy(t => templateOrder.ToList().IndexOf(t.Key)))
+			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category).OrderBy(t => templateOrder.IndexOf(t.Key)))
 			{
 				var category = tc.Key ?? "(Uncategorized)";
 				var categoryHeader = new Label
@@ -196,13 +204,13 @@ namespace OpenRA.Editor
 							Height = bitmap.Height / 2,
 							SizeMode = PictureBoxSizeMode.StretchImage
 						};
-	
+
 						var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
 						ibox.Click += (_, e) => surface1.SetTool(new BrushTool(brushTemplate));
-	
+
 						var template = t.Value;
 						tilePalette.Controls.Add(ibox);
-						tt.SetToolTip(ibox, "{1}:{0} ({2}x{3})".F(template.Image, template.Id, template.Size.X, template.Size.Y));
+						tt.SetToolTip(ibox, "{1}:{0} ({2}x{3})".F(template.Images[0], template.Id, template.Size.X, template.Size.Y));
 					}
 					catch { }
 				}
@@ -215,7 +223,7 @@ namespace OpenRA.Editor
 				try
 				{
 					var info = Program.Rules.Actors[a];
-					if (!info.Traits.Contains<RenderSimpleInfo>()) continue;
+					if (!info.Traits.Contains<ILegacyEditorRenderInfo>()) continue;
 
 					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
 					if (etf != null && etf.ExcludeTilesets != null
@@ -224,13 +232,15 @@ namespace OpenRA.Editor
 						&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
 
 					var templatePalette = shadowedPalette;
-					var rsi = info.Traits.GetOrDefault<RenderSimpleInfo>();
+					var rsi = info.Traits.GetOrDefault<ILegacyEditorRenderInfo>();
 
 					// exception for desert buildings
-					if (rsi != null && rsi.Palette != null && rsi.Palette.Contains("terrain"))
+					if (rsi != null && rsi.EditorPalette != null && rsi.EditorPalette.Contains("terrain"))
 						templatePalette = palette;
 
-					var template = RenderUtils.RenderActor(info, tileset, templatePalette);
+					var race = Program.Rules.Actors["world"].Traits.WithInterface<CountryInfo>().First().Race;
+					var sequenceProvider = Program.Rules.Sequences[tileset.Id];
+					var template = RenderUtils.RenderActor(info, sequenceProvider, tileset, templatePalette, race);
 					var ibox = new PictureBox
 					{
 						Image = template.Bitmap,
@@ -259,7 +269,7 @@ namespace OpenRA.Editor
 			{
 				try
 				{
-					var template = RenderUtils.RenderResourceType(a, tileset.Extensions, shadowedPalette);
+					var template = RenderUtils.RenderResourceType(a, tileset, shadowedPalette);
 					var ibox = new PictureBox
 					{
 						Image = template.Bitmap,
@@ -418,8 +428,7 @@ namespace OpenRA.Editor
 				pd.TitleBox.Text = surface1.Map.Title;
 				pd.DescBox.Text = surface1.Map.Description;
 				pd.AuthorBox.Text = surface1.Map.Author;
-				pd.SelectableCheckBox.Checked = surface1.Map.Selectable;
-				pd.ShellmapCheckBox.Checked = surface1.Map.UseAsShellmap;
+				pd.MapVisibilityComboBox.SelectedIndex = pd.MapVisibilityComboBox.FindStringExact(Enum.GetName(typeof(MapVisibility), surface1.Map.Visibility));
 
 				if (DialogResult.OK != pd.ShowDialog())
 					return;
@@ -427,8 +436,7 @@ namespace OpenRA.Editor
 				surface1.Map.Title = pd.TitleBox.Text;
 				surface1.Map.Description = pd.DescBox.Text;
 				surface1.Map.Author = pd.AuthorBox.Text;
-				surface1.Map.Selectable = pd.SelectableCheckBox.Checked;
-				surface1.Map.UseAsShellmap = pd.ShellmapCheckBox.Checked;
+				surface1.Map.Visibility = (MapVisibility)Enum.Parse(typeof(MapVisibility), pd.MapVisibilityComboBox.SelectedItem.ToString());
 			}
 		}
 
@@ -456,7 +464,7 @@ namespace OpenRA.Editor
 		void ExportMinimap(object sender, EventArgs e)
 		{
 			using (var sfd = new SaveFileDialog()
-			{ 
+			{
 				InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps"),
 				DefaultExt = "*.png",
 				Filter = "PNG Image (*.png)|*.png",
@@ -464,9 +472,8 @@ namespace OpenRA.Editor
 				FileName = Path.ChangeExtension(loadedMapName, ".png"),
 				RestoreDirectory = true
 			})
-
-			if (DialogResult.OK == sfd.ShowDialog())
-				miniMapBox.Image.Save(sfd.FileName);
+				if (DialogResult.OK == sfd.ShowDialog())
+					miniMapBox.Image.Save(sfd.FileName);
 		}
 
 		void ShowActorNamesClicked(object sender, EventArgs e)
@@ -570,10 +577,11 @@ namespace OpenRA.Editor
 
 		void AboutToolStripMenuItemClick(object sender, EventArgs e)
 		{
-			MessageBox.Show("OpenRA and OpenRA Editor are Free/Libre Open Source Software released under the GNU General Public License version 3. See AUTHORS and COPYING for details.",
-							"About",
-							MessageBoxButtons.OK,
-							MessageBoxIcon.Asterisk);
+			MessageBox.Show(
+				"OpenRA and OpenRA Editor are Free/Libre Open Source Software released under the GNU General Public License version 3. See AUTHORS and COPYING for details.",
+				"About",
+				MessageBoxButtons.OK,
+				MessageBoxIcon.Asterisk);
 		}
 
 		void HelpToolStripButton_Click(object sender, EventArgs e)
@@ -630,29 +638,33 @@ namespace OpenRA.Editor
 		{
 			ShowGridClicked(sender, e);
 		}
-		
+
 		public int CalculateTotalResource()
 		{
-			int totalResource = 0;
-			for (int i = 0; i < surface1.Map.MapSize.X; i++)
-				for (int j = 0; j < surface1.Map.MapSize.Y; j++)
+			var totalResource = 0;
+			for (var i = 0; i < surface1.Map.MapSize.X; i++)
+				for (var j = 0; j < surface1.Map.MapSize.Y; j++)
 				{
-					if (surface1.Map.MapResources.Value[i, j].Type != 0)
+					var cell = new CPos(i, j);
+					if (surface1.Map.MapResources.Value[cell].Type != 0)
 						totalResource += GetResourceValue(i, j);
 				}
 
 			return totalResource;
 		}
-		
+
 		int GetAdjecentCellsWith(int resourceType, int x, int y)
 		{
-			int sum = 0;
+			var sum = 0;
 			for (var u = -1; u < 2; u++)
 				for (var v = -1; v < 2; v++)
 				{
-					if (!surface1.Map.IsInMap(new CPos(x + u, y + v)))
+					var cell = new CPos(x + u, y + v);
+
+					if (!surface1.Map.Contains(cell))
 						continue;
-					if (surface1.Map.MapResources.Value[x + u, y + v].Type == resourceType)
+
+					if (surface1.Map.MapResources.Value[cell].Type == resourceType)
 						++sum;
 				}
 
@@ -661,15 +673,15 @@ namespace OpenRA.Editor
 
 		int GetResourceValue(int x, int y)
 		{
-			int imageLength = 0;
-			int type = surface1.Map.MapResources.Value[x, y].Type;
+			var imageLength = 0;
+			var type = surface1.Map.MapResources.Value[new CPos(x, y)].Type;
 			var template = surface1.ResourceTemplates.FirstOrDefault(a => a.Value.Info.ResourceType == type).Value;
 			if (type == 1)
 				imageLength = 12;
 			else if (type == 2)
 				imageLength = 3;
-			int density = (GetAdjecentCellsWith(type, x, y) * imageLength - 1) / 9;
-			int value = template.Info.ValuePerUnit;
+			var density = (GetAdjecentCellsWith(type, x, y) * imageLength - 1) / 9;
+			var value = template.Info.ValuePerUnit;
 			return density * value;
 		}
 

OpenRA.Editor/ITool.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/MapSelect.Designer.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/MapSelect.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -27,8 +27,7 @@ namespace OpenRA.Editor
 
 		public MapSelect(string currentMod)
 		{
-			MapFolderPath = new string[] { Platform.SupportDir, "maps", currentMod }
-				.Aggregate(Path.Combine);
+			MapFolderPath = Platform.ResolvePath("^", "maps", currentMod);
 
 			if (!Directory.Exists(MapFolderPath))
 				Directory.CreateDirectory(MapFolderPath);
@@ -47,7 +46,7 @@ namespace OpenRA.Editor
 
 			foreach (var map in MapCache.FindMapsIn(MapFolderPath))
 			{
-				ListViewItem map1 = new ListViewItem();
+				var map1 = new ListViewItem();
 				map1.Tag = map;
 				map1.Text = Path.GetFileNameWithoutExtension(map);
 				map1.ImageIndex = 0;

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/NewMapDialog.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/OpenRA.Editor.csproj

@@ -32,30 +32,17 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>..\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -73,6 +60,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="Eluant">
       <HintPath>..\thirdparty\Eluant.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -172,6 +160,12 @@
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
       <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
       <Name>OpenRA.Game</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
+      <Project>{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}</Project>
+      <Name>OpenRA.Mods.Common</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

OpenRA.Editor/Program.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -10,10 +10,7 @@
 
 using System;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Editor
 {

OpenRA.Editor/Properties/Resources.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.269

OpenRA.Editor/Properties/Settings.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.269

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -43,10 +43,10 @@ namespace OpenRA.Editor
 			this.TitleBox = new System.Windows.Forms.TextBox();
 			this.label2 = new System.Windows.Forms.Label();
 			this.DescBox = new System.Windows.Forms.TextBox();
-			this.SelectableCheckBox = new System.Windows.Forms.CheckBox();
 			this.label3 = new System.Windows.Forms.Label();
 			this.AuthorBox = new System.Windows.Forms.TextBox();
-			this.ShellmapCheckBox = new System.Windows.Forms.CheckBox();
+			this.MapVisibilityComboBox = new System.Windows.Forms.ComboBox();
+			this.label4 = new System.Windows.Forms.Label();
 			this.SuspendLayout();
 			//
 			// button2
@@ -103,16 +103,6 @@ namespace OpenRA.Editor
 			this.DescBox.Size = new System.Drawing.Size(286, 20);
 			this.DescBox.TabIndex = 17;
 			//
-			// selectable
-			//
-			this.SelectableCheckBox.AutoSize = true;
-			this.SelectableCheckBox.Location = new System.Drawing.Point(118, 138);
-			this.SelectableCheckBox.Name = "selectable";
-			this.SelectableCheckBox.Size = new System.Drawing.Size(130, 17);
-			this.SelectableCheckBox.TabIndex = 18;
-			this.SelectableCheckBox.Text = "Show in Map Chooser";
-			this.SelectableCheckBox.UseVisualStyleBackColor = true;
-			//
 			// label3
 			//
 			this.label3.AutoSize = true;
@@ -129,16 +119,27 @@ namespace OpenRA.Editor
 			this.AuthorBox.Size = new System.Drawing.Size(286, 20);
 			this.AuthorBox.TabIndex = 17;
 			//
-			// checkBox1
-			//
-			this.ShellmapCheckBox.AutoSize = true;
-			this.ShellmapCheckBox.Location = new System.Drawing.Point(118, 161);
-			this.ShellmapCheckBox.Name = "checkBox1";
-			this.ShellmapCheckBox.Size = new System.Drawing.Size(105, 17);
-			this.ShellmapCheckBox.TabIndex = 18;
-			this.ShellmapCheckBox.Text = "Use as Shellmap";
-			this.ShellmapCheckBox.UseVisualStyleBackColor = true;
 			//
+			// mapVisibilityComboBox
+			// 
+			this.MapVisibilityComboBox.FormattingEnabled = true;
+			this.MapVisibilityComboBox.Items.AddRange(new object[] {
+			"Lobby",
+			"Shellmap",
+			"MissionSelector"});
+			this.MapVisibilityComboBox.Location = new System.Drawing.Point(150, 137);
+			this.MapVisibilityComboBox.Name = "mapVisibilityComboBox";
+			this.MapVisibilityComboBox.Size = new System.Drawing.Size(121, 21);
+			this.MapVisibilityComboBox.TabIndex = 19;
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(90, 140);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(58, 13);
+			this.label4.TabIndex = 20;
+			this.label4.Text = "Map class:";
 			// PropertiesDialog
 			//
 			this.AcceptButton = this.button2;
@@ -146,8 +147,8 @@ namespace OpenRA.Editor
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.button1;
 			this.ClientSize = new System.Drawing.Size(370, 228);
-			this.Controls.Add(this.ShellmapCheckBox);
-			this.Controls.Add(this.SelectableCheckBox);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.MapVisibilityComboBox);
 			this.Controls.Add(this.AuthorBox);
 			this.Controls.Add(this.label3);
 			this.Controls.Add(this.DescBox);
@@ -173,9 +174,9 @@ namespace OpenRA.Editor
 		public System.Windows.Forms.TextBox TitleBox;
 		private System.Windows.Forms.Label label2;
 		public System.Windows.Forms.TextBox DescBox;
-		public System.Windows.Forms.CheckBox SelectableCheckBox;
 		private System.Windows.Forms.Label label3;
 		public System.Windows.Forms.TextBox AuthorBox;
-		public System.Windows.Forms.CheckBox ShellmapCheckBox;
+		public System.Windows.Forms.ComboBox MapVisibilityComboBox;
+		private System.Windows.Forms.Label label4;
 	}
 }

OpenRA.Editor/PropertiesDialog.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/RenderUtils.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -8,21 +8,21 @@
  */
 #endregion
 
-using System.Collections;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
-using OpenRA.Primitives;
+using OpenRA.Mods.Common.Graphics;
+using OpenRA.Mods.Common.SpriteLoaders;
 using OpenRA.Traits;
 
 namespace OpenRA.Editor
 {
 	static class RenderUtils
 	{
-		static Bitmap RenderShp(ISpriteSource shp, Palette p)
+		static Bitmap RenderShp(ShpTDSprite shp, IPalette p)
 		{
 			var frame = shp.Frames.First();
 
@@ -35,7 +35,7 @@ namespace OpenRA.Editor
 
 			unsafe
 			{
-				byte* q = (byte*)data.Scan0.ToPointer();
+				var q = (byte*)data.Scan0.ToPointer();
 				var stride2 = data.Stride;
 
 				for (var i = 0; i < frame.Size.Width; i++)
@@ -47,28 +47,30 @@ namespace OpenRA.Editor
 			return bitmap;
 		}
 
-		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
+		static readonly string[] LegacyExtensions = new[] { ".shp", ".tem", "" };
+
+		static string ResolveFilename(string name, TileSet tileSet)
 		{
-			var image = RenderSprites.GetImage(info);
+			var ssl = Game.ModData.SpriteSequenceLoader as TilesetSpecificSpriteSequenceLoader;
+			var extensions = ssl != null ? new[] { ssl.TilesetExtensions[tileSet.Id], ssl.DefaultSpriteExtension }.Append(LegacyExtensions) :
+				LegacyExtensions.AsEnumerable();
 
-			using (var s = GlobalFileSystem.OpenWithExts(image, tileset.Extensions))
+			foreach (var e in extensions)
+				if (GlobalFileSystem.Exists(name + e))
+					return name + e;
+
+			return name;
+		}
+
+		public static ActorTemplate RenderActor(ActorInfo info, SequenceProvider sequenceProvider, TileSet tileset, IPalette p, string race)
+		{
+			var image = info.Traits.Get<ILegacyEditorRenderInfo>().EditorImage(info, sequenceProvider, race);
+			image = ResolveFilename(image, tileset);
+			using (var s = GlobalFileSystem.Open(image))
 			{
-				var shp = new ShpReader(s);
+				var shp = new ShpTDSprite(s);
 				var bitmap = RenderShp(shp, p);
 
-				try
-				{
-					using (var s2 = GlobalFileSystem.OpenWithExts(image + "2", tileset.Extensions))
-					{
-						var shp2 = new ShpReader(s2);
-						var roofBitmap = RenderShp(shp2, p);
-
-						using (var g = System.Drawing.Graphics.FromImage(bitmap))
-							g.DrawImage(roofBitmap, 0, 0);
-					}
-				}
-				catch { }
-
 				return new ActorTemplate
 				{
 					Bitmap = bitmap,
@@ -78,13 +80,13 @@ namespace OpenRA.Editor
 			}
 		}
 
-		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
+		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, TileSet tileset, IPalette p)
 		{
-			var image = info.EditorSprite;
-			using (var s = GlobalFileSystem.OpenWithExts(image, exts))
+			var image = ResolveFilename(info.EditorSprite, tileset);
+			using (var s = GlobalFileSystem.Open(image))
 			{
 				// TODO: Do this properly
-				var shp = new ShpReader(s) as ISpriteSource;
+				var shp = new ShpTDSprite(s);
 				var frame = shp.Frames.Last();
 
 				var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
@@ -94,7 +96,7 @@ namespace OpenRA.Editor
 
 				unsafe
 				{
-					byte* q = (byte*)data.Scan0.ToPointer();
+					var q = (byte*)data.Scan0.ToPointer();
 					var stride = data.Stride;
 
 					for (var i = 0; i < frame.Size.Width; i++)
@@ -103,7 +105,7 @@ namespace OpenRA.Editor
 				}
 
 				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.Frames.Count() - 1 };
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.Frames.Count - 1 };
 			}
 		}
 	}

OpenRA.Editor/ResizeDialog.Designer.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/ResizeDialog.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Editor/ResourceTool.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -9,8 +9,6 @@
 #endregion
 
 using System;
-using OpenRA.FileFormats;
-
 using SGraphics = System.Drawing.Graphics;
 
 namespace OpenRA.Editor
@@ -23,12 +21,9 @@ namespace OpenRA.Editor
 
 		public void Apply(Surface surface)
 		{
-			surface.Map.MapResources.Value[surface.GetBrushLocation().X, surface.GetBrushLocation().Y]
-				= new TileReference<byte, byte>
-				{
-					Type = (byte)resourceTemplate.Info.ResourceType,
-					Index = (byte)random.Next(resourceTemplate.Info.MaxDensity)
-				};
+			var type = (byte)resourceTemplate.Info.ResourceType;
+			var index = (byte)random.Next(resourceTemplate.Info.MaxDensity);
+			surface.Map.MapResources.Value[surface.GetBrushLocation()] = new ResourceTile(type, index);
 
 			var ch = new int2(surface.GetBrushLocation().X / Surface.ChunkSize,
 				surface.GetBrushLocation().Y / Surface.ChunkSize);

OpenRA.Editor/Settings.StyleCop

@@ -1,344 +0,0 @@
-<StyleCopSettings Version="105">
-  <Analyzers>
-    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
-      <Rules>
-        <Rule Name="ElementsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="EnumerationItemsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationMustContainValidXml">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustHaveSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementDocumentationMustHaveSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustHaveSummaryText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementDocumentationMustHaveSummaryText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustNotHaveDefaultSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParametersMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustMatchElementParameters">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustDeclareParameterName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementReturnValueMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementReturnValueDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="VoidReturnValueMustNotBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParametersMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParametersMustBeDocumentedPartialClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustMatchTypeParameters">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustDeclareParameterName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PropertySummaryDocumentationMustMatchAccessors">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PropertySummaryDocumentationMustOmitSetAccessorWithRestrictedAccess">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustNotBeCopiedAndPasted">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="SingleLineCommentsMustNotUseDocumentationStyleSlashes">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustNotBeEmpty">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustContainWhitespace">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationMustMeetCharacterPercentage">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ConstructorSummaryDocumentationMustBeginWithStandardText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DestructorSummaryDocumentationMustBeginWithStandardText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationHeadersMustNotContainBlankLines">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="IncludedDocumentationXPathDoesNotExist">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="IncludeNodeDoesNotContainValidFileAndPath">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="InheritDocMustBeUsedWithInheritingClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustBeSpelledCorrectly">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileMustHaveHeader">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustShowCopyright">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustHaveCopyrightText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustContainFileName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustHaveValidCompanyText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderFileNameDocumentationMustMatchTypeName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.SpacingRules">
-      <Rules>
-        <Rule Name="TabsMustNotBeUsed">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.LayoutRules">
-      <Rules>
-        <Rule Name="CurlyBracketsForMultiLineStatementsMustNotShareLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="StatementMustNotBeOnSingleLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementMustNotBeOnSingleLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="CurlyBracketsMustNotBeOmitted">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustBeSeparatedByBlankLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.OrderingRules">
-      <Rules>
-        <Rule Name="UsingDirectivesMustBePlacedWithinNamespace">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustAppearInTheCorrectOrder">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustBeOrderedByAccess">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.ReadabilityRules">
-      <Rules>
-        <Rule Name="CodeMustNotContainMultipleStatementsOnOneLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="UseStringEmptyForEmptyStrings">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PrefixLocalCallsWithThis">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PrefixCallsCorrectly">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ParametersMustBeOnSameLineOrSeparateLines">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ParameterMustFollowComma">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="SplitParametersMustStartOnLineAfterDeclaration">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.MaintainabilityRules">
-      <Rules>
-        <Rule Name="AccessModifierMustBeDeclared">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FieldsMustBePrivate">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileMayOnlyContainASingleClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ArithmeticExpressionsMustDeclarePrecedence">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-  </Analyzers>
-</StyleCopSettings>

OpenRA.Editor/Surface.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
 using System.Windows.Forms;
-using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Traits;
@@ -27,7 +26,7 @@ namespace OpenRA.Editor
 	{
 		public static CPos Location(this ActorReference ar)
 		{
-			return (CPos)ar.InitDict.Get<LocationInit>().value;
+			return (CPos)ar.InitDict.Get<LocationInit>().Value(null);
 		}
 
 		public static void DrawStringContrast(this SGraphics g, Font f, string s, int x, int y, Brush fg, Brush bg)
@@ -46,8 +45,8 @@ namespace OpenRA.Editor
 		public Map Map { get; private set; }
 		public TileSet TileSet { get; private set; }
 		public TileSetRenderer TileSetRenderer { get; private set; }
-		public Palette Palette { get; private set; }
-		public Palette PlayerPalette { get; private set; }
+		public IPalette Palette { get; private set; }
+		public IPalette PlayerPalette { get; private set; }
 		public int2 Offset;
 
 		public int2 GetOffset() { return Offset; }
@@ -63,8 +62,8 @@ namespace OpenRA.Editor
 		public bool ShowRuler;
 
 		public bool IsPaste { get { return TileSelection != null && ResourceSelection != null; } }
-		public TileReference<ushort, byte>[,] TileSelection;
-		public TileReference<byte, byte>[,] ResourceSelection;
+		public TerrainTile[,] TileSelection;
+		public ResourceTile[,] ResourceSelection;
 		public CPos SelectionStart;
 		public CPos SelectionEnd;
 
@@ -82,7 +81,7 @@ namespace OpenRA.Editor
 
 		public Keys GetModifiers() { return ModifierKeys; }
 
-		public void Bind(Map m, TileSet ts, TileSetRenderer tsr, Palette p, Palette pp)
+		public void Bind(Map m, TileSet ts, TileSetRenderer tsr, IPalette p, IPalette pp)
 		{
 			Map = m;
 			TileSet = ts;
@@ -207,9 +206,9 @@ namespace OpenRA.Editor
 			var key = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == brushLocation);
 			if (key.Key != null) Map.Actors.Value.Remove(key.Key);
 
-			if (Map.MapResources.Value[brushLocation.X, brushLocation.Y].Type != 0)
+			if (Map.MapResources.Value[brushLocation].Type != 0)
 			{
-				Map.MapResources.Value[brushLocation.X, brushLocation.Y] = new TileReference<byte, byte>();
+				Map.MapResources.Value[brushLocation] = new ResourceTile(0, 0);
 				var ch = new int2(brushLocation.X / ChunkSize, brushLocation.Y / ChunkSize);
 				if (Chunks.ContainsKey(ch))
 				{
@@ -266,27 +265,34 @@ namespace OpenRA.Editor
 
 			unsafe
 			{
-				int* p = (int*)data.Scan0.ToPointer();
+				var p = (int*)data.Scan0.ToPointer();
 				var stride = data.Stride >> 2;
 
 				for (var i = 0; i < ChunkSize; i++)
 					for (var j = 0; j < ChunkSize; j++)
 					{
-						var tr = Map.MapTiles.Value[u * ChunkSize + i, v * ChunkSize + j];
+						var ui = u * ChunkSize + i;
+						var vj = v * ChunkSize + j;
+						var uv = new MPos(ui, vj);
+						var tr = Map.MapTiles.Value[uv];
 						var tile = TileSetRenderer.Data(tr.Type);
-						var index = (tr.Index < tile.Count) ? tr.Index : (byte)0;
+						if (tile == null)
+							continue;
+
+						var index = (tr.Index < tile.Length) ? tr.Index : (byte)0;
 						var rawImage = tile[index];
 						for (var x = 0; x < TileSetRenderer.TileSize; x++)
 							for (var y = 0; y < TileSetRenderer.TileSize; y++)
-								p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = Palette.GetColor(rawImage[x + TileSetRenderer.TileSize * y]).ToArgb();
+								p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] =
+									Palette.GetColor(rawImage[x + TileSetRenderer.TileSize * y]).ToArgb();
 
-						if (Map.MapResources.Value[u * ChunkSize + i, v * ChunkSize + j].Type != 0)
+						if (Map.MapResources.Value[uv].Type != 0)
 						{
-							var resourceImage = ResourceTemplates[Map.MapResources.Value[u * ChunkSize + i, v * ChunkSize + j].Type].Bitmap;
+							var resourceImage = ResourceTemplates[Map.MapResources.Value[uv].Type].Bitmap;
 							var srcdata = resourceImage.LockBits(resourceImage.Bounds(),
 								ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
 
-							int* q = (int*)srcdata.Scan0.ToPointer();
+							var q = (int*)srcdata.Scan0.ToPointer();
 							var srcstride = srcdata.Stride >> 2;
 
 							for (var x = 0; x < TileSetRenderer.TileSize; x++)
@@ -308,13 +314,14 @@ namespace OpenRA.Editor
 			{
 				using (var g = SGraphics.FromImage(bitmap))
 				{
-					var ts = Game.modData.Manifest.TileSize;
+					var ts = Game.ModData.Manifest.TileSize;
 					var rect = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
 					ControlPaint.DrawGrid(g, rect, new Size(2, ts.Height), Color.DarkRed);
 					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, 2), Color.DarkRed);
 					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, ts.Height), Color.Red);
 				}
 			}
+
 			return bitmap;
 		}
 
@@ -329,8 +336,9 @@ namespace OpenRA.Editor
 		{
 			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
 			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
-			return new CPos((vX + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize,
-			                (vY + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize);
+			return new CPos(
+				(vX + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize,
+				(vY + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize);
 		}
 
 		public void DrawActor(SGraphics g, CPos p, ActorTemplate t, ColorPalette cp)
@@ -345,10 +353,10 @@ namespace OpenRA.Editor
 		float2 GetDrawPosition(CPos location, Bitmap bmp, bool centered)
 		{
 			float offsetX = centered ? bmp.Width / 2 - TileSetRenderer.TileSize / 2 : 0;
-			float drawX = TileSetRenderer.TileSize * location.X * Zoom + Offset.X - offsetX;
+			var drawX = TileSetRenderer.TileSize * location.X * Zoom + Offset.X - offsetX;
 
 			float offsetY = centered ? bmp.Height / 2 - TileSetRenderer.TileSize / 2 : 0;
-			float drawY = TileSetRenderer.TileSize * location.Y * Zoom + Offset.Y - offsetY;
+			var drawY = TileSetRenderer.TileSize * location.Y * Zoom + Offset.Y - offsetY;
 
 			return new float2(drawX, drawY);
 		}
@@ -381,7 +389,7 @@ namespace OpenRA.Editor
 			var pr = Map.Players[name];
 			var pcpi = Program.Rules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>();
 			var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp);
-			return new Palette(PlayerPalette, remap).AsSystemPalette();
+			return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette();
 		}
 
 		Cache<string, ColorPalette> playerPalettes;
@@ -418,8 +426,8 @@ namespace OpenRA.Editor
 
 					var drawX = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
 					var drawY = TileSetRenderer.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);
+					var sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
+					var destRect = new RectangleF(drawX, drawY, bmp.Width * Zoom, bmp.Height * Zoom);
 					e.Graphics.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
 				}
 
@@ -468,20 +476,20 @@ namespace OpenRA.Editor
 
 			if (ShowRuler && Zoom > 0.2)
 			{
-				for (int i = Map.Bounds.Left; i <= Map.Bounds.Right; i += 8)
+				for (var i = Map.Bounds.Left; i <= Map.Bounds.Right; i += 8)
 				{
 					if (i % 8 == 0)
 					{
-						PointF point = new PointF(i * TileSetRenderer.TileSize * Zoom + Offset.X, (Map.Bounds.Top - 8) * TileSetRenderer.TileSize * Zoom + Offset.Y);
+						var point = new PointF(i * TileSetRenderer.TileSize * Zoom + Offset.X, (Map.Bounds.Top - 8) * TileSetRenderer.TileSize * Zoom + Offset.Y);
 						e.Graphics.DrawString((i - Map.Bounds.Left).ToString(), MarkerFont, TextBrush, point);
 					}
 				}
 
-				for (int i = Map.Bounds.Top; i <= Map.Bounds.Bottom; i += 8)
+				for (var i = Map.Bounds.Top; i <= Map.Bounds.Bottom; i += 8)
 				{
 					if (i % 8 == 0)
 					{
-						PointF point = new PointF((Map.Bounds.Left - 8) * TileSetRenderer.TileSize * Zoom + Offset.X, i * TileSetRenderer.TileSize * Zoom + Offset.Y);
+						var point = new PointF((Map.Bounds.Left - 8) * TileSetRenderer.TileSize * Zoom + Offset.X, i * TileSetRenderer.TileSize * Zoom + Offset.Y);
 						e.Graphics.DrawString((i - Map.Bounds.Left).ToString(), MarkerFont, TextBrush, point);
 					}
 				}
@@ -506,19 +514,20 @@ namespace OpenRA.Editor
 
 			if (start == end) return;
 
-			int width = Math.Abs((start - end).X);
-			int height = Math.Abs((start - end).Y);
+			var width = Math.Abs((start - end).X);
+			var height = Math.Abs((start - end).Y);
 
-			TileSelection = new TileReference<ushort, byte>[width, height];
-			ResourceSelection = new TileReference<byte, byte>[width, height];
+			TileSelection = new TerrainTile[width, height];
+			ResourceSelection = new ResourceTile[width, height];
 
-			for (int x = 0; x < width; x++)
+			for (var x = 0; x < width; x++)
 			{
-				for (int y = 0; y < height; y++)
+				for (var y = 0; y < height; y++)
 				{
 					// TODO: crash prevention
-					TileSelection[x, y] = Map.MapTiles.Value[start.X + x, start.Y + y];
-					ResourceSelection[x, y] = Map.MapResources.Value[start.X + x, start.Y + y];
+					var cell = new CPos(start.X + x, start.Y + y);
+					TileSelection[x, y] = Map.MapTiles.Value[cell];
+					ResourceSelection[x, y] = Map.MapResources.Value[cell];
 				}
 			}
 		}
@@ -529,16 +538,17 @@ namespace OpenRA.Editor
 			var width = Math.Abs((SelectionStart - SelectionEnd).X);
 			var height = Math.Abs((SelectionStart - SelectionEnd).Y);
 
-			for (int x = 0; x < width; x++)
+			for (var x = 0; x < width; x++)
 			{
-				for (int y = 0; y < height; y++)
+				for (var y = 0; y < height; y++)
 				{
 					var mapX = loc.X + x;
 					var mapY = loc.Y + y;
+					var cell = new CPos(mapX, mapY);
 
 					// TODO: crash prevention for outside of bounds
-					Map.MapTiles.Value[mapX, mapY] = TileSelection[x, y];
-					Map.MapResources.Value[mapX, mapY] = ResourceSelection[x, y];
+					Map.MapTiles.Value[cell] = TileSelection[x, y];
+					Map.MapResources.Value[cell] = ResourceSelection[x, y];
 
 					var ch = new int2(mapX / ChunkSize, mapY / ChunkSize);
 					if (Chunks.ContainsKey(ch))

OpenRA.Editor/TileSetRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.IO;
 using System.Linq;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
@@ -21,9 +20,9 @@ namespace OpenRA.Editor
 {
 	public class TileSetRenderer
 	{
-		public TileSet TileSet;
-		Dictionary<ushort, List<byte[]>> templates;
 		public readonly int TileSize;
+		public TileSet TileSet;
+		Dictionary<ushort, byte[][]> templates;
 
 		// Extract a square tile that the editor can render
 		byte[] ExtractSquareTile(ISpriteFrame frame)
@@ -45,45 +44,22 @@ namespace OpenRA.Editor
 			return data;
 		}
 
-		List<byte[]> LoadTemplate(string filename, string[] exts, Dictionary<string, ISpriteSource> sourceCache, int[] frames)
-		{
-			ISpriteSource source;
-			if (!sourceCache.ContainsKey(filename))
-			{
-				using (var s = GlobalFileSystem.OpenWithExts(filename, exts))
-					source = SpriteSource.LoadSpriteSource(s, filename);
-
-				if (source.CacheWhenLoadingTileset)
-					sourceCache.Add(filename, source);
-			}
-			else
-				source = sourceCache[filename];
-
-			if (frames != null)
-			{
-				var ret = new List<byte[]>();
-				var srcFrames = source.Frames.ToArray();
-				foreach (var i in frames)
-					ret.Add(ExtractSquareTile(srcFrames[i]));
-
-				return ret;
-			}
-
-			return source.Frames.Select(f => ExtractSquareTile(f)).ToList();
-		}
-
 		public TileSetRenderer(TileSet tileset, Size tileSize)
 		{
 			this.TileSet = tileset;
 			this.TileSize = Math.Min(tileSize.Width, tileSize.Height);
 
-			templates = new Dictionary<ushort, List<byte[]>>();
-			var sourceCache = new Dictionary<string, ISpriteSource>();
-			foreach (var t in TileSet.Templates)
-				templates.Add(t.Key, LoadTemplate(t.Value.Image, tileset.Extensions, sourceCache, t.Value.Frames));
+			templates = new Dictionary<ushort, byte[][]>();
+			var frameCache = new FrameCache(Game.ModData.SpriteLoaders);
+			foreach (var t in tileset.Templates)
+			{
+				var allFrames = frameCache[t.Value.Images[0]];
+				var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
+				templates.Add(t.Value.Id, frames.Select(f => ExtractSquareTile(f)).ToArray());
+			}
 		}
 
-		public Bitmap RenderTemplate(ushort id, Palette p)
+		public Bitmap RenderTemplate(ushort id, IPalette p)
 		{
 			var template = TileSet.Templates[id];
 			var templateData = templates[id];
@@ -126,9 +102,16 @@ namespace OpenRA.Editor
 			return bitmap;
 		}
 
-		public List<byte[]> Data(ushort id)
+		public byte[][] Data(ushort id)
 		{
-			return templates[id];
+			byte[][] template;
+			if (!templates.TryGetValue(id, out template))
+			{
+				Console.WriteLine("warning: Unknown tile template {0}", id);
+				return null;
+			}
+
+			return template;
 		}
 	}
 }

OpenRA.Game/Activities/Activity.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -10,31 +10,32 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Activities
 {
 	public abstract class Activity
 	{
 		public Activity NextActivity { get; set; }
 		protected bool IsCanceled { get; private set; }
 
-		public abstract Activity Tick( Actor self );
+		public abstract Activity Tick(Actor self);
 
-		public virtual void Cancel( Actor self )
+		public virtual void Cancel(Actor self)
 		{
 			IsCanceled = true;
 			NextActivity = null;
 		}
 
-		public virtual void Queue( Activity activity )
+		public virtual void Queue(Activity activity)
 		{
-			if( NextActivity != null )
-				NextActivity.Queue( activity );
+			if (NextActivity != null)
+				NextActivity.Queue(activity);
 			else
 				NextActivity = activity;
 		}
 
-		public virtual IEnumerable<Target> GetTargets( Actor self )
+		public virtual IEnumerable<Target> GetTargets(Actor self)
 		{
 			yield break;
 		}
@@ -42,12 +43,12 @@ namespace OpenRA.Traits
 
 	public static class ActivityExts
 	{
-		public static IEnumerable<Target> GetTargetQueue( this Actor self )
+		public static IEnumerable<Target> GetTargetQueue(this Actor self)
 		{
 			return self.GetCurrentActivity()
-				.Iterate( u => u.NextActivity )
-				.TakeWhile( u => u != null )
-				.SelectMany( u => u.GetTargets( self ) );
+				.Iterate(u => u.NextActivity)
+				.TakeWhile(u => u != null)
+				.SelectMany(u => u.GetTargets(self));
 		}
 	}
 }

OpenRA.Game/Activities/CallFunc.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -9,9 +9,8 @@
 #endregion
 
 using System;
-using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Activities
 {
 	public class CallFunc : Activity
 	{

OpenRA.Game/Actor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -14,6 +14,7 @@ using System.Drawing;
 using System.Linq;
 using Eluant;
 using Eluant.ObjectBinding;
+using OpenRA.Activities;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Scripting;
@@ -21,22 +22,54 @@ using OpenRA.Traits;
 
 namespace OpenRA
 {
-	public class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding
+	public interface IActor
+	{
+		ActorInfo Info { get; }
+		IWorld World { get; }
+		uint ActorID { get; }
+		Player Owner { get; set; }
+
+		T TraitOrDefault<T>();
+		T Trait<T>();
+		IEnumerable<T> TraitsImplementing<T>();
+
+		IEnumerable<IRenderable> Render(WorldRenderer wr);
+	}
+
+	public class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IActor
 	{
 		public readonly ActorInfo Info;
+		ActorInfo IActor.Info { get { return this.Info; } }
 
 		public readonly World World;
-		public readonly uint ActorID;
-		public Lazy<Rectangle> Bounds;
+		IWorld IActor.World { get { return World; } }
 
-		Lazy<IOccupySpace> occupySpace;
+		public readonly uint ActorID;
+		uint IActor.ActorID { get { return this.ActorID; } }
+
+		[Sync] public Player Owner { get; set; }
+
+		public bool IsInWorld { get; internal set; }
+		public bool Destroyed { get; private set; }
+
+		Activity currentActivity;
+
+		public Group Group;
+		public int Generation;
+
+		Lazy<Rectangle> bounds;
 		Lazy<IFacing> facing;
 		Lazy<Health> health;
+		Lazy<IOccupySpace> occupySpace;
 		Lazy<IEffectiveOwner> effectiveOwner;
 
+		public Rectangle Bounds { get { return bounds.Value; } }
 		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
 		public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } }
 
+		public bool IsIdle { get { return currentActivity == null; } }
+		public bool IsDead { get { return Destroyed || (health.Value == null ? false : health.Value.IsDead); } }
+
 		public CPos Location { get { return occupySpace.Value.TopLeft; } }
 		public WPos CenterPosition { get { return occupySpace.Value.CenterPosition; } }
 
@@ -50,11 +83,8 @@ namespace OpenRA
 			}
 		}
 
-		[Sync] public Player Owner;
-
-		Activity currentActivity;
-		public Group Group;
-		public int Generation;
+		readonly IEnumerable<IRenderModifier> traitsImplementingRenderModifier;
+		readonly IEnumerable<IRender> traitsImplementingRender;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -69,10 +99,12 @@ namespace OpenRA
 
 			if (name != null)
 			{
-				if (!world.Map.Rules.Actors.ContainsKey(name.ToLowerInvariant()))
-					throw new NotImplementedException("No rules definition for unit {0}".F(name.ToLowerInvariant()));
+				name = name.ToLowerInvariant();
 
-				Info = world.Map.Rules.Actors[name.ToLowerInvariant()];
+				if (!world.Map.Rules.Actors.ContainsKey(name))
+					throw new NotImplementedException("No rules definition for unit " + name);
+
+				Info = world.Map.Rules.Actors[name];
 				foreach (var trait in Info.TraitsInConstructOrder())
 					AddTrait(trait.Create(init));
 			}
@@ -81,7 +113,7 @@ namespace OpenRA
 			health = Exts.Lazy(() => TraitOrDefault<Health>());
 			effectiveOwner = Exts.Lazy(() => TraitOrDefault<IEffectiveOwner>());
 
-			Bounds = Exts.Lazy(() =>
+			bounds = Exts.Lazy(() =>
 			{
 				var si = Info.Traits.GetOrDefault<SelectableInfo>();
 				var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
@@ -93,39 +125,36 @@ namespace OpenRA
 
 				return new Rectangle(offset.X, offset.Y, size.X, size.Y);
 			});
+
+			traitsImplementingRenderModifier = TraitsImplementing<IRenderModifier>();
+			traitsImplementingRender = TraitsImplementing<IRender>();
 		}
 
 		public void Tick()
 		{
 			var wasIdle = IsIdle;
 			currentActivity = Traits.Util.RunActivity(this, currentActivity);
+
 			if (!wasIdle && IsIdle)
 				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
 					n.OnBecomingIdle(this);
 		}
 
-		public bool IsIdle
-		{
-			get { return currentActivity == null; }
-		}
-
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
 			var renderables = Renderables(wr);
-			foreach (var modifier in TraitsImplementing<IRenderModifier>())
+			foreach (var modifier in traitsImplementingRenderModifier)
 				renderables = modifier.ModifyRender(this, wr, renderables);
 			return renderables;
 		}
 
 		IEnumerable<IRenderable> Renderables(WorldRenderer wr)
 		{
-			foreach (var render in TraitsImplementing<IRender>())
+			foreach (var render in traitsImplementingRender)
 				foreach (var renderable in render.Render(this, wr))
 					yield return renderable;
 		}
 
-		public bool IsInWorld { get; internal set; }
-
 		public void QueueActivity(bool queued, Activity nextActivity)
 		{
 			if (!queued)
@@ -160,50 +189,62 @@ namespace OpenRA
 		public override bool Equals(object obj)
 		{
 			var o = obj as Actor;
-			return o != null && o.ActorID == ActorID;
+			return o != null && Equals(o);
+		}
+
+		public bool Equals(Actor other)
+		{
+			return ActorID == other.ActorID;
 		}
 
 		public override string ToString()
 		{
-			return "{0} {1}{2}".F(Info.Name, ActorID, IsInWorld ? "" : " (not in world)");
+			var name = Info.Name + " " + ActorID;
+			if (!IsInWorld)
+				name += " (not in world)";
+			return name;
 		}
 
 		public T Trait<T>()
 		{
-			return World.traitDict.Get<T>(this);
+			return World.TraitDict.Get<T>(this);
 		}
 
 		public T TraitOrDefault<T>()
 		{
-			return World.traitDict.GetOrDefault<T>(this);
+			return World.TraitDict.GetOrDefault<T>(this);
 		}
 
 		public IEnumerable<T> TraitsImplementing<T>()
 		{
-			return World.traitDict.WithInterface<T>(this);
+			return World.TraitDict.WithInterface<T>(this);
 		}
 
 		public bool HasTrait<T>()
 		{
-			return World.traitDict.Contains<T>(this);
+			return World.TraitDict.Contains<T>(this);
 		}
 
 		public void AddTrait(object trait)
 		{
-			World.traitDict.AddTrait(this, trait);
+			World.TraitDict.AddTrait(this, trait);
 		}
 
-		public bool Destroyed { get; private set; }
-
 		public void Destroy()
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (Destroyed) return;
+				if (Destroyed)
+					return;
 
-				World.Remove(this);
-				World.traitDict.RemoveActor(this);
+				if (IsInWorld)
+					World.Remove(this);
+
+				World.TraitDict.RemoveActor(this);
 				Destroyed = true;
+
+				if (luaInterface != null)
+					luaInterface.Value.OnActorDestroyed();
 			});
 		}
 
@@ -212,6 +253,9 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
+				if (Destroyed)
+					return;
+
 				var oldOwner = Owner;
 
 				// momentarily remove from world so the ownership queries don't get confused
@@ -225,19 +269,6 @@ namespace OpenRA
 			});
 		}
 
-		public bool IsDead()
-		{
-			if (Destroyed)
-				return true;
-
-			return (health.Value == null) ? false : health.Value.IsDead;
-		}
-
-		public bool IsDisguised()
-		{
-			return effectiveOwner.Value != null && effectiveOwner.Value.Disguised;
-		}
-
 		public void Kill(Actor attacker)
 		{
 			if (health.Value == null)
@@ -251,7 +282,8 @@ namespace OpenRA
 		Lazy<ScriptActorInterface> luaInterface;
 		public void OnScriptBind(ScriptContext context)
 		{
-			luaInterface = Exts.Lazy(() => new ScriptActorInterface(context, this));
+			if (luaInterface == null)
+				luaInterface = Exts.Lazy(() => new ScriptActorInterface(context, this));
 		}
 
 		public LuaValue this[LuaRuntime runtime, LuaValue keyValue]

OpenRA.Game/CPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -9,14 +9,13 @@
 #endregion
 
 using System;
-using System.Drawing;
 using Eluant;
 using Eluant.ObjectBinding;
 using OpenRA.Scripting;
 
 namespace OpenRA
 {
-	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding
+	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
 	{
 		public readonly int X, Y;
 
@@ -28,37 +27,45 @@ namespace OpenRA
 		public static CPos operator +(CVec a, CPos b) { return new CPos(a.X + b.X, a.Y + b.Y); }
 		public static CPos operator +(CPos a, CVec b) { return new CPos(a.X + b.X, a.Y + b.Y); }
 		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y); }
-
 		public static CVec operator -(CPos a, CPos b) { return new CVec(a.X - b.X, a.Y - b.Y); }
 
-		public static bool operator ==(CPos me, CPos other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator ==(CPos me, CPos other) { return me.X == other.X && me.Y == other.Y; }
 		public static bool operator !=(CPos me, CPos other) { return !(me == other); }
 
 		public static CPos Max(CPos a, CPos b) { return new CPos(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
 		public static CPos Min(CPos a, CPos b) { return new CPos(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
 
-		public float2 ToFloat2() { return new float2(X, Y); }
-		public int2 ToInt2() { return new int2(X, Y); }
-
-		public WPos CenterPosition { get { return new WPos(1024 * X + 512, 1024 * Y + 512, 0); } }
-		public WPos TopLeft { get { return new WPos(1024 * X, 1024 * Y, 0); } }
-		public WPos BottomRight { get { return new WPos(1024 * X + 1023, 1024 * Y + 1023, 0); } }
-
-		public CPos Clamp(Rectangle r)
-		{
-			return new CPos(Math.Min(r.Right, Math.Max(X, r.Left)),
-							Math.Min(r.Bottom, Math.Max(Y, r.Top)));
-		}
-
 		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
 
-		public override bool Equals(object obj)
+		public bool Equals(CPos other) { return X == other.X && Y == other.Y; }
+		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
+
+		public override string ToString() { return X + "," + Y; }
+
+		public MPos ToMPos(Map map)
 		{
-			var o = obj as CPos?;
-			return o != null && o == this;
+			return ToMPos(map.TileShape);
 		}
 
-		public override string ToString() { return "{0},{1}".F(X, Y); }
+		public MPos ToMPos(TileShape shape)
+		{
+			if (shape == TileShape.Rectangle)
+				return new MPos(X, Y);
+
+			// Convert from diamond cell (x, y) position to rectangular map position (u, v)
+			//  - The staggered rows make this fiddly (hint: draw a diagram!)
+			// (a) Consider the relationships:
+			//  - +1x (even -> odd) adds (0, 1) to (u, v)
+			//  - +1x (odd -> even) adds (1, 1) to (u, v)
+			//  - +1y (even -> odd) adds (-1, 1) to (u, v)
+			//  - +1y (odd -> even) adds (0, 1) to (u, v)
+			// (b) Therefore:
+			//  - ax + by adds (a - b)/2 to u (only even increments count)
+			//  - ax + by adds a + b to v
+			var u = (X - Y) / 2;
+			var v = X + Y;
+			return new MPos(u, v);
+		}
 
 		#region Scripting interface
 
@@ -111,16 +118,4 @@ namespace OpenRA
 
 		#endregion
 	}
-
-	public static class RectangleExtensions
-	{
-		public static CPos TopLeftAsCPos(this Rectangle r) { return new CPos(r.Left, r.Top); }
-		public static CPos BottomRightAsCPos(this Rectangle r) { return new CPos(r.Right, r.Bottom); }
-	}
-
-	public static class WorldCoordinateExtensions
-	{
-		public static CPos ToCPos(this WPos a) { return new CPos(a.X / 1024, a.Y / 1024); }
-		public static CVec ToCVec(this WVec a) { return new CVec(a.X / 1024, a.Y / 1024); }
-	}
 }

OpenRA.Game/CVec.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -16,18 +16,13 @@ using OpenRA.Scripting;
 
 namespace OpenRA
 {
-	public struct CVec : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaUnaryMinusBinding, ILuaEqualityBinding, ILuaTableBinding
+	public struct CVec : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaUnaryMinusBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CVec>
 	{
 		public readonly int X, Y;
 
 		public CVec(int x, int y) { X = x; Y = y; }
-		public CVec(Size p) { X = p.Width; Y = p.Height; }
-
 		public static readonly CVec Zero = new CVec(0, 0);
 
-		public static explicit operator CVec(int2 a) { return new CVec(a.X, a.Y); }
-		public static explicit operator CVec(float2 a) { return new CVec((int)a.X, (int)a.Y); }
-
 		public static CVec operator +(CVec a, CVec b) { return new CVec(a.X + b.X, a.Y + b.Y); }
 		public static CVec operator -(CVec a, CVec b) { return new CVec(a.X - b.X, a.Y - b.Y); }
 		public static CVec operator *(int a, CVec b) { return new CVec(a * b.X, a * b.Y); }
@@ -36,7 +31,7 @@ namespace OpenRA
 
 		public static CVec operator -(CVec a) { return new CVec(-a.X, -a.Y); }
 
-		public static bool operator ==(CVec me, CVec other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator ==(CVec me, CVec other) { return me.X == other.X && me.Y == other.Y; }
 		public static bool operator !=(CVec me, CVec other) { return !(me == other); }
 
 		public static CVec Max(CVec a, CVec b) { return new CVec(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
@@ -47,31 +42,23 @@ namespace OpenRA
 		public CVec Sign() { return new CVec(Math.Sign(X), Math.Sign(Y)); }
 		public CVec Abs() { return new CVec(Math.Abs(X), Math.Abs(Y)); }
 		public int LengthSquared { get { return X * X + Y * Y; } }
-		public int Length { get { return (int)Math.Sqrt(LengthSquared); } }
-
-		public float2 ToFloat2() { return new float2(X, Y); }
-		public int2 ToInt2() { return new int2(X, Y); }
-		public WVec ToWVec() { return new WVec(X*1024, Y*1024, 0); }
+		public int Length { get { return Exts.ISqrt(LengthSquared); } }
 
 		public CVec Clamp(Rectangle r)
 		{
 			return new CVec(
 				Math.Min(r.Right, Math.Max(X, r.Left)),
-				Math.Min(r.Bottom, Math.Max(Y, r.Top))
-			);
+				Math.Min(r.Bottom, Math.Max(Y, r.Top)));
 		}
 
 		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
 
-		public override bool Equals(object obj)
-		{
-			var o = obj as CVec?;
-			return o != null && o == this;
-		}
+		public bool Equals(CVec other) { return other == this; }
+		public override bool Equals(object obj) { return obj is CVec && Equals((CVec)obj); }
 
-		public override string ToString() { return "{0},{1}".F(X, Y); }
+		public override string ToString() { return X + "," + Y; }
 
-		public static readonly CVec[] directions =
+		public static readonly CVec[] Directions =
 		{
 			new CVec(-1, -1),
 			new CVec(-1,  0),
@@ -125,7 +112,6 @@ namespace OpenRA
 				{
 					case "X": return X;
 					case "Y": return Y;
-					case "Facing": return Traits.Util.GetFacing(this, 0);
 					default: throw new LuaException("CVec does not define a member '{0}'".F(key));
 				}
 			}

OpenRA.Game/CacheStorage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -8,15 +8,12 @@
  */
 #endregion
 
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.RA
+namespace OpenRA
 {
-	class DetectCloakedInfo : TraitInfo<DetectCloaked>
+	public interface ICacheStorage<T>
 	{
-		public readonly string[] CloakTypes = { "Cloak" };
-		public readonly int Range = 5;
+		void Remove(string key);
+		void Store(string key, T data);
+		T Retrieve(string key);
 	}
-
-	class DetectCloaked {}
-}
+}

OpenRA.Game/Download.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -28,7 +28,9 @@ namespace OpenRA
 			switch (ex.Status)
 			{
 				case WebExceptionStatus.NameResolutionFailure:
+					return "DNS lookup failed";
 				case WebExceptionStatus.Timeout:
+					return "Connection timeout";
 				case WebExceptionStatus.ConnectFailure:
 					return "Cannot connect to remote server";
 				case WebExceptionStatus.ProtocolError:
@@ -70,7 +72,8 @@ namespace OpenRA
 		{
 			Game.OnQuit -= Cancel;
 			wc.CancelAsync();
+			wc.Dispose();
 			cancelled = true;
 		}
 	}
-}
+}

OpenRA.Game/Effects/AsyncAction.cs

@@ -0,0 +1,38 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using OpenRA.Graphics;
+
+namespace OpenRA.Effects
+{
+	public class AsyncAction : IEffect
+	{
+		Action a;
+		IAsyncResult ar;
+
+		public AsyncAction(IAsyncResult ar, Action a)
+		{
+			this.a = a;
+			this.ar = ar;
+		}
+
+		public void Tick(World world)
+		{
+			if (ar.IsCompleted)
+			{
+				world.AddFrameEndTask(w => { w.Remove(this); a(); });
+			}
+		}
+
+		public IEnumerable<IRenderable> Render(WorldRenderer r) { yield break; }
+	}
+}

OpenRA.Game/Effects/DelayedAction.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Game/Effects/FlashTarget.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -18,17 +18,18 @@ namespace OpenRA.Effects
 	{
 		Actor target;
 		Player player;
-		int remainingTicks = 4;
+		int remainingTicks;
 
-		public FlashTarget(Actor target)
-			: this(target, null) { }
-
-		public FlashTarget(Actor target, Player asPlayer)
+		public FlashTarget(Actor target, Player asPlayer = null, int ticks = 4)
 		{
 			this.target = target;
 			player = asPlayer;
-			foreach (var e in target.World.Effects.OfType<FlashTarget>().Where(a => a.target == target).ToArray())
-				target.World.Remove(e);
+			remainingTicks = ticks;
+			target.World.RemoveAll(effect =>
+			{
+				var flashTarget = effect as FlashTarget;
+				return flashTarget != null && flashTarget.target == target;
+			});
 		}
 
 		public void Tick(World world)

OpenRA.Game/Effects/IEffect.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Game/Effects/SpriteEffect.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -13,15 +13,17 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Effects
 {
-	public class MoveFlash : IEffect
+	public class SpriteEffect : IEffect
 	{
+		string palette;
 		Animation anim;
 		WPos pos;
 
-		public MoveFlash(WPos pos, World world)
+		public SpriteEffect(WPos pos, World world, string sprite, string palette)
 		{
 			this.pos = pos;
-			anim = new Animation(world, "moveflsh");
+			this.palette = palette;
+			anim = new Animation(world, sprite);
 			anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
 		}
 
@@ -32,7 +34,7 @@ namespace OpenRA.Effects
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
-			return anim.Render(pos, WVec.Zero, 0, wr.Palette("moveflash"), 1f / wr.Viewport.Zoom);
+			return anim.Render(pos, WVec.Zero, 0, wr.Palette(palette), 1f / wr.Viewport.Zoom);
 		}
 	}
 }

OpenRA.Game/Exts.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -15,11 +15,17 @@ using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using OpenRA.Support;
+using OpenRA.Traits;
 
 namespace OpenRA
 {
 	public static class Exts
 	{
+		public static bool IsUppercase(this string str)
+		{
+			return string.Compare(str.ToUpperInvariant(), str, false) == 0;
+		}
+
 		public static string F(this string fmt, params object[] args)
 		{
 			return string.Format(fmt, args);
@@ -81,12 +87,34 @@ namespace OpenRA
 			return r.Contains(p.ToPointF());
 		}
 
+		static int WindingDirectionTest(int2 v0, int2 v1, int2 p)
+		{
+			return (v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y);
+		}
+
+		public static bool PolygonContains(this int2[] polygon, int2 p)
+		{
+			var windingNumber = 0;
+
+			for (var i = 0; i < polygon.Length; i++)
+			{
+				var tv = polygon[i];
+				var nv = polygon[(i + 1) % polygon.Length];
+
+				if (tv.Y <= p.Y && nv.Y > p.Y && WindingDirectionTest(tv, nv, p) > 0)
+					windingNumber++;
+				else if (tv.Y > p.Y && nv.Y <= p.Y && WindingDirectionTest(tv, nv, p) < 0)
+					windingNumber--;
+			}
+
+			return windingNumber != 0;
+		}
+
 		public static bool HasModifier(this Modifiers k, Modifiers mod)
 		{
 			return (k & mod) == mod;
 		}
 
-
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
 			where V : new()
 		{
@@ -101,18 +129,34 @@ namespace OpenRA
 			return ret;
 		}
 
+		public static int IndexOf<T>(this T[] array, T value)
+		{
+			return Array.IndexOf(array, value);
+		}
+
 		public static T Random<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
-			var xs = ts.ToArray();
-			return xs[r.Next(xs.Length)];
+			return Random(ts, r, true);
 		}
 
 		public static T RandomOrDefault<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
-			if (!ts.Any())
-				return default(T);
+			return Random(ts, r, false);
+		}
 
-			return ts.Random(r);
+		static T Random<T>(IEnumerable<T> ts, MersenneTwister r, bool throws)
+		{
+			var xs = ts as ICollection<T>;
+			xs = xs ?? ts.ToList();
+			if (xs.Count == 0)
+			{
+				if (throws)
+					throw new ArgumentException("Collection must not be empty.", "ts");
+				else
+					return default(T);
+			}
+			else
+				return xs.ElementAt(r.Next(xs.Count));
 		}
 
 		public static float Product(this IEnumerable<float> xs)
@@ -131,6 +175,55 @@ namespace OpenRA
 			for (;;) { yield return t; t = f(t); }
 		}
 
+		public static T MinBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
+		{
+			return ts.CompareBy(selector, 1, true);
+		}
+
+		public static T MaxBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
+		{
+			return ts.CompareBy(selector, -1, true);
+		}
+
+		public static T MinByOrDefault<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
+		{
+			return ts.CompareBy(selector, 1, false);
+		}
+
+		public static T MaxByOrDefault<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
+		{
+			return ts.CompareBy(selector, -1, false);
+		}
+
+		static T CompareBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector, int modifier, bool throws)
+		{
+			var comparer = Comparer<U>.Default;
+			T t;
+			U u;
+			using (var e = ts.GetEnumerator())
+			{
+				if (!e.MoveNext())
+					if (throws)
+						throw new ArgumentException("Collection must not be empty.", "ts");
+					else
+						return default(T);
+				t = e.Current;
+				u = selector(t);
+				while (e.MoveNext())
+				{
+					var nextT = e.Current;
+					var nextU = selector(nextT);
+					if (comparer.Compare(nextU, u) * modifier < 0)
+					{
+						t = nextT;
+						u = nextU;
+					}
+				}
+
+				return t;
+			}
+		}
+
 		public static int NextPowerOf2(int v)
 		{
 			--v;
@@ -149,6 +242,89 @@ namespace OpenRA
 
 		public static Size NextPowerOf2(this Size s) { return new Size(NextPowerOf2(s.Width), NextPowerOf2(s.Height)); }
 
+		public enum ISqrtRoundMode { Floor, Nearest, Ceiling }
+		public static int ISqrt(int number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
+		{
+			if (number < 0)
+				throw new InvalidOperationException("Attempted to calculate the square root of a negative integer: {0}".F(number));
+
+			return (int)ISqrt((uint)number, round);
+		}
+
+		public static uint ISqrt(uint number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
+		{
+			var divisor = 1U << 30;
+
+			var root = 0U;
+			var remainder = number;
+
+			// Find the highest term in the divisor
+			while (divisor > number)
+				divisor >>= 2;
+
+			// Evaluate the root, two bits at a time
+			while (divisor != 0)
+			{
+				if (root + divisor <= remainder)
+				{
+					remainder -= root + divisor;
+					root += 2 * divisor;
+				}
+
+				root >>= 1;
+				divisor >>= 2;
+			}
+
+			// Adjust for other rounding modes
+			if (round == ISqrtRoundMode.Nearest && remainder > root)
+				root += 1;
+			else if (round == ISqrtRoundMode.Ceiling && root * root < number)
+				root += 1;
+
+			return root;
+		}
+
+		public static long ISqrt(long number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
+		{
+			if (number < 0)
+				throw new InvalidOperationException("Attempted to calculate the square root of a negative integer: {0}".F(number));
+
+			return (long)ISqrt((ulong)number, round);
+		}
+
+		public static ulong ISqrt(ulong number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
+		{
+			var divisor = 1UL << 62;
+
+			var root = 0UL;
+			var remainder = number;
+
+			// Find the highest term in the divisor
+			while (divisor > number)
+				divisor >>= 2;
+
+			// Evaluate the root, two bits at a time
+			while (divisor != 0)
+			{
+				if (root + divisor <= remainder)
+				{
+					remainder -= root + divisor;
+					root += 2 * divisor;
+				}
+
+				root >>= 1;
+				divisor >>= 2;
+			}
+
+			// Adjust for other rounding modes
+			if (round == ISqrtRoundMode.Nearest && remainder > root)
+				root += 1;
+			else if (round == ISqrtRoundMode.Ceiling && root * root < number)
+				root += 1;
+
+			return root;
+		}
+
 		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
 		{
 			return string.Join(j, ts);
@@ -159,12 +335,21 @@ namespace OpenRA
 			return ts.Concat(moreTs);
 		}
 
-		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
+		public static HashSet<T> ToHashSet<T>(this IEnumerable<T> source)
+		{
+			return new HashSet<T>(source);
+		}
+
+		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(
+			this IEnumerable<TSource> source, Func<TSource, TKey> keySelector,
+			string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
 		{
 			return ToDictionaryWithConflictLog(source, keySelector, x => x, debugName, logKey, logValue);
 		}
 
-		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector, string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
+		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(
+			this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector,
+			string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
 		{
 			// Fall back on ToString() if null functions are provided:
 			logKey = logKey ?? (s => s.ToString());
@@ -175,8 +360,8 @@ namespace OpenRA
 			var d = new Dictionary<TKey, TElement>();
 			foreach (var item in source)
 			{
-				TKey key = keySelector(item);
-				TElement element = elementSelector(item);
+				var key = keySelector(item);
+				var element = elementSelector(item);
 
 				// Check for a key conflict:
 				if (d.ContainsKey(key))
@@ -201,7 +386,7 @@ namespace OpenRA
 			// If any duplicates were found, throw a descriptive error
 			if (dupKeys.Count > 0)
 			{
-				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value.ToArray()))).ToArray());
+				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value))));
 				var msg = "{0}, duplicate values found for the following keys: {1}".F(debugName, badKeysFormatted);
 				throw new ArgumentException(msg);
 			}
@@ -221,8 +406,8 @@ namespace OpenRA
 
 		public static T[] MakeArray<T>(int count, Func<int, T> f)
 		{
-			T[] result = new T[count];
-			for (int i = 0; i < count; i++)
+			var result = new T[count];
+			for (var i = 0; i < count; i++)
 				result[i] = f(i);
 
 			return result;
@@ -232,9 +417,18 @@ namespace OpenRA
 		{
 			var result = new T[width, height];
 			for (var i = 0; i < width; i++)
+			{
 				for (var j = 0; j < height; j++)
-					result[i, j] = i <= ts.GetUpperBound(0) && j <= ts.GetUpperBound(1)
-						? ts[i, j] : t;
+				{
+					// Workaround for broken ternary operators in certain versions of mono
+					// (3.10 and certain versions of the 3.8 series): https://bugzilla.xamarin.com/show_bug.cgi?id=23319
+					if (i <= ts.GetUpperBound(0) && j <= ts.GetUpperBound(1))
+						result[i, j] = ts[i, j];
+					else
+						result[i, j] = t;
+				}
+			}
+
 			return result;
 		}
 
@@ -263,6 +457,16 @@ namespace OpenRA
 		{
 			return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
 		}
+
+		public static bool IsTraitEnabled(this object trait)
+		{
+			return trait as IDisabledTrait == null || !(trait as IDisabledTrait).IsTraitDisabled;
+		}
+
+		public static bool IsTraitEnabled<T>(T t)
+		{
+			return IsTraitEnabled(t as object);
+		}
 	}
 
 	public static class Enum<T>

OpenRA.Game/FieldLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
 using System.Linq;
@@ -34,38 +35,44 @@ namespace OpenRA
 
 		public static void Load(object self, MiniYaml my)
 		{
-			var loadDict = typeLoadInfo[self.GetType()];
+			var loadInfo = typeLoadInfo[self.GetType()];
 
-			foreach (var kv in loadDict)
+			Dictionary<string, MiniYaml> md = null;
+
+			foreach (var fli in loadInfo)
 			{
 				object val;
-				if (kv.Value != null)
-					val = kv.Value(kv.Key.Name, kv.Key.FieldType, my);
-				else if (!TryGetValueFromYaml(kv.Key, my, out val))
-					continue;
 
-				kv.Key.SetValue(self, val);
+				if (fli.Loader != null)
+					val = fli.Loader(my);
+				else
+				{
+					if (md == null)
+						md = my.ToDictionary();
+
+					if (!TryGetValueFromYaml(fli.YamlName, fli.Field, md, out val))
+						continue;
+				}
+
+				fli.Field.SetValue(self, val);
 			}
 		}
 
-		static bool TryGetValueFromYaml(FieldInfo field, MiniYaml yaml, out object ret)
+		static bool TryGetValueFromYaml(string yamlName, FieldInfo field, Dictionary<string, MiniYaml> md, out object ret)
 		{
 			ret = null;
-			var n = yaml.Nodes.Where(x => x.Key == field.Name).ToList();
-			if (n.Count == 0)
+
+			MiniYaml yaml;
+			if (!md.TryGetValue(yamlName, out yaml))
 				return false;
-			if (n.Count == 1 && n[0].Value.Nodes.Count == 0)
+
+			if (yaml.Nodes.Count == 0)
 			{
-				ret = GetValue(field.Name, field.FieldType, n[0].Value.Value, field);
+				ret = GetValue(field.Name, field.FieldType, yaml.Value, field);
 				return true;
 			}
-			else if (n.Count > 1)
-			{
-				throw new InvalidOperationException("The field {0} has multiple definitions:\n{1}"
-					.F(field.Name, n.Select(m => "\t- " + m.Location).JoinWith("\n")));
-			}
 
-			throw new InvalidOperationException("TryGetValueFromYaml: unable to load field {0} (of type {1})".F(field.Name, field.FieldType));
+			throw new InvalidOperationException("TryGetValueFromYaml: unable to load field {0} (of type {1})".F(yamlName, field.FieldType));
 		}
 
 		public static T Load<T>(MiniYaml y) where T : new()
@@ -76,27 +83,31 @@ namespace OpenRA
 		}
 
 		static readonly object[] NoIndexes = { };
-		public static void LoadField(object self, string key, string value)
+		public static void LoadField(object target, string key, string value)
 		{
-			var field = self.GetType().GetField(key.Trim());
+			const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 
+			key = key.Trim();
+
+			var field = target.GetType().GetField(key, Flags);
 			if (field != null)
 			{
-				if (!field.HasAttribute<FieldFromYamlKeyAttribute>())
-					field.SetValue(self, GetValue(field.Name, field.FieldType, value, field));
+				var sa = field.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
+				if (!sa.FromYamlKey)
+					field.SetValue(target, GetValue(field.Name, field.FieldType, value, field));
 				return;
 			}
 
-			var prop = self.GetType().GetProperty(key.Trim());
-
+			var prop = target.GetType().GetProperty(key, Flags);
 			if (prop != null)
 			{
-				if (!prop.HasAttribute<FieldFromYamlKeyAttribute>())
-					prop.SetValue(self, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
+				var sa = prop.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
+				if (!sa.FromYamlKey)
+					prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
 				return;
 			}
 
-			UnknownFieldAction(key.Trim(), self.GetType());
+			UnknownFieldAction(key, target.GetType());
 		}
 
 		public static T GetValue<T>(string field, string value)
@@ -120,7 +131,6 @@ namespace OpenRA
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(ushort))
 			{
 				ushort res;
@@ -136,7 +146,6 @@ namespace OpenRA
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(float))
 			{
 				float res;
@@ -144,22 +153,19 @@ namespace OpenRA
 					return res * (value.Contains('%') ? 0.01f : 1f);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(decimal))
 			{
 				decimal res;
-				if (decimal.TryParse(value.Replace("%", ""),  NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+				if (decimal.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
 					return res * (value.Contains('%') ? 0.01m : 1m);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(string))
 			{
 				if (field != null && field.HasAttribute<TranslateAttribute>())
 					return Regex.Replace(value, "@[^@]+@", m => Translate(m.Value.Substring(1, m.Value.Length - 2)), RegexOptions.Compiled);
 				return value;
 			}
-
 			else if (fieldType == typeof(Color))
 			{
 				var parts = value.Split(',');
@@ -176,7 +182,26 @@ namespace OpenRA
 						Exts.ParseIntegerInvariant(parts[3]).Clamp(0, 255));
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(Color[]))
+			{
+				var parts = value.Split(',');
 
+				if (parts.Length % 4 != 0)
+					return InvalidValueAction(value, fieldType, fieldName);
+
+				var colors = new Color[parts.Length / 4];
+
+				for (var i = 0; i < colors.Length; i++)
+				{
+					colors[i] = Color.FromArgb(
+						Exts.ParseIntegerInvariant(parts[4 * i]).Clamp(0, 255),
+						Exts.ParseIntegerInvariant(parts[4 * i + 1]).Clamp(0, 255),
+						Exts.ParseIntegerInvariant(parts[4 * i + 2]).Clamp(0, 255),
+						Exts.ParseIntegerInvariant(parts[4 * i + 3]).Clamp(0, 255));
+				}
+
+				return colors;
+			}
 			else if (fieldType == typeof(HSLColor))
 			{
 				var parts = value.Split(',');
@@ -190,7 +215,6 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(Hotkey))
 			{
 				Hotkey res;
@@ -199,7 +223,6 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(WRange))
 			{
 				WRange res;
@@ -208,7 +231,6 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(WVec))
 			{
 				var parts = value.Split(',');
@@ -221,7 +243,26 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(WVec[]))
+			{
+				var parts = value.Split(',');
 
+				if (parts.Length % 3 != 0)
+					return InvalidValueAction(value, fieldType, fieldName);
+
+				var vecs = new WVec[parts.Length / 3];
+
+				for (var i = 0; i < vecs.Length; ++i)
+				{
+					WRange rx, ry, rz;
+					if (WRange.TryParse(parts[3 * i], out rx)
+							&& WRange.TryParse(parts[3 * i + 1], out ry)
+							&& WRange.TryParse(parts[3 * i + 2], out rz))
+						vecs[i] = new WVec(rx, ry, rz);
+				}
+
+				return vecs;
+			}
 			else if (fieldType == typeof(WPos))
 			{
 				var parts = value.Split(',');
@@ -234,7 +275,6 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(WAngle))
 			{
 				int res;
@@ -242,7 +282,6 @@ namespace OpenRA
 					return new WAngle(res);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(WRot))
 			{
 				var parts = value.Split(',');
@@ -252,12 +291,11 @@ namespace OpenRA
 					if (Exts.TryParseIntegerInvariant(value, out rr)
 						&& Exts.TryParseIntegerInvariant(value, out rp)
 						&& Exts.TryParseIntegerInvariant(value, out ry))
-							return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
+						return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(CPos))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
@@ -265,7 +303,6 @@ namespace OpenRA
 					Exts.ParseIntegerInvariant(parts[0]),
 					Exts.ParseIntegerInvariant(parts[1]));
 			}
-
 			else if (fieldType == typeof(CVec))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
@@ -273,7 +310,6 @@ namespace OpenRA
 					Exts.ParseIntegerInvariant(parts[0]),
 					Exts.ParseIntegerInvariant(parts[1]));
 			}
-
 			else if (fieldType.IsEnum)
 			{
 				try
@@ -285,10 +321,8 @@ namespace OpenRA
 					return InvalidValueAction(value, fieldType, fieldName);
 				}
 			}
-
 			else if (fieldType == typeof(bool))
 				return ParseYesNo(value, fieldType, fieldName);
-
 			else if (fieldType.IsArray)
 			{
 				if (value == null)
@@ -297,11 +331,10 @@ namespace OpenRA
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
 				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
-				for (int i = 0; i < parts.Length; i++)
+				for (var i = 0; i < parts.Length; i++)
 					ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
 				return ret;
 			}
-
 			else if (fieldType == typeof(Size))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
@@ -309,7 +342,6 @@ namespace OpenRA
 					Exts.ParseIntegerInvariant(parts[0]),
 					Exts.ParseIntegerInvariant(parts[1]));
 			}
-
 			else if (fieldType == typeof(int2))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
@@ -317,7 +349,6 @@ namespace OpenRA
 					Exts.ParseIntegerInvariant(parts[0]),
 					Exts.ParseIntegerInvariant(parts[1]));
 			}
-
 			else if (fieldType == typeof(float2))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
@@ -330,7 +361,6 @@ namespace OpenRA
 					yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
 				return new float2(xx, yy);
 			}
-
 			else if (fieldType == typeof(Rectangle))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
@@ -340,7 +370,6 @@ namespace OpenRA
 					Exts.ParseIntegerInvariant(parts[2]),
 					Exts.ParseIntegerInvariant(parts[3]));
 			}
-
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
@@ -348,14 +377,12 @@ namespace OpenRA
 				var argValues = new object[] { parts };
 				return fieldType.GetConstructor(argTypes).Invoke(argValues);
 			}
-
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Nullable<>))
 			{
 				var innerType = fieldType.GetGenericArguments().First();
 				var innerValue = GetValue("Nullable<T>", innerType, value, field);
 				return fieldType.GetConstructor(new[] { innerType }).Invoke(new[] { innerValue });
 			}
-
 			else if (fieldType == typeof(DateTime))
 			{
 				DateTime dt;
@@ -363,6 +390,21 @@ namespace OpenRA
 					return dt;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else
+			{
+				var conv = TypeDescriptor.GetConverter(fieldType);
+				if (conv.CanConvertFrom(typeof(string)))
+				{
+					try
+					{
+						return conv.ConvertFromInvariantString(value);
+					}
+					catch
+					{
+						return InvalidValueAction(value, fieldType, fieldName);
+					}
+				}
+			}
 
 			UnknownFieldAction("[Type] {0}".F(value), fieldType);
 			return null;
@@ -378,49 +420,101 @@ namespace OpenRA
 			return InvalidValueAction(p, fieldType, field);
 		}
 
-		static Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>> typeLoadInfo = new Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>>(GetTypeLoadInfo);
-
-		static Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>> GetTypeLoadInfo(Type type)
+		public sealed class FieldLoadInfo
 		{
-			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
+			public readonly FieldInfo Field;
+			public readonly SerializeAttribute Attribute;
+			public readonly string YamlName;
+			public readonly Func<MiniYaml, object> Loader;
 
-			foreach (var ff in type.GetFields())
+			internal FieldLoadInfo(FieldInfo field, SerializeAttribute attr, string yamlName, Func<MiniYaml, object> loader = null)
+			{
+				Field = field;
+				Attribute = attr;
+				YamlName = yamlName;
+				Loader = loader;
+			}
+		}
+
+		public static IEnumerable<FieldLoadInfo> GetTypeLoadInfo(Type type, bool includePrivateByDefault = false)
+		{
+			return typeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
+		}
+
+		static Cache<Type, List<FieldLoadInfo>> typeLoadInfo = new Cache<Type, List<FieldLoadInfo>>(BuildTypeLoadInfo);
+
+		static List<FieldLoadInfo> BuildTypeLoadInfo(Type type)
+		{
+			var ret = new List<FieldLoadInfo>();
+
+			foreach (var ff in type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
 			{
 				var field = ff;
-				var ignore = field.GetCustomAttributes<IgnoreAttribute>(false);
-				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>(false);
-				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>(false);
-				if (loadUsing.Length != 0)
-					ret[field] = (_1, fieldType, yaml) => loadUsing[0].LoaderFunc(field)(yaml);
-				else if (fromYamlKey.Length != 0)
-					ret[field] = (f, ft, yaml) => GetValue(f, ft, yaml.Value, field);
-				else if (ignore.Length == 0)
-					ret[field] = null;
+
+				var sa = field.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
+				if (!sa.Serialize)
+					continue;
+
+				var yamlName = string.IsNullOrEmpty(sa.YamlName) ? field.Name : sa.YamlName;
+
+				var loader = sa.GetLoader(type);
+				if (loader == null && sa.FromYamlKey)
+					loader = (yaml) => GetValue(yamlName, field.FieldType, yaml.Value, field);
+
+				var fli = new FieldLoadInfo(field, sa, yamlName, loader);
+				ret.Add(fli);
 			}
 
 			return ret;
 		}
 
 		[AttributeUsage(AttributeTargets.Field)]
-		public sealed class IgnoreAttribute : Attribute { }
+		public sealed class IgnoreAttribute : SerializeAttribute
+		{
+			public IgnoreAttribute()
+				: base(false) { }
+		}
 
 		[AttributeUsage(AttributeTargets.Field)]
-		public sealed class LoadUsingAttribute : Attribute
+		public sealed class LoadUsingAttribute : SerializeAttribute
 		{
-			Func<MiniYaml, object> loaderFuncCache;
-			public readonly string Loader;
-
 			public LoadUsingAttribute(string loader)
 			{
 				Loader = loader;
 			}
+		}
 
-			internal Func<MiniYaml, object> LoaderFunc(FieldInfo field)
+		[AttributeUsage(AttributeTargets.Field)]
+		public class SerializeAttribute : Attribute
+		{
+			public static readonly SerializeAttribute Default = new SerializeAttribute(true);
+
+			public bool IsDefault { get { return this == Default; } }
+
+			public readonly bool Serialize;
+			public string YamlName;
+			public string Loader;
+			public bool FromYamlKey;
+
+			public SerializeAttribute(bool serialize = true)
 			{
-				const BindingFlags BindingFlag = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
-				if (loaderFuncCache == null)
-					loaderFuncCache = (Func<MiniYaml, object>)Delegate.CreateDelegate(typeof(Func<MiniYaml, object>), field.DeclaringType.GetMethod(Loader, BindingFlag));
-				return loaderFuncCache;
+				Serialize = serialize;
+			}
+
+			internal Func<MiniYaml, object> GetLoader(Type type)
+			{
+				const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.FlattenHierarchy;
+
+				if (!string.IsNullOrEmpty(Loader))
+				{
+					var method = type.GetMethod(Loader, Flags);
+					if (method == null)
+						throw new InvalidOperationException("{0} does not specify a loader function '{1}'".F(type.Name, Loader));
+
+					return (Func<MiniYaml, object>)Delegate.CreateDelegate(typeof(Func<MiniYaml, object>), method);
+				}
+
+				return null;
 			}
 		}
 
@@ -442,7 +536,14 @@ namespace OpenRA
 	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
 	public sealed class TranslateAttribute : Attribute { }
 
-	public sealed class FieldFromYamlKeyAttribute : Attribute { }
+	[AttributeUsage(AttributeTargets.Field)]
+	public sealed class FieldFromYamlKeyAttribute : FieldLoader.SerializeAttribute
+	{
+		public FieldFromYamlKeyAttribute()
+		{
+			FromYamlKey = true;
+		}
+	}
 
 	// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
 	public sealed class DescAttribute : Attribute

OpenRA.Game/FieldSaver.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
 using System.Linq;
@@ -19,31 +20,33 @@ namespace OpenRA
 {
 	public static class FieldSaver
 	{
-		public static MiniYaml Save(object o)
+		public static MiniYaml Save(object o, bool includePrivateByDefault = false)
 		{
 			var nodes = new List<MiniYamlNode>();
 			string root = null;
 
-			foreach (var f in o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance))
+			foreach (var info in FieldLoader.GetTypeLoadInfo(o.GetType(), includePrivateByDefault))
 			{
-				if (f.HasAttribute<FieldFromYamlKeyAttribute>())
-					root = FormatValue(o, f);
+				if (info.Attribute.FromYamlKey)
+					root = FormatValue(o, info.Field);
 				else
-					nodes.Add(new MiniYamlNode(f.Name, FormatValue(o, f)));
+					nodes.Add(new MiniYamlNode(info.YamlName, FormatValue(o, info.Field)));
 			}
 
 			return new MiniYaml(root, nodes);
 		}
 
-		public static MiniYaml SaveDifferences(object o, object from)
+		public static MiniYaml SaveDifferences(object o, object from, bool includePrivateByDefault = false)
 		{
 			if (o.GetType() != from.GetType())
 				throw new InvalidOperationException("FieldLoader: can't diff objects of different types");
 
-			var fields = o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
-				.Where(f => FormatValue(o, f) != FormatValue(from, f));
+			var fields = FieldLoader.GetTypeLoadInfo(o.GetType(), includePrivateByDefault)
+				.Where(info => FormatValue(o, info.Field) != FormatValue(from, info.Field));
 
-			return new MiniYaml(null, fields.Select(f => new MiniYamlNode(f.Name, FormatValue(o, f))).ToList());
+			return new MiniYaml(
+				null,
+				fields.Select(info => new MiniYamlNode(info.YamlName, FormatValue(o, info.Field))).ToList());
 		}
 
 		public static MiniYamlNode SaveField(object o, string field)
@@ -66,9 +69,13 @@ namespace OpenRA
 					((int)c.B).Clamp(0, 255));
 			}
 
-			// Don't save floats in settings.yaml using country-specific decimal separators which can be misunderstood as group seperators.
+			// Don't save using country-specific decimal separators which can be misunderstood as group seperators.
 			if (t == typeof(float))
 				return ((float)v).ToString(CultureInfo.InvariantCulture);
+			if (t == typeof(decimal))
+				return ((decimal)v).ToString(CultureInfo.InvariantCulture);
+			if (t == typeof(double))
+				return ((double)v).ToString(CultureInfo.InvariantCulture);
 
 			if (t == typeof(Rectangle))
 			{
@@ -79,12 +86,28 @@ namespace OpenRA
 			if (t.IsArray)
 			{
 				var elems = ((Array)v).OfType<object>();
-				return elems.JoinWith(",");
+				return elems.JoinWith(", ");
 			}
 
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))
+				return ""; // TODO
+
 			if (t == typeof(DateTime))
 				return ((DateTime)v).ToString("yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture);
 
+			// Try the TypeConverter
+			var conv = TypeDescriptor.GetConverter(t);
+			if (conv.CanConvertTo(typeof(string)))
+			{
+				try
+				{
+					return conv.ConvertToInvariantString(v);
+				}
+				catch
+				{
+				}
+			}
+
 			return v.ToString();
 		}
 

OpenRA.Game/FileFormats/AudLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -36,7 +36,7 @@ namespace OpenRA.FileFormats
 			Chunk c;
 			c.CompressedSize = s.ReadUInt16();
 			c.OutputSize = s.ReadUInt16();
-			if (0xdeaf != s.ReadUInt32())
+			if (s.ReadUInt32() != 0xdeaf)
 				throw new InvalidDataException("Chunk header is bogus");
 			return c;
 		}
@@ -45,17 +45,19 @@ namespace OpenRA.FileFormats
 	public static class AudLoader
 	{
 		static int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
-		static int[] stepTable = {
-									7,     8,     9,     10,    11,    12,     13,    14,    16,
-									17,    19,    21,    23,    25,    28,     31,    34,    37,
-									41,    45,    50,    55,    60,    66,     73,    80,    88,
-									97,    107,   118,   130,   143,   157,    173,   190,   209,
-									230,   253,   279,   307,   337,   371,    408,   449,   494,
-									544,   598,   658,   724,   796,   876,    963,   1060,  1166,
-									1282,  1411,  1552,  1707,  1878,  2066,   2272,  2499,  2749,
-									3024,  3327,  3660,  4026,  4428,  4871,   5358,  5894,  6484,
-									7132,  7845,  8630,  9493,  10442, 11487,  12635, 13899, 15289,
-									16818, 18500, 20350, 22385, 24623, 27086,  29794, 32767 };
+		static int[] stepTable =
+		{
+			7, 8, 9, 10, 11, 12, 13, 14, 16,
+			17, 19, 21, 23, 25, 28, 31, 34, 37,
+			41, 45, 50, 55, 60, 66, 73, 80, 88,
+			97, 107, 118, 130, 143, 157, 173, 190, 209,
+			230, 253, 279, 307, 337, 371, 408, 449, 494,
+			544, 598, 658, 724, 796, 876, 963, 1060, 1166,
+			1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749,
+			3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484,
+			7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289,
+			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
+		};
 
 		static short DecodeSample(byte b, ref int index, ref int current)
 		{
@@ -131,7 +133,7 @@ namespace OpenRA.FileFormats
 			while (dataSize > 0)
 			{
 				var chunk = Chunk.Read(s);
-				for (int n = 0; n < chunk.CompressedSize; n++)
+				for (var n = 0; n < chunk.CompressedSize; n++)
 				{
 					var b = s.ReadUInt8();
 

OpenRA.Game/FileFormats/Blast.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -66,7 +66,7 @@ namespace OpenRA.FileFormats
 
 			if (coded < 0 || coded > 1)
 				throw new NotImplementedException("Invalid datastream");
-			var EncodedLiterals = coded == 1;
+			var encodedLiterals = coded == 1;
 
 			// log2(dictionary size) - 6
 			var dict = br.ReadBits(8);
@@ -92,7 +92,7 @@ namespace OpenRA.FileFormats
 					// Magic number for "done"
 					if (len == 519)
 					{
-						for (int i = 0; i < next; i++)
+						for (var i = 0; i < next; i++)
 							ms.WriteByte(outBuffer[i]);
 						break;
 					}
@@ -135,21 +135,21 @@ namespace OpenRA.FileFormats
 						// Flush window to outstream
 						if (next == MAXWIN)
 						{
-							for (int i = 0; i < next; i++)
+							for (var i = 0; i < next; i++)
 								ms.WriteByte(outBuffer[i]);
 							next = 0;
 							first = false;
 						}
 					} while (len != 0);
 				}
-				// literal value
 				else
 				{
-					var symbol = EncodedLiterals ? Decode(litcode, br) : br.ReadBits(8);
+					// literal value
+					var symbol = encodedLiterals ? Decode(litcode, br) : br.ReadBits(8);
 					outBuffer[next++] = (byte)symbol;
 					if (next == MAXWIN)
 					{
-						for (int i = 0; i < next; i++)
+						for (var i = 0; i < next; i++)
 							ms.WriteByte(outBuffer[i]);
 						next = 0;
 						first = false;
@@ -236,21 +236,20 @@ namespace OpenRA.FileFormats
 			var s = 0; // current symbol
 
 			// convert compact repeat counts into symbol bit length list
-			foreach (byte code in rep)
+			foreach (var code in rep)
 			{
 				var num = (code >> 4) + 1; // Number of codes (top four bits plus 1)
 				var len = (byte)(code & 15); // Code length (low four bits)
 				do
-				{
 					length[s++] = len;
-				} while (--num > 0);
+				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++)
+			for (var i = 0; i < n; i++)
 				Count[length[i]]++;
 
 			// no codes!
@@ -259,7 +258,7 @@ namespace OpenRA.FileFormats
 
 			// check for an over-subscribed or incomplete set of lengths
 			var left = 1; // one possible code of zero length
-			for (int len = 1; len <= Blast.MAXBITS; len++)
+			for (var len = 1; len <= Blast.MAXBITS; len++)
 			{
 				left <<= 1;	// one more bit, double codes left
 				left -= Count[len];	// deduct count from possible codes
@@ -269,7 +268,7 @@ namespace OpenRA.FileFormats
 
 			// generate offsets into symbol table for each length for sorting
 			var offs = new short[Blast.MAXBITS + 1];
-			for (int len = 1; len < Blast.MAXBITS; len++)
+			for (var 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

OpenRA.Game/FileFormats/Blowfish.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -21,42 +21,42 @@ namespace OpenRA.FileFormats
 				uint c = key[j++ % key.Length];
 				uint d = key[j++ % key.Length];
 
-				m_p[i] ^= a << 24 | b << 16 | c << 8 | d;
+				lookupMfromP[i] ^= a << 24 | b << 16 | c << 8 | d;
 			}
 
 			uint l = 0, r = 0;
 
-			for (int i = 0; i < 18; )
+			for (var i = 0; i < 18;)
 			{
 				Encrypt(ref l, ref r);
-				m_p[i++] = l;
-				m_p[i++] = r;
+				lookupMfromP[i++] = l;
+				lookupMfromP[i++] = r;
 			}
 
-			for (int i = 0; i < 4; ++i)
-				for (int j = 0; j < 256; )
+			for (var i = 0; i < 4; ++i)
+				for (var j = 0; j < 256;)
 				{
 					Encrypt(ref l, ref r);
-					m_s[i, j++] = l;
-					m_s[i, j++] = r;
+					lookupMfromS[i, j++] = l;
+					lookupMfromS[i, j++] = r;
 				}
 		}
 
 		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
 		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
 
-		delegate void CipherFunc( ref uint a, ref uint b );
+		delegate void CipherFunc(ref uint a, ref uint b);
 
 		static uint[] RunCipher(uint[] data, CipherFunc f)
 		{
-			uint[] result = new uint[data.Length];
+			var result = new uint[data.Length];
 
-			int size = data.Length / 2;
-			int i = 0;
+			var size = data.Length / 2;
+			var i = 0;
 			while (size-- > 0)
 			{
-				uint a = SwapBytes(data[i]);
-				uint b = SwapBytes(data[i+1]);
+				var a = SwapBytes(data[i]);
+				var b = SwapBytes(data[i + 1]);
 
 				f(ref a, ref b);
 
@@ -69,55 +69,57 @@ namespace OpenRA.FileFormats
 
 		void Encrypt(ref uint a, ref uint b)
 		{
-			uint _a = a, _b = b;
-			_a ^= m_p[0];
+			uint tempA = a, tempB = b;
+			tempA ^= lookupMfromP[0];
 
-			bool x = false;
-			for( int i = 1; i <= 16; i++, x ^= true)
+			var x = false;
+			for (var i = 1; i <= 16; i++, x ^= true)
 			{
 				if (x)
-					Round(ref _a, _b, i);
+					Round(ref tempA, tempB, i);
 				else
-					Round(ref _b, _a, i);
+					Round(ref tempB, tempA, i);
 			}
-			_b ^= m_p[17];
 
-			a = _b;
-			b = _a;
+			tempB ^= lookupMfromP[17];
+
+			a = tempB;
+			b = tempA;
 		}
 
 		void Decrypt(ref uint a, ref uint b)
 		{
-			uint _a = a, _b = b;
-			_a ^= m_p[17];
+			uint tempA = a, tempB = b;
+			tempA ^= lookupMfromP[17];
 
-			bool x = false;
-			for (int i = 16; i >= 1; i--, x ^= true)
+			var x = false;
+			for (var i = 16; i >= 1; i--, x ^= true)
 			{
 				if (x)
-					Round(ref _a, _b, i);
+					Round(ref tempA, tempB, i);
 				else
-					Round(ref _b, _a, i);
+					Round(ref tempB, tempA, i);
 			}
-			_b ^= m_p[0];
 
-			a = _b;
-			b = _a;
+			tempB ^= lookupMfromP[0];
+
+			a = tempB;
+			b = tempA;
 		}
 
 		uint S(uint x, int i)
 		{
-			return m_s[i, (x >> ((3 - i) << 3)) & 0xff];
+			return lookupMfromS[i, (x >> ((3 - i) << 3)) & 0xff];
 		}
 
-		uint bf_f(uint x)
+		uint ConvertBFtoF(uint x)
 		{
 			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
 		}
 
 		void Round(ref uint a, uint b, int n)
 		{
-			a ^= bf_f(b) ^ m_p[n];
+			a ^= ConvertBFtoF(b) ^ lookupMfromP[n];
 		}
 
 		static uint SwapBytes(uint i)
@@ -127,7 +129,7 @@ namespace OpenRA.FileFormats
 			return i;
 		}
 
-		uint[] m_p = new uint[] {
+		uint[] lookupMfromP = new uint[] {
 			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
 			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
 			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
@@ -135,7 +137,7 @@ namespace OpenRA.FileFormats
 			0x9216d5d9, 0x8979fb1b
 		};
 
-		uint[,] m_s = new uint[,] {
+		uint[,] lookupMfromS = new uint[,] {
 			{
 				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
 				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
@@ -400,7 +402,6 @@ namespace OpenRA.FileFormats
 				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
 				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
 			}
-
 		};
 	}
 }

OpenRA.Game/FileFormats/BlowfishKeyProvider.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -13,35 +13,36 @@ using System.Linq;
 
 namespace OpenRA.FileFormats
 {
-	/* possibly the fugliest C# i've ever seen. */
+	/* TODO: Convert this direct C port into readable code. */
 
 	class BlowfishKeyProvider
 	{
-		const string pubkeyStr = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
+		const string PublicKeyString = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
 
 		class PublicKey
 		{
-			public uint[] key1 = new uint[64];
-			public uint[] key2 = new uint[64];
-			public uint len;
+			public uint[] KeyOne = new uint[64];
+			public uint[] KeyTwo = new uint[64];
+			public uint Len;
 		}
+
 		PublicKey pubkey = new PublicKey();
 
-		uint[] glob1 = new uint[64];
-		uint glob1_bitlen, glob1_len_x2;
-		uint[] glob2 = new uint[130];
-		uint[] glob1_hi = new uint[4];
-		uint[] glob1_hi_inv = new uint[4];
-		uint glob1_hi_bitlen;
-		uint glob1_hi_inv_lo, glob1_hi_inv_hi;
+		uint[] globOne = new uint[64];
+		uint globOneBitLen, globOneLenXTwo;
+		uint[] globTwo = new uint[130];
+		uint[] globOneHigh = new uint[4];
+		uint[] globOneHighInv = new uint[4];
+		uint globOneHighBitLen;
+		uint globOneHighInvLow, globOneHighInvHigh;
 
-		static void init_bignum(uint[] n, uint val, uint len)
+		static void InitBigNum(uint[] n, uint val, uint len)
 		{
-			for (int i = 0; i < len; i++) n[i] = 0;
+			for (var i = 0; i < len; i++) n[i] = 0;
 			n[0] = val;
 		}
 
-		static void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
+		static void MoveKeyToBig(uint[] n, byte[] key, uint klen, uint blen)
 		{
 			byte sign;
 
@@ -50,22 +51,22 @@ namespace OpenRA.FileFormats
 
 			unsafe
 			{
-				fixed (uint* _pn = &n[0])
+				fixed (uint* tempPn = &n[0])
 				{
-					byte* pn = (byte*)_pn;
-					uint i = blen * 4;
+					var pn = (byte*)tempPn;
+					var i = blen * 4;
 					for (; i > klen; i--) pn[i - 1] = (byte)sign;
 					for (; i > 0; i--) pn[i - 1] = key[klen - i];
 				}
 			}
 		}
 
-		static void key_to_bignum(uint[] n, byte[] key, uint len)
+		static void KeyToBigNum(uint[] n, byte[] key, uint len)
 		{
 			uint keylen;
 			int i;
 
-			int j = 0;
+			var j = 0;
 
 			if (key[j] != 2) return;
 			j++;
@@ -81,11 +82,12 @@ namespace OpenRA.FileFormats
 				keylen = key[j];
 				j++;
 			}
+
 			if (keylen <= len * 4)
-				move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
+				MoveKeyToBig(n, key.Skip(j).ToArray(), keylen, len);
 		}
 
-		static uint len_bignum(uint[] n, uint len)
+		static uint LenBigNum(uint[] n, uint len)
 		{
 			uint i;
 			i = len - 1;
@@ -93,10 +95,10 @@ namespace OpenRA.FileFormats
 			return i + 1;
 		}
 
-		static uint bitlen_bignum(uint[] n, uint len)
+		static uint BitLenBigNum(uint[] n, uint len)
 		{
 			uint ddlen, bitlen, mask;
-			ddlen = len_bignum(n, len);
+			ddlen = LenBigNum(n, len);
 			if (ddlen == 0) return 0;
 			bitlen = ddlen * 32;
 			mask = 0x80000000;
@@ -105,43 +107,44 @@ namespace OpenRA.FileFormats
 				mask >>= 1;
 				bitlen--;
 			}
+
 			return bitlen;
 		}
 
-		void init_pubkey()
+		void InitPublicKey()
 		{
-			init_bignum(pubkey.key2, 0x10001, 64);
+			InitBigNum(pubkey.KeyTwo, 0x10001, 64);
 
-			key_to_bignum(pubkey.key1, Convert.FromBase64String(pubkeyStr), 64);
-			pubkey.len = bitlen_bignum(pubkey.key1, 64) - 1;
+			KeyToBigNum(pubkey.KeyOne, Convert.FromBase64String(PublicKeyString), 64);
+			pubkey.Len = BitLenBigNum(pubkey.KeyOne, 64) - 1;
 		}
 
-		uint len_predata()
+		uint LenPreData()
 		{
-			uint a = (pubkey.len - 1) / 8;
+			var a = (pubkey.Len - 1) / 8;
 			return (55 / a + 1) * (a + 1);
 		}
 
-		static int cmp_bignum(uint[] n1, uint[] n2, uint len)
+		static int CompareBigNum(uint[] n1, uint[] n2, uint len)
 		{
-
 			while (len > 0)
 			{
 				--len;
 				if (n1[len] < n2[len]) return -1;
 				if (n1[len] > n2[len]) return 1;
 			}
+
 			return 0;
 		}
 
-		static void mov_bignum(uint[] dest, uint[] src, uint len)
+		static void MoveBigNum(uint[] dest, uint[] src, uint len)
 		{
 			Array.Copy(src, dest, len);
 		}
 
-		static void shr_bignum(uint[] n, int bits, int len)
+		static void ShrBigNum(uint[] n, int bits, int len)
 		{
-			int i; int i2 = bits / 32;
+			int i; var i2 = bits / 32;
 
 			if (i2 > 0)
 			{
@@ -149,13 +152,13 @@ namespace OpenRA.FileFormats
 				for (; i < len; i++) n[i] = 0;
 				bits = bits % 32;
 			}
+
 			if (bits == 0) return;
-			for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 -
-		  bits));
+			for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 - bits));
 			n[i] = n[i] >> bits;
 		}
 
-		static void shl_bignum(uint[] n, int bits, int len)
+		static void ShlBigNum(uint[] n, int bits, int len)
 		{
 			int i, i2;
 
@@ -166,26 +169,26 @@ namespace OpenRA.FileFormats
 				for (; i > 0; i--) n[i] = 0;
 				bits = bits % 32;
 			}
+
 			if (bits == 0) return;
-			for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 -
-		  bits));
+			for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 - bits));
 			n[0] <<= bits;
 		}
 
-		static uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
+		static uint SubBigNum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
 		{
 			uint i1, i2;
 
 			len += len;
 			unsafe
 			{
-				fixed (uint* _ps1 = &src1[0])
-				fixed (uint* _ps2 = &src2[0])
-				fixed (uint* _pd = &dest[0])
+				fixed (uint* tempPs1 = &src1[0])
+				fixed (uint* tempPs2 = &src2[0])
+				fixed (uint* tempPd = &dest[0])
 				{
-					ushort* ps1 = (ushort*)_ps1;
-					ushort* ps2 = (ushort*)_ps2;
-					ushort* pd = (ushort*)_pd;
+					var ps1 = (ushort*)tempPs1;
+					var ps2 = (ushort*)tempPs2;
+					var pd = (ushort*)tempPd;
 
 					while (--len != -1)
 					{
@@ -196,18 +199,19 @@ namespace OpenRA.FileFormats
 					}
 				}
 			}
+
 			return carry;
 		}
 
-		static unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
+		static unsafe uint SubBigNum(uint* dest, uint* src1, uint* src2, uint carry, int len)
 		{
 			uint i1, i2;
 
 			len += len;
 
-			ushort* ps1 = (ushort*)src1;
-			ushort* ps2 = (ushort*)src2;
-			ushort* pd = (ushort*)dest;
+			var ps1 = (ushort*)src1;
+			var ps2 = (ushort*)src2;
+			var pd = (ushort*)dest;
 
 			while (--len != -1)
 			{
@@ -215,36 +219,37 @@ namespace OpenRA.FileFormats
 				i2 = *ps2++;
 				*pd++ = (ushort)(i1 - i2 - carry);
 				if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
-
 			}
+
 			return carry;
 		}
 
-		static void inv_bignum(uint[] n1, uint[] n2, uint len)
+		static void InvertBigNum(uint[] n1, uint[] n2, uint len)
 		{
-			uint[] n_tmp = new uint[64];
-			uint n2_bytelen, bit;
-			int n2_bitlen;
+			var nTmp = new uint[64];
+			uint nTwoByteLen, bit;
+			int nTwoBitLen;
 
-			int j = 0;
+			var j = 0;
 
-			init_bignum(n_tmp, 0, len);
-			init_bignum(n1, 0, len);
-			n2_bitlen = (int)bitlen_bignum(n2, len);
-			bit = ((uint)1) << (n2_bitlen % 32);
-			j = ((n2_bitlen + 32) / 32) - 1;
-			n2_bytelen = (uint)((n2_bitlen - 1) / 32) * 4;
-			n_tmp[n2_bytelen / 4] |= ((uint)1) << ((n2_bitlen - 1) & 0x1f);
+			InitBigNum(nTmp, 0, len);
+			InitBigNum(n1, 0, len);
+			nTwoBitLen = (int)BitLenBigNum(n2, len);
+			bit = ((uint)1) << (nTwoBitLen % 32);
+			j = ((nTwoBitLen + 32) / 32) - 1;
+			nTwoByteLen = (uint)((nTwoBitLen - 1) / 32) * 4;
+			nTmp[nTwoByteLen / 4] |= ((uint)1) << ((nTwoBitLen - 1) & 0x1f);
 
-			while (n2_bitlen > 0)
+			while (nTwoBitLen > 0)
 			{
-				n2_bitlen--;
-				shl_bignum(n_tmp, 1, (int)len);
-				if (cmp_bignum(n_tmp, n2, len) != -1)
+				nTwoBitLen--;
+				ShlBigNum(nTmp, 1, (int)len);
+				if (CompareBigNum(nTmp, n2, len) != -1)
 				{
-					sub_bignum(n_tmp, n_tmp, n2, 0, (int)len);
+					SubBigNum(nTmp, nTmp, n2, 0, (int)len);
 					n1[j] |= bit;
 				}
+
 				bit >>= 1;
 				if (bit == 0)
 				{
@@ -252,44 +257,46 @@ namespace OpenRA.FileFormats
 					bit = 0x80000000;
 				}
 			}
-			init_bignum(n_tmp, 0, len);
+
+			InitBigNum(nTmp, 0, len);
 		}
 
-		static void inc_bignum(uint[] n, uint len)
+		static void IncrementBigNum(uint[] n, uint len)
 		{
-			int i = 0;
+			var i = 0;
 			while ((++n[i] == 0) && (--len > 0)) i++;
 		}
 
-		void init_two_dw(uint[] n, uint len)
+		void InitTwoDw(uint[] n, uint len)
 		{
-			mov_bignum(glob1, n, len);
-			glob1_bitlen = bitlen_bignum(glob1, len);
-			glob1_len_x2 = (glob1_bitlen + 15) / 16;
-			mov_bignum(glob1_hi, glob1.Skip((int)len_bignum(glob1, len) - 2).ToArray(), 2);
-			glob1_hi_bitlen = bitlen_bignum(glob1_hi, 2) - 32;
-			shr_bignum(glob1_hi, (int)glob1_hi_bitlen, 2);
-			inv_bignum(glob1_hi_inv, glob1_hi, 2);
-			shr_bignum(glob1_hi_inv, 1, 2);
-			glob1_hi_bitlen = (glob1_hi_bitlen + 15) % 16 + 1;
-			inc_bignum(glob1_hi_inv, 2);
-			if (bitlen_bignum(glob1_hi_inv, 2) > 32)
+			MoveBigNum(globOne, n, len);
+			globOneBitLen = BitLenBigNum(globOne, len);
+			globOneLenXTwo = (globOneBitLen + 15) / 16;
+			MoveBigNum(globOneHigh, globOne.Skip((int)LenBigNum(globOne, len) - 2).ToArray(), 2);
+			globOneHighBitLen = BitLenBigNum(globOneHigh, 2) - 32;
+			ShrBigNum(globOneHigh, (int)globOneHighBitLen, 2);
+			InvertBigNum(globOneHighInv, globOneHigh, 2);
+			ShrBigNum(globOneHighInv, 1, 2);
+			globOneHighBitLen = (globOneHighBitLen + 15) % 16 + 1;
+			IncrementBigNum(globOneHighInv, 2);
+			if (BitLenBigNum(globOneHighInv, 2) > 32)
 			{
-				shr_bignum(glob1_hi_inv, 1, 2);
-				glob1_hi_bitlen--;
+				ShrBigNum(globOneHighInv, 1, 2);
+				globOneHighBitLen--;
 			}
-			glob1_hi_inv_lo = (ushort)glob1_hi_inv[0];
-			glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
+
+			globOneHighInvLow = (ushort)globOneHighInv[0];
+			globOneHighInvHigh = (ushort)(globOneHighInv[0] >> 16);
 		}
 
-		static unsafe void mul_bignum_word(ushort* pn1, uint[] n2, uint mul, uint len)
+		static unsafe void MulBignumWord(ushort* pn1, uint[] n2, uint mul, uint len)
 		{
 			uint i, tmp;
 			unsafe
 			{
-				fixed (uint* _pn2 = &n2[0])
+				fixed (uint* tempPn2 = &n2[0])
 				{
-					ushort* pn2 = (ushort*)_pn2;
+					var pn2 = (ushort*)tempPn2;
 
 					tmp = 0;
 					for (i = 0; i < len; i++)
@@ -305,131 +312,134 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		static void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
+		static void MulBigNum(uint[] dest, uint[] src1, uint[] src2, uint len)
 		{
-		  uint i;
+			uint i;
 
-		  unsafe
-		  {
-			  fixed( uint * _psrc2 = &src2[0] )
-			  fixed(uint* _pdest = &dest[0])
-			  {
-				  ushort* psrc2 = (ushort*)_psrc2;
-				  ushort* pdest = (ushort*)_pdest;
-
-				  init_bignum(dest, 0, len * 2);
-				  for (i = 0; i < len * 2; i++)
-					  mul_bignum_word(pdest++, src1, *psrc2++, len * 2);
-			  }
-		  }
-		}
-
-		static void not_bignum(uint[] n, uint len)
-		{
-		  uint i;
-		  for (i = 0; i < len; i++) n[i] = ~n[i];
-		}
-
-		static void neg_bignum(uint[] n, uint len)
-		{
-		  not_bignum(n, len);
-		  inc_bignum(n, len);
-		}
-
-		unsafe uint get_mulword(uint* n)
-		{
-			ushort* wn = (ushort*)n;
-			uint i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
-				 + (((*(wn - 2) ^ 0xffff) * glob1_hi_inv_hi + glob1_hi_inv_hi) >> 1) + 1)
-				 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_hi) >> 1) +
-				 (((*wn ^ 0xffff) * glob1_hi_inv_lo) >> 1) + 1) >> 14) + glob1_hi_inv_hi
-				 * (*wn ^ 0xffff) * 2) >> (int)glob1_hi_bitlen);
-			if (i > 0xffff) i = 0xffff;
-			return i & 0xffff;
-		}
-
-		static void dec_bignum(uint[] n, uint len)
-		{
-			int i = 0;
-			while ((--n[i] == 0xffffffff) && (--len > 0))
-				i++;
-		}
-
-		void calc_a_bignum(uint[] n1, uint[] n2, uint[] n3, uint len)
-		{
-			uint g2_len_x2, len_diff;
 			unsafe
 			{
-				fixed( uint* g1 = &glob1[0])
-				fixed (uint* g2 = &glob2[0])
+				fixed (uint* tempSrc2 = &src2[0])
+				fixed (uint* tempPdest = &dest[0])
 				{
-					mul_bignum(glob2, n2, n3, len);
-					glob2[len * 2] = 0;
-					g2_len_x2 = len_bignum(glob2, len * 2 + 1) * 2;
-					if (g2_len_x2 >= glob1_len_x2)
-					{
-						inc_bignum(glob2, len * 2 + 1);
-						neg_bignum(glob2, len * 2 + 1);
-						len_diff = g2_len_x2 + 1 - glob1_len_x2;
-						ushort* esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
-						ushort* edi = ((ushort*)g2) + (g2_len_x2 + 1);
-						for (; len_diff != 0; len_diff--)
-						{
-							edi--;
-							uint tmp = get_mulword((uint*)edi);
-							esi--;
-							if (tmp > 0)
-							{
-								mul_bignum_word(esi, glob1, tmp, 2 * len);
-								if ((*edi & 0x8000) == 0)
-								{
-									if (0 != sub_bignum((uint*)esi, (uint*)esi, g1, 0, (int)len)) (*edi)--;
-								}
-							}
-						}
-						neg_bignum(glob2, len);
-						dec_bignum(glob2, len);
-					}
-					mov_bignum(n1, glob2, len);
+					var psrc2 = (ushort*)tempSrc2;
+					var pdest = (ushort*)tempPdest;
+
+					InitBigNum(dest, 0, len * 2);
+					for (i = 0; i < len * 2; i++)
+						MulBignumWord(pdest++, src1, *psrc2++, len * 2);
 				}
 			}
 		}
 
-		void clear_tmp_vars(uint len)
+		static void NotBigNum(uint[] n, uint len)
 		{
-			init_bignum(glob1, 0, len);
-			init_bignum(glob2, 0, len);
-			init_bignum(glob1_hi_inv, 0, 4);
-			init_bignum(glob1_hi, 0, 4);
-			glob1_bitlen = 0;
-			glob1_hi_bitlen = 0;
-			glob1_len_x2 = 0;
-			glob1_hi_inv_lo = 0;
-			glob1_hi_inv_hi = 0;
+			uint i;
+			for (i = 0; i < len; i++) n[i] = ~n[i];
 		}
 
-		void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
+		static void NegBigNum(uint[] n, uint len)
 		{
-			uint[] n_tmp = new uint[64];
+			NotBigNum(n, len);
+			IncrementBigNum(n, len);
+		}
+
+		unsafe uint GetMulWord(uint* n)
+		{
+			var wn = (ushort*)n;
+			var i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * globOneHighInvLow + 0x10000) >> 1)
+				 + (((*(wn - 2) ^ 0xffff) * globOneHighInvHigh + globOneHighInvHigh) >> 1) + 1)
+				 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * globOneHighInvHigh) >> 1) +
+				 (((*wn ^ 0xffff) * globOneHighInvLow) >> 1) + 1) >> 14) + globOneHighInvHigh
+				 * (*wn ^ 0xffff) * 2) >> (int)globOneHighBitLen);
+			if (i > 0xffff) i = 0xffff;
+			return i & 0xffff;
+		}
+
+		static void DecBigNum(uint[] n, uint len)
+		{
+			var i = 0;
+			while ((--n[i] == 0xffffffff) && (--len > 0))
+				i++;
+		}
+
+		void CalcBigNum(uint[] n1, uint[] n2, uint[] n3, uint len)
+		{
+			uint globTwoXtwo, lenDiff;
+			unsafe
+			{
+				fixed (uint* g1 = &globOne[0])
+				fixed (uint* g2 = &globTwo[0])
+				{
+					MulBigNum(globTwo, n2, n3, len);
+					globTwo[len * 2] = 0;
+					globTwoXtwo = LenBigNum(globTwo, len * 2 + 1) * 2;
+					if (globTwoXtwo >= globOneLenXTwo)
+					{
+						IncrementBigNum(globTwo, len * 2 + 1);
+						NegBigNum(globTwo, len * 2 + 1);
+						lenDiff = globTwoXtwo + 1 - globOneLenXTwo;
+						var esi = ((ushort*)g2) + (1 + globTwoXtwo - globOneLenXTwo);
+						var edi = ((ushort*)g2) + (globTwoXtwo + 1);
+						for (; lenDiff != 0; lenDiff--)
+						{
+							edi--;
+							var tmp = GetMulWord((uint*)edi);
+							esi--;
+							if (tmp > 0)
+							{
+								MulBignumWord(esi, globOne, tmp, 2 * len);
+								if ((*edi & 0x8000) == 0)
+								{
+									if (0 != SubBigNum((uint*)esi, (uint*)esi, g1, 0, (int)len))
+										(*edi)--;
+								}
+							}
+						}
+
+						NegBigNum(globTwo, len);
+						DecBigNum(globTwo, len);
+					}
+
+					MoveBigNum(n1, globTwo, len);
+				}
+			}
+		}
+
+		void ClearTempVars(uint len)
+		{
+			InitBigNum(globOne, 0, len);
+			InitBigNum(globTwo, 0, len);
+			InitBigNum(globOneHighInv, 0, 4);
+			InitBigNum(globOneHigh, 0, 4);
+			globOneBitLen = 0;
+			globOneHighBitLen = 0;
+			globOneLenXTwo = 0;
+			globOneHighInvLow = 0;
+			globOneHighInvHigh = 0;
+		}
+
+		void CalcKey(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
+		{
+			var n_tmp = new uint[64];
 			uint n3_len, n4_len;
 			int n3_bitlen;
 			uint bit_mask;
 
 			unsafe
 			{
-				fixed (uint* _pn3 = &n3[0])
+				fixed (uint* tempPn3 = &n3[0])
 				{
-					uint* pn3 = _pn3;
+					var pn3 = tempPn3;
 
-					init_bignum(n1, 1, len);
-					n4_len = len_bignum(n4, len);
-					init_two_dw(n4, n4_len);
-					n3_bitlen = (int)bitlen_bignum(n3, n4_len);
+					InitBigNum(n1, 1, len);
+					n4_len = LenBigNum(n4, len);
+					InitTwoDw(n4, n4_len);
+					n3_bitlen = (int)BitLenBigNum(n3, n4_len);
 					n3_len = (uint)((n3_bitlen + 31) / 32);
 					bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
 					pn3 += n3_len - 1;
 					n3_bitlen--;
-					mov_bignum(n1, n2, n4_len);
+					MoveBigNum(n1, n2, n4_len);
 					while (--n3_bitlen != -1)
 					{
 						if (bit_mask == 0)
@@ -437,39 +447,41 @@ namespace OpenRA.FileFormats
 							bit_mask = 0x80000000;
 							pn3--;
 						}
-						calc_a_bignum(n_tmp, n1, n1, n4_len);
+
+						CalcBigNum(n_tmp, n1, n1, n4_len);
 						if ((*pn3 & bit_mask) != 0)
-							calc_a_bignum(n1, n_tmp, n2, n4_len);
+							CalcBigNum(n1, n_tmp, n2, n4_len);
 						else
-							mov_bignum(n1, n_tmp, n4_len);
+							MoveBigNum(n1, n_tmp, n4_len);
 						bit_mask >>= 1;
 					}
-					init_bignum(n_tmp, 0, n4_len);
-					clear_tmp_vars(len);
+
+					InitBigNum(n_tmp, 0, n4_len);
+					ClearTempVars(len);
 				}
 			}
 		}
 
-		static unsafe void memcpy(byte* dest, byte* src, int len)
+		static unsafe void Memcopy(byte* dest, byte* src, int len)
 		{
 			while (len-- != 0) *dest++ = *src++;
 		}
 
-		unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
+		unsafe void ProcessPredata(byte* pre, uint pre_len, byte* buf)
 		{
-			uint[] n2 = new uint[64];
-			uint[] n3 = new uint[64];
+			var n2 = new uint[64];
+			var n3 = new uint[64];
 
-			uint a = (pubkey.len - 1) / 8;
+			var a = (pubkey.Len - 1) / 8;
 			while (a + 1 <= pre_len)
 			{
-				init_bignum(n2, 0, 64);
-				fixed( uint * pn2 = &n2[0] )
-					memcpy((byte *)pn2, pre, (int)a + 1);
-				calc_a_key(n3, n2, pubkey.key2, pubkey.key1, 64);
+				InitBigNum(n2, 0, 64);
+				fixed (uint* pn2 = &n2[0])
+					Memcopy((byte*)pn2, pre, (int)a + 1);
+				CalcKey(n3, n2, pubkey.KeyTwo, pubkey.KeyOne, 64);
 
-				fixed( uint * pn3 = &n3[0] )
-					memcpy(buf, (byte *)pn3, (int)a);
+				fixed (uint* pn3 = &n3[0])
+					Memcopy(buf, (byte*)pn3, (int)a);
 
 				pre_len -= a + 1;
 				pre += a + 1;
@@ -479,15 +491,16 @@ namespace OpenRA.FileFormats
 
 		public byte[] DecryptKey(byte[] src)
 		{
-			init_pubkey();
-			byte[] dest = new byte[256];
+			InitPublicKey();
+			var dest = new byte[256];
 
 			unsafe
 			{
 				fixed (byte* pdest = &dest[0])
 				fixed (byte* psrc = &src[0])
-					process_predata(psrc, len_predata(), pdest);
+					ProcessPredata(psrc, LenPreData(), pdest);
 			}
+
 			return dest.Take(56).ToArray();
 		}
 	}

OpenRA.Game/FileFormats/CRC32.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -10,7 +10,6 @@
 
 namespace OpenRA.FileFormats
 {
-
 	/// <summary>
 	/// Static class that uses a lookup table to calculates CRC32
 	/// checksums of input strings.
@@ -98,12 +97,13 @@ namespace OpenRA.FileFormats
 		/// </returns>
 		public static uint Calculate(byte[] data, uint polynomial)
 		{
-			uint crc = polynomial;
-			for (int i = 0; i < data.Length; i++)
+			var crc = polynomial;
+			for (var i = 0; i < data.Length; i++)
 				crc = (crc >> 8) ^ lookUp[(crc & 0xFF) ^ data[i]];
 			crc ^= polynomial;
 			return crc;
 		}
+
 		public static uint Calculate(byte[] data)
 		{
 			return Calculate(data, 0xFFFFFFFF);
@@ -119,12 +119,13 @@ namespace OpenRA.FileFormats
 		/// <returns>The calculated checksum.</returns>
 		public static unsafe uint Calculate(byte* data, uint len, uint polynomial)
 		{
-			uint crc = polynomial;
-			for (int i = 0; i < len; i++)
+			var crc = polynomial;
+			for (var i = 0; i < len; i++)
 				crc = (crc >> 8) ^ lookUp[(crc & 0xFF) ^ *data++];
 			crc ^= polynomial;
 			return crc;
 		}
+
 		public static unsafe uint Calculate(byte* data, uint len)
 		{
 			return Calculate(data, len, 0xFFFFFFFF);

OpenRA.Game/FileFormats/Format2.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Game/FileFormats/Format40.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -12,58 +12,58 @@ namespace OpenRA.FileFormats
 {
 	public static class Format40
 	{
-		public static int DecodeInto( byte[] src, byte[] dest )
+		public static int DecodeInto(byte[] src, byte[] dest, int srcOffset)
 		{
-			var ctx = new FastByteReader(src);
-			int destIndex = 0;
+			var ctx = new FastByteReader(src, srcOffset);
+			var destIndex = 0;
 
-			while( true )
+			while (true)
 			{
-				byte i = ctx.ReadByte();
-				if( ( i & 0x80 ) == 0 )
+				var i = ctx.ReadByte();
+				if ((i & 0x80) == 0)
 				{
-					int count = i & 0x7F;
-					if( count == 0 )
+					var count = i & 0x7F;
+					if (count == 0)
 					{
 						// case 6
 						count = ctx.ReadByte();
-						byte value = ctx.ReadByte();
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] ^= value;
+						var value = ctx.ReadByte();
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] ^= value;
 					}
 					else
 					{
 						// case 5
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+						for (var end = destIndex + count; destIndex < end; destIndex++)
 							dest[destIndex] ^= ctx.ReadByte();
 					}
 				}
 				else
 				{
-					int count = i & 0x7F;
-					if( count == 0 )
+					var count = i & 0x7F;
+					if (count == 0)
 					{
 						count = ctx.ReadWord();
-						if( count == 0 )
+						if (count == 0)
 							return destIndex;
 
-						if( ( count & 0x8000 ) == 0 )
+						if ((count & 0x8000) == 0)
 						{
 							// case 2
-							destIndex += ( count & 0x7FFF );
+							destIndex += count & 0x7FFF;
 						}
-						else if( ( count & 0x4000 ) == 0 )
+						else if ((count & 0x4000) == 0)
 						{
 							// case 3
-							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
+							for (var end = destIndex + (count & 0x3FFF); destIndex < end; destIndex++)
 								dest[destIndex] ^= ctx.ReadByte();
 						}
 						else
 						{
 							// case 4
-							byte value = ctx.ReadByte();
-							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
-								dest[ destIndex ] ^= value;
+							var value = ctx.ReadByte();
+							for (var end = destIndex + (count & 0x3FFF); destIndex < end; destIndex++)
+								dest[destIndex] ^= value;
 						}
 					}
 					else

OpenRA.Game/FileFormats/Format80.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -16,11 +16,12 @@ namespace OpenRA.FileFormats
 	class FastByteReader
 	{
 		readonly byte[] src;
-		int offset = 0;
+		int offset;
 
-		public FastByteReader(byte[] src)
+		public FastByteReader(byte[] src, int offset = 0)
 		{
 			this.src = src;
+			this.offset = offset;
 		}
 
 		public bool Done() { return offset >= src.Length; }
@@ -59,11 +60,10 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		public static int DecodeInto(byte[] src, byte[] dest)
+		public static int DecodeInto(byte[] src, byte[] dest, int srcOffset = 0, bool reverse = false)
 		{
-			var ctx = new FastByteReader(src);
+			var ctx = new FastByteReader(src, srcOffset);
 			var destIndex = 0;
-
 			while (true)
 			{
 				var i = ctx.ReadByte();
@@ -103,7 +103,7 @@ namespace OpenRA.FileFormats
 					{
 						// case 5
 						var count = ctx.ReadWord();
-						var srcIndex = ctx.ReadWord();
+						var srcIndex = reverse ? destIndex - ctx.ReadWord() : ctx.ReadWord();
 						if (srcIndex >= destIndex)
 							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
 
@@ -114,7 +114,7 @@ namespace OpenRA.FileFormats
 					{
 						// case 3
 						var count = count3 + 3;
-						var srcIndex = ctx.ReadWord();
+						var srcIndex = reverse ? destIndex - ctx.ReadWord() : ctx.ReadWord();
 						if (srcIndex >= destIndex)
 							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
 
@@ -125,26 +125,79 @@ namespace OpenRA.FileFormats
 			}
 		}
 
+		static int CountSame(byte[] src, int offset, int maxCount)
+		{
+			maxCount = Math.Min(src.Length - offset, maxCount);
+			if (maxCount <= 0)
+				return 0;
+
+			var first = src[offset++];
+			var count = 1;
+
+			while (count < maxCount && src[offset++] == first)
+				count++;
+
+			return count;
+		}
+
+		static void WriteCopyBlocks(byte[] src, int offset, int count, MemoryStream output)
+		{
+			while (count > 0)
+			{
+				var writeNow = Math.Min(count, 0x3F);
+				output.WriteByte((byte)(0x80 | writeNow));
+				output.Write(src, offset, writeNow);
+
+				count -= writeNow;
+				offset += writeNow;
+			}
+		}
+
+		// Quick and dirty Format80 encoder version 2
+		// Uses raw copy and RLE compression
 		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
+			using (var ms = new MemoryStream())
 			{
-				var len = Math.Min(ctx.Remaining(), 0x3F);
-				ms.WriteByte((byte)(0x80 | len));
-				while (len-- > 0)
-					ms.WriteByte(ctx.ReadByte());
+				var offset = 0;
+				var left = src.Length;
+				var blockStart = 0;
+
+				while (offset < left)
+				{
+					var repeatCount = CountSame(src, offset, 0xFFFF);
+					if (repeatCount >= 4)
+					{
+						// Write what we haven't written up to now
+						WriteCopyBlocks(src, blockStart, offset - blockStart, ms);
+
+						// Command 4: Repeat byte n times
+						ms.WriteByte(0xFE);
+
+						// Low byte
+						ms.WriteByte((byte)(repeatCount & 0xFF));
+
+						// High byte
+						ms.WriteByte((byte)(repeatCount >> 8));
+
+						// Value to repeat
+						ms.WriteByte(src[offset]);
+
+						offset += repeatCount;
+						blockStart = offset;
+					}
+					else
+						offset++;
+				}
+
+				// Write what we haven't written up to now
+				WriteCopyBlocks(src, blockStart, offset - blockStart, ms);
+
+				// Write terminator
+				ms.WriteByte(0x80);
+
+				return ms.ToArray();
 			}
-			while (!ctx.Done());
-
-			ms.WriteByte(0x80);	// terminator -- 0-length run.
-
-			return ms.ToArray();
 		}
 	}
 }

OpenRA.Game/FileFormats/HvaReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -22,28 +22,28 @@ namespace OpenRA.FileFormats
 		public HvaReader(Stream s)
 		{
 			// Index swaps for transposing a matrix
-			var ids = new byte[]{0,4,8,12,1,5,9,13,2,6,10,14};
+			var ids = new byte[] { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14 };
 
 			s.Seek(16, SeekOrigin.Begin);
 			FrameCount = s.ReadUInt32();
 			LimbCount = s.ReadUInt32();
 
 			// Skip limb names
-			s.Seek(16*LimbCount, SeekOrigin.Current);
-			Transforms = new float[16*FrameCount*LimbCount];
+			s.Seek(16 * LimbCount, SeekOrigin.Current);
+			Transforms = new float[16 * FrameCount * LimbCount];
 			for (var j = 0; j < FrameCount; j++)
 				for (var i = 0; i < LimbCount; i++)
-			{
-				// Convert to column-major matrices and add the final matrix row
-				var c = 16*(LimbCount*j + i);
-				Transforms[c + 3] = 0;
-				Transforms[c + 7] = 0;
-				Transforms[c + 11] = 0;
-				Transforms[c + 15] = 1;
+				{
+					// Convert to column-major matrices and add the final matrix row
+					var c = 16 * (LimbCount * j + i);
+					Transforms[c + 3] = 0;
+					Transforms[c + 7] = 0;
+					Transforms[c + 11] = 0;
+					Transforms[c + 15] = 1;
 
-				for (var k = 0; k < 12; k++)
-					Transforms[c + ids[k]] = s.ReadFloat();
-			}
+					for (var k = 0; k < 12; k++)
+						Transforms[c + ids[k]] = s.ReadFloat();
+				}
 		}
 
 		public static HvaReader Load(string filename)

OpenRA.Game/FileFormats/IdxReader.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using OpenRA.FileSystem;
+
+namespace OpenRA.FileFormats
+{
+	public class IdxReader
+	{
+		public readonly int SoundCount;
+		public List<IdxEntry> Entries;
+
+		public IdxReader(Stream s)
+		{
+			s.Seek(0, SeekOrigin.Begin);
+
+			var id = s.ReadASCII(4);
+
+			if (id != "GABA")
+				throw new InvalidDataException("Unable to load Idx file, did not find magic id, found {0} instead".F(id));
+
+			var two = s.ReadInt32();
+
+			if (two != 2)
+				throw new InvalidDataException("Unable to load Idx file, did not find magic number 2, found {0} instead".F(two));
+
+			SoundCount = s.ReadInt32();
+
+			Entries = new List<IdxEntry>();
+
+			for (var i = 0; i < SoundCount; i++)
+				Entries.Add(new IdxEntry(s));
+		}
+	}
+}

OpenRA.Game/FileFormats/ImaAdpcmLoader.cs

@@ -0,0 +1,99 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	struct ImaAdpcmChunk
+	{
+		public int CompressedSize;
+		public int OutputSize;
+
+		public static ImaAdpcmChunk Read(Stream s)
+		{
+			ImaAdpcmChunk c;
+			c.CompressedSize = s.ReadUInt16();
+			c.OutputSize = s.ReadUInt16();
+			if (s.ReadUInt32() != 0xdeaf)
+				throw new InvalidDataException("Chunk header is bogus");
+			return c;
+		}
+	}
+
+	public static class ImaAdpcmLoader
+	{
+		static readonly int[] IndexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
+		static readonly int[] StepTable =
+		{
+			7, 8, 9, 10, 11, 12, 13, 14, 16,
+			17, 19, 21, 23, 25, 28, 31, 34, 37,
+			41, 45, 50, 55, 60, 66, 73, 80, 88,
+			97, 107, 118, 130, 143, 157, 173, 190, 209,
+			230, 253, 279, 307, 337, 371, 408, 449, 494,
+			544, 598, 658, 724, 796, 876, 963, 1060, 1166,
+			1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749,
+			3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484,
+			7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289,
+			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
+		};
+
+		static short DecodeImaAdpcmSample(byte b, ref int index, ref int current)
+		{
+			var sb = (b & 8) != 0;
+			b &= 7;
+
+			var delta = (StepTable[index] * b) / 4 + StepTable[index] / 8;
+			if (sb) delta = -delta;
+
+			current += delta;
+			if (current > short.MaxValue) current = short.MaxValue;
+			if (current < short.MinValue) current = short.MinValue;
+
+			index += IndexAdjust[b];
+			if (index < 0) index = 0;
+			if (index > 88) index = 88;
+
+			return (short)current;
+		}
+
+		public static byte[] LoadImaAdpcmSound(byte[] raw, ref int index)
+		{
+			var currentSample = 0;
+			return LoadImaAdpcmSound(raw, ref index, ref currentSample);
+		}
+
+		public static byte[] LoadImaAdpcmSound(byte[] raw, ref int index, ref int currentSample)
+		{
+			var s = new MemoryStream(raw);
+			var dataSize = raw.Length;
+			var outputSize = raw.Length * 4;
+
+			var output = new byte[outputSize];
+			var offset = 0;
+
+			while (dataSize-- > 0)
+			{
+				var b = s.ReadUInt8();
+
+				var t = DecodeImaAdpcmSample(b, ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+
+				t = DecodeImaAdpcmSample((byte)(b >> 4), ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+			}
+
+			return output;
+		}
+	}
+}

OpenRA.Game/FileFormats/IniFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -33,7 +33,7 @@ namespace OpenRA.FileFormats
 
 		public void Load(Stream s)
 		{
-			StreamReader reader = new StreamReader(s);
+			var reader = new StreamReader(s);
 			IniSection currentSection = null;
 
 			while (!reader.EndOfStream)
@@ -44,9 +44,9 @@ namespace OpenRA.FileFormats
 
 				switch (line[0])
 				{
-				case ';': break;
-				case '[': currentSection = ProcessSection(line); break;
-				default: ProcessEntry(line, currentSection); break;
+					case ';': break;
+					case '[': currentSection = ProcessSection(line); break;
+					default: ProcessEntry(line, currentSection); break;
 				}
 			}
 		}
@@ -55,10 +55,10 @@ namespace OpenRA.FileFormats
 
 		IniSection ProcessSection(string line)
 		{
-			Match m = sectionPattern.Match(line);
+			var m = sectionPattern.Match(line);
 			if (!m.Success)
 				return null;
-			string sectionName = m.Groups[1].Value.ToLowerInvariant();
+			var sectionName = m.Groups[1].Value.ToLowerInvariant();
 
 			IniSection ret;
 			if (!sections.TryGetValue(sectionName, out ret))
@@ -78,11 +78,11 @@ namespace OpenRA.FileFormats
 
 			var key = line;
 			var value = "";
-			int eq = line.IndexOf('=');
+			var eq = line.IndexOf('=');
 			if (eq >= 0)
 			{
-				key = line.Substring(0, eq);
-				value = line.Substring(eq + 1, line.Length - eq - 1);
+				key = line.Substring(0, eq).Trim();
+				value = line.Substring(eq + 1, line.Length - eq - 1).Trim();
 			}
 
 			if (currentSection == null)

OpenRA.Game/FileFormats/PngLoader.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -39,9 +39,9 @@ namespace OpenRA.FileFormats
 
 				Bitmap bitmap = null;
 				Color[] palette = null;
-				List<byte> data = new List<byte>();
+				var data = new List<byte>();
 
-				for (; ; )
+				for (;;)
 				{
 					var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
 					var type = Encoding.UTF8.GetString(br.ReadBytes(4));
@@ -54,7 +54,6 @@ namespace OpenRA.FileFormats
 						{
 							case "IHDR":
 								{
-
 									var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
 									var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
 									var bitDepth = cr.ReadByte();
@@ -67,8 +66,8 @@ namespace OpenRA.FileFormats
 									if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
 
 									bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
-
 								}
+
 								break;
 
 							case "PLTE":
@@ -80,6 +79,7 @@ namespace OpenRA.FileFormats
 										palette[i] = Color.FromArgb(r, g, b);
 									}
 								}
+
 								break;
 
 							case "tRNS":
@@ -87,12 +87,14 @@ namespace OpenRA.FileFormats
 									for (var i = 0; i < length; i++)
 										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
 								}
+
 								break;
 
 							case "IDAT":
 								{
 									data.AddRange(content);
 								}
+
 								break;
 
 							case "IEND":
@@ -168,8 +170,8 @@ namespace OpenRA.FileFormats
 		}
 
 		[Flags]
-		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 };
-		enum PngFilter { None, Sub, Up, Average, Paeth };
+		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 }
+		enum PngFilter { None, Sub, Up, Average, Paeth }
 
 		static PixelFormat MakePixelFormat(byte bitDepth, PngColorType colorType)
 		{

OpenRA.Game/FileFormats/R8Reader.cs

@@ -1,79 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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 COPYING.
- */
-#endregion
-
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using OpenRA.Graphics;
-
-namespace OpenRA.FileFormats
-{
-	class R8Image : ISpriteFrame
-	{
-		public Size Size { get; private set; }
-		public Size FrameSize { get; private set; }
-		public float2 Offset { get; private set; }
-		public byte[] Data { get; set; }
-
-		public R8Image(Stream s)
-		{
-			// Scan forward until we find some data
-			var type = s.ReadUInt8();
-			while (type == 0)
-				type = s.ReadUInt8();
-
-			var width = s.ReadInt32();
-			var height = s.ReadInt32();
-			var x = s.ReadInt32();
-			var y = s.ReadInt32();
-
-			Size = new Size(width, height);
-			Offset = new int2(width/2 - x, height/2 - y);
-
-			/*var imageOffset = */s.ReadInt32();
-			var paletteOffset = s.ReadInt32();
-			var bpp = s.ReadUInt8();
-			if (bpp != 8)
-				throw new InvalidDataException("Error: {0} bits per pixel are not supported.".F(bpp));
-
-			var frameHeight = s.ReadUInt8();
-			var frameWidth = s.ReadUInt8();
-			FrameSize = new Size(frameWidth, frameHeight);
-
-			// Skip alignment byte
-			s.ReadUInt8();
-
-			Data = s.ReadBytes(width*height);
-
-			// Ignore palette
-			if (type == 1 && paletteOffset != 0)
-				s.Seek(520, SeekOrigin.Current);
-		}
-	}
-
-	public class R8Reader : ISpriteSource
-	{
-		readonly List<ISpriteFrame> frames = new List<ISpriteFrame>();
-		public IEnumerable<ISpriteFrame> Frames { get { return frames; } }
-		public bool CacheWhenLoadingTileset { get { return true; } }
-
-		public readonly int ImageCount;
-		public R8Reader(Stream stream)
-		{
-			while (stream.Position < stream.Length)
-			{
-				frames.Add(new R8Image(stream));
-				ImageCount++;
-			}
-		}
-	}
-}

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -11,7 +11,6 @@
 using System;
 using System.IO;
 using System.Text;
-using OpenRA.Network;
 
 namespace OpenRA.FileFormats
 {
@@ -47,7 +46,7 @@ namespace OpenRA.FileFormats
 				throw new NotSupportedException("Metadata version {0} is not supported".F(version));
 
 			// Read game info (max 100K limit as a safeguard against corrupted files)
-			string data = fs.ReadString(Encoding.UTF8, 1024 * 100);
+			var data = fs.ReadString(Encoding.UTF8, 1024 * 100);
 			GameInfo = GameInformation.Deserialize(data);
 		}
 
@@ -58,7 +57,7 @@ namespace OpenRA.FileFormats
 			writer.Write(MetaVersion);
 
 			// Write data
-			int dataLength = 0;
+			var dataLength = 0;
 			{
 				// Write lobby info data
 				writer.Flush();
@@ -72,7 +71,7 @@ namespace OpenRA.FileFormats
 
 		public void RenameFile(string newFilenameWithoutExtension)
 		{
-			var newPath = Path.Combine(Path.GetDirectoryName(FilePath), newFilenameWithoutExtension) + ".rep";
+			var newPath = Path.Combine(Path.GetDirectoryName(FilePath), newFilenameWithoutExtension) + ".orarep";
 			File.Move(FilePath, newPath);
 			FilePath = newPath;
 		}

OpenRA.Game/FileFormats/ShpD2Reader.cs

@@ -1,115 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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 COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using OpenRA.Graphics;
-
-namespace OpenRA.FileFormats
-{
-	[Flags] enum FormatFlags : int
-	{
-		PaletteTable = 1,
-		SkipFormat80 = 2,
-		VariableLengthTable = 4
-	}
-
-	class Frame : ISpriteFrame
-	{
-		public Size Size { get; private set; }
-		public Size FrameSize { get { return Size; } }
-		public float2 Offset { get { return float2.Zero; } }
-		public byte[] Data { get; set; }
-
-		public Frame(Stream s)
-		{
-			var flags = (FormatFlags)s.ReadUInt16();
-			s.Position += 1;
-			var width = s.ReadUInt16();
-			var height = s.ReadUInt8();
-			Size = new Size(width, height);
-
-			// Subtract header size
-			var dataLeft = s.ReadUInt16() - 10;
-			var dataSize = s.ReadUInt16();
-
-			byte[] table;
-			if ((flags & FormatFlags.PaletteTable) != 0)
-			{
-				var n = (flags & FormatFlags.VariableLengthTable) != 0 ? s.ReadUInt8() : (byte)16;
-				table = new byte[n];
-				for (var i = 0; i < n; i++)
-					table[i] = s.ReadUInt8();
-
-				dataLeft -= n;
-			}
-			else
-			{
-				table = new byte[256];
-				for (var i = 0; i < 256; i++)
-					table[i] = (byte)i;
-				table[1] = 0x7f;
-				table[2] = 0x7e;
-				table[3] = 0x7d;
-				table[4] = 0x7c;
-			}
-
-			Data = new byte[width * height];
-
-			// Decode image data
-			var compressed = s.ReadBytes(dataLeft);
-			if ((flags & FormatFlags.SkipFormat80) == 0)
-			{
-				var temp = new byte[dataSize];
-				Format80.DecodeInto(compressed, temp);
-				compressed = temp;
-			}
-
-			Format2.DecodeInto(compressed, Data, 0);
-
-			// Lookup values in lookup table
-			for (var j = 0; j < Data.Length; j++)
-				Data[j] = table[Data[j]];
-		}
-	}
-
-	public class ShpD2Reader : ISpriteSource
-	{
-		readonly List<ISpriteFrame> frames = new List<ISpriteFrame>();
-		public IEnumerable<ISpriteFrame> Frames { get { return frames; } }
-		public bool CacheWhenLoadingTileset { get { return false; } }
-
-		public ShpD2Reader(Stream s)
-		{
-			var imageCount = s.ReadUInt16();
-
-			// Last offset is pointer to end of file.
-			var offsets = new uint[imageCount + 1];
-			var temp = s.ReadUInt32();
-
-			// If fourth byte in file is non-zero, the offsets are two bytes each.
-			var twoByteOffset = (temp & 0xFF0000) > 0;
-			s.Position = 2;
-
-			for (var i = 0; i < imageCount + 1; i++)
-				offsets[i] = (twoByteOffset ? s.ReadUInt16() : s.ReadUInt32()) + 2;
-
-			for (var i = 0; i < imageCount; i++)
-			{
-				s.Position = offsets[i];
-				frames.Add(new Frame(s));
-			}
-		}
-	}
-}

OpenRA.Game/FileFormats/ShpReader.cs

@@ -1,203 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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 COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using OpenRA.Graphics;
-
-namespace OpenRA.FileFormats
-{
-	enum Format { Format20 = 0x20, Format40 = 0x40, Format80 = 0x80 }
-
-	class ImageHeader : ISpriteFrame
-	{
-		public Size Size { get { return reader.Size; } }
-		public Size FrameSize { get { return reader.Size; } }
-		public float2 Offset { get { return float2.Zero; } }
-		public byte[] Data { get; set; }
-
-		public uint FileOffset;
-		public Format Format;
-
-		public uint RefOffset;
-		public Format RefFormat;
-		public ImageHeader RefImage;
-
-		ShpReader reader;
-		// Used by ShpWriter
-		public ImageHeader() { }
-
-		public ImageHeader(Stream stream, ShpReader reader)
-		{
-			this.reader = reader;
-			var data = stream.ReadUInt32();
-			FileOffset = data & 0xffffff;
-			Format = (Format)(data >> 24);
-
-			RefOffset = stream.ReadUInt16();
-			RefFormat = (Format)stream.ReadUInt16();
-		}
-
-		public void WriteTo(BinaryWriter writer)
-		{
-			writer.Write(FileOffset | ((uint)Format << 24));
-			writer.Write((ushort)RefOffset);
-			writer.Write((ushort)RefFormat);
-		}
-	}
-
-	public class ShpReader : ISpriteSource
-	{
-		readonly List<ImageHeader> headers = new List<ImageHeader>();
-		Lazy<IEnumerable<ISpriteFrame>> spriteFrames;
-		public IEnumerable<ISpriteFrame> Frames { get { return spriteFrames.Value; } }
-		public bool CacheWhenLoadingTileset { get { return false; } }
-		public readonly Size Size;
-
-		int recurseDepth = 0;
-		readonly int imageCount;
-
-		public ShpReader(Stream stream)
-		{
-			imageCount = stream.ReadUInt16();
-			stream.Position += 4;
-			var width = stream.ReadUInt16();
-			var height = stream.ReadUInt16();
-			Size = new Size(width, height);
-
-			stream.Position += 4;
-			for (var i = 0; i < imageCount; i++)
-				headers.Add(new ImageHeader(stream, this));
-
-			// Skip eof and zero headers
-			stream.Position += 16;
-
-			var offsets = headers.ToDictionary(h => h.FileOffset, h => h);
-			for (var i = 0; i < imageCount; i++)
-			{
-				var h = headers[i];
-				if (h.Format == Format.Format20)
-					h.RefImage = headers[i - 1];
-
-				else if (h.Format == Format.Format40 && !offsets.TryGetValue(h.RefOffset, out h.RefImage))
-					throw new InvalidDataException("Reference doesnt point to image data {0}->{1}".F(h.FileOffset, h.RefOffset));
-			}
-
-			foreach (var h in headers)
-				Decompress(stream, h);
-
-			spriteFrames = Exts.Lazy(() => headers.Cast<ISpriteFrame>());
-		}
-
-		static byte[] ReadCompressedData(Stream stream, ImageHeader h)
-		{
-			stream.Position = h.FileOffset;
-
-			// Actually, far too big. There's no length field with the correct length though :(
-			var compressedLength = (int)(stream.Length - stream.Position);
-			var compressedBytes = new byte[compressedLength];
-			stream.Read(compressedBytes, 0, compressedLength);
-
-			return compressedBytes;
-		}
-
-		void Decompress(Stream stream, ImageHeader h)
-		{
-			// No extra work is required for empty frames
-			if (h.Size.Width == 0 || h.Size.Height == 0)
-				return;
-
-			if (recurseDepth > imageCount)
-				throw new InvalidDataException("Format20/40 headers contain infinite loop");
-
-			switch (h.Format)
-			{
-				case Format.Format20:
-				case Format.Format40:
-				{
-					if (h.RefImage.Data == null)
-					{
-						++recurseDepth;
-						Decompress(stream, h.RefImage);
-						--recurseDepth;
-					}
-
-					h.Data = CopyImageData(h.RefImage.Data);
-					Format40.DecodeInto(ReadCompressedData(stream, h), h.Data);
-					break;
-				}
-
-				case Format.Format80:
-				{
-					var imageBytes = new byte[Size.Width * Size.Height];
-					Format80.DecodeInto(ReadCompressedData(stream, h), imageBytes);
-					h.Data = imageBytes;
-					break;
-				}
-
-				default:
-					throw new InvalidDataException();
-			}
-		}
-
-		byte[] CopyImageData(byte[] baseImage)
-		{
-			var imageData = new byte[Size.Width * Size.Height];
-			for (var i = 0; i < Size.Width * Size.Height; i++)
-				imageData[i] = baseImage[i];
-
-			return imageData;
-		}
-
-		public static ShpReader Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return new ShpReader(s);
-		}
-
-		public static void Write(Stream s, Size size, 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) * 8;
-
-			using (var bw = new BinaryWriter(s))
-			{
-				bw.Write((ushort)compressedFrames.Length);
-				bw.Write((ushort)0);
-				bw.Write((ushort)0);
-				bw.Write((ushort)size.Width);
-				bw.Write((ushort)size.Height);
-				bw.Write((uint)0);
-
-				foreach (var f in compressedFrames)
-				{
-					var ih = new ImageHeader { Format = Format.Format80, FileOffset = (uint)dataOffset };
-					dataOffset += f.Length;
-
-					ih.WriteTo(bw);
-				}
-
-				var eof = new ImageHeader { FileOffset = (uint)dataOffset };
-				eof.WriteTo(bw);
-
-				var allZeroes = new ImageHeader { };
-				allZeroes.WriteTo(bw);
-
-				foreach (var f in compressedFrames)
-					bw.Write(f);
-			}
-		}
-	}
-}

OpenRA.Game/FileFormats/ShpTSReader.cs

@@ -1,104 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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 COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using OpenRA.Graphics;
-
-namespace OpenRA.FileFormats
-{
-	class FrameHeader : ISpriteFrame
-	{
-		public Size Size { get; private set; }
-		public Size FrameSize { get; private set; }
-		public float2 Offset { get; private set; }
-		public byte[] Data { get; set; }
-
-		public readonly uint FileOffset;
-		public readonly byte Format;
-
-		public FrameHeader(Stream stream, Size frameSize)
-		{
-			var x = stream.ReadUInt16();
-			var y = stream.ReadUInt16();
-			var width = stream.ReadUInt16();
-			var height = stream.ReadUInt16();
-
-			Offset = new float2(x + 0.5f * (width - frameSize.Width), y + 0.5f * (height - frameSize.Height));
-			Size = new Size(width, height);
-			FrameSize = frameSize;
-
-			Format = stream.ReadUInt8();
-			stream.Position += 11;
-			FileOffset = stream.ReadUInt32();
-		}
-	}
-
-	public class ShpTSReader : ISpriteSource
-	{
-		readonly List<FrameHeader> frames = new List<FrameHeader>();
-		Lazy<IEnumerable<ISpriteFrame>> spriteFrames;
-		public IEnumerable<ISpriteFrame> Frames { get { return spriteFrames.Value; } }
-		public bool CacheWhenLoadingTileset { get { return false; } }
-
-		public ShpTSReader(Stream stream)
-		{
-			stream.ReadUInt16();
-			var width = stream.ReadUInt16();
-			var height = stream.ReadUInt16();
-			var size = new Size(width, height);
-			var frameCount = stream.ReadUInt16();
-
-			for (var i = 0; i < frameCount; i++)
-				frames.Add(new FrameHeader(stream, size));
-
-			for (var i = 0; i < frameCount; i++)
-			{
-				var f = frames[i];
-				if (f.FileOffset == 0)
-					continue;
-
-				stream.Position = f.FileOffset;
-
-				// Uncompressed
-				if (f.Format == 1 || f.Format == 0)
-					f.Data = stream.ReadBytes(f.Size.Width * f.Size.Height);
-
-				// Uncompressed scanlines
-				else if (f.Format == 2)
-				{
-					f.Data = new byte[f.Size.Width * f.Size.Height];
-					for (var j = 0; j < f.Size.Height; j++)
-					{
-						var length = stream.ReadUInt16() - 2;
-						stream.Read(f.Data, f.Size.Width * j, length);
-					}
-				}
-
-				// RLE-zero compressed scanlines
-				else if (f.Format == 3)
-				{
-					f.Data = new byte[f.Size.Width * f.Size.Height];
-
-					for (var j = 0; j < f.Size.Height; j++)
-					{
-						var length = stream.ReadUInt16() - 2;
-						Format2.DecodeInto(stream.ReadBytes(length), f.Data, j * f.Size.Width);
-					}
-				}
-			}
-
-			spriteFrames = Exts.Lazy(() => frames.Cast<ISpriteFrame>());
-		}
-	}
-}

OpenRA.Game/FileFormats/TmpRAReader.cs

@@ -1,51 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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 COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using OpenRA.Graphics;
-
-namespace OpenRA.FileFormats
-{
-	public class TmpRAReader : ISpriteSource
-	{
-		readonly List<ISpriteFrame> tiles = new List<ISpriteFrame>();
-		public IEnumerable<ISpriteFrame> Frames { get { return tiles; } }
-		public bool CacheWhenLoadingTileset { get { return false; } }
-
-		public TmpRAReader(Stream s)
-		{
-			var width = s.ReadUInt16();
-			var height = s.ReadUInt16();
-			var size = new Size(width, height);
-
-			s.Position += 12;
-			var imgStart = s.ReadUInt32();
-			s.Position += 8;
-			var indexEnd = s.ReadInt32();
-			s.Position += 4;
-			var indexStart = s.ReadInt32();
-
-			s.Position = indexStart;
-			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
-			{
-				if (b != 255)
-				{
-					s.Position = imgStart + b * width * height;
-					tiles.Add(new TmpTile(s.ReadBytes(width * height), size));
-				}
-				else
-					tiles.Add(new TmpTile(null, size));
-			}
-		}
-	}
-}

OpenRA.Game/FileFormats/TmpTDReader.cs

@@ -1,69 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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 COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.IO;
-using OpenRA.Graphics;
-
-namespace OpenRA.FileFormats
-{
-	public class TmpTile : ISpriteFrame
-	{
-		public Size Size { get; private set; }
-		public Size FrameSize { get; private set; }
-		public float2 Offset { get { return float2.Zero; } }
-		public byte[] Data { get; set; }
-
-		public TmpTile(byte[] data, Size size)
-		{
-			FrameSize = size;
-			Data = data;
-
-			if (data == null)
-				Data = new byte[0];
-			else
-				Size = size;
-		}
-	}
-
-	public class TmpTDReader : ISpriteSource
-	{
-		readonly List<ISpriteFrame> tiles = new List<ISpriteFrame>();
-		public IEnumerable<ISpriteFrame> Frames { get { return tiles; } }
-		public bool CacheWhenLoadingTileset { get { return false; } }
-
-		public TmpTDReader(Stream s)
-		{
-			var width = s.ReadUInt16();
-			var height = s.ReadUInt16();
-			var size = new Size(width, height);
-
-			s.Position += 8;
-			var imgStart = s.ReadUInt32();
-			s.Position += 8;
-			var indexEnd = s.ReadInt32();
-			var indexStart = s.ReadInt32();
-
-			s.Position = indexStart;
-			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
-			{
-				if (b != 255)
-				{
-					s.Position = imgStart + b * width * height;
-					tiles.Add(new TmpTile(s.ReadBytes(width * height), size));
-				}
-				else
-					tiles.Add(new TmpTile(null, size));
-			}
-		}
-	}
-}

OpenRA.Game/FileFormats/TmpTSReader.cs

@@ -1,76 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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 COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using OpenRA.Graphics;
-
-namespace OpenRA.FileFormats
-{
-	public class TmpTSTile : ISpriteFrame
-	{
-		public Size Size { get; private set; }
-		public Size FrameSize { get { return Size; } }
-		public float2 Offset { get { return float2.Zero; } }
-		public byte[] Data { get; set; }
-
-		public TmpTSTile(Stream s, Size size)
-		{
-			Size = size;
-
-			// Ignore tile header for now
-			s.Position += 52;
-
-			Data = new byte[size.Width * size.Height];
-
-			// Unpack tile data
-			var width = 4;
-			for (var i = 0; i < size.Height; i++)
-			{
-				var start = i * size.Width + (size.Width - width) / 2;
-				for (var j = 0; j < width; j++)
-					Data[start + j] = s.ReadUInt8();
-
-				width += (i < size.Height / 2 - 1? 1 : -1) * 4;
-			}
-
-			// Ignore Z-data for now
-			// Ignore extra data for now
-		}
-	}
-
-	public class TmpTSReader : ISpriteSource
-	{
-		readonly List<ISpriteFrame> tiles = new List<ISpriteFrame>();
-		public IEnumerable<ISpriteFrame> Frames { get { return tiles; } }
-		public bool CacheWhenLoadingTileset { get { return false; } }
-
-		public TmpTSReader(Stream s)
-		{
-			var templateWidth = s.ReadUInt32();
-			var templateHeight = s.ReadUInt32();
-			var tileWidth = s.ReadInt32();
-			var tileHeight = s.ReadInt32();
-			var size = new Size(tileWidth, tileHeight);
-			var offsets = new uint[templateWidth * templateHeight];
-			for (var i = 0; i < offsets.Length; i++)
-				offsets[i] = s.ReadUInt32();
-
-			for (var i = 0; i < offsets.Length; i++)
-			{
-				s.Position = offsets[i];
-				tiles.Add(new TmpTSTile(s, size));
-			}
-		}
-	}
-}

OpenRA.Game/FileFormats/VqaReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -25,16 +25,28 @@ namespace OpenRA.FileFormats
 		ushort numColors;
 		ushort blockWidth;
 		ushort blockHeight;
-		byte cbParts;
+		byte chunkBufferParts;
 		int2 blocks;
-		UInt32[] offsets;
+		uint[] offsets;
 		uint[] palette;
+		uint videoFlags; // if 0x10 is set the video is a 16 bit hq video (ts and later)
+		int sampleRate;
+		int sampleBits;
+		int audioChannels;
 
 		// Stores a list of subpixels, referenced by the VPTZ chunk
 		byte[] cbf;
 		byte[] cbp;
-		int cbChunk = 0;
-		int cbOffset = 0;
+		byte[] cbfBuffer;
+
+		// Buffer for loading file subchunks, the maximum chunk size of a file is not defined
+		// and the header definition for the size of the biggest chunks (color data) isn't accurate.
+		// But 256k is large enough for all TS videos(< 200k).
+		byte[] fileBuffer = new byte[256000];
+		int maxCbfzSize = 256000;
+		int vtprSize = 0;
+		int currentChunkBuffer = 0;
+		int chunkBufferOffset = 0;
 
 		// Top half contains block info, bottom half contains references to cbf array
 		byte[] origData;
@@ -42,9 +54,14 @@ namespace OpenRA.FileFormats
 		// Final frame output
 		uint[,] frameData;
 		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
+		bool hasAudio;
 
 		public byte[] AudioData { get { return audioData; } }
 		public int CurrentFrame { get { return currentFrame; } }
+		public int SampleRate { get { return sampleRate; } }
+		public int SampleBits { get { return sampleBits; } }
+		public int AudioChannels { get { return audioChannels; } }
+		public bool HasAudio { get { return hasAudio; } }
 
 		public VqaReader(Stream stream)
 		{
@@ -53,14 +70,14 @@ namespace OpenRA.FileFormats
 			// Decode FORM chunk
 			if (stream.ReadASCII(4) != "FORM")
 				throw new InvalidDataException("Invalid vqa (invalid FORM section)");
-			/*var length = */ stream.ReadUInt32();
+			/*var length = */stream.ReadUInt32();
 
 			if (stream.ReadASCII(8) != "WVQAVQHD")
 				throw new InvalidDataException("Invalid vqa (not WVQAVQHD)");
-			/* var length = */stream.ReadUInt32();
+			/*var length2 = */stream.ReadUInt32();
 
 			/*var version = */stream.ReadUInt16();
-			/*var flags = */stream.ReadUInt16();
+			videoFlags = stream.ReadUInt16();
 			Frames = stream.ReadUInt16();
 			Width = stream.ReadUInt16();
 			Height = stream.ReadUInt16();
@@ -68,7 +85,7 @@ namespace OpenRA.FileFormats
 			blockWidth = stream.ReadUInt8();
 			blockHeight = stream.ReadUInt8();
 			Framerate = stream.ReadUInt8();
-			cbParts = stream.ReadUInt8();
+			chunkBufferParts = stream.ReadUInt8();
 			blocks = new int2(Width / blockWidth, Height / blockHeight);
 
 			numColors = stream.ReadUInt16();
@@ -77,31 +94,54 @@ namespace OpenRA.FileFormats
 			/*var unknown2 = */stream.ReadUInt32();
 
 			// Audio
-			/*var freq = */stream.ReadUInt16();
-			/*var channels = */stream.ReadByte();
-			/*var bits = */stream.ReadByte();
-			/*var unknown3 = */stream.ReadBytes(14);
+			sampleRate = stream.ReadUInt16();
+			audioChannels = stream.ReadByte();
+			sampleBits = stream.ReadByte();
+
+			/*var unknown3 =*/stream.ReadUInt32();
+			/*var unknown4 =*/stream.ReadUInt16();
+			/*maxCbfzSize =*/stream.ReadUInt32(); // Unreliable
+
+			/*var unknown5 =*/stream.ReadUInt32();
 
 			var frameSize = Exts.NextPowerOf2(Math.Max(Width, Height));
-			cbf = new byte[Width*Height];
-			cbp = new byte[Width*Height];
-			palette = new uint[numColors];
-			origData = new byte[2*blocks.X*blocks.Y];
-			frameData = new uint[frameSize, frameSize];
 
-			var type = stream.ReadASCII(4);
-			if (type != "FINF")
+			if (IsHqVqa)
 			{
-				stream.Seek(27, SeekOrigin.Current);
-				type = stream.ReadASCII(4);
+				cbfBuffer = new byte[maxCbfzSize];
+				cbf = new byte[maxCbfzSize * 3];
+				origData = new byte[maxCbfzSize];
+			}
+			else
+			{
+				cbfBuffer = new byte[Width * Height];
+				cbf = new byte[Width * Height];
+				cbp = new byte[Width * Height];
+				origData = new byte[2 * blocks.X * blocks.Y];
+			}
+
+			palette = new uint[numColors];
+			frameData = new uint[frameSize, frameSize];
+			var type = stream.ReadASCII(4);
+			while (type != "FINF")
+			{
+				// Sub type is a file tag
+				if (type[3] == 'F')
+				{
+					var jmp = int2.Swap(stream.ReadUInt32());
+					stream.Seek(jmp, SeekOrigin.Current);
+					type = stream.ReadASCII(4);
+				}
+				else
+					throw new NotSupportedException("Vqa uses unknown Subtype: {0}".F(type));
 			}
 
 			/*var length = */stream.ReadUInt16();
 			/*var unknown4 = */stream.ReadUInt16();
 
 			// Frame offsets
-			offsets = new UInt32[Frames];
-			for (int i = 0; i < Frames; i++)
+			offsets = new uint[Frames];
+			for (var i = 0; i < Frames; i++)
 			{
 				offsets[i] = stream.ReadUInt32();
 				if (offsets[i] > 0x40000000)
@@ -116,16 +156,16 @@ namespace OpenRA.FileFormats
 
 		public void Reset()
 		{
-			currentFrame = cbOffset = cbChunk = 0;
+			currentFrame = chunkBufferOffset = currentChunkBuffer = 0;
 			LoadFrame();
 		}
 
 		void CollectAudioData()
 		{
-			var ms = new MemoryStream();
+			var audio1 = new MemoryStream(); // left channel / mono
+			var audio2 = new MemoryStream(); // right channel
 			var adpcmIndex = 0;
-
-			bool compressed = false;
+			var compressed = false;
 			for (var i = 0; i < Frames; i++)
 			{
 				stream.Seek(offsets[i], SeekOrigin.Begin);
@@ -134,15 +174,33 @@ namespace OpenRA.FileFormats
 				while (stream.Position < end)
 				{
 					var type = stream.ReadASCII(4);
+					if (type == "SN2J")
+					{
+						var jmp = int2.Swap(stream.ReadUInt32());
+						stream.Seek(jmp, SeekOrigin.Current);
+						type = stream.ReadASCII(4);
+					}
+
 					var length = int2.Swap(stream.ReadUInt32());
 
 					switch (type)
 					{
 						case "SND0":
 						case "SND2":
-							var rawAudio = stream.ReadBytes((int)length);
-							ms.Write(rawAudio);
-							compressed = (type == "SND2");
+							if (audioChannels == 1)
+							{
+								var rawAudio = stream.ReadBytes((int)length);
+								audio1.Write(rawAudio);
+							}
+							else
+							{
+								var rawAudio = stream.ReadBytes((int)length / 2);
+								audio1.Write(rawAudio);
+								rawAudio = stream.ReadBytes((int)length / 2);
+								audio2.Write(rawAudio);
+							}
+
+							compressed = type == "SND2";
 							break;
 						default:
 							stream.ReadBytes((int)length);
@@ -154,7 +212,37 @@ namespace OpenRA.FileFormats
 				}
 			}
 
-			audioData = (compressed) ? AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex) : ms.ToArray();
+			if (audioChannels == 1)
+				audioData = compressed ? AudLoader.LoadSound(audio1.ToArray(), ref adpcmIndex) : audio1.ToArray();
+			else
+			{
+				byte[] leftData, rightData;
+				if (!compressed)
+				{
+					leftData = audio1.ToArray();
+					rightData = audio2.ToArray();
+				}
+				else
+				{
+					adpcmIndex = 0;
+					leftData = AudLoader.LoadSound(audio1.ToArray(), ref adpcmIndex);
+					adpcmIndex = 0;
+					rightData = AudLoader.LoadSound(audio2.ToArray(), ref adpcmIndex);
+				}
+
+				audioData = new byte[rightData.Length + leftData.Length];
+				var rightIndex = 0;
+				var leftIndex = 0;
+				for (var i = 0; i < audioData.Length;)
+				{
+					audioData[i++] = leftData[leftIndex++];
+					audioData[i++] = leftData[leftIndex++];
+					audioData[i++] = rightData[rightIndex++];
+					audioData[i++] = rightData[rightIndex++];
+				}
+			}
+
+			hasAudio = audioData.Length > 0;
 		}
 
 		public void AdvanceFrame()
@@ -170,18 +258,41 @@ namespace OpenRA.FileFormats
 
 			// Seek to the start of the frame
 			stream.Seek(offsets[currentFrame], SeekOrigin.Begin);
-			var end = (currentFrame < Frames - 1) ? offsets[currentFrame+1] : stream.Length;
+			var end = (currentFrame < Frames - 1) ? offsets[currentFrame + 1] : stream.Length;
 
 			while (stream.Position < end)
 			{
 				var type = stream.ReadASCII(4);
-				var length = int2.Swap(stream.ReadUInt32());
+				var length = 0U;
+				if (type == "SN2J")
+				{
+					var jmp = int2.Swap(stream.ReadUInt32());
+					stream.Seek(jmp, SeekOrigin.Current);
+					type = stream.ReadASCII(4);
+					if (type == "SND2")
+					{
+						length = int2.Swap(stream.ReadUInt32());
+						stream.Seek(length, SeekOrigin.Current);
+						type = stream.ReadASCII(4);
+					}
+					else
+						throw new NotSupportedException();
+				}
 
-				switch(type)
+				length = int2.Swap(stream.ReadUInt32());
+
+				switch (type)
 				{
 					case "VQFR":
 						DecodeVQFR(stream);
-					break;
+						break;
+					case "\0VQF":
+						stream.ReadByte();
+						DecodeVQFR(stream);
+						break;
+					case "VQFL":
+						DecodeVQFR(stream, "VQFL");
+						break;
 					default:
 						// Don't parse sound here.
 						stream.ReadBytes((int)length);
@@ -194,61 +305,102 @@ namespace OpenRA.FileFormats
 		}
 
 		// VQA Frame
-		public void DecodeVQFR(Stream s)
+		public void DecodeVQFR(Stream s, string parentType = "VQFR")
 		{
 			while (true)
 			{
 				// Chunks are aligned on even bytes; may be padded with a single null
 				if (s.Peek() == 0) s.ReadByte();
 				var type = s.ReadASCII(4);
-				int subchunkLength = (int)int2.Swap(s.ReadUInt32());
+				var subchunkLength = (int)int2.Swap(s.ReadUInt32());
 
-				switch(type)
+				switch (type)
 				{
 					// Full frame-modifier
 					case "CBFZ":
-						Format80.DecodeInto(s.ReadBytes(subchunkLength), cbf);
-					break;
+						var decodeMode = s.Peek() == 0;
+						s.ReadBytes(fileBuffer, 0, subchunkLength);
+						Array.Clear(cbf, 0, cbf.Length);
+						Array.Clear(cbfBuffer, 0, cbfBuffer.Length);
+						var decodeCount = 0;
+						decodeCount = Format80.DecodeInto(fileBuffer, cbfBuffer, decodeMode ? 1 : 0, decodeMode);
+						if ((videoFlags & 0x10) == 16)
+						{
+							var p = 0;
+							for (var i = 0; i < decodeCount; i += 2)
+							{
+								var packed = cbfBuffer[i + 1] << 8 | cbfBuffer[i];
+								/* 15      bit      0
+								   0rrrrrgg gggbbbbb
+								   HI byte  LO byte*/
+								cbf[p++] = (byte)((packed & 0x7C00) >> 7);
+								cbf[p++] = (byte)((packed & 0x3E0) >> 2);
+								cbf[p++] = (byte)((packed & 0x1f) << 3);
+							}
+						}
+						else
+						{
+							cbf = cbfBuffer;
+						}
+
+						if (parentType == "VQFL")
+							return;
+						break;
 					case "CBF0":
 						cbf = s.ReadBytes(subchunkLength);
-					break;
+						break;
 
 					// frame-modifier chunk
 					case "CBP0":
 					case "CBPZ":
 						// Partial buffer is full; dump and recreate
-						if (cbChunk == cbParts)
+						if (currentChunkBuffer == chunkBufferParts)
 						{
 							if (type == "CBP0")
 								cbf = (byte[])cbp.Clone();
 							else
 								Format80.DecodeInto(cbp, cbf);
 
-							cbOffset = cbChunk = 0;
+							chunkBufferOffset = currentChunkBuffer = 0;
 						}
 
 						var bytes = s.ReadBytes(subchunkLength);
-						bytes.CopyTo(cbp,cbOffset);
-						cbOffset += subchunkLength;
-						cbChunk++;
-					break;
+						bytes.CopyTo(cbp, chunkBufferOffset);
+						chunkBufferOffset += subchunkLength;
+						currentChunkBuffer++;
+						break;
 
 					// Palette
 					case "CPL0":
-						for (int i = 0; i < numColors; i++)
+						for (var i = 0; i < numColors; i++)
 						{
-							byte r = (byte)(s.ReadUInt8() << 2);
-							byte g = (byte)(s.ReadUInt8() << 2);
-							byte b = (byte)(s.ReadUInt8() << 2);
+							var r = (byte)(s.ReadUInt8() << 2);
+							var g = (byte)(s.ReadUInt8() << 2);
+							var b = (byte)(s.ReadUInt8() << 2);
 							palette[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 						}
-					break;
+
+						break;
 
 					// Frame data
 					case "VPTZ":
 						Format80.DecodeInto(s.ReadBytes(subchunkLength), origData);
+
 						// This is the last subchunk
 						return;
+					case "VPRZ":
+						Array.Clear(origData, 0, origData.Length);
+						s.ReadBytes(fileBuffer, 0, subchunkLength);
+						if (fileBuffer[0] != 0)
+							vtprSize = Format80.DecodeInto(fileBuffer, origData);
+						else
+							Format80.DecodeInto(fileBuffer, origData, 1, true);
+						return;
+					case "VPTR":
+						Array.Clear(origData, 0, origData.Length);
+						s.ReadBytes(origData, 0, subchunkLength);
+						vtprSize = subchunkLength;
+						return;
 					default:
 						throw new InvalidDataException("Unknown sub-chunk {0}".F(type));
 				}
@@ -260,19 +412,76 @@ namespace OpenRA.FileFormats
 		void DecodeFrameData()
 		{
 			cachedFrame = currentFrame;
-			for (var y = 0; y < blocks.Y; y++)
-				for (var x = 0; x < blocks.X; x++)
+			if (IsHqVqa)
+			{
+				/* The VP?? chunks of the video file contains an array of instructions for
+				 * how the blocks of the finished frame will be filled with color data blocks
+				 * contained in the CBF? chunks.
+				 */
+				var p = 0;
+				for (var y = 0; y < blocks.Y;)
 				{
-					var px = origData[x + y*blocks.X];
-					var mod = origData[x + (y + blocks.Y)*blocks.X];
-					for (var j = 0; j < blockHeight; j++)
-						for (var i = 0; i < blockWidth; i++)
+					for (var x = 0; x < blocks.X;)
+					{
+						if (y >= blocks.Y)
+							break;
+
+						// The first 3 bits of the short determine the type of instruction with the rest being one or two parameters.
+						var val = (int)origData[p++];
+						val |= origData[p++] << 8;
+						var para_A = val & 0x1fff;
+						var para_B1 = val & 0xFF;
+						var para_B2 = (((val / 256) & 0x1f) + 1) * 2;
+						switch (val >> 13)
 						{
-							var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
-							byte color = (mod == 0x0f) ? px : cbf[cbfi];
-							frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
+							case 0:
+								x += para_A;
+								break;
+							case 1:
+								WriteBlock(para_B1, para_B2, ref x, ref y);
+								break;
+							case 2:
+								WriteBlock(para_B1, 1, ref x, ref y);
+								for (var i = 0; i < para_B2; i++)
+									WriteBlock(origData[p++], 1, ref x, ref y);
+								break;
+							case 3:
+								WriteBlock(para_A, 1, ref x, ref y);
+								break;
+							case 5:
+								WriteBlock(para_A, origData[p++], ref x, ref y);
+								break;
+							default:
+								throw new NotSupportedException();
 						}
+					}
+
+					y++;
 				}
+
+				if (p != vtprSize)
+					throw new IndexOutOfRangeException();
+			}
+			else
+			{
+				for (var y = 0; y < blocks.Y; y++)
+				{
+					for (var x = 0; x < blocks.X; x++)
+					{
+						var px = origData[x + y * blocks.X];
+						var mod = origData[x + (y + blocks.Y) * blocks.X];
+						for (var j = 0; j < blockHeight; j++)
+						{
+							for (var i = 0; i < blockWidth; i++)
+							{
+								var cbfi = (mod * 256 + px) * 8 + j * blockWidth + i;
+								var color = (mod == 0x0f) ? px : cbf[cbfi];
+								frameData[y * blockHeight + j, x * blockWidth + i] = palette[color];
+							}
+						}
+					}
+				}
+			}
 		}
 
 		public uint[,] FrameData
@@ -285,5 +494,33 @@ namespace OpenRA.FileFormats
 				return frameData;
 			}
 		}
+
+		bool IsHqVqa { get { return (videoFlags & 0x10) == 16; } }
+
+		void WriteBlock(int blockNumber, int count, ref int x, ref int y)
+		{
+			for (var i = 0; i < count; i++)
+			{
+				var frameX = x * blockWidth;
+				var frameY = y * blockHeight;
+				var offset = blockNumber * blockHeight * blockWidth * 3;
+				for (var by = 0; by < blockHeight; by++)
+					for (var bx = 0; bx < blockWidth; bx++)
+					{
+						var p = (bx + by * blockWidth) * 3;
+
+						frameData[frameY + by, frameX + bx] = (uint)(0xFF << 24 | cbf[offset + p] << 16 | cbf[offset + p + 1] << 8 | cbf[offset + p + 2]);
+					}
+
+				x++;
+				if (x >= blocks.X)
+				{
+					x = 0;
+					y++;
+					if (y >= blocks.Y && i != count - 1)
+						throw new IndexOutOfRangeException();
+				}
+			}
+		}
 	}
 }

OpenRA.Game/FileFormats/VxlReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -38,15 +38,15 @@ namespace OpenRA.FileFormats
 		public readonly uint LimbCount;
 		public VxlLimb[] Limbs;
 
-		uint BodySize;
+		uint bodySize;
 
 		static void ReadVoxelData(Stream s, VxlLimb l)
 		{
-			var baseSize = l.Size[0]*l.Size[1];
+			var baseSize = l.Size[0] * l.Size[1];
 			var colStart = new int[baseSize];
 			for (var i = 0; i < baseSize; i++)
 				colStart[i] = s.ReadInt32();
-			s.Seek(4*baseSize, SeekOrigin.Current);
+			s.Seek(4 * baseSize, SeekOrigin.Current);
 			var dataStart = s.Position;
 
 			// Count the voxels in this limb
@@ -65,12 +65,12 @@ namespace OpenRA.FileFormats
 					var count = s.ReadUInt8();
 					z += count;
 					l.VoxelCount += count;
-					s.Seek(2*count + 1, SeekOrigin.Current);
+					s.Seek(2 * count + 1, SeekOrigin.Current);
 				} while (z < l.Size[2]);
 			}
 
 			// Read the data
-			l.VoxelMap = new Dictionary<byte, VxlElement>[l.Size[0],l.Size[1]];
+			l.VoxelMap = new Dictionary<byte, VxlElement>[l.Size[0], l.Size[1]];
 			for (var i = 0; i < baseSize; i++)
 			{
 				// Empty column
@@ -79,10 +79,10 @@ namespace OpenRA.FileFormats
 
 				s.Seek(dataStart + colStart[i], SeekOrigin.Begin);
 
-				byte x = (byte)(i % l.Size[0]);
-				byte y = (byte)(i / l.Size[0]);
+				var x = (byte)(i % l.Size[0]);
+				var y = (byte)(i / l.Size[0]);
 				byte z = 0;
-				l.VoxelMap[x,y] = new Dictionary<byte, VxlElement>();
+				l.VoxelMap[x, y] = new Dictionary<byte, VxlElement>();
 				do
 				{
 					z += s.ReadUInt8();
@@ -93,9 +93,10 @@ namespace OpenRA.FileFormats
 						v.Color = s.ReadUInt8();
 						v.Normal = s.ReadUInt8();
 
-						l.VoxelMap[x,y].Add(z, v);
+						l.VoxelMap[x, y].Add(z, v);
 						z++;
 					}
+
 					// Skip duplicate count
 					s.ReadUInt8();
 				} while (z < l.Size[2]);
@@ -104,14 +105,13 @@ namespace OpenRA.FileFormats
 
 		public VxlReader(Stream s)
 		{
-
 			if (!s.ReadASCII(16).StartsWith("Voxel Animation"))
 				throw new InvalidDataException("Invalid vxl header");
 
 			s.ReadUInt32();
 			LimbCount = s.ReadUInt32();
 			s.ReadUInt32();
-			BodySize = s.ReadUInt32();
+			bodySize = s.ReadUInt32();
 			s.Seek(770, SeekOrigin.Current);
 
 			// Read Limb headers
@@ -124,12 +124,12 @@ namespace OpenRA.FileFormats
 			}
 
 			// Skip to the Limb footers
-			s.Seek(802 + 28*LimbCount + BodySize, SeekOrigin.Begin);
+			s.Seek(802 + 28 * LimbCount + bodySize, SeekOrigin.Begin);
 
-			var LimbDataOffset = new uint[LimbCount];
+			var limbDataOffset = new uint[LimbCount];
 			for (var i = 0; i < LimbCount; i++)
 			{
-				LimbDataOffset[i] = s.ReadUInt32();
+				limbDataOffset[i] = s.ReadUInt32();
 				s.Seek(8, SeekOrigin.Current);
 				Limbs[i].Scale = s.ReadFloat();
 				s.Seek(48, SeekOrigin.Current);
@@ -143,7 +143,7 @@ namespace OpenRA.FileFormats
 
 			for (var i = 0; i < LimbCount; i++)
 			{
-				s.Seek(802 + 28*LimbCount + LimbDataOffset[i], SeekOrigin.Begin);
+				s.Seek(802 + 28 * LimbCount + limbDataOffset[i], SeekOrigin.Begin);
 				ReadVoxelData(s, Limbs[i]);
 			}
 		}

OpenRA.Game/FileFormats/WavLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -26,9 +26,13 @@ namespace OpenRA.FileFormats
 		public readonly int BlockAlign;
 		public readonly int BitsPerSample;
 
+		public readonly int UncompressedSize;
 		public readonly int DataSize;
 		public readonly byte[] RawOutput;
 
+		public enum WaveType { Pcm = 0x1, ImaAdpcm = 0x11 }
+		public static WaveType Type { get; private set; }
+
 		public WavLoader(Stream s)
 		{
 			while (s.Position < s.Length)
@@ -47,16 +51,25 @@ namespace OpenRA.FileFormats
 						break;
 					case "fmt ":
 						FmtChunkSize = s.ReadInt32();
-						if (FmtChunkSize != 16)
-							throw new NotSupportedException("{0} fmt chunk size is not a supported encoding scheme.".F(FmtChunkSize));
 						AudioFormat = s.ReadInt16();
-						if (AudioFormat != 1)
-							throw new NotSupportedException("Non-PCM compression is not supported.");
+						Type = (WaveType)AudioFormat;
+						if (Type != WaveType.Pcm && Type != WaveType.ImaAdpcm)
+							throw new NotSupportedException("Compression type is not supported.");
 						Channels = s.ReadInt16();
 						SampleRate = s.ReadInt32();
 						ByteRate = s.ReadInt32();
 						BlockAlign = s.ReadInt16();
 						BitsPerSample = s.ReadInt16();
+
+						s.ReadBytes(FmtChunkSize - 16);
+						break;
+					case "fact":
+						{
+							var chunkSize = s.ReadInt32();
+							UncompressedSize = s.ReadInt32();
+							s.ReadBytes(chunkSize - 4);
+						}
+
 						break;
 					case "data":
 						DataSize = s.ReadInt32();
@@ -64,11 +77,104 @@ namespace OpenRA.FileFormats
 						break;
 					default:
 						// Ignore unknown chunks
-						var chunkSize = s.ReadInt32();
-						s.ReadBytes(chunkSize);
+						{
+							var chunkSize = s.ReadInt32();
+							s.ReadBytes(chunkSize);
+						}
+
 						break;
 				}
 			}
+
+			if (Type == WaveType.ImaAdpcm)
+			{
+				RawOutput = DecodeImaAdpcmData();
+				BitsPerSample = 16;
+			}
+		}
+
+		public static float WaveLength(Stream s)
+		{
+			s.Position = 12;
+			var fmt = s.ReadASCII(4);
+
+			if (fmt != "fmt ")
+				return 0;
+
+			s.Position = 22;
+			var channels = s.ReadInt16();
+			var sampleRate = s.ReadInt32();
+
+			s.Position = 34;
+			var bitsPerSample = s.ReadInt16();
+			var length = s.Length * 8;
+
+			return length / (channels * sampleRate * bitsPerSample);
+		}
+
+		public byte[] DecodeImaAdpcmData()
+		{
+			var s = new MemoryStream(RawOutput);
+
+			var numBlocks = DataSize / BlockAlign;
+			var blockDataSize = BlockAlign - (Channels * 4);
+			var outputSize = UncompressedSize * Channels * 2;
+
+			var outOffset = 0;
+			var output = new byte[outputSize];
+
+			var predictor = new int[Channels];
+			var index = new int[Channels];
+
+			// Decode each block of IMA ADPCM data in RawOutput
+			for (var block = 0; block < numBlocks; block++)
+			{
+				// Each block starts with a initial state per-channel
+				for (var c = 0; c < Channels; c++)
+				{
+					predictor[c] = s.ReadInt16();
+					index[c] = s.ReadUInt8();
+					/* unknown/reserved */ s.ReadUInt8();
+
+					// Output first sample from input
+					output[outOffset++] = (byte)predictor[c];
+					output[outOffset++] = (byte)(predictor[c] >> 8);
+
+					if (outOffset >= outputSize)
+						return output;
+				}
+
+				// Decode and output remaining data in this block
+				var blockOffset = 0;
+				while (blockOffset < blockDataSize)
+				{
+					for (var c = 0; c < Channels; c++)
+					{
+						// Decode 4 bytes (to 16 bytes of output) per channel
+						var chunk = s.ReadBytes(4);
+						var decoded = ImaAdpcmLoader.LoadImaAdpcmSound(chunk, ref index[c], ref predictor[c]);
+
+						// Interleave output, one sample per channel
+						var outOffsetChannel = outOffset + (2 * c);
+						for (var i = 0; i < decoded.Length; i += 2)
+						{
+							var outOffsetSample = outOffsetChannel + i;
+							if (outOffsetSample >= outputSize)
+								return output;
+
+							output[outOffsetSample] = decoded[i];
+							output[outOffsetSample + 1] = decoded[i + 1];
+							outOffsetChannel += 2 * (Channels - 1);
+						}
+
+						blockOffset += 4;
+					}
+
+					outOffset += 16 * Channels;
+				}
+			}
+
+			return output;
 		}
 	}
 }

OpenRA.Game/FileFormats/XccGlobalDatabase.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -34,7 +34,7 @@ namespace OpenRA.FileFormats
 					entries.Add(new string(chars.ToArray()));
 
 					// Skip comment
-					while ((c = reader.ReadChar()) != 0);
+					while ((c = reader.ReadChar()) != 0) { }
 				}
 			}
 

OpenRA.Game/FileFormats/XccLocalDatabase.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -47,9 +47,9 @@ namespace OpenRA.FileFormats
 			using (var writer = new BinaryWriter(data))
 			{
 				writer.Write(Encoding.ASCII.GetBytes("XCC by Olaf van der Spek"));
-				writer.Write(new byte[] {0x1A,0x04,0x17,0x27,0x10,0x19,0x80,0x00});
+				writer.Write(new byte[] { 0x1A, 0x04, 0x17, 0x27, 0x10, 0x19, 0x80, 0x00 });
 
-				writer.Write((int)(Entries.Aggregate(Entries.Length, (a,b) => a + b.Length) + 52)); // Size
+				writer.Write((int)(Entries.Aggregate(Entries.Length, (a, b) => a + b.Length) + 52)); // Size
 				writer.Write((int)0); // Type
 				writer.Write((int)0); // Version
 				writer.Write((int)0); // Game/Format (0 == TD)
@@ -64,4 +64,4 @@ namespace OpenRA.FileFormats
 			return data.ToArray();
 		}
 	}
-}
+}

OpenRA.Game/FileSystem/BagFile.cs

@@ -0,0 +1,192 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
+
+namespace OpenRA.FileSystem
+{
+	public sealed class BagFile : IFolder, IDisposable
+	{
+		static readonly uint[] Nothing = { };
+
+		readonly string bagFilename;
+		readonly Stream s;
+		readonly int bagFilePriority;
+		readonly Dictionary<uint, IdxEntry> index;
+
+		public BagFile(string filename, int priority)
+		{
+			bagFilename = filename;
+			bagFilePriority = priority;
+
+			// A bag file is always accompanied with an .idx counterpart
+			// For example: audio.bag requires the audio.idx file
+			var indexFilename = Path.ChangeExtension(filename, ".idx");
+
+			s = GlobalFileSystem.Open(filename);
+
+			// Build the index and dispose the stream, it is no longer needed after this
+			List<IdxEntry> entries;
+			using (var indexStream = GlobalFileSystem.Open(indexFilename))
+			{
+				var reader = new IdxReader(indexStream);
+
+				entries = reader.Entries;
+			}
+
+			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
+				"{0} (bag format)".F(filename),
+				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
+		}
+
+		public int Priority { get { return 1000 + bagFilePriority; } }
+		public string Name { get { return bagFilename; } }
+
+		public Stream GetContent(uint hash)
+		{
+			IdxEntry entry;
+			if (!index.TryGetValue(hash, out entry))
+				return null;
+
+			s.Seek(entry.Offset, SeekOrigin.Begin);
+
+			var waveHeaderMemoryStream = new MemoryStream();
+
+			var channels = (entry.Flags & 1) > 0 ? 2 : 1;
+
+			if ((entry.Flags & 2) > 0)
+			{
+				// PCM
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 36));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(16));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)WavLoader.WaveType.Pcm));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(2 * channels * entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)(2 * channels)));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)16));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
+			}
+
+			if ((entry.Flags & 8) > 0)
+			{
+				// IMA ADPCM
+				var samplesPerChunk = (2 * (entry.ChunkSize - 4)) + 1;
+				var bytesPerSec = (int)Math.Floor(((double)(2 * entry.ChunkSize) / samplesPerChunk) * ((double)entry.SampleRate / 2));
+				var chunkSize = entry.ChunkSize > entry.Length ? entry.Length : entry.ChunkSize;
+
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 52));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(20));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)WavLoader.WaveType.ImaAdpcm));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(bytesPerSec));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)chunkSize));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)4));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)2));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)samplesPerChunk));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fact"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(4));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(4 * entry.Length));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
+			}
+
+			waveHeaderMemoryStream.Seek(0, SeekOrigin.Begin);
+
+			// Construct a merged stream
+			var mergedStream = new MergedStream(waveHeaderMemoryStream, s);
+			mergedStream.SetLength(waveHeaderMemoryStream.Length + entry.Length);
+
+			return mergedStream;
+		}
+
+		uint? FindMatchingHash(string filename)
+		{
+			var hash = IdxEntry.HashFilename(filename, PackageHashType.CRC32);
+			if (index.ContainsKey(hash))
+				return hash;
+
+			// Maybe we were given a raw hash?
+			uint raw;
+			if (!uint.TryParse(filename, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out raw))
+				return null;
+
+			if ("{0:X}".F(raw) == filename && index.ContainsKey(raw))
+				return raw;
+
+			return null;
+		}
+
+		public Stream GetContent(string filename)
+		{
+			var hash = FindMatchingHash(filename);
+			return hash.HasValue ? GetContent(hash.Value) : null;
+		}
+
+		public bool Exists(string filename)
+		{
+			return FindMatchingHash(filename).HasValue;
+		}
+
+		public IEnumerable<uint> ClassicHashes()
+		{
+			return Nothing;
+		}
+
+		public IEnumerable<uint> CrcHashes()
+		{
+			return index.Keys;
+		}
+
+		public IEnumerable<string> AllFileNames()
+		{
+			var lookup = new Dictionary<uint, string>();
+			if (GlobalFileSystem.Exists("global mix database.dat"))
+			{
+				var db = new XccGlobalDatabase(GlobalFileSystem.Open("global mix database.dat"));
+				foreach (var e in db.Entries)
+				{
+					var hash = IdxEntry.HashFilename(e, PackageHashType.CRC32);
+					if (!lookup.ContainsKey(hash))
+						lookup.Add(hash, e);
+				}
+			}
+
+			return index.Keys.Select(k => lookup.ContainsKey(k) ? lookup[k] : "{0:X}".F(k));
+		}
+
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			GlobalFileSystem.Unmount(this);
+			throw new NotImplementedException("Updating bag files unsupported");
+		}
+
+		public void Dispose()
+		{
+			if (s != null)
+				s.Dispose();
+		}
+	}
+}

OpenRA.Game/FileSystem/BigFile.cs

@@ -0,0 +1,111 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileSystem
+{
+	public class BigFile : IFolder
+	{
+		public string Name { get; private set; }
+		public int Priority { get; private set; }
+		readonly Dictionary<string, Entry> entries = new Dictionary<string, Entry>();
+
+		public BigFile(string filename, int priority)
+		{
+			Name = filename;
+			Priority = priority;
+
+			var s = GlobalFileSystem.Open(filename);
+
+			if (s.ReadASCII(4) != "BIGF")
+				throw new InvalidDataException("Header is not BIGF");
+
+			// Total archive size.
+			s.ReadUInt32();
+
+			var entryCount = s.ReadUInt32();
+			if (BitConverter.IsLittleEndian)
+				entryCount = int2.Swap(entryCount);
+
+			// First entry offset? This is apparently bogus for EA's .big files
+			// and we don't have to try seeking there since the entries typically start next in EA's .big files.
+			s.ReadUInt32();
+
+			for (var i = 0; i < entryCount; i++)
+			{
+				var entry = new Entry(s);
+				entries.Add(entry.Path, entry);
+			}
+		}
+
+		class Entry
+		{
+			readonly Stream s;
+			readonly uint offset;
+			readonly uint size;
+			public readonly string Path;
+
+			public Entry(Stream s)
+			{
+				this.s = s;
+
+				offset = s.ReadUInt32();
+				size = s.ReadUInt32();
+				if (BitConverter.IsLittleEndian)
+				{
+					offset = int2.Swap(offset);
+					size = int2.Swap(size);
+				}
+
+				Path = s.ReadASCIIZ();
+			}
+
+			public Stream GetData()
+			{
+				s.Position = offset;
+				return new MemoryStream(s.ReadBytes((int)size));
+			}
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return entries[filename].GetData();
+		}
+
+		public bool Exists(string filename)
+		{
+			return entries.ContainsKey(filename);
+		}
+
+		public IEnumerable<uint> ClassicHashes()
+		{
+			return entries.Keys.Select(filename => PackageEntry.HashFilename(filename, PackageHashType.Classic));
+		}
+
+		public IEnumerable<uint> CrcHashes()
+		{
+			return Enumerable.Empty<uint>();
+		}
+
+		public IEnumerable<string> AllFileNames()
+		{
+			return entries.Keys;
+		}
+
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

OpenRA.Game/FileSystem/D2kSoundResources.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -56,10 +56,7 @@ namespace OpenRA.FileSystem
 				return null;
 
 			s.Seek(e.Offset, SeekOrigin.Begin);
-			var data = new byte[e.Length];
-			s.Read(data, 0, (int)e.Length);
-
-			return new MemoryStream(data);
+			return new MemoryStream(s.ReadBytes((int)e.Length));
 		}
 
 		public Stream GetContent(string filename)
@@ -79,7 +76,7 @@ namespace OpenRA.FileSystem
 
 		public string Name { get { return filename; } }
 
-		public int Priority { get { return 1000 + priority; }}
+		public int Priority { get { return 1000 + priority; } }
 
 		public IEnumerable<uint> ClassicHashes()
 		{

OpenRA.Game/FileSystem/Folder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -39,7 +39,7 @@ namespace OpenRA.FileSystem
 
 		public Stream GetContent(string filename)
 		{
-			try { return File.OpenRead( Path.Combine( path, filename ) ); }
+			try { return File.OpenRead(Path.Combine(path, filename)); }
 			catch { return null; }
 		}
 
@@ -75,8 +75,8 @@ namespace OpenRA.FileSystem
 
 			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);
+				using (var writer = new BinaryWriter(dataStream))
+					writer.Write(file.Value);
 		}
 	}
 }

OpenRA.Game/FileSystem/GlobalFileSystem.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -62,56 +62,58 @@ namespace OpenRA.FileSystem
 		{
 			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
 				return new MixFile(filename, order, content);
-			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
 				return new ZipFile(filename, order, content);
-			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
 				return new ZipFile(filename, order, content);
-			else if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("Creating .RS archives is unsupported");
-			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("Creating .Z archives is unsupported");
-			else if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("Creating .PAK archives is unsupported");
-			else
-				return new Folder(filename, order, content);
+			if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("The creation of .RS archives is unimplemented");
+			if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("The creation of .Z archives is unimplemented");
+			if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("The creation of .PAK archives is unimplemented");
+			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("The creation of .big archives is unimplemented");
+
+			return new Folder(filename, order, content);
 		}
 
 		public static IFolder OpenPackage(string filename, string annotation, int order)
 		{
 			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
 			{
-				var type = string.IsNullOrEmpty(annotation) ? PackageHashType.Classic :
-					FieldLoader.GetValue<PackageHashType>("(value)", annotation);
+				var type = string.IsNullOrEmpty(annotation)
+					? PackageHashType.Classic
+					: FieldLoader.GetValue<PackageHashType>("(value)", annotation);
+
 				return new MixFile(filename, type, order);
 			}
-			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+
+			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
 				return new ZipFile(filename, order);
-			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
 				return new ZipFile(filename, order);
-			else if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
+			if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
 				return new D2kSoundResources(filename, order);
-			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+			if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
 				return new InstallShieldPackage(filename, order);
-			else if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
+			if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
 				return new PakFile(filename, order);
-			else
-				return new Folder(filename, order);
+			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
+				return new BigFile(filename, order);
+			if (filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
+				return new BagFile(filename, order);
+
+			return new Folder(filename, order);
 		}
 
-		public static void Mount(string name)
-		{
-			Mount(name, null);
-		}
-
-		public static void Mount(string name, string annotation)
+		public static void Mount(string name, string annotation = null)
 		{
 			var optional = name.StartsWith("~");
 			if (optional)
 				name = name.Substring(1);
 
-			// paths starting with ^ are relative to the support dir
-			if (name.StartsWith("^"))
-				name = Platform.SupportDir + name.Substring(1);
+			name = Platform.ResolvePath(name);
 
 			FolderPaths.Add(name);
 			Action a = () => MountInner(OpenPackage(name, annotation, order++));
@@ -156,8 +158,7 @@ namespace OpenRA.FileSystem
 			var index = type == PackageHashType.CRC32 ? crcHashIndex : classicHashIndex;
 			var folder = index[PackageEntry.HashFilename(filename, type)]
 				.Where(x => x.Exists(filename))
-				.OrderBy(x => x.Priority)
-				.FirstOrDefault();
+				.MinByOrDefault(x => x.Priority);
 
 			if (folder != null)
 				return folder.GetContent(filename);
@@ -165,45 +166,38 @@ namespace OpenRA.FileSystem
 			return null;
 		}
 
-		public static Stream Open(string filename) { return OpenWithExts(filename, ""); }
-
-		public static Stream OpenWithExts(string filename, params string[] exts)
+		public static Stream Open(string filename)
 		{
 			Stream s;
-			if (!TryOpenWithExts(filename, exts, out s))
+			if (!TryOpen(filename, out s))
 				throw new FileNotFoundException("File not found: {0}".F(filename), filename);
 
 			return s;
 		}
 
-		public static bool TryOpenWithExts(string filename, string[] exts, out Stream s)
+		public static bool TryOpen(string filename, out Stream s)
 		{
+			// Check the cache for a quick lookup
 			if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1)
 			{
-				foreach (var ext in exts)
-				{
-					s = GetFromCache(PackageHashType.Classic, filename + ext);
-					if (s != null)
-						return true;
+				s = GetFromCache(PackageHashType.Classic, filename);
+				if (s != null)
+					return true;
 
-					s = GetFromCache(PackageHashType.CRC32, filename + ext);
-					if (s != null)
-						return true;
-				}
+				s = GetFromCache(PackageHashType.CRC32, filename);
+				if (s != null)
+					return true;
 			}
 
-			foreach (var ext in exts)
-			{
-				var folder = MountedFolders
-					.Where(x => x.Exists(filename + ext))
-					.OrderByDescending(x => x.Priority)
-					.FirstOrDefault();
+			// Ask each package individually
+			var folder = MountedFolders
+				.Where(x => x.Exists(filename))
+				.MaxByOrDefault(x => x.Priority);
 
-				if (folder != null)
-				{
-					s = folder.GetContent(filename + ext);
-					return true;
-				}
+			if (folder != null)
+			{
+				s = folder.GetContent(filename);
+				return true;
 			}
 
 			s = null;
@@ -230,8 +224,7 @@ namespace OpenRA.FileSystem
 			if (Exists(filename))
 				using (var s = Open(filename))
 				{
-					var buf = new byte[s.Length];
-					s.Read(buf, 0, buf.Length);
+					var buf = s.ReadBytes((int)s.Length);
 					a = Assembly.Load(buf);
 					assemblyCache.Add(filename, a);
 					return a;

OpenRA.Game/FileSystem/IdxEntry.cs

@@ -0,0 +1,94 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileSystem
+{
+	public class IdxEntry
+	{
+		public const string DefaultExtension = "wav";
+
+		public readonly uint Hash;
+		public readonly string Name;
+		public readonly string Extension;
+		public readonly uint Offset;
+		public readonly uint Length;
+		public readonly uint SampleRate;
+		public readonly uint Flags;
+		public readonly uint ChunkSize;
+
+		public IdxEntry(uint hash, uint offset, uint length, uint sampleRate, uint flags, uint chuckSize)
+		{
+			Hash = hash;
+			Offset = offset;
+			Length = length;
+			SampleRate = sampleRate;
+			Flags = flags;
+			ChunkSize = chuckSize;
+		}
+
+		public IdxEntry(Stream s)
+		{
+			var asciiname = s.ReadASCII(16);
+
+			var pos = asciiname.IndexOf('\0');
+			if (pos != 0)
+				asciiname = asciiname.Substring(0, pos);
+
+			Name = asciiname;
+			Extension = DefaultExtension;
+			Offset = s.ReadUInt32();
+			Length = s.ReadUInt32();
+			SampleRate = s.ReadUInt32();
+			Flags = s.ReadUInt32();
+			ChunkSize = s.ReadUInt32();
+			Hash = HashFilename(string.Concat(Name, ".", Extension), PackageHashType.CRC32);
+		}
+
+		public void Write(BinaryWriter w)
+		{
+			w.Write(Name.PadRight(16, '\0'));
+			w.Write(Offset);
+			w.Write(Length);
+			w.Write(SampleRate);
+			w.Write(Flags);
+			w.Write(ChunkSize);
+		}
+
+		public override string ToString()
+		{
+			string filename;
+			if (names.TryGetValue(Hash, out filename))
+				return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(filename, Offset, Length);
+			else
+				return "0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}".F(Hash, Offset, Length);
+		}
+
+		public static uint HashFilename(string name, PackageHashType type)
+		{
+			return PackageEntry.HashFilename(name, type);
+		}
+
+		static Dictionary<uint, string> names = new Dictionary<uint, string>();
+
+		public static void AddStandardName(string s)
+		{
+			// RA1 and TD
+			var hash = HashFilename(s, PackageHashType.Classic);
+			names.Add(hash, s);
+
+			// TS
+			var crcHash = HashFilename(s, PackageHashType.CRC32);
+			names.Add(crcHash, s);
+		}
+	}
+}

OpenRA.Game/FileSystem/InstallShieldPackage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -32,8 +32,8 @@ namespace OpenRA.FileSystem
 			s = GlobalFileSystem.Open(filename);
 
 			// Parse package header
-			BinaryReader reader = new BinaryReader(s);
-			uint signature = reader.ReadUInt32();
+			var reader = new BinaryReader(s);
+			var signature = reader.ReadUInt32();
 			if (signature != 0x8C655D13)
 				throw new InvalidDataException("Not an Installshield package");
 
@@ -42,58 +42,58 @@ namespace OpenRA.FileSystem
 			reader.ReadBytes(4);
 			/*var ArchiveSize = */reader.ReadUInt32();
 			reader.ReadBytes(19);
-			var TOCAddress = reader.ReadInt32();
+			var tocAddress = reader.ReadInt32();
 			reader.ReadBytes(4);
-			var DirCount = reader.ReadUInt16();
+			var dirCount = reader.ReadUInt16();
 
 			// Parse the directory list
-			s.Seek(TOCAddress, SeekOrigin.Begin);
-			BinaryReader TOCreader = new BinaryReader(s);
+			s.Seek(tocAddress, SeekOrigin.Begin);
+			var tocReader = new BinaryReader(s);
 
 			var fileCountInDirs = new List<uint>();
+
 			// Parse directories
-			for (var i = 0; i < DirCount; i++)
-				fileCountInDirs.Add(ParseDirectory(TOCreader));
+			for (var i = 0; i < dirCount; i++)
+				fileCountInDirs.Add(ParseDirectory(tocReader));
 
 			// Parse files
 			foreach (var fileCount in fileCountInDirs)
 				for (var i = 0; i < fileCount; i++)
 					ParseFile(reader);
-
 		}
 
 		static uint 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));
+			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);
-			return FileCount;
+			reader.ReadBytes(chunkSize - nameLength - 6);
+			return fileCount;
 		}
 
-		uint AccumulatedData = 0;
+		uint accumulatedData = 0;
 		void ParseFile(BinaryReader reader)
 		{
 			reader.ReadBytes(7);
-			var CompressedSize = reader.ReadUInt32();
+			var compressedSize = reader.ReadUInt32();
 			reader.ReadBytes(12);
-			var ChunkSize = reader.ReadUInt16();
+			var chunkSize = reader.ReadUInt16();
 			reader.ReadBytes(4);
-			var NameLength = reader.ReadByte();
-			var FileName = new String(reader.ReadChars(NameLength));
+			var nameLength = reader.ReadByte();
+			var fileName = new string(reader.ReadChars(nameLength));
 
-			var hash = PackageEntry.HashFilename(FileName, PackageHashType.Classic);
+			var hash = PackageEntry.HashFilename(fileName, PackageHashType.Classic);
 			if (!index.ContainsKey(hash))
-				index.Add(hash, new PackageEntry(hash,AccumulatedData, CompressedSize));
-			filenames.Add(FileName);
-			AccumulatedData += CompressedSize;
+				index.Add(hash, new PackageEntry(hash, accumulatedData, compressedSize));
+			filenames.Add(fileName);
+			accumulatedData += compressedSize;
 
 			// Skip to the end of the chunk
-			reader.ReadBytes(ChunkSize - NameLength - 30);
+			reader.ReadBytes(chunkSize - nameLength - 30);
 		}
 
 		public Stream GetContent(uint hash)
@@ -103,8 +103,7 @@ namespace OpenRA.FileSystem
 				return null;
 
 			s.Seek(dataStart + e.Offset, SeekOrigin.Begin);
-			var data = new byte[e.Length];
-			s.Read(data, 0, (int)e.Length);
+			var data = s.ReadBytes((int)e.Length);
 
 			return new MemoryStream(Blast.Decompress(data));
 		}
@@ -134,7 +133,7 @@ namespace OpenRA.FileSystem
 			return index.ContainsKey(PackageEntry.HashFilename(filename, PackageHashType.Classic));
 		}
 
-		public int Priority { get { return 2000 + priority; }}
+		public int Priority { get { return 2000 + priority; } }
 		public string Name { get { return filename; } }
 
 		public void Write(Dictionary<string, byte[]> contents)

OpenRA.Game/FileSystem/MixFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -17,7 +17,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.FileSystem
 {
-	public class MixFile : IFolder
+	public sealed class MixFile : IFolder, IDisposable
 	{
 		readonly Dictionary<uint, PackageEntry> index;
 		readonly long dataStart;
@@ -68,9 +68,8 @@ namespace OpenRA.FileSystem
 				entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
 
 			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
-				"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, (isCncMix ? "C&C" : "RA/TS/RA2"), isEncrypted, dataStart),
-				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
-			);
+				"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, isCncMix ? "C&C" : "RA/TS/RA2", isEncrypted, dataStart),
+				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
 		}
 
 		static List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
@@ -83,7 +82,7 @@ namespace OpenRA.FileSystem
 			for (var i = 0; i < numFiles; i++)
 				items.Add(new PackageEntry(s));
 
-			headerEnd = offset + 6 + numFiles*PackageEntry.Size;
+			headerEnd = offset + 6 + numFiles * PackageEntry.Size;
 			return items;
 		}
 
@@ -101,8 +100,8 @@ namespace OpenRA.FileSystem
 			var numFiles = ms.ReadUInt16();
 
 			// Decrypt the full header - round bytes up to a full block
-			var blockCount = (13 + numFiles*PackageEntry.Size)/8;
-			headerEnd = offset + 80 + blockCount*8;
+			var blockCount = (13 + numFiles * PackageEntry.Size) / 8;
+			headerEnd = offset + 80 + blockCount * 8;
 
 			return Decrypt(ReadBlocks(s, offset + 80, blockCount), fish);
 		}
@@ -113,7 +112,7 @@ namespace OpenRA.FileSystem
 
 			var ms = new MemoryStream();
 			var writer = new BinaryWriter(ms);
-			foreach(var t in decrypted)
+			foreach (var t in decrypted)
 				writer.Write(t);
 			writer.Flush();
 
@@ -126,7 +125,7 @@ namespace OpenRA.FileSystem
 			s.Seek(offset, SeekOrigin.Begin);
 
 			// A block is a single encryption unit (represented as two 32-bit integers)
-			var ret = new uint[2*count];
+			var ret = new uint[2 * count];
 			for (var i = 0; i < ret.Length; i++)
 				ret[i] = s.ReadUInt32();
 
@@ -157,8 +156,7 @@ namespace OpenRA.FileSystem
 				return null;
 
 			s.Seek(dataStart + e.Offset, SeekOrigin.Begin);
-			var data = new byte[e.Length];
-			s.Read(data, 0, (int)e.Length);
+			var data = s.ReadBytes((int)e.Length);
 			return new MemoryStream(data);
 		}
 
@@ -168,7 +166,7 @@ namespace OpenRA.FileSystem
 			return hash.HasValue ? GetContent(hash.Value) : null;
 		}
 
-		static readonly uint[] Nothing = {};
+		static readonly uint[] Nothing = { };
 		public IEnumerable<uint> ClassicHashes()
 		{
 			if (type == PackageHashType.Classic)
@@ -220,7 +218,7 @@ namespace OpenRA.FileSystem
 
 		public int Priority { get { return 1000 + priority; } }
 		public string Name { get { return filename; } }
-		
+
 		public void Write(Dictionary<string, byte[]> contents)
 		{
 			// Cannot modify existing mixfile - rename existing file and
@@ -259,5 +257,11 @@ namespace OpenRA.FileSystem
 					s.Write(file.Value);
 			}
 		}
+
+		public void Dispose()
+		{
+			if (s != null)
+				s.Dispose();
+		}
 	}
 }

OpenRA.Game/FileSystem/PackageEntry.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -20,6 +20,7 @@ namespace OpenRA.FileSystem
 
 	public class PackageEntry
 	{
+		public const int Size = 12;
 		public readonly uint Hash;
 		public readonly uint Offset;
 		public readonly uint Length;
@@ -48,7 +49,7 @@ namespace OpenRA.FileSystem
 		public override string ToString()
 		{
 			string filename;
-			if (Names.TryGetValue(Hash, out filename))
+			if (names.TryGetValue(Hash, out filename))
 				return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(filename, Offset, Length);
 			else
 				return "0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}".F(Hash, Offset, Length);
@@ -56,55 +57,54 @@ namespace OpenRA.FileSystem
 
 		public static uint HashFilename(string name, PackageHashType type)
 		{
-			switch(type)
+			switch (type)
 			{
-			case PackageHashType.Classic:
-				{
-					name = name.ToUpperInvariant();
-					if (name.Length % 4 != 0)
-						name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');
-
-					MemoryStream ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
-					BinaryReader reader = new BinaryReader(ms);
-
-					int len = name.Length >> 2;
-					uint result = 0;
-
-					while (len-- != 0)
-						result = ((result << 1) | (result >> 31)) + reader.ReadUInt32();
-
-					return result;
-				}
-
-			case PackageHashType.CRC32:
-				{
-					name = name.ToUpperInvariant();
-					var l = name.Length;
-					int a = l >> 2;
-					if ((l & 3) != 0)
+				case PackageHashType.Classic:
 					{
-						name += (char)(l - (a << 2));
-						int i = 3 - (l & 3);
-						while (i-- != 0)
-							name += name[a << 2];
-					}
-					return CRC32.Calculate(Encoding.ASCII.GetBytes(name));
-				}
+						name = name.ToUpperInvariant();
+						if (name.Length % 4 != 0)
+							name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');
 
-			default: throw new NotImplementedException("Unknown hash type `{0}`".F(type));
+						var ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
+						var reader = new BinaryReader(ms);
+
+						var len = name.Length >> 2;
+						uint result = 0;
+
+						while (len-- != 0)
+							result = ((result << 1) | (result >> 31)) + reader.ReadUInt32();
+
+						return result;
+					}
+
+				case PackageHashType.CRC32:
+					{
+						name = name.ToUpperInvariant();
+						var l = name.Length;
+						var a = l >> 2;
+						if ((l & 3) != 0)
+						{
+							name += (char)(l - (a << 2));
+							var i = 3 - (l & 3);
+							while (i-- != 0)
+								name += name[a << 2];
+						}
+
+						return CRC32.Calculate(Encoding.ASCII.GetBytes(name));
+					}
+
+				default: throw new NotImplementedException("Unknown hash type `{0}`".F(type));
 			}
 		}
 
-		static Dictionary<uint, string> Names = new Dictionary<uint,string>();
+		static Dictionary<uint, string> names = new Dictionary<uint, string>();
 
 		public static void AddStandardName(string s)
 		{
-			uint hash = HashFilename(s, PackageHashType.Classic); // RA1 and TD
-			Names.Add(hash, s);
-			uint crcHash = HashFilename(s, PackageHashType.CRC32); // TS
-			Names.Add(crcHash, s);
+			var hash = HashFilename(s, PackageHashType.Classic); // RA1 and TD
+			names.Add(hash, s);
+			var crcHash = HashFilename(s, PackageHashType.CRC32); // TS
+			names.Add(crcHash, s);
 		}
-
-		public const int Size = 12;
 	}
 }

OpenRA.Game/FileSystem/Pak.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -59,8 +59,7 @@ namespace OpenRA.FileSystem
 				return null;
 
 			stream.Seek(entry.Offset, SeekOrigin.Begin);
-			var data = new byte[entry.Length];
-			stream.Read(data, 0, (int)entry.Length);
+			var data = stream.ReadBytes((int)entry.Length);
 			return new MemoryStream(data);
 		}
 

OpenRA.Game/FileSystem/ZipFile.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -16,7 +17,7 @@ using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
 
 namespace OpenRA.FileSystem
 {
-	public class ZipFile : IFolder
+	public sealed class ZipFile : IFolder, IDisposable
 	{
 		string filename;
 		SZipFile pkg;
@@ -60,11 +61,7 @@ namespace OpenRA.FileSystem
 			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);
-
+				z.CopyTo(ms);
 				ms.Seek(0, SeekOrigin.Begin);
 				return ms;
 			}
@@ -109,6 +106,12 @@ namespace OpenRA.FileSystem
 			pkg.Close();
 			pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
 		}
+
+		public void Dispose()
+		{
+			if (pkg != null)
+				pkg.Close();
+		}
 	}
 
 	class StaticMemoryDataSource : IStaticDataSource

OpenRA.Game/Game.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -9,15 +9,14 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
-using OpenRA.FileSystem;
+using System.Threading;
 using MaxMind.GeoIP2;
-using OpenRA.GameRules;
+using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Network;
 using OpenRA.Primitives;
@@ -28,13 +27,16 @@ namespace OpenRA
 {
 	public static class Game
 	{
-		public static MouseButtonPreference mouseButtonPreference = new MouseButtonPreference();
+		public const int NetTickScale = 3; // 120 ms net tick for 40 ms local tick
+		public const int Timestep = 40;
+		public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
 
-		public static ModData modData;
+		public static ModData ModData;
 		public static Settings Settings;
+		public static ICursor Cursor;
 		static WorldRenderer worldRenderer;
 
-		internal static OrderManager orderManager;
+		internal static OrderManager OrderManager;
 		static Server.Server server;
 
 		public static MersenneTwister CosmeticRandom = new MersenneTwister(); // not synced
@@ -44,10 +46,13 @@ namespace OpenRA
 
 		public static DatabaseReader GeoIpDatabase;
 
-		public static OrderManager JoinServer(string host, int port, string password)
+		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
-			var om = new OrderManager(host, port, password,
-				new ReplayRecorderConnection(new NetworkConnection(host, port), ChooseReplayFilename));
+			IConnection connection = new NetworkConnection(host, port);
+			if (recordReplay)
+				connection = new ReplayRecorderConnection(connection, ChooseReplayFilename);
+
+			var om = new OrderManager(host, port, password, connection);
 			JoinInner(om);
 			return om;
 		}
@@ -59,10 +64,10 @@ namespace OpenRA
 
 		static void JoinInner(OrderManager om)
 		{
-			if (orderManager != null) orderManager.Dispose();
-			orderManager = om;
+			if (OrderManager != null) OrderManager.Dispose();
+			OrderManager = om;
 			lastConnectionState = ConnectionState.PreConnecting;
-			ConnectionStateChanged(orderManager);
+			ConnectionStateChanged(OrderManager);
 		}
 
 		public static void JoinReplay(string replayFile)
@@ -75,21 +80,28 @@ namespace OpenRA
 			JoinInner(new OrderManager("<no server>", -1, "", new EchoConnection()));
 		}
 
-		public static int RenderFrame = 0;
-		public static int NetFrameNumber { get { return orderManager.NetFrameNumber; } }
-		public static int LocalTick { get { return orderManager.LocalFrameNumber; } }
-		public const int NetTickScale = 3; // 120 ms net tick for 40 ms local tick
-		public const int Timestep = 40;
-		public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
+		// More accurate replacement for Environment.TickCount
+		static Stopwatch stopwatch = Stopwatch.StartNew();
+		public static int RunTime { get { return (int)Game.stopwatch.ElapsedMilliseconds; } }
 
+		public static int RenderFrame = 0;
+		public static int NetFrameNumber { get { return OrderManager.NetFrameNumber; } }
+		public static int LocalTick { get { return OrderManager.LocalFrameNumber; } }
+
+		public static event Action<string, int> OnRemoteDirectConnect = (a, b) => { };
 		public static event Action<OrderManager> ConnectionStateChanged = _ => { };
 		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
-		public static int LocalClientId { get { return orderManager.Connection.LocalClientId; } }
+		public static int LocalClientId { get { return OrderManager.Connection.LocalClientId; } }
+
+		public static void RemoteDirectConnect(string host, int port)
+		{
+			OnRemoteDirectConnect(host, port);
+		}
 
 		// Hacky workaround for orderManager visibility
 		public static Widget OpenWindow(World world, string widget)
 		{
-			return Ui.OpenWindow(widget, new WidgetArgs() { { "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer } });
+			return Ui.OpenWindow(widget, new WidgetArgs() { { "world", world }, { "orderManager", OrderManager }, { "worldRenderer", worldRenderer } });
 		}
 
 		// Who came up with the great idea of making these things
@@ -98,8 +110,8 @@ namespace OpenRA
 		{
 			return Ui.OpenWindow(widget, new WidgetArgs(args)
 			{
-				{ "world", worldRenderer.world },
-				{ "orderManager", orderManager },
+				{ "world", worldRenderer.World },
+				{ "orderManager", OrderManager },
 				{ "worldRenderer", worldRenderer },
 			});
 		}
@@ -107,76 +119,294 @@ namespace OpenRA
 		// Load a widget with world, orderManager, worldRenderer args, without adding it to the widget tree
 		public static Widget LoadWidget(World world, string id, Widget parent, WidgetArgs args)
 		{
-			return modData.WidgetLoader.LoadWidget(new WidgetArgs(args)
+			return ModData.WidgetLoader.LoadWidget(new WidgetArgs(args)
 			{
 				{ "world", world },
-				{ "orderManager", orderManager },
+				{ "orderManager", OrderManager },
 				{ "worldRenderer", worldRenderer },
 			}, parent, id);
 		}
 
+		public static event Action LobbyInfoChanged = () => { };
+
+		internal static void SyncLobbyInfo()
+		{
+			LobbyInfoChanged();
+		}
+
+		public static event Action BeforeGameStart = () => { };
+		internal static void StartGame(string mapUID, WorldType type)
+		{
+			Cursor.SetCursor(null);
+			BeforeGameStart();
+
+			Map map;
+
+			using (new PerfTimer("PrepareMap"))
+				map = ModData.PrepareMap(mapUID);
+			using (new PerfTimer("NewWorld"))
+			{
+				OrderManager.World = new World(map, OrderManager, type);
+				OrderManager.World.Timestep = Timestep;
+			}
+
+			if (worldRenderer != null)
+				worldRenderer.Dispose();
+
+			worldRenderer = new WorldRenderer(OrderManager.World);
+
+			using (new PerfTimer("LoadComplete"))
+				OrderManager.World.LoadComplete(worldRenderer);
+
+			if (OrderManager.GameStarted)
+				return;
+
+			Ui.MouseFocusWidget = null;
+			Ui.KeyboardFocusWidget = null;
+
+			OrderManager.LocalFrameNumber = 0;
+			OrderManager.LastTickTime = RunTime;
+			OrderManager.StartGame();
+			worldRenderer.RefreshPalette();
+			Cursor.SetCursor("default");
+
+			GC.Collect();
+		}
+
+		public static bool IsHost
+		{
+			get
+			{
+				var id = OrderManager.Connection.LocalClientId;
+				var client = OrderManager.LobbyInfo.ClientWithIndex(id);
+				return client != null && client.IsAdmin;
+			}
+		}
+
+		static Modifiers modifiers;
+		public static Modifiers GetModifierKeys() { return modifiers; }
+		internal static void HandleModifierKeys(Modifiers mods) { modifiers = mods; }
+
+		public static void InitializeSettings(Arguments args)
+		{
+			Settings = new Settings(Platform.ResolvePath("^", "settings.yaml"), args);
+		}
+
+		internal static void Initialize(Arguments args)
+		{
+			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
+
+			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
+
+			InitializeSettings(args);
+
+			Log.AddChannel("perf", "perf.log");
+			Log.AddChannel("debug", "debug.log");
+			Log.AddChannel("sync", "syncreport.log");
+			Log.AddChannel("server", "server.log");
+			Log.AddChannel("sound", "sound.log");
+			Log.AddChannel("graphics", "graphics.log");
+			Log.AddChannel("geoip", "geoip.log");
+
+			if (Settings.Server.DiscoverNatDevices)
+				UPnP.TryNatDiscovery();
+			else
+			{
+				Settings.Server.NatDeviceAvailable = false;
+				Settings.Server.AllowPortForward = false;
+			}
+
+			try
+			{
+				GeoIpDatabase = new DatabaseReader("GeoLite2-Country.mmdb");
+			}
+			catch (Exception e)
+			{
+				Log.Write("geoip", "DatabaseReader failed: {0}", e);
+			}
+
+			GlobalFileSystem.Mount(Platform.GameDir); // Needed to access shaders
+			var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", null };
+			foreach (var r in renderers)
+			{
+				if (r == null)
+					throw new InvalidOperationException("No suitable renderers were found. Check graphics.log for details.");
+
+				Settings.Graphics.Renderer = r;
+				try
+				{
+					Renderer = new Renderer(Settings.Graphics, Settings.Server);
+					break;
+				}
+				catch (Exception e)
+				{
+					Log.Write("graphics", "{0}", e);
+					Console.WriteLine("Renderer initialization failed. Fallback in place. Check graphics.log for details.");
+				}
+			}
+
+			try
+			{
+				Sound.Create(Settings.Sound.Engine);
+			}
+			catch (Exception e)
+			{
+				Log.Write("sound", "{0}", e);
+				Console.WriteLine("Creating the sound engine failed. Fallback in place. Check sound.log for details.");
+				Settings.Sound.Engine = "Null";
+				Sound.Create(Settings.Sound.Engine);
+			}
+
+			Console.WriteLine("Available mods:");
+			foreach (var mod in ModMetadata.AllMods)
+				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
+
+			InitializeMod(Settings.Game.Mod, args);
+
+			if (Settings.Server.DiscoverNatDevices)
+				RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.StoppingNatDiscovery);
+		}
+
+		public static void InitializeMod(string mod, Arguments args)
+		{
+			// Clear static state if we have switched mods
+			LobbyInfoChanged = () => { };
+			ConnectionStateChanged = om => { };
+			BeforeGameStart = () => { };
+			OnRemoteDirectConnect = (a, b) => { };
+			delayedActions = new ActionQueue();
+
+			Ui.ResetAll();
+
+			if (worldRenderer != null)
+				worldRenderer.Dispose();
+			worldRenderer = null;
+			if (server != null)
+				server.Shutdown();
+			if (OrderManager != null)
+				OrderManager.Dispose();
+
+			if (ModData != null)
+				ModData.Dispose();
+			ModData = null;
+
+			// Fall back to default if the mod doesn't exist
+			if (!ModMetadata.AllMods.ContainsKey(mod))
+				mod = new GameSettings().Mod;
+
+			Console.WriteLine("Loading mod: {0}", mod);
+			Settings.Game.Mod = mod;
+
+			Sound.StopMusic();
+			Sound.StopVideo();
+			Sound.Initialize();
+
+			ModData = new ModData(mod, !Settings.Server.Dedicated);
+			ModData.InitializeLoaders();
+			if (!Settings.Server.Dedicated)
+				Renderer.InitializeFonts(ModData.Manifest);
+
+			using (new PerfTimer("LoadMaps"))
+				ModData.MapCache.LoadMaps();
+
+			if (Settings.Graphics.HardwareCursors)
+			{
+				try
+				{
+					Cursor = new HardwareCursor(ModData.CursorProvider);
+				}
+				catch (Exception e)
+				{
+					Log.Write("debug", "Failed to initialize hardware cursors. Falling back to software cursors.");
+					Log.Write("debug", "Error was: " + e.Message);
+
+					Console.WriteLine("Failed to initialize hardware cursors. Falling back to software cursors.");
+					Console.WriteLine("Error was: " + e.Message);
+
+					Cursor = new SoftwareCursor(ModData.CursorProvider);
+					Settings.Graphics.HardwareCursors = false;
+				}
+			}
+			else
+				Cursor = new SoftwareCursor(ModData.CursorProvider);
+
+			PerfHistory.Items["render"].HasNormalTick = false;
+			PerfHistory.Items["batches"].HasNormalTick = false;
+			PerfHistory.Items["render_widgets"].HasNormalTick = false;
+			PerfHistory.Items["render_flip"].HasNormalTick = false;
+
+			JoinLocal();
+
+			if (Settings.Server.Dedicated)
+			{
+				while (true)
+				{
+					Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
+					Settings.Save();
+					CreateServer(new ServerSettings(Settings.Server));
+					while (true)
+					{
+						Thread.Sleep(100);
+
+						if (server.State == Server.ServerState.GameStarted && server.Conns.Count < 1)
+						{
+							Console.WriteLine("No one is playing, shutting down...");
+							server.Shutdown();
+							break;
+						}
+					}
+
+					if (Settings.Server.DedicatedLoop)
+					{
+						Console.WriteLine("Starting a new server instance...");
+						ModData.MapCache.LoadMaps();
+						continue;
+					}
+
+					break;
+				}
+
+				Environment.Exit(0);
+			}
+			else
+				ModData.LoadScreen.StartGame(args);
+		}
+
+		public static void LoadShellMap()
+		{
+			var shellmap = ChooseShellmap();
+
+			using (new PerfTimer("StartGame"))
+				StartGame(shellmap, WorldType.Shellmap);
+		}
+
+		static string ChooseShellmap()
+		{
+			var shellmaps = ModData.MapCache
+				.Where(m => m.Status == MapStatus.Available && m.Map.Visibility.HasFlag(MapVisibility.Shellmap))
+				.Select(m => m.Uid);
+
+			if (!shellmaps.Any())
+				throw new InvalidDataException("No valid shellmaps available");
+
+			return shellmaps.Random(CosmeticRandom);
+		}
+
+		static RunStatus state = RunStatus.Running;
+		public static event Action OnQuit = () => { };
+
 		// Note: These delayed actions should only be used by widgets or disposing objects
 		// - things that depend on a particular world should be queuing them on the worldactor.
 		static ActionQueue delayedActions = new ActionQueue();
 		public static void RunAfterTick(Action a) { delayedActions.Add(a); }
 		public static void RunAfterDelay(int delay, Action a) { delayedActions.Add(a, delay); }
 
-		static float cursorFrame = 0f;
-		static void Tick(OrderManager orderManager)
+		static void InnerLogicTick(OrderManager orderManager)
 		{
-			if (orderManager.Connection.ConnectionState != lastConnectionState)
-			{
-				lastConnectionState = orderManager.Connection.ConnectionState;
-				ConnectionStateChanged(orderManager);
-			}
+			var tick = RunTime;
 
-			TickInner(orderManager);
-			if (worldRenderer != null && orderManager.world != worldRenderer.world)
-				TickInner(worldRenderer.world.orderManager);
+			var world = orderManager.World;
 
-			using (new PerfSample("render"))
-			{
-				++RenderFrame;
-
-				// worldRenderer is null during the initial install/download screen
-				if (worldRenderer != null)
-				{
-					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft.ToFloat2(), worldRenderer.Viewport.Zoom);
-					Sound.SetListenerPosition(worldRenderer.Position(worldRenderer.Viewport.CenterLocation));
-					worldRenderer.Draw();
-				}
-				else
-					Renderer.BeginFrame(float2.Zero, 1f);
-
-				using (new PerfSample("render_widgets"))
-				{
-					Ui.Draw();
-					if (modData != null && modData.CursorProvider != null)
-					{
-						var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-						modData.CursorProvider.DrawCursor(Renderer, cursorName, Viewport.LastMousePos, (int)cursorFrame);
-					}
-				}
-
-				using (new PerfSample("render_flip"))
-				{
-					Renderer.EndFrame(new DefaultInputHandler(orderManager.world));
-				}
-			}
-
-			PerfHistory.items["render"].Tick();
-			PerfHistory.items["batches"].Tick();
-			PerfHistory.items["render_widgets"].Tick();
-			PerfHistory.items["render_flip"].Tick();
-
-			delayedActions.PerformActions();
-		}
-
-		static void TickInner(OrderManager orderManager)
-		{
-			var tick = Environment.TickCount;
-
-			var world = orderManager.world;
 			var uiTickDelta = tick - Ui.LastTickTime;
 			if (uiTickDelta >= Timestep)
 			{
@@ -187,19 +417,19 @@ namespace OpenRA
 				Viewport.TicksSinceLastMove += uiTickDelta / Timestep;
 
 				Sync.CheckSyncUnchanged(world, Ui.Tick);
-				cursorFrame += 0.5f;
+				Cursor.Tick();
 			}
 
 			var worldTimestep = world == null ? Timestep : world.Timestep;
-			var worldTickDelta = (tick - orderManager.LastTickTime);
+			var worldTickDelta = tick - orderManager.LastTickTime;
 			if (worldTimestep != 0 && worldTickDelta >= worldTimestep)
+			{
 				using (new PerfSample("tick_time"))
 				{
 					// Tick the world to advance the world time to match real time:
 					//    If dt < TickJankThreshold then we should try and catch up by repeatedly ticking
 					//    If dt >= TickJankThreshold then we should accept the jank and progress at the normal rate
 					// dt is rounded down to an integer tick count in order to preserve fractional tick components.
-
 					var integralTickTimestep = (worldTickDelta / worldTimestep) * worldTimestep;
 					orderManager.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : worldTimestep;
 
@@ -231,251 +461,171 @@ namespace OpenRA
 						}
 						else
 							if (orderManager.NetFrameNumber == 0)
-								orderManager.LastTickTime = Environment.TickCount;
+								orderManager.LastTickTime = RunTime;
 
 						Sync.CheckSyncUnchanged(world, () => world.TickRender(worldRenderer));
 					}
 				}
-		}
-
-		public static event Action LobbyInfoChanged = () => { };
-
-		internal static void SyncLobbyInfo()
-		{
-			LobbyInfoChanged();
-		}
-
-		public static event Action BeforeGameStart = () => { };
-		internal static void StartGame(string mapUID, bool isShellmap)
-		{
-			BeforeGameStart();
-
-			Map map;
-
-			using (new PerfTimer("PrepareMap"))
-				map = modData.PrepareMap(mapUID);
-			using (new PerfTimer("NewWorld"))
-			{
-				orderManager.world = new World(map, orderManager, isShellmap);
-				orderManager.world.Timestep = Timestep;
-			}
-			worldRenderer = new WorldRenderer(orderManager.world);
-			using (new PerfTimer("LoadComplete"))
-				orderManager.world.LoadComplete(worldRenderer);
-
-			if (orderManager.GameStarted)
-				return;
-
-			Ui.MouseFocusWidget = null;
-			Ui.KeyboardFocusWidget = null;
-
-			orderManager.LocalFrameNumber = 0;
-			orderManager.LastTickTime = Environment.TickCount;
-			orderManager.StartGame();
-			worldRenderer.RefreshPalette();
-		}
-
-		public static bool IsHost
-		{
-			get
-			{
-				var id = orderManager.Connection.LocalClientId;
-				var client = orderManager.LobbyInfo.ClientWithIndex(id);
-				return client != null && client.IsAdmin;
 			}
 		}
 
-		static Modifiers modifiers;
-		public static Modifiers GetModifierKeys() { return modifiers; }
-		internal static void HandleModifierKeys(Modifiers mods) { modifiers = mods; }
-
-		internal static void Initialize(Arguments args)
+		static void LogicTick()
 		{
-			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
+			delayedActions.PerformActions();
 
-			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
-
-			Settings = new Settings(Platform.SupportDir + "settings.yaml", args);
-
-			Log.LogPath = Platform.SupportDir + "Logs" + Path.DirectorySeparatorChar;
-			Log.AddChannel("perf", "perf.log");
-			Log.AddChannel("debug", "debug.log");
-			Log.AddChannel("sync", "syncreport.log");
-			Log.AddChannel("server", "server.log");
-			Log.AddChannel("sound", "sound.log");
-			Log.AddChannel("graphics", "graphics.log");
-			Log.AddChannel("geoip", "geoip.log");
-
-			if (Settings.Server.DiscoverNatDevices)
-				UPnP.TryNatDiscovery();
-			else
+			if (OrderManager.Connection.ConnectionState != lastConnectionState)
 			{
-				Settings.Server.NatDeviceAvailable = false;
-				Settings.Server.AllowPortForward = false;
+				lastConnectionState = OrderManager.Connection.ConnectionState;
+				ConnectionStateChanged(OrderManager);
 			}
 
-			try
-			{
-				GeoIpDatabase = new DatabaseReader("GeoLite2-Country.mmdb");
-			}
-			catch (Exception e)
-			{
-				Log.Write("geoip", "DatabaseReader failed: {0}", e);
-			}
+			InnerLogicTick(OrderManager);
+			if (worldRenderer != null && OrderManager.World != worldRenderer.World)
+				InnerLogicTick(worldRenderer.World.OrderManager);
+		}
 
-			GlobalFileSystem.Mount("."); // Needed to access shaders
-			var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", null };
-			foreach (var r in renderers)
+		static void RenderTick()
+		{
+			using (new PerfSample("render"))
 			{
-				if (r == null)
-					throw new InvalidOperationException("No suitable renderers were found. Check graphics.log for details.");
+				++RenderFrame;
 
-				Settings.Graphics.Renderer = r;
-				try
+				// worldRenderer is null during the initial install/download screen
+				if (worldRenderer != null)
 				{
-					Renderer.Initialize(Settings.Graphics.Mode);
-					break;
+					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.Zoom);
+					Sound.SetListenerPosition(worldRenderer.Viewport.CenterPosition);
+					worldRenderer.Draw();
 				}
-				catch (Exception e)
+				else
+					Renderer.BeginFrame(int2.Zero, 1f);
+
+				using (new PerfSample("render_widgets"))
 				{
-					Log.Write("graphics", "{0}", e);
-					Console.WriteLine("Renderer initialization failed. Fallback in place. Check graphics.log for details.");
-				}
-			}
+					Game.Renderer.WorldVoxelRenderer.BeginFrame();
+					Ui.PrepareRenderables();
+					Game.Renderer.WorldVoxelRenderer.EndFrame();
 
-			Renderer = new Renderer();
+					Ui.Draw();
 
-			try
-			{
-				Sound.Create(Settings.Sound.Engine);
-			}
-			catch (Exception e)
-			{
-				Log.Write("sound", "{0}", e);
-				Console.WriteLine("Creating the sound engine failed. Fallback in place. Check sound.log for details.");
-				Settings.Sound.Engine = "Null";
-				Sound.Create(Settings.Sound.Engine);
-			}
-
-			Console.WriteLine("Available mods:");
-			foreach (var mod in ModMetadata.AllMods)
-				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
-
-			InitializeWithMod(Settings.Game.Mod, args.GetValue("Launch.Replay", null));
-
-			if (Settings.Server.DiscoverNatDevices)
-				RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.TryStoppingNatDiscovery);
-		}
-
-		public static void InitializeWithMod(string mod, string replay)
-		{
-			// Clear static state if we have switched mods
-			LobbyInfoChanged = () => { };
-			AddChatLine = (a, b, c) => { };
-			ConnectionStateChanged = om => { };
-			BeforeGameStart = () => { };
-			Ui.ResetAll();
-
-			worldRenderer = null;
-			if (server != null)
-				server.Shutdown();
-			if (orderManager != null)
-				orderManager.Dispose();
-
-			// Fall back to default if the mod doesn't exist
-			if (!ModMetadata.AllMods.ContainsKey(mod))
-				mod = new GameSettings().Mod;
-
-			Console.WriteLine("Loading mod: {0}", mod);
-			Settings.Game.Mod = mod;
-
-			Sound.StopMusic();
-			Sound.StopVideo();
-			Sound.Initialize();
-
-			modData = new ModData(mod);
-			Renderer.InitializeFonts(modData.Manifest);
-			modData.InitializeLoaders();
-			using (new PerfTimer("LoadMaps"))
-				modData.MapCache.LoadMaps();
-
-			PerfHistory.items["render"].hasNormalTick = false;
-			PerfHistory.items["batches"].hasNormalTick = false;
-			PerfHistory.items["render_widgets"].hasNormalTick = false;
-			PerfHistory.items["render_flip"].hasNormalTick = false;
-
-			JoinLocal();
-
-			if (Settings.Server.Dedicated)
-			{
-				while (true)
-				{
-					Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
-					Settings.Save();
-					CreateServer(new ServerSettings(Settings.Server));
-					while (true)
+					if (ModData != null && ModData.CursorProvider != null)
 					{
-						System.Threading.Thread.Sleep(100);
+						Cursor.SetCursor(Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default");
+						Cursor.Render(Renderer);
+					}
+				}
 
-						if (server.State == Server.ServerState.GameStarted && server.Conns.Count < 1)
-						{
-							Console.WriteLine("No one is playing, shutting down...");
-							server.Shutdown();
-							break;
-						}
+				using (new PerfSample("render_flip"))
+					Renderer.EndFrame(new DefaultInputHandler(OrderManager.World));
+			}
+
+			PerfHistory.Items["render"].Tick();
+			PerfHistory.Items["batches"].Tick();
+			PerfHistory.Items["render_widgets"].Tick();
+			PerfHistory.Items["render_flip"].Tick();
+		}
+
+		static void Loop()
+		{
+			// The game loop mainly does two things: logic updates and
+			// drawing on the screen.
+			// ---
+			// We ideally want the logic to run every 'Timestep' ms and
+			// rendering to be done at 'MaxFramerate', so 1000 / MaxFramerate ms.
+			// Any additional free time is used in 'Sleep' so we don't
+			// consume more CPU/GPU resources than necessary.
+			// ---
+			// In case logic or rendering takes more time than the ideal
+			// and we're getting behind, we can skip rendering some frames
+			// but there's a fail-safe minimum FPS to make sure the screen
+			// gets updated at least that often.
+			// ---
+			// TODO: Separate world/UI rendering
+			// It would be nice to separate the world rendering from the UI rendering
+			// so that we can update the UI more often than the world. This would
+			// help make the game playable (mouse/controls) even in low world
+			// framerates.
+			// It's not possible at the moment because the render buffer is cleared
+			// before rendering and we don't keep the last rendered world buffer.
+
+			// When the logic has fallen behind by this much, skip the pending
+			// updates and start fresh.
+			// For example, if we want to update logic every 10 ms but each loop
+			// temporarily takes 100 ms, the 'nextLogic' timestamp will be too low
+			// and the current timestamp ('now') will have moved on. Even if the
+			// update time returns to normal, it will take a long time to catch up
+			// (if ever).
+			// This also means that the 'logicInterval' cannot be longer than this
+			// value.
+			const int MaxLogicTicksBehind = 250;
+
+			// Try to maintain at least this many FPS during replays, even if it slows down logic.
+			// However, if the user has enabled a framerate limit that is even lower
+			// than this, then that limit will be used.
+			const int MinReplayFps = 10;
+
+			// Timestamps for when the next logic and rendering should run
+			var nextLogic = RunTime;
+			var nextRender = RunTime;
+			var forcedNextRender = RunTime;
+
+			while (state == RunStatus.Running)
+			{
+				// Ideal time between logic updates. Timestep = 0 means the game is paused
+				// but we still call LogicTick() because it handles pausing internally.
+				var logicInterval = worldRenderer != null && worldRenderer.World.Timestep != 0 ? worldRenderer.World.Timestep : Game.Timestep;
+
+				// Ideal time between screen updates
+				var maxFramerate = Settings.Graphics.CapFramerate ? Settings.Graphics.MaxFramerate.Clamp(1, 1000) : 1000;
+				var renderInterval = 1000 / maxFramerate;
+
+				var now = RunTime;
+
+				// If the logic has fallen behind too much, skip it and catch up
+				if (now - nextLogic > MaxLogicTicksBehind)
+					nextLogic = now;
+
+				// When's the next update (logic or render)
+				var nextUpdate = Math.Min(nextLogic, nextRender);
+				if (now >= nextUpdate)
+				{
+					var forceRender = now >= forcedNextRender;
+
+					if (now >= nextLogic)
+					{
+						nextLogic += logicInterval;
+
+						LogicTick();
+
+						// Force at least one render per tick during regular gameplay
+						if (OrderManager.World != null && !OrderManager.World.IsReplay)
+							forceRender = true;
 					}
 
-					if (Settings.Server.DedicatedLoop)
+					var haveSomeTimeUntilNextLogic = now < nextLogic;
+					var isTimeToRender = now >= nextRender;
+
+					if ((isTimeToRender && haveSomeTimeUntilNextLogic) || forceRender)
 					{
-						Console.WriteLine("Starting a new server instance...");
-						modData.MapCache.LoadMaps();
-						continue;
+						nextRender = now + renderInterval;
+
+						// Pick the minimum allowed FPS (the lower between 'minReplayFPS'
+						// and the user's max frame rate) and convert it to maximum time
+						// allowed between screen updates.
+						// We do this before rendering to include the time rendering takes
+						// in this interval.
+						var maxRenderInterval = Math.Max(1000 / MinReplayFps, renderInterval);
+						forcedNextRender = now + maxRenderInterval;
+
+						RenderTick();
 					}
-
-					break;
 				}
-
-				Environment.Exit(0);
-			}
-			else
-			{
-				modData.LoadScreen.StartGame();
-				Settings.Save();
-				if (!string.IsNullOrEmpty(replay))
-					Game.JoinReplay(replay);
+				else
+					Thread.Sleep(nextUpdate - now);
 			}
 		}
 
-		public static void LoadShellMap()
-		{
-			var shellmap = ChooseShellmap();
-
-			using (new PerfTimer("StartGame"))
-				StartGame(shellmap, true);
-		}
-
-		static string ChooseShellmap()
-		{
-			var shellmaps = modData.MapCache
-				.Where(m => m.Status == MapStatus.Available && m.Map.UseAsShellmap)
-				.Select(m => m.Uid);
-
-			if (!shellmaps.Any())
-				throw new InvalidDataException("No valid shellmaps available");
-
-			return shellmaps.Random(CosmeticRandom);
-		}
-
-		static bool quit;
-		public static event Action OnQuit = () => { };
-
-		static double idealFrameTime;
-		public static void SetIdealFrameTime(int fps)
-		{ 
-			idealFrameTime = 1.0 / fps;
-		}
-
-		internal static void Run()
+		internal static RunStatus Run()
 		{
 			if (Settings.Graphics.MaxFramerate < 1)
 			{
@@ -483,34 +633,42 @@ namespace OpenRA
 				Settings.Graphics.CapFramerate = false;
 			}
 
-			SetIdealFrameTime(Settings.Graphics.MaxFramerate);
-
-			while (!quit)
+			try
 			{
-				if (Settings.Graphics.CapFramerate)
-				{
-					var sw = Stopwatch.StartNew();
-
-					Tick(orderManager);
-
-					var waitTime = Math.Min(idealFrameTime - sw.Elapsed.TotalSeconds, 1);
-					if (waitTime > 0)
-						System.Threading.Thread.Sleep(TimeSpan.FromSeconds(waitTime));
-				}
-				else
-					Tick(orderManager);
+				Loop();
+			}
+			finally
+			{
+				// Ensure that the active replay is properly saved
+				if (OrderManager != null)
+					OrderManager.Dispose();
 			}
 
-			// Ensure that the active replay is properly saved
-			if (orderManager != null)
-				orderManager.Dispose();
+			if (worldRenderer != null)
+				worldRenderer.Dispose();
+			ModData.Dispose();
+			ChromeProvider.Deinitialize();
+			Renderer.Dispose();
 
 			OnQuit();
+
+			return state;
 		}
 
-		public static void Exit() { quit = true; }
+		public static void Exit()
+		{
+			state = RunStatus.Success;
+		}
 
-		public static Action<Color, string, string> AddChatLine = (c, n, s) => { };
+		public static void Restart()
+		{
+			state = RunStatus.Restart;
+		}
+
+		public static void AddChatLine(Color color, string name, string text)
+		{
+			OrderManager.AddChatLine(color, name, text);
+		}
 
 		public static void Debug(string s, params object[] args)
 		{
@@ -519,10 +677,10 @@ namespace OpenRA
 
 		public static void Disconnect()
 		{
-			if (orderManager.world != null)
-				orderManager.world.traitDict.PrintReport();
+			if (OrderManager.World != null)
+				OrderManager.World.TraitDict.PrintReport();
 
-			orderManager.Dispose();
+			OrderManager.Dispose();
 			CloseServer();
 			JoinLocal();
 		}
@@ -535,12 +693,12 @@ namespace OpenRA
 
 		public static T CreateObject<T>(string name)
 		{
-			return modData.ObjectCreator.CreateObject<T>(name);
+			return ModData.ObjectCreator.CreateObject<T>(name);
 		}
 
 		public static void CreateServer(ServerSettings settings)
 		{
-			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, modData);
+			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, ModData);
 		}
 
 		public static int CreateLocalServer(string map)
@@ -553,14 +711,14 @@ namespace OpenRA
 				AllowPortForward = false
 			};
 
-			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, modData);
+			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, ModData);
 
 			return server.Port;
 		}
 
 		public static bool IsCurrentWorld(World world)
 		{
-			return orderManager != null && orderManager.world == world;
+			return OrderManager != null && OrderManager.World == world;
 		}
 	}
 }

OpenRA.Game/GameInformation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -18,9 +18,14 @@ namespace OpenRA
 {
 	public class GameInformation
 	{
+		public string Mod;
+		public string Version;
+
 		public string MapUid;
 		public string MapTitle;
+
 		public DateTime StartTimeUtc;
+
 		// Game end timestamp (when the recoding stopped).
 		public DateTime EndTimeUtc;
 
@@ -28,7 +33,7 @@ namespace OpenRA
 		// replay recording stopped.
 		public TimeSpan Duration { get { return EndTimeUtc > StartTimeUtc ? EndTimeUtc - StartTimeUtc : TimeSpan.Zero; } }
 		public IList<Player> Players { get; private set; }
-		public MapPreview MapPreview { get { return Game.modData.MapCache[MapUid]; } }
+		public MapPreview MapPreview { get { return Game.ModData.MapCache[MapUid]; } }
 		public IEnumerable<Player> HumanPlayers { get { return Players.Where(p => p.IsHuman); } }
 		public bool IsSinglePlayer { get { return HumanPlayers.Count() == 1; } }
 
@@ -78,7 +83,7 @@ namespace OpenRA
 
 			nodes.Add(new MiniYamlNode("Root", FieldSaver.Save(this)));
 
-			for (var i=0; i<Players.Count; i++)
+			for (var i = 0; i < Players.Count; i++)
 				nodes.Add(new MiniYamlNode("Player@{0}".F(i), FieldSaver.Save(Players[i])));
 
 			return nodes.WriteToString();
@@ -113,7 +118,7 @@ namespace OpenRA
 				Color = runtimePlayer.Color,
 				Team = client.Team,
 				SpawnPoint = runtimePlayer.SpawnPoint,
-				IsRandomFaction = runtimePlayer.Country.Race != client.Country,
+				IsRandomFaction = runtimePlayer.Country.Race != client.Race,
 				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint
 			};
 
@@ -133,34 +138,36 @@ namespace OpenRA
 
 		public class Player
 		{
-			//
-			// Start-up information 
-			//
-
+			// Start-up information
 			public int ClientIndex;
+
 			// The player name, not guaranteed to be unique.
 			public string Name;
 			public bool IsHuman;
 			public bool IsBot;
+
 			// The faction name (aka Country)
 			public string FactionName;
+
 			// The faction id (aka Country, aka Race)
 			public string FactionId;
 			public HSLColor Color;
+
 			// The team id on start-up, or 0 if the player is not part of the team.
 			public int Team;
 			public int SpawnPoint;
+
 			// True if the faction was chosen at random; otherwise, false
 			public bool IsRandomFaction;
+
 			// True if the spawn point was chosen at random; otherwise, false.</summary>
 			public bool IsRandomSpawnPoint;
 
-			//
 			// Information gathered at a later stage
-			//
 
 			// The game outcome for this player
 			public WinState Outcome;
+
 			// The time when this player won or lost the game
 			public DateTime OutcomeTimestampUtc;
 		}

OpenRA.Game/GameRules/ActorInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -11,13 +11,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.FileFormats;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA
 {
-	//TODO: This is not exported into the documentation yet.
+	// TODO: This is not exported into the documentation yet.
 	[Desc("A unit/building inside the game. Every rules starts with one and adds trait to it.",
 		"Special actors like world or player are usually defined in system.yaml and affect everything.")]
 	public class ActorInfo
@@ -28,12 +27,13 @@ namespace OpenRA
 			"You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.")]
 		public readonly string Name;
 		public readonly TypeDictionary Traits = new TypeDictionary();
+		List<ITraitInfo> constructOrderCache = null;
 
-		public ActorInfo( string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits )
+		public ActorInfo(string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
 			try
 			{
-				var mergedNode = MergeWithParent(node, allUnits).NodesDict;
+				var mergedNode = MergeWithParent(node, allUnits).ToDictionary();
 
 				Name = name;
 				foreach (var t in mergedNode)
@@ -46,15 +46,15 @@ namespace OpenRA
 			}
 		}
 
-		static MiniYaml GetParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
+		static MiniYaml GetParent(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
 			MiniYaml inherits;
-			node.NodesDict.TryGetValue( "Inherits", out inherits );
-			if( inherits == null || string.IsNullOrEmpty( inherits.Value ) )
+			node.ToDictionary().TryGetValue("Inherits", out inherits);
+			if (inherits == null || string.IsNullOrEmpty(inherits.Value))
 				return null;
 
 			MiniYaml parent;
-			allUnits.TryGetValue( inherits.Value, out parent );
+			allUnits.TryGetValue(inherits.Value, out parent);
 			if (parent == null)
 				throw new InvalidOperationException(
 					"Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
@@ -62,9 +62,9 @@ namespace OpenRA
 			return parent;
 		}
 
-		static MiniYaml MergeWithParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
+		static MiniYaml MergeWithParent(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
-			var parent = GetParent( node, allUnits );
+			var parent = GetParent(node, allUnits);
 			if (parent != null)
 			{
 				var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
@@ -73,6 +73,7 @@ namespace OpenRA
 				result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
 				return result;
 			}
+
 			return node;
 		}
 
@@ -88,37 +89,56 @@ namespace OpenRA
 
 		public IEnumerable<ITraitInfo> TraitsInConstructOrder()
 		{
-			var ret = new List<ITraitInfo>();
-			var t = Traits.WithInterface<ITraitInfo>().ToList();
-			int index = 0;
-			while (t.Count != 0)
+			if (constructOrderCache != null)
+				return constructOrderCache;
+
+			var source = Traits.WithInterface<ITraitInfo>().Select(i => new
 			{
-				var prereqs = PrerequisitesOf(t[index]);
-				var unsatisfied = prereqs.Where(n => !ret.Any(x => x.GetType() == n || n.IsAssignableFrom(x.GetType())));
-				if (!unsatisfied.Any())
+				Trait = i,
+				Type = i.GetType(),
+				Dependencies = PrerequisitesOf(i).ToList()
+			}).ToList();
+
+			var resolved = source.Where(s => !s.Dependencies.Any()).ToList();
+			var unresolved = source.Except(resolved);
+
+			var testResolve = new Func<Type, Type, bool>((a, b) => a == b || a.IsAssignableFrom(b));
+			var more = unresolved.Where(u => u.Dependencies.All(d => resolved.Exists(r => testResolve(d, r.Type))));
+
+			// Re-evaluate the vars above until sorted
+			while (more.Any())
+				resolved.AddRange(more);
+
+			if (unresolved.Any())
+			{
+				var exceptionString = "ActorInfo(\"" + Name + "\") failed to initialize because of the following:\r\n";
+				var missing = unresolved.SelectMany(u => u.Dependencies.Where(d => !source.Any(s => testResolve(d, s.Type)))).Distinct();
+
+				exceptionString += "Missing:\r\n";
+				foreach (var m in missing)
+					exceptionString += m + " \r\n";
+
+				exceptionString += "Unresolved:\r\n";
+				foreach (var u in unresolved)
 				{
-					ret.Add(t[index]);
-					t.RemoveAt(index);
-					index = 0;
+					var deps = u.Dependencies.Where(d => !resolved.Exists(r => r.Type == d));
+					exceptionString += u.Type + ": { " + string.Join(", ", deps) + " }\r\n";
 				}
-				else if (++index >= t.Count)
-					throw new InvalidOperationException("Trait prerequisites not satisfied (or prerequisite loop) Actor={0} Unresolved={1} Missing={2}".F(
-						Name,
-						t.Select(x => x.GetType().Name).JoinWith(","),
-						unsatisfied.Select(x => x.Name).JoinWith(",")));
+
+				throw new Exception(exceptionString);
 			}
 
-			return ret;
+			constructOrderCache = resolved.Select(r => r.Trait).ToList();
+			return constructOrderCache;
 		}
 
-		static List<Type> PrerequisitesOf(ITraitInfo info)
+		static IEnumerable<Type> PrerequisitesOf(ITraitInfo info)
 		{
 			return info
 				.GetType()
 				.GetInterfaces()
-				.Where( t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof( Requires<> ) )
-				.Select( t => t.GetGenericArguments()[ 0 ] )
-				.ToList();
+				.Where(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Requires<>))
+				.Select(t => t.GetGenericArguments()[0]);
 		}
 
 		public IEnumerable<Pair<string, Type>> GetInitKeys()
@@ -128,11 +148,11 @@ namespace OpenRA
 					.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>))
 					.Select(i => i.GetGenericArguments()[0])).ToList();
 
-			inits.Add( typeof(OwnerInit) );		/* not exposed by a trait; this is used by the Actor itself */
+			inits.Add(typeof(OwnerInit));		/* not exposed by a trait; this is used by the Actor itself */
 
 			return inits.Select(
 				i => Pair.New(
-					i.Name.Replace( "Init", "" ), i ));
+					i.Name.Replace("Init", ""), i));
 		}
 	}
 }

OpenRA.Game/GameRules/DamageWarhead.cs

@@ -0,0 +1,86 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Effects;
+using OpenRA.Traits;
+
+namespace OpenRA.GameRules
+{
+	public abstract class DamageWarhead : Warhead
+	{
+		[Desc("How much (raw) damage to deal")]
+		public readonly int Damage = 0;
+
+		[Desc("Infantry death animation to use")]
+		public readonly string DeathType = "1";
+
+		[Desc("Whether we should prevent prone response for infantry.")]
+		public readonly bool PreventProne = false;
+
+		[Desc("By what percentage should damage be modified against prone infantry.")]
+		public readonly int ProneModifier = 50;
+
+		[FieldLoader.LoadUsing("LoadVersus")]
+		[Desc("Damage percentage versus each armortype. 0% = can't target.")]
+		public readonly Dictionary<string, int> Versus;
+
+		public static object LoadVersus(MiniYaml yaml)
+		{
+			var nd = yaml.ToDictionary();
+			return nd.ContainsKey("Versus")
+				? nd["Versus"].ToDictionary(my => FieldLoader.GetValue<int>("(value)", my.Value))
+				: new Dictionary<string, int>();
+		}
+
+		public int DamageVersus(ActorInfo victim)
+		{
+			var armor = victim.Traits.GetOrDefault<ArmorInfo>();
+			if (armor != null && armor.Type != null)
+			{
+				int versus;
+				if (Versus.TryGetValue(armor.Type, out versus))
+					return versus;
+			}
+
+			return 100;
+		}
+
+		// TODO: This can be removed after the legacy and redundant 0% = not targetable
+		// assumption has been removed from the yaml definitions
+		public override bool CanTargetActor(ActorInfo victim, Actor firedBy)
+		{
+			var health = victim.Traits.GetOrDefault<HealthInfo>();
+			if (health == null)
+				return false;
+
+			return DamageVersus(victim) > 0;
+		}
+
+		public override void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
+		{
+			// Used by traits that damage a single actor, rather than a position
+			if (target.Type == TargetType.Actor)
+				DoImpact(target.Actor, firedBy, damageModifiers);
+			else if (target.Type != TargetType.Invalid)
+				DoImpact(target.CenterPosition, firedBy, damageModifiers);
+		}
+
+		public abstract void DoImpact(WPos pos, Actor firedBy, IEnumerable<int> damageModifiers);
+
+		public virtual void DoImpact(Actor victim, Actor firedBy, IEnumerable<int> damageModifiers)
+		{
+			var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim.Info)));
+			victim.InflictDamage(firedBy, damage, this);
+		}
+	}
+}

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -20,18 +20,22 @@ namespace OpenRA.GameRules
 		public int Length { get; private set; } // seconds
 		public bool Exists { get; private set; }
 
-		public MusicInfo( string key, MiniYaml value )
+		public MusicInfo(string key, MiniYaml value)
 		{
 			Title = value.Value;
 
-			var nd = value.NodesDict;
+			var nd = value.ToDictionary();
 			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
-			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key)+"."+ext;
+			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
 			if (!GlobalFileSystem.Exists(Filename))
 				return;
 
 			Exists = true;
-			Length = (int)AudLoader.SoundLength(GlobalFileSystem.Open(Filename));
+			using (var s = GlobalFileSystem.Open(Filename))
+				if (Filename.ToLowerInvariant().EndsWith("wav"))
+					Length = (int)WavLoader.WaveLength(s);
+				else
+					Length = (int)AudLoader.SoundLength(s);
 		}
 
 		public void Reload()
@@ -40,7 +44,11 @@ namespace OpenRA.GameRules
 				return;
 
 			Exists = true;
-			Length = (int)AudLoader.SoundLength(GlobalFileSystem.Open(Filename));
+			using (var s = GlobalFileSystem.Open(Filename))
+				if (Filename.ToLowerInvariant().EndsWith("wav"))
+					Length = (int)WavLoader.WaveLength(s);
+				else
+					Length = (int)AudLoader.SoundLength(s);
 		}
 	}
 }

OpenRA.Game/GameRules/Ruleset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.GameRules;
@@ -23,7 +22,6 @@ namespace OpenRA
 		public readonly IReadOnlyDictionary<string, SoundInfo> Voices;
 		public readonly IReadOnlyDictionary<string, SoundInfo> Notifications;
 		public readonly IReadOnlyDictionary<string, MusicInfo> Music;
-		public readonly IReadOnlyDictionary<string, string> Movies;
 		public readonly IReadOnlyDictionary<string, TileSet> TileSets;
 		public readonly IReadOnlyDictionary<string, SequenceProvider> Sequences;
 
@@ -33,7 +31,6 @@ namespace OpenRA
 			IDictionary<string, SoundInfo> voices,
 			IDictionary<string, SoundInfo> notifications,
 			IDictionary<string, MusicInfo> music,
-			IDictionary<string, string> movies,
 			IDictionary<string, TileSet> tileSets,
 			IDictionary<string, SequenceProvider> sequences)
 		{
@@ -42,7 +39,6 @@ namespace OpenRA
 			Voices = new ReadOnlyDictionary<string, SoundInfo>(voices);
 			Notifications = new ReadOnlyDictionary<string, SoundInfo>(notifications);
 			Music = new ReadOnlyDictionary<string, MusicInfo>(music);
-			Movies = new ReadOnlyDictionary<string, string>(movies);
 			TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
 			Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
 		}

OpenRA.Game/GameRules/RulesetCache.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -11,14 +11,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.FileFormats;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Support;
 
 namespace OpenRA
 {
-	public class RulesetCache
+	public sealed class RulesetCache : IDisposable
 	{
 		readonly ModData modData;
 
@@ -27,7 +26,6 @@ namespace OpenRA
 		readonly Dictionary<string, SoundInfo> voiceCache = new Dictionary<string, SoundInfo>();
 		readonly Dictionary<string, SoundInfo> notificationCache = new Dictionary<string, SoundInfo>();
 		readonly Dictionary<string, MusicInfo> musicCache = new Dictionary<string, MusicInfo>();
-		readonly Dictionary<string, string> movieCache = new Dictionary<string, string>();
 		readonly Dictionary<string, TileSet> tileSetCache = new Dictionary<string, TileSet>();
 		readonly Dictionary<string, SequenceCache> sequenceCaches = new Dictionary<string, SequenceCache>();
 
@@ -57,7 +55,6 @@ namespace OpenRA
 			Dictionary<string, SoundInfo> voices;
 			Dictionary<string, SoundInfo> notifications;
 			Dictionary<string, MusicInfo> music;
-			Dictionary<string, string> movies;
 			Dictionary<string, TileSet> tileSets;
 
 			using (new PerfTimer("Actors"))
@@ -70,14 +67,12 @@ namespace OpenRA
 				notifications = LoadYamlRules(notificationCache, m.Notifications, map.NotificationDefinitions, (k, _) => new SoundInfo(k.Value));
 			using (new PerfTimer("Music"))
 				music = LoadYamlRules(musicCache, m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
-			using (new PerfTimer("Movies"))
-				movies = LoadYamlRules(movieCache, m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
 			using (new PerfTimer("TileSets"))
 				tileSets = LoadTileSets(tileSetCache, sequenceCaches, m.TileSets);
 
 			var sequences = sequenceCaches.ToDictionary(kvp => kvp.Key, kvp => new SequenceProvider(kvp.Value, map));
 
-			return new Ruleset(actors, weapons, voices, notifications, music, movies, tileSets, sequences);
+			return new Ruleset(actors, weapons, voices, notifications, music, tileSets, sequences);
 		}
 
 		Dictionary<string, T> LoadYamlRules<T>(
@@ -138,5 +133,12 @@ namespace OpenRA
 
 			return items;
 		}
+
+		public void Dispose()
+		{
+			foreach (var cache in sequenceCaches.Values)
+				cache.Dispose();
+			sequenceCaches.Clear();
+		}
 	}
 }

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -11,43 +11,41 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.FileFormats;
 
 namespace OpenRA.GameRules
 {
 	public class SoundInfo
 	{
-		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Variants;
-		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Prefixes;
-		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Voices;
-		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Notifications;
-		public readonly string DefaultVariant = ".aud" ;
-		public readonly string DefaultPrefix = "" ;
+		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Variants;
+		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Prefixes;
+		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Voices;
+		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Notifications;
+		public readonly string DefaultVariant = ".aud";
+		public readonly string DefaultPrefix = "";
 		public readonly string[] DisableVariants = { };
 		public readonly string[] DisablePrefixes = { };
 
 		static Dictionary<string, string[]> Load(MiniYaml y, string name)
 		{
-			return y.NodesDict.ContainsKey(name)
-				? y.NodesDict[name].NodesDict.ToDictionary(
-					a => a.Key,
-					a => FieldLoader.GetValue<string[]>("(value)", a.Value.Value))
+			var nd = y.ToDictionary();
+			return nd.ContainsKey(name)
+				? nd[name].ToDictionary(my => FieldLoader.GetValue<string[]>("(value)", my.Value))
 				: new Dictionary<string, string[]>();
 		}
 
 		public readonly Lazy<Dictionary<string, SoundPool>> VoicePools;
 		public readonly Lazy<Dictionary<string, SoundPool>> NotificationsPools;
 
-		public SoundInfo( MiniYaml y )
+		public SoundInfo(MiniYaml y)
 		{
-			FieldLoader.Load( this, y );
+			FieldLoader.Load(this, y);
 			Variants = Load(y, "Variants");
 			Prefixes = Load(y, "Prefixes");
 			Voices = Load(y, "Voices");
 			Notifications = Load(y, "Notifications");
 
 			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
-			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary( a => a.Key, a => new SoundPool(a.Value) ));
+			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
 		}
 	}
 

OpenRA.Game/GameRules/Warhead.cs

@@ -0,0 +1,120 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Effects;
+using OpenRA.Traits;
+
+namespace OpenRA.GameRules
+{
+	[Desc("Base warhead class. This can be used to derive other warheads from.")]
+	public abstract class Warhead
+	{
+		[Desc("What types of targets are affected.")]
+		public readonly string[] ValidTargets = { "Ground", "Water" };
+
+		[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
+		public readonly string[] InvalidTargets = { };
+
+		[Desc("What diplomatic stances are affected.")]
+		public readonly Stance ValidStances = Stance.Ally | Stance.Neutral | Stance.Enemy;
+
+		[Desc("Can this warhead affect the actor that fired it.")]
+		public readonly bool AffectsParent = false;
+
+		[Desc("Delay in ticks before applying the warhead effect.", "0 = instant (old model).")]
+		public readonly int Delay = 0;
+
+		HashSet<string> validTargetSet;
+		HashSet<string> invalidTargetSet;
+
+		public bool IsValidTarget(IEnumerable<string> targetTypes)
+		{
+			if (validTargetSet == null)
+				validTargetSet = new HashSet<string>(ValidTargets);
+			if (invalidTargetSet == null)
+				invalidTargetSet = new HashSet<string>(InvalidTargets);
+			return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes);
+		}
+
+		/// <summary>Applies the warhead's effect against the target.</summary>
+		public abstract void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers);
+
+		/// <summary>Checks if the warhead is valid against (can do something to) the target.</summary>
+		public bool IsValidAgainst(Target target, World world, Actor firedBy)
+		{
+			if (target.Type == TargetType.Actor)
+				return IsValidAgainst(target.Actor, firedBy);
+
+			if (target.Type == TargetType.FrozenActor)
+				return IsValidAgainst(target.FrozenActor, firedBy);
+
+			if (target.Type == TargetType.Terrain)
+			{
+				var cell = world.Map.CellContaining(target.CenterPosition);
+				if (!world.Map.Contains(cell))
+					return false;
+
+				var cellInfo = world.Map.GetTerrainInfo(cell);
+				if (!IsValidTarget(cellInfo.TargetTypes))
+					return false;
+
+				return true;
+			}
+
+			return false;
+		}
+
+		// TODO: This can be removed after the legacy and redundant 0% = not targetable
+		// assumption has been removed from the yaml definitions
+		public virtual bool CanTargetActor(ActorInfo victim, Actor firedBy) { return false; }
+
+		/// <summary>Checks if the warhead is valid against (can do something to) the actor.</summary>
+		public bool IsValidAgainst(Actor victim, Actor firedBy)
+		{
+			if (!CanTargetActor(victim.Info, firedBy))
+				return false;
+
+			if (!AffectsParent && victim == firedBy)
+				return false;
+
+			var stance = firedBy.Owner.Stances[victim.Owner];
+			if (!ValidStances.HasFlag(stance))
+				return false;
+
+			// A target type is valid if it is in the valid targets list, and not in the invalid targets list.
+			var targetable = victim.TraitOrDefault<ITargetable>();
+			if (targetable == null || !IsValidTarget(targetable.TargetTypes))
+				return false;
+
+			return true;
+		}
+
+		/// <summary>Checks if the warhead is valid against (can do something to) the frozen actor.</summary>
+		public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
+		{
+			if (!CanTargetActor(victim.Info, firedBy))
+				return false;
+
+			// AffectsParent checks do not make sense for FrozenActors, so skip to stance checks
+			var stance = firedBy.Owner.Stances[victim.Owner];
+			if (!ValidStances.HasFlag(stance))
+				return false;
+
+			// A target type is valid if it is in the valid targets list, and not in the invalid targets list.
+			var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>();
+			if (targetable == null || !IsValidTarget(targetable.GetTargetTypes()))
+				return false;
+
+			return true;
+		}
+	}
+}

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -8,90 +8,19 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
-using OpenRA.FileFormats;
 using OpenRA.Traits;
 
 namespace OpenRA.GameRules
 {
-	public class WarheadInfo
-	{
-		[Desc("Distance from the explosion center at which damage is 1/2.")]
-		public readonly WRange Spread = new WRange(43);
-		[FieldLoader.LoadUsing("LoadVersus")]
-		[Desc("Damage vs each armortype. 0% = can't target.")]
-		public readonly Dictionary<string, float> Versus;
-		[Desc("Can this damage ore?")]
-		public readonly bool Ore = false;
-		[Desc("Explosion effect to use.")]
-		public readonly string Explosion = null;
-		[Desc("Palette to use for explosion effect.")]
-		public readonly string ExplosionPalette = "effect";
-		[Desc("Explosion effect on hitting water (usually a splash).")]
-		public readonly string WaterExplosion = null;
-		[Desc("Palette to use for effect on hitting water (usually a splash).")]
-		public readonly string WaterExplosionPalette = "effect";
-		[Desc("Type of smudge to apply to terrain.")]
-		public readonly string[] SmudgeType = { };
-		[Desc("Size of the explosion. provide 2 values for a ring effect (outer/inner).")]
-		public readonly int[] Size = { 0, 0 };
-		[Desc("Infantry death animation to use")]
-		public readonly string InfDeath = "1";
-		[Desc("Sound to play on impact.")]
-		public readonly string ImpactSound = null;
-		[Desc("Sound to play on impact with water")]
-		public readonly string WaterImpactSound = null;
-		[Desc("How much (raw) damage to deal")]
-		public readonly int Damage = 0;
-		[Desc("Delay in ticks before dealing the damage, 0 = instant (old model).")]
-		public readonly int Delay = 0;
-		[Desc("Which damage model to use.")]
-		public readonly DamageModel DamageModel = DamageModel.Normal;
-		[Desc("Whether we should prevent prone response for infantry.")]
-		public readonly bool PreventProne = false;
-
-		public float EffectivenessAgainst(ActorInfo ai)
-		{
-			var health = ai.Traits.GetOrDefault<HealthInfo>();
-			if (health == null)
-				return 0f;
-
-			var armor = ai.Traits.GetOrDefault<ArmorInfo>();
-			if (armor == null || armor.Type == null)
-				return 1;
-
-			float versus;
-			return Versus.TryGetValue(armor.Type, out versus) ? versus : 1;
-		}
-
-		public WarheadInfo(MiniYaml yaml)
-		{
-			FieldLoader.Load(this, yaml);
-		}
-
-		static object LoadVersus(MiniYaml y)
-		{
-			return y.NodesDict.ContainsKey("Versus")
-				? y.NodesDict["Versus"].NodesDict.ToDictionary(
-					a => a.Key,
-					a => FieldLoader.GetValue<float>("(value)", a.Value.Value))
-				: new Dictionary<string, float>();
-		}
-	}
-
-	public enum DamageModel
-	{
-		Normal,								// classic RA damage model: point actors, distance-based falloff
-		PerCell,							// like RA's "nuke damage"
-		HealthPercentage					// for MAD Tank
-	}
-
 	public class ProjectileArgs
 	{
 		public WeaponInfo Weapon;
-		public float FirepowerModifier = 1.0f;
+		public IEnumerable<int> DamageModifiers;
+		public IEnumerable<int> InaccuracyModifiers;
 		public int Facing;
 		public WPos Source;
 		public Actor SourceActor;
@@ -101,32 +30,54 @@ namespace OpenRA.GameRules
 
 	public interface IProjectileInfo { IEffect Create(ProjectileArgs args); }
 
-	public class WeaponInfo
+	public sealed class WeaponInfo
 	{
+		[Desc("The maximum range the weapon can fire.")]
 		public readonly WRange Range = WRange.Zero;
+
+		[Desc("The sound played when the weapon is fired.")]
 		public readonly string[] Report = null;
-		[Desc("Rate of Fire")]
-		public readonly int ROF = 1;
+
+		[Desc("Delay in ticks between reloading ammo magazines.")]
+		public readonly int ReloadDelay = 1;
+
+		[Desc("Number of shots in a single ammo magazine.")]
 		public readonly int Burst = 1;
+
 		public readonly bool Charges = false;
-		public readonly string Palette = "effect";
+
+		[Desc("What types of targets are affected.")]
 		public readonly string[] ValidTargets = { "Ground", "Water" };
+
+		[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
 		public readonly string[] InvalidTargets = { };
+
+		[Desc("Delay in ticks between firing shots from the same ammo magazine.")]
 		public readonly int BurstDelay = 5;
+
+		[Desc("The minimum range the weapon can fire.")]
 		public readonly WRange MinRange = WRange.Zero;
 
-		[FieldLoader.LoadUsing("LoadProjectile")] public IProjectileInfo Projectile;
-		[FieldLoader.LoadUsing("LoadWarheads")] public List<WarheadInfo> Warheads;
+		[FieldLoader.LoadUsing("LoadProjectile")]
+		public readonly IProjectileInfo Projectile;
+
+		[FieldLoader.LoadUsing("LoadWarheads")]
+		public readonly List<Warhead> Warheads = new List<Warhead>();
+
+		readonly HashSet<string> validTargetSet;
+		readonly HashSet<string> invalidTargetSet;
 
 		public WeaponInfo(string name, MiniYaml content)
 		{
 			FieldLoader.Load(this, content);
+			validTargetSet = new HashSet<string>(ValidTargets);
+			invalidTargetSet = new HashSet<string>(InvalidTargets);
 		}
 
 		static object LoadProjectile(MiniYaml yaml)
 		{
 			MiniYaml proj;
-			if (!yaml.NodesDict.TryGetValue("Projectile", out proj))
+			if (!yaml.ToDictionary().TryGetValue("Projectile", out proj))
 				return null;
 			var ret = Game.CreateObject<IProjectileInfo>(proj.Value + "Info");
 			FieldLoader.Load(ret, proj);
@@ -135,57 +86,39 @@ namespace OpenRA.GameRules
 
 		static object LoadWarheads(MiniYaml yaml)
 		{
-			var ret = new List<WarheadInfo>();
-			foreach (var w in yaml.Nodes)
-				if (w.Key.Split('@')[0] == "Warhead")
-					ret.Add(new WarheadInfo(w.Value));
+			var retList = new List<Warhead>();
+			foreach (var node in yaml.Nodes.Where(n => n.Key.StartsWith("Warhead")))
+			{
+				var ret = Game.CreateObject<Warhead>(node.Value.Value + "Warhead");
+				FieldLoader.Load(ret, node.Value);
+				retList.Add(ret);
+			}
 
-			return ret;
+			return retList;
 		}
 
-		public bool IsValidAgainst(Actor a)
+		public bool IsValidTarget(IEnumerable<string> targetTypes)
 		{
-			var targetable = a.TraitOrDefault<ITargetable>();
-			if (targetable == null || !ValidTargets.Intersect(targetable.TargetTypes).Any()
-				|| InvalidTargets.Intersect(targetable.TargetTypes).Any())
-				return false;
-
-			if (Warheads.All(w => w.EffectivenessAgainst(a.Info) <= 0))
-				return false;
-
-			return true;
+			return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes);
 		}
 
-		public bool IsValidAgainst(FrozenActor a)
-		{
-			var targetable = a.Info.Traits.GetOrDefault<ITargetableInfo>();
-			if (targetable == null || !ValidTargets.Intersect(targetable.GetTargetTypes()).Any()
-				|| InvalidTargets.Intersect(targetable.GetTargetTypes()).Any())
-				return false;
-
-			if (Warheads.All(w => w.EffectivenessAgainst(a.Info) <= 0))
-				return false;
-
-			return true;
-		}
-
-		public bool IsValidAgainst(Target target, World world)
+		/// <summary>Checks if the weapon is valid against (can target) the target.</summary>
+		public bool IsValidAgainst(Target target, World world, Actor firedBy)
 		{
 			if (target.Type == TargetType.Actor)
-				return IsValidAgainst(target.Actor);
+				return IsValidAgainst(target.Actor, firedBy);
 
 			if (target.Type == TargetType.FrozenActor)
-				return IsValidAgainst(target.FrozenActor);
+				return IsValidAgainst(target.FrozenActor, firedBy);
 
 			if (target.Type == TargetType.Terrain)
 			{
-				var cell = target.CenterPosition.ToCPos();
-				if (!world.Map.IsInMap(cell))
+				var cell = world.Map.CellContaining(target.CenterPosition);
+				if (!world.Map.Contains(cell))
 					return false;
 
-				var cellInfo = world.GetTerrainInfo(cell);
-				if (!ValidTargets.Intersect(cellInfo.TargetTypes).Any()
-					|| InvalidTargets.Intersect(cellInfo.TargetTypes).Any())
+				var cellInfo = world.Map.GetTerrainInfo(cell);
+				if (!IsValidTarget(cellInfo.TargetTypes))
 					return false;
 
 				return true;
@@ -193,5 +126,46 @@ namespace OpenRA.GameRules
 
 			return false;
 		}
+
+		/// <summary>Checks if the weapon is valid against (can target) the actor.</summary>
+		public bool IsValidAgainst(Actor victim, Actor firedBy)
+		{
+			var targetable = victim.TraitOrDefault<ITargetable>();
+			if (targetable == null || !IsValidTarget(targetable.TargetTypes))
+				return false;
+
+			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
+				return false;
+
+			return true;
+		}
+
+		/// <summary>Checks if the weapon is valid against (can target) the frozen actor.</summary>
+		public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
+		{
+			var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>();
+			if (targetable == null || !IsValidTarget(targetable.GetTargetTypes()))
+				return false;
+
+			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
+				return false;
+
+			return true;
+		}
+
+		/// <summary>Applies all the weapon's warheads to the target.</summary>
+		public void Impact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
+		{
+			foreach (var warhead in Warheads)
+			{
+				var wh = warhead; // force the closure to bind to the current warhead
+
+				Action a = () => wh.DoImpact(target, firedBy, damageModifiers);
+				if (wh.Delay > 0)
+					firedBy.World.AddFrameEndTask(w => w.Add(new DelayedAction(wh.Delay, a)));
+				else
+					a();
+			}
+		}
 	}
 }

OpenRA.Game/Graphics/Animation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -15,7 +15,8 @@ namespace OpenRA.Graphics
 {
 	public class Animation
 	{
-		public Sequence CurrentSequence { get; private set; }
+		readonly int defaultTick = 40; // 25 fps == 40 ms
+		public ISpriteSequence CurrentSequence { get; private set; }
 		public bool IsDecoration = false;
 		public Func<bool> Paused;
 
@@ -23,9 +24,11 @@ namespace OpenRA.Graphics
 
 		int frame = 0;
 		bool backwards = false;
-		bool tickAlways;
+
 		string name;
 
+		bool tickAlways;
+
 		public string Name { get { return name; } }
 
 		readonly SequenceProvider sequenceProvider;
@@ -40,7 +43,7 @@ namespace OpenRA.Graphics
 		{
 			this.sequenceProvider = sequenceProvider;
 			this.name = name.ToLowerInvariant();
-			this.tickFunc = () => {};
+			this.tickFunc = () => { };
 			this.facingFunc = facingFunc;
 		}
 
@@ -76,6 +79,8 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = false;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = 0;
 			tickFunc = () =>
 			{
@@ -91,6 +96,8 @@ namespace OpenRA.Graphics
 				return false;
 
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			var tick = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+			timeUntilNextFrame = Math.Min(tick, timeUntilNextFrame);
 			frame %= CurrentSequence.Length;
 			return true;
 		}
@@ -100,6 +107,8 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = false;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = 0;
 			tickFunc = () =>
 			{
@@ -124,6 +133,8 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = true;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = func();
 			tickFunc = () => frame = func();
 		}
@@ -149,7 +160,7 @@ namespace OpenRA.Graphics
 				while (timeUntilNextFrame <= 0)
 				{
 					tickFunc();
-					timeUntilNextFrame += CurrentSequence != null ? CurrentSequence.Tick : 40; // 25 fps == 40 ms
+					timeUntilNextFrame += CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
 				}
 			}
 		}
@@ -166,7 +177,7 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public Sequence GetSequence(string sequenceName)
+		public ISpriteSequence GetSequence(string sequenceName)
 		{
 			return sequenceProvider.GetSequence(name, sequenceName);
 		}

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -50,5 +50,4 @@ namespace OpenRA.Graphics
 			return new AnimationWithOffset(a, null, null, null, null);
 		}
 	}
-}
-
+}