Cache passenger bounty traits.

This avoids querying from potentially dead actors.

.gitattributes

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

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,39 @@
+<!--
+  This is a guideline, which shall help to write enhancement requests or bug reports.
+  Fill in the placeholders below. Delete any headings and placeholders that you do not use.
+
+  Before you start check if a similar request/bug report already exists in this Github issue tracker and comment there.
+
+When submitting a feature or enhancement request:
+
+1. Explain briefly what the enhancement is and why you think it would be useful.
+2. Provide any other necessary or useful information regarding your issue, such as (code) examples or related links.
+
+
+When submitting a bug report, please follow the template below:
+-->
+
+### Issue Summary
+<!-- Explanation of the issue. Expectation vs. actual behavior. -->
+... ... ...
+
+#### System Information
+- **Operating System:** [e.g. Windows 10, Mac OS 10.12, Ubuntu 16.04, ...]
+- **.NET / Mono Version:** [e.g. .NET 4.7.1, Mono 4.6.2, ...]
+- **OpenRA Version:** [e.g. release-20180218, playtest-20180208, ...]
+- **Mod:** [e.g. Red Alert, Tiberian Dawn, Dune2000, ...]
+
+#### Additional Information:
+- Steps to reproduce
+	1. Step
+	2. Step
+	3. ...
+
+- Logs
+<!-- If you have a log (e.g. debug.log, exception.log), zip and attach it. -->
+
+- OpenRA Replays
+<!-- You have to zip it before you can attach it. When does the issue appear [e.g. 10:33]? -->
+
+- Screenshots & Videos
+<!-- You should be able to attach screenshots by drag&drop. Videos need to be uploaded to an external platform (e.g. https://www.youtube.com, https://www.dropbox.com) -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+Thank you for your contribution to OpenRA!
+
+Please be aware that we do not have enough project maintainers to match the rate of contributions, so it may take several days before somebody is able to respond to your Pull Request.
+
+You can help speed up the review process by following a few steps:
+
+* Make sure that you have read and understand the OpenRA Coding Standard (see https://github.com/OpenRA/OpenRA/wiki/Coding-Standard).
+* Write quality commit messages (see https://chris.beams.io/posts/git-commit/).
+* Only commit changes that directly relate to your Pull Request.  Use your Git interface to unstage any unrelated changes to project files, line endings, whitespace, or other files.
+* Review the code diff view below to double check that your changes satisfy the above three points.
+* Use the `make test` and `make check` commands to check for (and fix!) any issues that are reported by our automated tests.
+* If you are changing shared mod or engine code, make sure that you have tested your changes in all four default mods.
+* Respond to review comments as soon as you reasonably can.  Reviewers will usually prioritize Pull Requests that are still fresh in their minds.  Make sure to leave a comment when you push new changes, otherwise GitHub does not automatically notify reviewers!
+* Leave a polite comment asking for reviews if a week or more has passed without feedback.
+
+If you need any help you can ask in the #openra IRC channel on freenode (most active during European evenings).

.gitignore

@@ -1,80 +1,88 @@
-# Visual Studio
-Release
-bin
-obj
-*.ncb
-*.vcproj*
-*.suo
-*.user
-*.sln.cache
-*.manifest
-*.CodeAnalysisLog.xml
-*.lastcodeanalysissucceeded
-_ReSharper.*/
-
-# movies
-*.vqa
-
-# archives
-*.mix
-
-# binaries
-mods/*/*.dll
-mods/*/*.mdb
-/*.dll
-/*.dll.config
-/*.so
-/*.dylib
-/*.pdb
-/*.mdb
-/*.exe
-thirdparty/download/*
-*.mmdb.gz
-
-# backup files by various editors
-*~
-*.orig
-\#*
-.*.sw?
-
-# Monodevelop
-*.pidb
-*.userprefs
-
-# Mac OS X
-.DS_Store
-
-# XCode
-packaging/osx/launcher/build/
-packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
-packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
-packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
-temp.c
-temp.o
-temp.s
-OpenRA.Launcher.Mac/build/
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
-*.resources
-
-# auto-generated documentation
-DOCUMENTATION.md
-Lua-API.md
-*.html
-openra.6
-
-# StyleCop
-*.Cache
-StyleCopViolations.xml
-
-# SublimeText
-*.sublime-project
-*.sublime-workspace
-
-# NUnit
-/TestResult.xml
-/lib/
-
-# Support directory
-/Support
+# Visual Studio
+Release
+bin
+obj
+*.ncb
+*.vcproj*
+*.suo
+*.user
+*.sln.cache
+*.manifest
+*.CodeAnalysisLog.xml
+*.lastcodeanalysissucceeded
+_ReSharper.*/
+/.vs
+
+# movies
+*.vqa
+
+# archives
+*.mix
+
+# binaries
+mods/*/*.dll
+mods/*/*.mdb
+mods/*/*.pdb
+/*.dll
+/*.dll.config
+/*.so
+/*.dylib
+/*.pdb
+/*.mdb
+/*.exe
+thirdparty/download/*
+*.mmdb.gz
+
+# backup files by various editors
+*~
+*.orig
+\#*
+.*.sw?
+
+# Monodevelop
+*.pidb
+*.userprefs
+
+# Mac OS X
+.DS_Store
+
+# XCode
+packaging/osx/launcher/build/
+packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
+packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
+packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
+temp.c
+temp.o
+temp.s
+OpenRA.Launcher.Mac/build/
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
+*.resources
+
+# auto-generated documentation
+DOCUMENTATION.md
+WEAPONS.md
+Lua-API.md
+Settings.md
+*.html
+openra.6
+update.log
+
+# StyleCop
+*.Cache
+StyleCopViolations.xml
+
+# SublimeText
+*.sublime-project
+*.sublime-workspace
+
+# NUnit
+/TestResult.xml
+/lib/
+
+# Support directory
+/Support
+
+# IntelliJ files
+.idea

.travis.yml

@@ -2,7 +2,7 @@
 # see travis-ci.org for details
 
 language: csharp
-mono: 4.2.1
+mono: 4.6.1
 
 # http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
@@ -19,6 +19,12 @@ addons:
     - nsis-common
     - dpkg
     - markdown
+    - zlib1g-dev
+    - libbz2-dev
+    - cmake
+    - genisoimage
+    - fakeroot
+    - zsync
 
 # Environment variables
 env:
@@ -31,7 +37,7 @@ env:
 # Run the NUnit tests
 script:
  - travis_retry make all-dependencies
- - make all SDK="-sdk:4.0"
+ - make all SDK="-sdk:4.5"
  - make check
  - make check-scripts
  - make test
@@ -39,7 +45,7 @@ script:
 
 # 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 ..
+ - test $TRAVIS_PULL_REQUEST == "false" && cd packaging && ./update-wiki.sh $TRAVIS_BRANCH; cd ..
 
 # Only watch the development branch and tagged release.
 branches:
@@ -70,10 +76,8 @@ deploy:
   provider: releases
   api_key:
     secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
-  file:
-    - build/OpenRA-${TRAVIS_TAG}.exe
-    - build/OpenRA-${TRAVIS_TAG}.zip
-    - build/openra_${DOTVERSION}_all.deb
+  file_glob: true
+  file: build/*
   skip_cleanup: true
   on:
     all_branches: true

AUTHORS

@@ -5,10 +5,8 @@ The OpenRA developers are:
     * Chris Forbes (chrisf)
     * Igor Popov (ihptru)
     * Lukas Franke (abcdefg30)
-    * Matthias Mailänder (Mailaender)
     * Oliver Brakmann (obrakmann)
     * Paul Chote (pchote)
-    * Pavel Penev (penev92)
     * Reaperrr
     * Tom Roostan (RoosterDragon)
 
@@ -17,8 +15,10 @@ Previous developers included:
     * Caleb Anderson (RobotCaleb)
     * Curtis Shmyr (hamb)
     * Daniel Hernandez (Mancano)
+    * Matthias Mailänder (Mailaender)
     * Megan Bowra-Dean (beedee)
     * Mike Bundy (kehaar)
+    * Pavel Penev (penev92)
     * Robert Pepperell (ytinasni)
     * ScottNZ
 
@@ -26,6 +26,7 @@ Also thanks to:
     * Adam Valy (Tschokky)
     * Akseli Virtanen (RAGEQUIT)
     * Alexander Fast (mizipzor)
+    * Alexis Hunt (alercah)
     * Allen262
     * Andrew Aldridge (i80and)
     * Andrew Perkins
@@ -37,12 +38,14 @@ Also thanks to:
     * Bellator
     * Biofreak
     * Braxton Williams (Buddytex)
+    * Brendan Gluth (Mechanical_Man)
     * Bryan Wilbur
     * Bugra Cuhadaroglu (BugraC)
     * Christer Ulfsparre (Holloweye)
     * Chris Grant (Unit158)
     * clem
     * Cody Brittain (Generalcamo)
+    * Constantin Helmig (CH4Code)
     * D2k Sardaukar
     * D'Arcy Rush (r34ch)
     * Daniel Derejvanik (Harisson)
@@ -51,6 +54,7 @@ Also thanks to:
     * David Russell (DavidARussell)
     * DeadlySurprise
     * Dmitri Suvorov (suvjunmd)
+    * dtluna
     * Erasmus Schroder (rasco)
     * Eric Bajumpaa (SteelPhase)
     * Evgeniy Sergeev (evgeniysergeev)
@@ -58,24 +62,26 @@ Also thanks to:
     * Florian Wiesbauer (FiveAces)
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
-    * Glen Anderson (GlenAnderson)
+    * Glen Anderson (glen7)
     * Glenn Martin Jensen (Baxxster)
     * Gordon Martin (Happy0)
     * Guido Lipke (LipkeGu)
-    * Gyula Zimmermann (Graion Dilach)
     * Hervé Matysiak (Herve-M)
     * Huw Pascoe
     * Ian T. Jacobsen (Smilex)
     * Imago
     * Iran
+    * Ishan Bhargava (ishantheperson)
     * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
     * James Gilbert (DSUK)
     * Jan-Willem Buurlage (jwbuurlage)
     * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
+    * Jefri Sevkin (Arular)
     * Jes
     * Joakim Lindberg (booom3)
+    * Joe Alam (joealam)
     * John Turner (whinis)
     * Jonas A. Lind (SoScared)
     * Joppy Furr
@@ -83,11 +89,14 @@ Also thanks to:
     * Kenny Hoxworth (hoxworth)
     * Kevin Azzam (ChaoticMind)
     * Krishnakanth Mallik
+    * Kyle Smith (Smitty)
     * Kyrre Soerensen (zypres)
     * Lawrence Wang
     * Lesueur Benjamin (Valkirie)
     * Maarten Meuris (Nyerguds)
+    * Manuel Geiger (Ectras)
     * Mark Olson (markolson)
+    * Markus Hartung (hartmark)
     * Matija Hustic (matija-hustic)
     * Matthew Gatland (mgatland)
     * Matthew Uzzell (MUzzell)
@@ -95,9 +104,13 @@ Also thanks to:
     * Max621
     * Max Ugrumov (katzsmile)
     * Michael Rätzel
+    * Michael Silber (frühstück)
     * Michael Sztolcman (s1w_)
+    * Mike Gagné (AngryBirdz)
+    * Muh
     * Mustafa Alperen Seki (MustaphaTR)
     * Neil Shivkar (havok13888)
+    * Nikolay Fomin (netnazgul)
     * Nooze
     * Nukem
     * Okunev Yu Dmitry (xaionaro)
@@ -105,9 +118,12 @@ Also thanks to:
     * Paolo Chiodi (paolochiodi)
     * Paul Dovydaitis (pdovy)
     * Pavlos Touboulidis (pav)
+    * Pedro Ferreira Ramos (bateramos)
+    * Peter Amrehn (jongleur1983)
     * Pizzaoverhead
-    * Piët Delport (pjdelport)
+    * Pi Delport (pjdelport)
     * Psydev
+    * Raphael Vogt (TheRaffy, Yellow)
     * Raymond Bedrossian (Squiggles211)
     * Raymond Martineau (mart0258)
     * Riderr3
@@ -124,6 +140,7 @@ Also thanks to:
     * Tirili
     * Tristan Keating (Kilkakon)
     * Tristan Mühlbacher (MicroBit)
+    * UnknownProgrammer
     * Vladimir Komarov (VrKomarov)
     * Wuschel
 
@@ -156,15 +173,15 @@ under the MIT license.
 Using FuzzyLogicLibrary (fuzzynet) by Dmitry
 Kaluzhny and released under the GNU GPL terms.
 
-Using Mono.Nat by Alan McGovern and Ben
-Motmans and distributed under the MIT license.
+Using Open.Nat by Lucas Ontivero, based on the work
+of Alan McGovern and Ben Motmans and distributed
+under the MIT license.
 
 Using ICSharpCode.SharpZipLib initially by Mike
 Krueger and distributed under the GNU GPL terms.
 
-Using SmartIrc4Net developed by Mirco Bauer
-distributed under the LGPL version 2.1 or later.
-
+Using rix0rrr.BeaconLib developed by Rico Huijbers
+distributed under MIT License.
 
 Finally, special thanks goes to the original teams
 at Westwood Studios and EA for creating the classic

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by private-messaging a project team member (users with a + in front
+of their name) via our IRC channel (#openra on freenode –
+[webchat](http://webchat.freenode.net/?channels=openra)). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -17,7 +17,7 @@
 
 Please `git rebase` to the latest revision of the bleed branch.
 
-Don't forget to add youself to [AUTHORS](https://github.com/OpenRA/OpenRA/blob/bleed/AUTHORS).
+Don't forget to add yourself to [AUTHORS](https://github.com/OpenRA/OpenRA/blob/bleed/AUTHORS).
 
 Please propose a [CHANGELOG](https://github.com/OpenRA/OpenRA/wiki/CHANGELOG) entry in the pull-request comments.
 

INSTALL.md

@@ -7,65 +7,86 @@ 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)
+* [.NET Framework >= 4.5 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
 * [SDL 2](http://www.libsdl.org/download-2.0.php) (included)
 * [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included)
 * [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included)
 * [OpenAL](http://kcat.strangesoft.net/openal.html) (included)
 * [liblua 5.1](http://luabinaries.sourceforge.net/download.html) (included)
 
-You need to fetch the thirdparty dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places by typing `make dependencies` in a command terminal.
+You need to fetch the thirdparty dependencies and place them at the appropriate places by typing `make dependencies` in a command terminal.
 
 To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with MSBuild or use the Makefile analogue command `make all` scripted in PowerShell syntax.
 
-Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert or `OpenRA.Game.exe Game.Mod=cnc` for Tiberian Dawn.
+Run the game with `launch-game.cmd`. It can be handed arguments that specify the exact mod one wishes to run, for example, run `launch-game.cmd Game.Mod=ra` to launch Red Alert, `launch-game.cmd Game.Mod=cnc` to start Tiberian dawn or `launch-game.cmd Game.Mod=d2k` to launch Dune 2000.
 
 Linux
 =====
 
-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.
+Use `make dependencies` to map the native libraries to your system and fetch the remaining CLI dependencies to place them at the appropriate places.
 
-To compile OpenRA, run `make all` from the command line.
+To compile OpenRA, run `make all` from the command line. After this one can run the game with `./launch-game.sh`. It is also possible to specify the mod you wish to run from the command line, e.g. with `./launch-game.sh Game.Mod=ts` if you wish to try the experimental Tiberian Sun mod. 
 
-Run with either `launch-game.sh` or `mono --debug OpenRA.Game.exe`.
+Type `sudo make install` for system-wide installation. Run `sudo make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run the Red Alert by executing the `openra-ra` command, the Dune 2000 mod by running the `openra-d2k` command and Tiberian Dawn by the `openra-cnc` command. Alternatively, you can also run these mods by clicking on their desktop shortcuts if you ran `sudo make install-linux-shortcuts`. 
 
-Type `sudo make install-all` for system wide installation. Run `make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run from the `openra` shortcut.
+Arch Linux
+----------
+
+It is important to note there is an unofficial [`openra-git`](https://aur.archlinux.org/packages/openra-git) package in the Arch User Repository (AUR) of Arch Linux. If manually compiling is the way you wish to go the build and runtime dependencies can be installed with:
+
+```
+sudo pacman -S mono openal libgl freetype2 sdl2 lua51 xdg-utils zenity
+```
 
 Debian/Ubuntu
 -------------
 
-* nuget
-* mono-devel
-* libfreetype6
-* libopenal1
-* liblua5.1-0
-* libsdl2-2.0-0
-* xdg-utils
-* zenity
+```
+sudo apt install mono-devel libfreetype6 libopenal1 liblua5.1-0 libsdl2-2.0-0 xdg-utils zenity wget
+```
 
-openSUSE
---------
+Fedora
+------
 
-* mono-devel
-* nuget
-* openal
-* freetype2
-* SDL2
-* lua51
-* xdg-utils
-* zenity
+```
+sudo dnf install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity
+```
 
 Gentoo
 ------
 
-* dev-lang/mono
-* dev-dotnet/libgdiplus
-* dev-dotnet/nuget
-* media-libs/freetype:2
-* media-libs/libsdl2
-* media-libs/openal
-* virtual/jpeg
-* virtual/opengl
-* dev-lang/lua-5.1.5
-* x11-misc/xdg-utils
-* gnome-extra/zenity
+```
+sudo emerge -av dev-lang/mono dev-dotnet/libgdiplus media-libs/freetype:2 media-libs/libsdl2 media-libs/openal virtual/jpeg virtual/opengl '=dev-lang/lua-5.1.5*' x11-misc/xdg-utils gnome-extra/zenity
+```
+
+Mageia
+------
+
+```
+sudo dnf install "pkgconfig(mono)" SDL2 freetype "lib*lua5.1" "lib*freetype2" "lib*sdl2.0_0" openal-soft xdg-utils zenity
+```
+
+openSUSE
+--------
+
+```
+sudo zypper in mono-devel openal-soft freetype2 SDL2 lua51 xdg-utils zenity
+```
+
+Red Hat Enterprise Linux (and rebuilds, e.g. CentOS)
+----------------------------------------------------
+
+The EPEL repository is required in order for the following command to run properly. 
+
+```
+sudo yum install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity
+```
+
+OSX
+=====
+
+Use `make dependencies` to map the native libraries to your system.
+
+To compile OpenRA, run `make` from the command line.
+
+Run with `./launch-game.sh`.

Makefile

@@ -3,9 +3,6 @@
 # to compile, run:
 #   make [DEBUG=false]
 #
-# to compile with development tools, run:
-#   make all [DEBUG=false]
-#
 # to check unit tests (requires NUnit version >= 2.6), run:
 #  make nunit [NUNIT_CONSOLE=<path-to/nunit[2]-console>] [NUNIT_LIBS_PATH=<path-to-libs-dir>] [NUNIT_LIBS=<nunit-libs>]
 #      Use NUNIT_CONSOLE if nunit[3|2]-console was not downloaded by `make dependencies` nor is it in bin search paths
@@ -17,18 +14,16 @@
 # to check the official mod dlls for StyleCop violations, run:
 #   make check
 #
-# to generate documentation aimed at modders, run:
-#   make docs
-#
 # to install, run:
 #   make [prefix=/foo] [bindir=/bar/bin] install
 #
-# to install with development tools, run:
-#   make [prefix=/foo] [bindir=/bar/bin] install-all
-#
 # to install Linux startup scripts, desktop files and icons:
 #   make install-linux-shortcuts [DEBUG=false]
 #
+# to install the engine and common mod files (omitting the default mods):
+#   make install-engine
+#   make install-common-mod-files
+#
 # to uninstall, run:
 #   make uninstall
 #
@@ -44,9 +39,9 @@
 #
 SDK         ?=
 CSC         = mcs $(SDK)
-CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
+CSFLAGS     = -nologo -warn:4 -codepage:utf8 -langversion:5 -unsafe -warnaserror
 DEFINE      = TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll
+COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Numerics.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll
 NUNIT_LIBS_PATH :=
 NUNIT_LIBS  := $(NUNIT_LIBS_PATH)nunit.framework.dll
 
@@ -88,7 +83,6 @@ INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
 CORE = pdefault game utility server
-TOOLS = gamemonitor
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
 # dependencies
@@ -108,8 +102,7 @@ endif
 game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET = OpenRA.Game.exe
 game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll
-game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll thirdparty/download/Open.Nat.dll
 PROGRAMS += game
 game: $(game_TARGET)
 
@@ -127,7 +120,7 @@ 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/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
+mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS)
 PROGRAMS += mod_common
 mod_common: $(mod_common_TARGET)
 
@@ -146,18 +139,9 @@ test_dll: $(test_dll_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) $(mod_common_TARGET)
-mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_ra
-mod_ra: $(mod_ra_TARGET)
-
 # Command and Conquer
 mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-mod_cnc_TARGET = mods/cnc/OpenRA.Mods.Cnc.dll
+mod_cnc_TARGET = mods/common/OpenRA.Mods.Cnc.dll
 mod_cnc_KIND = library
 mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
 mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
@@ -173,58 +157,40 @@ mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_d2k
 mod_d2k: $(mod_d2k_TARGET)
 
-# Tiberian Sun
-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_common_TARGET)
-mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_ts
-mod_ts: $(mod_ts_TARGET)
-
 check-scripts:
 	@echo
 	@echo "Checking for Lua syntax errors..."
 	@luac -p $(shell find mods/*/maps/* -iname '*.lua')
 	@luac -p $(shell find lua/* -iname '*.lua')
 
-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.Platforms.Default..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Platforms.Default
-	@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.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
+check: utility stylecheck mods
 	@echo
 	@echo "Checking for explicit interface violations..."
 	@mono --debug OpenRA.Utility.exe all --check-explicit-interfaces
 	@echo
+	@echo "Checking for code style violations in OpenRA.Game..."
+	@mono --debug OpenRA.StyleCheck.exe OpenRA.Game
+	@echo
+	@echo "Checking for code style violations in OpenRA.Platforms.Default..."
+	@mono --debug OpenRA.StyleCheck.exe OpenRA.Platforms.Default
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.Common..."
+	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.Common
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.Cnc..."
+	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.Cnc
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.D2k..."
+	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.D2k
+	@echo
+	@echo "Checking for code style violations in OpenRA.Utility..."
+	@mono --debug OpenRA.StyleCheck.exe OpenRA.Utility
+	@echo
+	@echo "Checking for code style violations in OpenRA.Test..."
+	@mono --debug OpenRA.StyleCheck.exe OpenRA.Test
+	@echo
 	@echo "Checking for code style violations in OpenRA.Server..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Server
+	@mono --debug OpenRA.StyleCheck.exe OpenRA.Server
 
 NUNIT_CONSOLE := $(shell test -f thirdparty/download/nunit3-console.exe && echo mono thirdparty/download/nunit3-console.exe || \
 	which nunit3-console 2>/dev/null || which nunit2-console 2>/dev/null || which nunit-console 2>/dev/null)
@@ -262,16 +228,6 @@ test: utility mods
 
 ##### Launchers / Utilities #####
 
-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')
 utility_TARGET = OpenRA.Utility.exe
 utility_KIND = exe
@@ -280,6 +236,13 @@ utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.Sh
 PROGRAMS += utility
 utility: $(utility_TARGET)
 
+stylecheck_SRCS := $(shell find OpenRA.StyleCheck/ -iname '*.cs')
+stylecheck_TARGET = OpenRA.StyleCheck.exe
+stylecheck_KIND = exe
+stylecheck_LIBS = thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
+PROGRAMS += stylecheck
+stylecheck: $(stylecheck_TARGET)
+
 # Dedicated server
 server_SRCS := $(shell find OpenRA.Server/ -iname '*.cs')
 server_TARGET = OpenRA.Server.exe
@@ -291,6 +254,7 @@ server: $(server_TARGET)
 
 # Patches binary headers to work around a mono bug
 fixheader.exe: packaging/fixheader.cs
+	@command -v $(CSC) >/dev/null || (echo "Mono is not installed. Please install Mono from http://www.mono-project.com/download/ before building OpenRA."; exit 1)
 	@echo CSC fixheader.exe
 	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
 
@@ -318,15 +282,11 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 #
 default: core
 
-core: game platforms mods utility server
+core: dependencies game platforms mods utility server
 
-tools: gamemonitor
+mods: mod_common mod_cnc mod_d2k
 
-package: all-dependencies core tools docs version
-
-mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
-
-all: dependencies core tools
+all: dependencies core stylecheck
 
 clean:
 	@-$(RM_F) *.exe *.dll *.dylib *.dll.config ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
@@ -340,63 +300,49 @@ cli-dependencies:
 	@ $(CP_R) thirdparty/download/*.dll .
 	@ $(CP_R) thirdparty/download/*.dll.config .
 
-linux-dependencies: cli-dependencies linux-native-dependencies
+linux-dependencies: cli-dependencies geoip-dependencies linux-native-dependencies
 
 linux-native-dependencies:
 	@./thirdparty/configure-native-deps.sh
 
-windows-dependencies:
+windows-dependencies: cli-dependencies geoip-dependencies
 	@./thirdparty/fetch-thirdparty-deps-windows.sh
 
-osx-dependencies: cli-dependencies
+osx-dependencies: cli-dependencies geoip-dependencies
 	@./thirdparty/fetch-thirdparty-deps-osx.sh
 	@ $(CP_R) thirdparty/download/osx/*.dylib .
 	@ $(CP_R) thirdparty/download/osx/*.dll.config .
 
-dependencies: $(os-dependencies)
+geoip-dependencies:
 	@./thirdparty/fetch-geoip-db.sh
 	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
 
-all-dependencies: cli-dependencies windows-dependencies osx-dependencies
+dependencies: $(os-dependencies)
 
-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
+all-dependencies: cli-dependencies windows-dependencies osx-dependencies geoip-dependencies
+
+version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml
+	@echo "$(VERSION)" > VERSION
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
-		awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i}.tmp2 && \
-		awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp2 > $${i} && \
-		rm $${i}.tmp $${i}.tmp2; \
+		awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp > $${i} && \
+		rm $${i}.tmp; \
 	done
 
-docs: utility mods version
-	@mono --debug OpenRA.Utility.exe all --docs > DOCUMENTATION.md
-	@mono --debug OpenRA.Utility.exe all --lua-docs > Lua-API.md
-
 man-page: utility mods
 	@mono --debug OpenRA.Utility.exe all --man-page > openra.6
 
-install: install-core
-
-install-all: install-core install-tools
+install: default install-core
 
 install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
 
-install-core: default
-	@-echo "Installing OpenRA to $(DATA_INSTALL_DIR)"
+install-engine:
+	@-echo "Installing OpenRA engine to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_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/"
-	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) "$(DATA_INSTALL_DIR)/mods/ra"
-	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
-	@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"
 
-	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
 	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
+	@$(INSTALL_DATA) VERSION "$(DATA_INSTALL_DIR)/VERSION"
 	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
 	@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
 
@@ -409,98 +355,133 @@ install-core: default
 	@$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) SharpFont.dll "$(DATA_INSTALL_DIR)"
 	@$(CP) SharpFont.dll.config "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) Mono.Nat.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) Open.Nat.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)"
-	@$(INSTALL_PROGRAM) RestSharp.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SmarIrc4net.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) rix0rrr.BeaconLib.dll "$(DATA_INSTALL_DIR)"
 
-ifneq ($(UNAME_S),Darwin)
+install-common-mod-files:
+	@-echo "Installing OpenRA common mod files to $(DATA_INSTALL_DIR)"
+	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
+	@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
+	@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
+	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
+	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
+
+install-default-mods:
+	@-echo "Installing OpenRA default mods to $(DATA_INSTALL_DIR)"
+	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
+	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
+	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
+	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
+	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
+	@$(CP_R) mods/modcontent "$(DATA_INSTALL_DIR)/mods/"
+
+install-core: install-engine install-common-mod-files install-default-mods
 	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
-endif
-
-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)"
 
 install-linux-icons:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor "$(DESTDIR)$(datadir)/icons/"
+	for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
+		$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps"; \
+		$(INSTALL_DATA) packaging/linux/icons/ra_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-ra.png"; \
+		$(INSTALL_DATA) packaging/linux/icons/cnc_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-cnc.png"; \
+		$(INSTALL_DATA) packaging/linux/icons/d2k_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-d2k.png"; \
+	done
+	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps"
+	$(INSTALL_DATA) packaging/linux/icons/ra_scalable.svg "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-ra.svg"
+	$(INSTALL_DATA) packaging/linux/icons/cnc_scalable.svg "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-cnc.svg"
 
 install-linux-desktop:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Red Alert/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-ra.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-ra.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-cnc.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-cnc.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Dune 2000/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-d2k.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-d2k.desktop "$(DESTDIR)$(datadir)/applications"
+	@-$(RM) packaging/linux/openra-ra.desktop packaging/linux/openra-cnc.desktop packaging/linux/openra-d2k.desktop
 
 install-linux-mime:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
-	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MODID}/ra/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-ra.xml"
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-cnc.xml"
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-d2k.xml"
 
 install-linux-appdata:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
-	@$(INSTALL_DATA) packaging/linux/openra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Red Alert/g' | sed 's/{SCREENSHOT_RA}/ type="default"/g' | sed 's/{SCREENSHOT_CNC}//g' | sed 's/{SCREENSHOT_D2K}//g'> packaging/linux/openra-ra.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-ra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Tiberian Dawn/g' | sed 's/{SCREENSHOT_RA}//g' | sed 's/{SCREENSHOT_CNC}/ type="default"/g' | sed 's/{SCREENSHOT_D2K}//g'> packaging/linux/openra-cnc.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-cnc.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Dune 2000/g' | sed 's/{SCREENSHOT_RA}//g' | sed 's/{SCREENSHOT_CNC}//g' | sed 's/{SCREENSHOT_D2K}/ type="default"/g'> packaging/linux/openra-d2k.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-d2k.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@-$(RM) packaging/linux/openra-ra.appdata.xml packaging/linux/openra-cnc.appdata.xml packaging/linux/openra-d2k.appdata.xml
 
 install-man-page: man-page
 	@$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man6/"
 	@$(INSTALL_DATA) openra.6 "$(DESTDIR)$(mandir)/man6/"
 
 install-linux-scripts:
-	@echo "#!/bin/sh" > openra
-	@echo 'cd "$(gameinstalldir)"' >> openra
 ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-	@echo 'mono OpenRA.Game.exe "$$@"' >> openra
+	@sed 's/{DEBUG}//' packaging/linux/openra.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra.debug.in
+	@sed 's/{DEBUG}//' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
 else
-	@echo 'mono --debug OpenRA.Game.exe "$$@"' >> openra
-endif
-	@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
-
-	@echo "#!/bin/sh" > openra-server
-	@echo 'cd "$(gameinstalldir)"' >> openra-server
-ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-	@echo 'mono OpenRA.Server.exe "$$@"' >> openra-server
-else
-	@echo 'mono --debug OpenRA.Server.exe "$$@"' >> openra-server
+	@sed 's/{DEBUG}/--debug/' packaging/linux/openra.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra.debug.in
+	@sed 's/{DEBUG}/--debug/' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
 endif
 
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.debug.in  | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.debug.in | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.debug.in | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k
+
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx openra-server "$(BIN_INSTALL_DIR)"
-	@-$(RM) openra-server
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-cnc "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k "$(BIN_INSTALL_DIR)"
+	@-$(RM) packaging/linux/openra-ra packaging/linux/openra-cnc packaging/linux/openra-d2k packaging/linux/openra.debug.in
+
+	@sed 's/{MODID}/ra/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra-server
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc-server
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k-server
+
+	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra-server "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-cnc-server "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k-server "$(BIN_INSTALL_DIR)"
+	@-$(RM) packaging/linux/openra-ra-server packaging/linux/openra-cnc-server packaging/linux/openra-d2k-server packaging/linux/openra-server.debug.in
 
 uninstall:
 	@-$(RM_R) "$(DATA_INSTALL_DIR)"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-server"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.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"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-ra"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-ra-server"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-cnc"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-cnc-server"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-d2k"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-d2k-server"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k.desktop"
+	@-for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-ra.png"; \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-cnc.png"; \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-d2k.png"; \
+	done
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-ra.svg"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-cnc.svg"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-ra.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-cnc.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-d2k.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-ra.appdata.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-cnc.appdata.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-d2k.appdata.xml"
 	@-$(RM_F) "$(DESTDIR)$(mandir)/man6/openra.6"
 
 help:
 	@echo 'to compile, run:'
 	@echo '  make [DEBUG=false]'
 	@echo
-	@echo 'to compile with development tools, run:'
-	@echo '  make all [DEBUG=false]'
-	@echo
 	@echo 'to check unit tests (requires NUnit version >= 2.6), run:'
 	@echo '  make nunit [NUNIT_CONSOLE=<path-to/nunit[3|2]-console>] [NUNIT_LIBS_PATH=<path-to-libs-dir>] [NUNIT_LIBS=<nunit-libs>]'
 	@echo '     Use NUNIT_CONSOLE if nunit[3|2]-console was not downloaded by `make dependencies` nor is it in bin search paths'
@@ -510,15 +491,9 @@ help:
 	@echo 'to check the official mods for erroneous yaml files, run:'
 	@echo '  make test'
 	@echo
-	@echo 'to generate documentation aimed at modders, run:'
-	@echo '  make docs'
-	@echo
 	@echo 'to install, run:'
 	@echo '  make [prefix=/foo] [bindir=/bar/bin] install'
 	@echo
-	@echo 'to install with development tools, run:'
-	@echo '  make [prefix=/foo] [bindir=/bar/bin] install-all'
-	@echo
 	@echo 'to install Linux startup scripts, desktop files and icons'
 	@echo '  make install-linux-shortcuts [DEBUG=false]'
 	@echo
@@ -537,4 +512,4 @@ help:
 
 .SUFFIXES:
 
-.PHONY: core tools package all mods clean distclean dependencies version $(PROGRAMS) nunit
+.PHONY: core package all mods clean distclean dependencies version $(PROGRAMS) nunit

OpenRA.Game.exe.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <runtime>
-    <loadFromRemoteSources enabled="true" />
-  </runtime>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
 </configuration>

OpenRA.Game/Activities/Activity.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -9,31 +9,274 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Traits;
 
 namespace OpenRA.Activities
 {
+	public enum ActivityState { Queued, Active, Done, Canceled }
+
+	/*
+	 * Activities are actions carried out by actors during each tick.
+	 *
+	 * Activities exist in a graph data structure built up amongst themselves. Each activity has a parent activity,
+	 * optionally child activities, and usually a next activity. An actor's CurrentActivity is a pointer into that graph
+	 * and moves through it as activities run.
+	 *
+	 * There are two kinds of activities, the base activity and composite activities. They differ in the way their children
+	 * are run: while a base activity is responsible for running its children itself, a composite activity relies on the actor's
+	 * activity-running code. Therefore, the actor's CurrentActivity stays on the base activity while it runs its children. With
+	 * composite activities however, the CurrentActivity moves through the list of children as they run.
+	 *
+	 *
+	 * Things to be aware of when writing activities:
+	 *
+	 * - Use "return NextActivity" at least once somewhere in the tick method.
+	 * - Do not use "return new SomeActivity()" as that will break the graph. Queue the new activity and use "return NextActivity" instead.
+	 * - Do not "reuse" (with "SequenceActivities", for example) activity objects that have already finished running.
+	 *   Queue a new instance instead.
+	 * - Avoid calling actor.CancelActivity(). It is almost always a bug. Call activity.Cancel() instead.
+	 * - A composite activity will run at least twice. The first time when it returns its children,
+	 *   the second time when its last child returns its Parent.
+	 * - Do not return the Parent explicitly unless you have an extremly good reason. "return NextActivity"
+	 *   will do the right thing in all circumstances.
+	 * - You do not need to care about the ChildActivity pointer advancing through the list of children,
+	 *   the activity code already takes care of that.
+	 * - If you want to check whether there are any follow-up activities queued, check against "NextInQueue"
+	 *   in favour of "NextActivity" to avoid checking against the Parent activity.
+	 *
+	 *
+	 * Guide when to use which kind of activity:
+	 *
+	 * - The activity does not have any children -> base activity
+	 * - The activity needs to run preparatory steps during each tick before its children can be run -> base activity
+	 * - The activity or the actor is left in a bogus state when one of the child activities is canceled -> base activity
+	 * - The activity's children are self-contained and can run independently of the parent -> composite activity
+	 * - The activity does not have any or little logic of its own, but is just composed of sub-steps -> composite activity
+	*/
 	public abstract class Activity
 	{
-		public Activity NextActivity { get; set; }
-		protected bool IsCanceled { get; private set; }
+		public ActivityState State { get; private set; }
+
+		/// <summary>
+		/// Returns the top-most activity *from the point of view of the calling activity*. Note that the root activity
+		/// can and likely will have next activities of its own, which would in turn be the root for their children.
+		/// </summary>
+		public Activity RootActivity
+		{
+			get
+			{
+				var p = this;
+				while (p.ParentActivity != null)
+					p = p.ParentActivity;
+
+				return p;
+			}
+		}
+
+		Activity parentActivity;
+		public Activity ParentActivity
+		{
+			get
+			{
+				return parentActivity;
+			}
+
+			protected set
+			{
+				parentActivity = value;
+
+				var next = NextInQueue;
+				if (next != null)
+					next.ParentActivity = parentActivity;
+			}
+		}
+
+		Activity childActivity;
+		protected Activity ChildActivity
+		{
+			get
+			{
+				return childActivity != null && childActivity.State < ActivityState.Done ? childActivity : null;
+			}
+
+			set
+			{
+				if (value == this || value == ParentActivity || value == NextInQueue)
+					childActivity = null;
+				else
+				{
+					childActivity = value;
+
+					if (childActivity != null)
+						childActivity.ParentActivity = this;
+				}
+			}
+		}
+
+		Activity nextActivity;
+
+		/// <summary>
+		/// The getter will return either the next activity or, if there is none, the parent one.
+		/// </summary>
+		public virtual Activity NextActivity
+		{
+			get
+			{
+				return nextActivity != null ? nextActivity : ParentActivity;
+			}
+
+			set
+			{
+				if (value == this || value == ParentActivity || (value != null && value.ParentActivity == this))
+					nextActivity = null;
+				else
+				{
+					nextActivity = value;
+
+					if (nextActivity != null)
+						nextActivity.ParentActivity = ParentActivity;
+				}
+			}
+		}
+
+		/// <summary>
+		/// The getter will return the next activity on the same level _only_, in contrast to NextActivity.
+		/// Use this to check whether there are any follow-up activities queued.
+		/// </summary>
+		public Activity NextInQueue
+		{
+			get { return nextActivity; }
+			set { NextActivity = value; }
+		}
+
+		public bool IsInterruptible { get; protected set; }
+		public bool IsCanceled { get { return State == ActivityState.Canceled; } }
+
+		public Activity()
+		{
+			IsInterruptible = true;
+		}
+
+		public Activity TickOuter(Actor self)
+		{
+			if (State == ActivityState.Done && Game.Settings.Debug.StrictActivityChecking)
+				throw new InvalidOperationException("Actor {0} attempted to tick activity {1} after it had already completed.".F(self, this.GetType()));
+
+			if (State == ActivityState.Queued)
+			{
+				OnFirstRun(self);
+				State = ActivityState.Active;
+			}
+
+			var ret = Tick(self);
+			if (ret == null || (ret != this && ret.ParentActivity != this))
+			{
+				// Make sure that the Parent's ChildActivity pointer is moved forwards as the child queue advances.
+				// The Child's ParentActivity will be set automatically during assignment.
+				if (ParentActivity != null && ParentActivity != ret)
+					ParentActivity.ChildActivity = ret;
+
+				if (State != ActivityState.Canceled)
+					State = ActivityState.Done;
+
+				OnLastRun(self);
+			}
+
+			return ret;
+		}
 
 		public abstract Activity Tick(Actor self);
 
-		public virtual void Cancel(Actor self)
+		/// <summary>
+		/// Runs once immediately before the first Tick() execution.
+		/// </summary>
+		protected virtual void OnFirstRun(Actor self) { }
+
+		/// <summary>
+		/// Runs once immediately after the last Tick() execution.
+		/// </summary>
+		protected virtual void OnLastRun(Actor self) { }
+
+		/// <summary>
+		/// Runs once on Actor.Dispose() (through OnActorDisposeOuter) and can be used to perform activity clean-up on actor death/disposal,
+		/// for example by force-triggering OnLastRun (which would otherwise be skipped).
+		/// </summary>
+		protected virtual void OnActorDispose(Actor self) { }
+
+		/// <summary>
+		/// Runs once on Actor.Dispose().
+		/// Main purpose is to ensure ChildActivity.OnActorDispose runs as well (which isn't otherwise accessible due to protection level).
+		/// </summary>
+		internal void OnActorDisposeOuter(Actor self)
 		{
-			IsCanceled = true;
-			NextActivity = null;
+			if (ChildActivity != null)
+				ChildActivity.OnActorDisposeOuter(self);
+
+			OnActorDispose(self);
+		}
+
+		public virtual bool Cancel(Actor self, bool keepQueue = false)
+		{
+			if (!IsInterruptible)
+				return false;
+
+			if (ChildActivity != null && !ChildActivity.Cancel(self))
+				return false;
+
+			if (!keepQueue)
+				NextActivity = null;
+
+			ChildActivity = null;
+			State = ActivityState.Canceled;
+
+			return true;
 		}
 
 		public virtual void Queue(Activity activity)
 		{
-			if (NextActivity != null)
-				NextActivity.Queue(activity);
+			if (NextInQueue != null)
+				NextInQueue.Queue(activity);
 			else
-				NextActivity = activity;
+				NextInQueue = activity;
+		}
+
+		public virtual void QueueChild(Activity activity)
+		{
+			if (ChildActivity != null)
+				ChildActivity.Queue(activity);
+			else
+				ChildActivity = activity;
+		}
+
+		/// <summary>
+		/// Prints the activity tree, starting from the root or optionally from a given origin.
+		///
+		/// Call this method from any place that's called during a tick, such as the Tick() method itself or
+		/// the Before(First|Last)Run() methods. The origin activity will be marked in the output.
+		/// </summary>
+		/// <param name="origin">Activity from which to start traversing, and which to mark. If null, mark the calling activity, and start traversal from the root.</param>
+		/// <param name="level">Initial level of indentation.</param>
+		protected void PrintActivityTree(Activity origin = null, int level = 0)
+		{
+			if (origin == null)
+				RootActivity.PrintActivityTree(this);
+			else
+			{
+				Console.Write(new string(' ', level * 2));
+				if (origin == this)
+					Console.Write("*");
+
+				Console.WriteLine(this.GetType().ToString().Split('.').Last());
+
+				if (ChildActivity != null)
+					ChildActivity.PrintActivityTree(origin, level + 1);
+
+				if (NextInQueue != null)
+					NextInQueue.PrintActivityTree(origin, level);
+			}
 		}
 
 		public virtual IEnumerable<Target> GetTargets(Actor self)
@@ -42,11 +285,34 @@ namespace OpenRA.Activities
 		}
 	}
 
+	/// <summary>
+	/// In contrast to the base activity class, which is responsible for running its children itself,
+	/// composite activities rely on the actor's activity-running logic for their children.
+	/// </summary>
+	public abstract class CompositeActivity : Activity
+	{
+		/// <summary>
+		/// The getter will return the first non-null value of either child, next or parent activity, in that order, or ultimately null.
+		/// </summary>
+		public override Activity NextActivity
+		{
+			get
+			{
+				if (ChildActivity != null)
+					return ChildActivity;
+				else if (NextInQueue != null)
+					return NextInQueue;
+				else
+					return ParentActivity;
+			}
+		}
+	}
+
 	public static class ActivityExts
 	{
 		public static IEnumerable<Target> GetTargetQueue(this Actor self)
 		{
-			return self.GetCurrentActivity()
+			return self.CurrentActivity
 				.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-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -16,25 +16,18 @@ namespace OpenRA.Activities
 	public class CallFunc : Activity
 	{
 		public CallFunc(Action a) { this.a = a; }
-		public CallFunc(Action a, bool interruptable)
+		public CallFunc(Action a, bool interruptible)
 		{
 			this.a = a;
-			this.interruptable = interruptable;
+			IsInterruptible = interruptible;
 		}
 
 		Action a;
-		bool interruptable;
 
 		public override Activity Tick(Actor self)
 		{
 			if (a != null) a();
 			return NextActivity;
 		}
-
-		public override void Cancel(Actor self)
-		{
-			if (interruptable)
-				base.Cancel(self);
-		}
 	}
 }

OpenRA.Game/Actor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -28,8 +28,9 @@ namespace OpenRA
 		internal struct SyncHash
 		{
 			public readonly ISync Trait;
-			public readonly int Hash;
-			public SyncHash(ISync trait, int hash) { Trait = trait; Hash = hash; }
+			readonly Func<object, int> hashFunction;
+			public SyncHash(ISync trait) { Trait = trait; hashFunction = Sync.GetHashFunction(trait); }
+			public int Hash() { return hashFunction(Trait); }
 		}
 
 		public readonly ActorInfo Info;
@@ -38,23 +39,22 @@ namespace OpenRA
 
 		public readonly uint ActorID;
 
-		public Player Owner { get; set; }
+		public Player Owner { get; internal set; }
 
 		public bool IsInWorld { get; internal set; }
+		public bool WillDispose { get; private set; }
 		public bool Disposed { get; private set; }
 
-		Activity currentActivity;
+		public Activity CurrentActivity { get; private set; }
 
-		public Group Group;
 		public int Generation;
+		public Actor ReplacedByActor;
 
-		public Rectangle Bounds { get; private set; }
-		public Rectangle VisualBounds { get; private set; }
 		public IEffectiveOwner EffectiveOwner { get; private set; }
 		public IOccupySpace OccupiesSpace { get; private set; }
 		public ITargetable[] Targetables { get; private set; }
 
-		public bool IsIdle { get { return currentActivity == null; } }
+		public bool IsIdle { get { return CurrentActivity == null; } }
 		public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
 
 		public CPos Location { get { return OccupiesSpace.TopLeft; } }
@@ -70,15 +70,19 @@ namespace OpenRA
 			}
 		}
 
-		internal IEnumerable<SyncHash> SyncHashes { get; private set; }
+		internal SyncHash[] SyncHashes { get; private set; }
 
 		readonly IFacing facing;
 		readonly IHealth health;
 		readonly IRenderModifier[] renderModifiers;
 		readonly IRender[] renders;
-		readonly IDisable[] disables;
+		readonly IMouseBounds[] mouseBounds;
 		readonly IVisibilityModifier[] visibilityModifiers;
 		readonly IDefaultVisibility defaultVisibility;
+		readonly INotifyBecomingIdle[] becomingIdles;
+		readonly INotifyIdle[] tickIdles;
+		readonly ITargetablePositions[] targetablePositions;
+		WPos[] staticTargetablePositions;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -111,61 +115,48 @@ namespace OpenRA
 			// PERF: Cache all these traits as soon as the actor is created. This is a fairly cheap one-off cost per
 			// actor that allows us to provide some fast implementations of commonly used methods that are relied on by
 			// performance-sensitive parts of the core game engine, such as pathfinding, visibility and rendering.
-			Bounds = DetermineBounds();
-			VisualBounds = DetermineVisualBounds();
 			EffectiveOwner = TraitOrDefault<IEffectiveOwner>();
 			facing = TraitOrDefault<IFacing>();
 			health = TraitOrDefault<IHealth>();
 			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
 			renders = TraitsImplementing<IRender>().ToArray();
-			disables = TraitsImplementing<IDisable>().ToArray();
+			mouseBounds = TraitsImplementing<IMouseBounds>().ToArray();
 			visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
 			defaultVisibility = Trait<IDefaultVisibility>();
+			becomingIdles = TraitsImplementing<INotifyBecomingIdle>().ToArray();
+			tickIdles = TraitsImplementing<INotifyIdle>().ToArray();
 			Targetables = TraitsImplementing<ITargetable>().ToArray();
+			targetablePositions = TraitsImplementing<ITargetablePositions>().ToArray();
+			world.AddFrameEndTask(w =>
+			{
+				// Caching this in a AddFrameEndTask, because trait construction order might cause problems if done directly at creation time.
+				// All actors that can move or teleport should have IPositionable, if not it's pretty safe to assume the actor is completely immobile and
+				// all targetable positions can be cached if all ITargetablePositions have no conditional requirements.
+				if (!Info.HasTraitInfo<IPositionableInfo>() && targetablePositions.Any() && targetablePositions.All(tp => tp.AlwaysEnabled))
+					staticTargetablePositions = targetablePositions.SelectMany(tp => tp.TargetablePositions(this)).ToArray();
+			});
 
-			SyncHashes =
-				TraitsImplementing<ISync>()
-				.Select(sync => Pair.New(sync, Sync.GetHashFunction(sync)))
-				.ToArray()
-				.Select(pair => new SyncHash(pair.First, pair.Second(pair.First)));
-		}
-
-		Rectangle DetermineBounds()
-		{
-			var si = Info.TraitInfoOrDefault<SelectableInfo>();
-			var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
-				TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
-
-			var offset = -size / 2;
-			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
-				offset += new int2(si.Bounds[2], si.Bounds[3]);
-
-			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
-		}
-
-		Rectangle DetermineVisualBounds()
-		{
-			var sd = Info.TraitInfoOrDefault<ISelectionDecorationsInfo>();
-			if (sd == null || sd.SelectionBoxBounds == null)
-				return Bounds;
-
-			var size = new int2(sd.SelectionBoxBounds[0], sd.SelectionBoxBounds[1]);
-
-			var offset = -size / 2;
-			if (sd.SelectionBoxBounds.Length > 2)
-				offset += new int2(sd.SelectionBoxBounds[2], sd.SelectionBoxBounds[3]);
-
-			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
+			SyncHashes = TraitsImplementing<ISync>().Select(sync => new SyncHash(sync)).ToArray();
 		}
 
 		public void Tick()
 		{
 			var wasIdle = IsIdle;
-			currentActivity = ActivityUtils.RunActivity(this, currentActivity);
+			CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
 
 			if (!wasIdle && IsIdle)
-				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
+			{
+				foreach (var n in becomingIdles)
 					n.OnBecomingIdle(this);
+
+				// If IsIdle is true, it means the last CurrentActivity.Tick returned null.
+				// If a next activity has been queued via OnBecomingIdle, we need to start running it now,
+				// to avoid an 'empty' null tick where the actor will (visibly, if moving) do nothing.
+				CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
+			}
+			else if (wasIdle)
+				foreach (var tickIdle in tickIdles)
+					tickIdle.TickIdle(this);
 		}
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
@@ -191,6 +182,35 @@ namespace OpenRA
 					yield return renderable;
 		}
 
+		public IEnumerable<Rectangle> ScreenBounds(WorldRenderer wr)
+		{
+			var bounds = Bounds(wr);
+			foreach (var modifier in renderModifiers)
+				bounds = modifier.ModifyScreenBounds(this, wr, bounds);
+			return bounds;
+		}
+
+		IEnumerable<Rectangle> Bounds(WorldRenderer wr)
+		{
+			// PERF: Avoid LINQ. See comments for Renderables
+			foreach (var render in renders)
+				foreach (var r in render.ScreenBounds(this, wr))
+					if (!r.IsEmpty)
+						yield return r;
+		}
+
+		public Rectangle MouseBounds(WorldRenderer wr)
+		{
+			foreach (var mb in mouseBounds)
+			{
+				var bounds = mb.MouseoverBounds(this, wr);
+				if (!bounds.IsEmpty)
+					return bounds;
+			}
+
+			return Rectangle.Empty;
+		}
+
 		public void QueueActivity(bool queued, Activity nextActivity)
 		{
 			if (!queued)
@@ -200,21 +220,18 @@ namespace OpenRA
 
 		public void QueueActivity(Activity nextActivity)
 		{
-			if (currentActivity == null)
-				currentActivity = nextActivity;
+			if (CurrentActivity == null)
+				CurrentActivity = nextActivity;
 			else
-				currentActivity.Queue(nextActivity);
+				CurrentActivity.RootActivity.Queue(nextActivity);
 		}
 
-		public void CancelActivity()
+		public bool CancelActivity()
 		{
-			if (currentActivity != null)
-				currentActivity.Cancel(this);
-		}
+			if (CurrentActivity != null)
+				return CurrentActivity.RootActivity.Cancel(this);
 
-		public Activity GetCurrentActivity()
-		{
-			return currentActivity;
+			return true;
 		}
 
 		public override int GetHashCode()
@@ -264,6 +281,14 @@ namespace OpenRA
 
 		public void Dispose()
 		{
+			// If CurrentActivity isn't null, run OnActorDisposeOuter in case some cleanups are needed.
+			// This should be done before the FrameEndTask to avoid dependency issues.
+			if (CurrentActivity != null)
+				CurrentActivity.RootActivity.OnActorDisposeOuter(this);
+
+			// Allow traits/activities to prevent a race condition when they depend on disposing the actor (e.g. Transforms)
+			WillDispose = true;
+
 			World.AddFrameEndTask(w =>
 			{
 				if (Disposed)
@@ -286,27 +311,35 @@ namespace OpenRA
 		// TODO: move elsewhere.
 		public void ChangeOwner(Player newOwner)
 		{
-			World.AddFrameEndTask(w =>
-			{
-				if (Disposed)
-					return;
+			World.AddFrameEndTask(_ => ChangeOwnerSync(newOwner));
+		}
 
-				var oldOwner = Owner;
-				var wasInWorld = IsInWorld;
+		/// <summary>
+		/// Change the actors owner without queuing a FrameEndTask.
+		/// This must only be called from inside an existing FrameEndTask.
+		/// </summary>
+		public void ChangeOwnerSync(Player newOwner)
+		{
+			if (Disposed)
+				return;
 
-				// momentarily remove from world so the ownership queries don't get confused
-				if (wasInWorld)
-					w.Remove(this);
+			var oldOwner = Owner;
+			var wasInWorld = IsInWorld;
 
-				Owner = newOwner;
-				Generation++;
+			// momentarily remove from world so the ownership queries don't get confused
+			if (wasInWorld)
+				World.Remove(this);
 
-				if (wasInWorld)
-					w.Add(this);
+			Owner = newOwner;
+			Generation++;
 
-				foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
-					t.OnOwnerChanged(this, oldOwner, newOwner);
-			});
+			foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
+				t.OnOwnerChanged(this, oldOwner, newOwner);
+
+			World.Selection.OnOwnerChanged(this, oldOwner, newOwner);
+
+			if (wasInWorld)
+				World.Add(this);
 		}
 
 		public DamageState GetDamageState()
@@ -317,29 +350,20 @@ namespace OpenRA
 			return (health == null) ? DamageState.Undamaged : health.DamageState;
 		}
 
-		public void InflictDamage(Actor attacker, int damage, IWarhead warhead)
+		public void InflictDamage(Actor attacker, Damage damage)
 		{
 			if (Disposed || health == null)
 				return;
 
-			health.InflictDamage(this, attacker, damage, warhead, false);
+			health.InflictDamage(this, attacker, damage, false);
 		}
 
-		public void Kill(Actor attacker)
+		public void Kill(Actor attacker, BitSet<DamageType> damageTypes = default(BitSet<DamageType>))
 		{
 			if (Disposed || health == null)
 				return;
 
-			health.Kill(this, attacker);
-		}
-
-		public bool IsDisabled()
-		{
-			// PERF: Avoid LINQ.
-			foreach (var disable in disables)
-				if (disable.Disabled)
-					return true;
-			return false;
+			health.Kill(this, attacker, damageTypes);
 		}
 
 		public bool CanBeViewedByPlayer(Player player)
@@ -352,21 +376,23 @@ namespace OpenRA
 			return defaultVisibility.IsVisible(this, player);
 		}
 
-		public IEnumerable<string> GetAllTargetTypes()
+		public BitSet<TargetableType> GetAllTargetTypes()
 		{
 			// PERF: Avoid LINQ.
+			var targetTypes = new BitSet<TargetableType>();
 			foreach (var targetable in Targetables)
-				foreach (var targetType in targetable.TargetTypes)
-					yield return targetType;
+				targetTypes = targetTypes.Union(targetable.TargetTypes);
+			return targetTypes;
 		}
 
-		public IEnumerable<string> GetEnabledTargetTypes()
+		public BitSet<TargetableType> GetEnabledTargetTypes()
 		{
 			// PERF: Avoid LINQ.
+			var targetTypes = new BitSet<TargetableType>();
 			foreach (var targetable in Targetables)
 				if (targetable.IsTraitEnabled())
-					foreach (var targetType in targetable.TargetTypes)
-						yield return targetType;
+					targetTypes = targetTypes.Union(targetable.TargetTypes);
+			return targetTypes;
 		}
 
 		public bool IsTargetableBy(Actor byActor)
@@ -379,6 +405,18 @@ namespace OpenRA
 			return false;
 		}
 
+		public IEnumerable<WPos> GetTargetablePositions()
+		{
+			if (staticTargetablePositions != null)
+				return staticTargetablePositions;
+
+			var enabledTargetablePositionTraits = targetablePositions.Where(Exts.IsTraitEnabled);
+			if (enabledTargetablePositionTraits.Any())
+				return enabledTargetablePositionTraits.SelectMany(tp => tp.TargetablePositions(this));
+
+			return new[] { this.CenterPosition };
+		}
+
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;

OpenRA.Game/CPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -18,27 +18,43 @@ namespace OpenRA
 {
 	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
 	{
-		public readonly int X, Y;
+		// Coordinates are packed in a 32 bit signed int
+		// X and Y are 12 bits (signed): -2048...2047
+		// Layer is an unsigned byte
+		// Packing is XXXX XXXX XXXX YYYY YYYY YYYY LLLL LLLL
+		public readonly int Bits;
 
-		public CPos(int x, int y) { X = x; Y = y; }
-		public static readonly CPos Zero = new CPos(0, 0);
+		// X is padded to MSB, so bit shift does the correct sign extension
+		public int X { get { return Bits >> 20; } }
+
+		// Align Y with a short, cast, then shift the rest of the way
+		// The signed short bit shift does the correct sign extension
+		public int Y { get { return ((short)(Bits >> 4)) >> 4; } }
+
+		public byte Layer { get { return (byte)Bits; } }
+
+		public CPos(int bits) { Bits = bits; }
+		public CPos(int x, int y) : this(x, y, 0) { }
+		public CPos(int x, int y, byte layer)
+		{
+			Bits = (x & 0xFFF) << 20 | (y & 0xFFF) << 8 | layer;
+		}
+
+		public static readonly CPos Zero = new CPos(0, 0, 0);
 
 		public static explicit operator CPos(int2 a) { return new CPos(a.X, a.Y); }
 
-		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 CPos operator +(CVec a, CPos b) { return new CPos(a.X + b.X, a.Y + b.Y, b.Layer); }
+		public static CPos operator +(CPos a, CVec b) { return new CPos(a.X + b.X, a.Y + b.Y, a.Layer); }
+		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y, a.Layer); }
 		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.Bits == other.Bits; }
 		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 override int GetHashCode() { return Bits.GetHashCode(); }
 
-		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
-
-		public bool Equals(CPos other) { return X == other.X && Y == other.Y; }
+		public bool Equals(CPos other) { return Bits == other.Bits; }
 		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
 
 		public override string ToString() { return X + "," + Y; }
@@ -83,11 +99,24 @@ namespace OpenRA
 		public LuaValue Subtract(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
 			CPos a;
-			CVec b;
-			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
-				throw new LuaException("Attempted to call CPos.Subtract(CPos, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
+			var rightType = right.WrappedClrType();
+			if (!left.TryGetClrValue(out a))
+				throw new LuaException("Attempted to call CPos.Subtract(CPos, (CPos|CVec)) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, rightType.Name));
 
-			return new LuaCustomClrObject(a - b);
+			if (rightType == typeof(CPos))
+			{
+				CPos b;
+				right.TryGetClrValue(out b);
+				return new LuaCustomClrObject(a - b);
+			}
+			else if (rightType == typeof(CVec))
+			{
+				CVec b;
+				right.TryGetClrValue(out b);
+				return new LuaCustomClrObject(a - b);
+			}
+
+			throw new LuaException("Attempted to call CPos.Subtract(CPos, (CPos|CVec)) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, rightType.Name));
 		}
 
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
@@ -107,6 +136,7 @@ namespace OpenRA
 				{
 					case "X": return X;
 					case "Y": return Y;
+					case "Layer": return Layer;
 					default: throw new LuaException("CPos does not define a member '{0}'".F(key));
 				}
 			}

OpenRA.Game/CVec.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/CacheStorage.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/ContentInstaller.cs

@@ -1,41 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-
-namespace OpenRA
-{
-	// Referenced from ModMetadata, so needs to be in OpenRA.Game :(
-	public class ContentInstaller : IGlobalModData
-	{
-		public enum FilenameCase { Input, ForceLower, ForceUpper }
-
-		public readonly string[] TestFiles = { };
-		public readonly string[] DiskTestFiles = { };
-		public readonly string PackageToExtractFromCD = null;
-		public readonly bool OverwriteFiles = true;
-
-		public readonly FilenameCase OutputFilenameCase = FilenameCase.ForceLower;
-		public readonly Dictionary<string, string[]> CopyFilesFromCD = new Dictionary<string, string[]>();
-		public readonly Dictionary<string, string[]> ExtractFilesFromCD = new Dictionary<string, string[]>();
-
-		public readonly string PackageMirrorList = null;
-
-		public readonly string MusicPackageMirrorList = null;
-		public readonly int ShippedSoundtracks = 0;
-
-		/// <summary> InstallShield .CAB file IDs, used to extract Mod-specific files. </summary>
-		public readonly HashSet<int> InstallShieldCABFileIds = new HashSet<int>();
-
-		/// <summary> InstallShield .CAB file IDs, used to extract Mod-specific archives and extract contents of ExtractFilesFromCD. </summary>
-		public readonly HashSet<string> InstallShieldCABFilePackageIds = new HashSet<string>();
-	}
-}

OpenRA.Game/CryptoUtil.cs

@@ -0,0 +1,261 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace OpenRA
+{
+	public static class CryptoUtil
+	{
+		// Fixed byte pattern for the OID header
+		static readonly byte[] OIDHeader = { 0x30, 0xD, 0x6, 0x9, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0xD, 0x1, 0x1, 0x1, 0x5, 0x0 };
+
+		public static string PublicKeyFingerprint(RSAParameters parameters)
+		{
+			// Public key fingerprint is defined as the SHA1 of the modulus + exponent bytes
+			return SHA1Hash(parameters.Modulus.Append(parameters.Exponent).ToArray());
+		}
+
+		public static string EncodePEMPublicKey(RSAParameters parameters)
+		{
+			var data = Convert.ToBase64String(EncodePublicKey(parameters));
+			var output = new StringBuilder();
+			output.AppendLine("-----BEGIN PUBLIC KEY-----");
+			for (var i = 0; i < data.Length; i += 64)
+				output.AppendLine(data.Substring(i, Math.Min(64, data.Length - i)));
+			output.Append("-----END PUBLIC KEY-----");
+
+			return output.ToString();
+		}
+
+		public static RSAParameters DecodePEMPublicKey(string key)
+		{
+			try
+			{
+				// Reconstruct original key data
+				var lines = key.Split('\n');
+				var data = Convert.FromBase64String(lines.Skip(1).Take(lines.Length - 2).JoinWith(""));
+
+				// Pull the modulus and exponent bytes out of the ASN.1 tree
+				// Expect this to blow up if the key is not correctly formatted
+				using (var s = new MemoryStream(data))
+				{
+					// SEQUENCE
+					s.ReadByte();
+					ReadTLVLength(s);
+
+					// SEQUENCE -> fixed header junk
+					s.ReadByte();
+					var headerLength = ReadTLVLength(s);
+					s.Position += headerLength;
+
+					// SEQUENCE -> BIT_STRING
+					s.ReadByte();
+					ReadTLVLength(s);
+					s.ReadByte();
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE
+					s.ReadByte();
+					ReadTLVLength(s);
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER (modulus)
+					s.ReadByte();
+					var modulusLength = ReadTLVLength(s);
+					s.ReadByte();
+					var modulus = s.ReadBytes(modulusLength - 1);
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER (exponent)
+					s.ReadByte();
+					var exponentLength = ReadTLVLength(s);
+					s.ReadByte();
+					var exponent = s.ReadBytes(exponentLength - 1);
+
+					return new RSAParameters
+					{
+						Modulus = modulus,
+						Exponent = exponent
+					};
+				}
+			}
+			catch (Exception e)
+			{
+				throw new InvalidDataException("Invalid PEM public key", e);
+			}
+		}
+
+		static byte[] EncodePublicKey(RSAParameters parameters)
+		{
+			using (var stream = new MemoryStream())
+			{
+				var writer = new BinaryWriter(stream);
+
+				var modExpLength = TripletFullLength(parameters.Modulus.Length + 1) + TripletFullLength(parameters.Exponent.Length + 1);
+				var bitStringLength = TripletFullLength(modExpLength + 1);
+				var sequenceLength = TripletFullLength(bitStringLength + OIDHeader.Length);
+
+				// SEQUENCE
+				writer.Write((byte)0x30);
+				WriteTLVLength(writer, sequenceLength);
+
+				// SEQUENCE -> fixed header junk
+				writer.Write(OIDHeader);
+
+				// SEQUENCE -> BIT_STRING
+				writer.Write((byte)0x03);
+				WriteTLVLength(writer, bitStringLength);
+				writer.Write((byte)0x00);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE
+				writer.Write((byte)0x30);
+				WriteTLVLength(writer, modExpLength);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER
+				// Modulus is padded with a zero to avoid issues with the sign bit
+				writer.Write((byte)0x02);
+				WriteTLVLength(writer, parameters.Modulus.Length + 1);
+				writer.Write((byte)0);
+				writer.Write(parameters.Modulus);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER
+				// Exponent is padded with a zero to avoid issues with the sign bit
+				writer.Write((byte)0x02);
+				WriteTLVLength(writer, parameters.Exponent.Length + 1);
+				writer.Write((byte)0);
+				writer.Write(parameters.Exponent);
+
+				return stream.ToArray();
+			}
+		}
+
+		static void WriteTLVLength(BinaryWriter writer, int length)
+		{
+			if (length < 0x80)
+			{
+				// Length < 128 is stored in a single byte
+				writer.Write((byte)length);
+			}
+			else
+			{
+				// If 128 <= length < 256**128 first byte encodes number of bytes required to hold the length
+				// High-bit is set as a flag to use this long-form encoding
+				var lengthBytes = BitConverter.GetBytes(length).Reverse().SkipWhile(b => b == 0).ToArray();
+				writer.Write((byte)(0x80 | lengthBytes.Length));
+				writer.Write(lengthBytes);
+			}
+		}
+
+		static int ReadTLVLength(Stream s)
+		{
+			var length = s.ReadByte();
+			if (length < 0x80)
+				return length;
+
+			var data = new byte[4];
+			s.ReadBytes(data, 0, Math.Min(length & 0x7F, 4));
+			return BitConverter.ToInt32(data.ToArray(), 0);
+		}
+
+		static int TripletFullLength(int dataLength)
+		{
+			if (dataLength < 0x80)
+				return 2 + dataLength;
+
+			return 2 + dataLength + BitConverter.GetBytes(dataLength).Reverse().SkipWhile(b => b == 0).Count();
+		}
+
+		public static string DecryptString(RSAParameters parameters, string data)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					return Encoding.UTF8.GetString(rsa.Decrypt(Convert.FromBase64String(data), false));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to decrypt string with exception: {0}", e);
+				Console.WriteLine("String decryption failed: {0}", e);
+				return null;
+			}
+		}
+
+		public static string Sign(RSAParameters parameters, string data)
+		{
+			return Sign(parameters, Encoding.UTF8.GetBytes(data));
+		}
+
+		public static string Sign(RSAParameters parameters, byte[] data)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					using (var csp = SHA1.Create())
+						return Convert.ToBase64String(rsa.SignHash(csp.ComputeHash(data), CryptoConfig.MapNameToOID("SHA1")));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to sign string with exception: {0}", e);
+				Console.WriteLine("String signing failed: {0}", e);
+				return null;
+			}
+		}
+
+		public static bool VerifySignature(RSAParameters parameters, string data, string signature)
+		{
+			return VerifySignature(parameters, Encoding.UTF8.GetBytes(data), signature);
+		}
+
+		public static bool VerifySignature(RSAParameters parameters, byte[] data, string signature)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					using (var csp = SHA1.Create())
+						return rsa.VerifyHash(csp.ComputeHash(data), CryptoConfig.MapNameToOID("SHA1"), Convert.FromBase64String(signature));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to verify signature with exception: {0}", e);
+				Console.WriteLine("Signature validation failed: {0}", e);
+				return false;
+			}
+		}
+
+		public static string SHA1Hash(Stream data)
+		{
+			using (var csp = SHA1.Create())
+				return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
+		}
+
+		public static string SHA1Hash(byte[] data)
+		{
+			using (var csp = SHA1.Create())
+				return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
+		}
+
+		public static string SHA1Hash(string data)
+		{
+			return SHA1Hash(Encoding.UTF8.GetBytes(data));
+		}
+	}
+}

OpenRA.Game/Download.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -17,8 +17,8 @@ namespace OpenRA
 {
 	public class Download
 	{
+		readonly object syncObject = new object();
 		WebClient wc;
-		bool cancelled;
 
 		public static string FormatErrorMessage(Exception e)
 		{
@@ -28,6 +28,8 @@ namespace OpenRA
 
 			switch (ex.Status)
 			{
+				case WebExceptionStatus.RequestCanceled:
+					return "Cancelled";
 				case WebExceptionStatus.NameResolutionFailure:
 					return "DNS lookup failed";
 				case WebExceptionStatus.Timeout:
@@ -41,40 +43,55 @@ namespace OpenRA
 			}
 		}
 
-		public Download(string url, string path, Action<DownloadProgressChangedEventArgs> onProgress, Action<AsyncCompletedEventArgs, bool> onComplete)
+		void EnableTLS12OnWindows()
 		{
-			wc = new WebClient();
-			wc.Proxy = null;
-
-			wc.DownloadProgressChanged += (_, a) => onProgress(a);
-			wc.DownloadFileCompleted += (_, a) => onComplete(a, cancelled);
-
-			Game.OnQuit += Cancel;
-			wc.DownloadFileCompleted += (_, a) => { Game.OnQuit -= Cancel; };
-
-			wc.DownloadFileAsync(new Uri(url), path);
+			// Enable TLS 1.2 on Windows: .NET 4.7 on Windows 10 only supports obsolete protocols by default
+			// SecurityProtocolType.Tls12 is not defined in the .NET 4.5 reference dlls used by mono,
+			// so we must use the enum's constant value directly
+			if (Platform.CurrentPlatform == PlatformType.Windows)
+				ServicePointManager.SecurityProtocol |= (SecurityProtocolType)3072;
 		}
 
-		public Download(string url, Action<DownloadProgressChangedEventArgs> onProgress, Action<DownloadDataCompletedEventArgs, bool> onComplete)
+		public Download(string url, string path, Action<DownloadProgressChangedEventArgs> onProgress, Action<AsyncCompletedEventArgs> onComplete)
 		{
-			wc = new WebClient();
-			wc.Proxy = null;
+			EnableTLS12OnWindows();
 
-			wc.DownloadProgressChanged += (_, a) => onProgress(a);
-			wc.DownloadDataCompleted += (_, a) => onComplete(a, cancelled);
-
-			Game.OnQuit += Cancel;
-			wc.DownloadDataCompleted += (_, a) => { Game.OnQuit -= Cancel; };
-
-			wc.DownloadDataAsync(new Uri(url));
+			lock (syncObject)
+			{
+				wc = new WebClient { Proxy = null };
+				wc.DownloadProgressChanged += (_, a) => onProgress(a);
+				wc.DownloadFileCompleted += (_, a) => { DisposeWebClient(); onComplete(a); };
+				wc.DownloadFileAsync(new Uri(url), path);
+			}
 		}
 
-		public void Cancel()
+		public Download(string url, Action<DownloadProgressChangedEventArgs> onProgress, Action<DownloadDataCompletedEventArgs> onComplete)
 		{
-			Game.OnQuit -= Cancel;
-			wc.CancelAsync();
-			wc.Dispose();
-			cancelled = true;
+			EnableTLS12OnWindows();
+
+			lock (syncObject)
+			{
+				wc = new WebClient { Proxy = null };
+				wc.DownloadProgressChanged += (_, a) => onProgress(a);
+				wc.DownloadDataCompleted += (_, a) => { DisposeWebClient(); onComplete(a); };
+				wc.DownloadDataAsync(new Uri(url));
+			}
+		}
+
+		void DisposeWebClient()
+		{
+			lock (syncObject)
+			{
+				wc.Dispose();
+				wc = null;
+			}
+		}
+
+		public void CancelAsync()
+		{
+			lock (syncObject)
+				if (wc != null)
+					wc.CancelAsync();
 		}
 	}
 }

OpenRA.Game/Effects/AsyncAction.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/Effects/DelayedAction.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/Effects/DelayedImpact.cs

@@ -0,0 +1,45 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Effects
+{
+	public class DelayedImpact : IEffect
+	{
+		readonly Target target;
+		readonly Actor firedBy;
+		readonly IEnumerable<int> damageModifiers;
+		readonly IWarhead wh;
+
+		int delay;
+
+		public DelayedImpact(int delay, IWarhead wh, Target target, Actor firedBy, IEnumerable<int> damageModifiers)
+		{
+			this.wh = wh;
+			this.delay = delay;
+
+			this.target = target;
+			this.firedBy = firedBy;
+			this.damageModifiers = damageModifiers;
+		}
+
+		public void Tick(World world)
+		{
+			if (--delay <= 0)
+				world.AddFrameEndTask(w => { w.Remove(this); wh.DoImpact(target, firedBy, damageModifiers); });
+		}
+
+		public IEnumerable<IRenderable> Render(WorldRenderer wr) { yield break; }
+	}
+}

OpenRA.Game/Effects/IEffect.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -19,4 +19,9 @@ namespace OpenRA.Effects
 		void Tick(World world);
 		IEnumerable<IRenderable> Render(WorldRenderer r);
 	}
+
+	// Identifier interface for effects that are added to ScreenMap
+	public interface ISpatiallyPartitionable { }
+
+	public interface IEffectAboveShroud { IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr); }
 }

OpenRA.Game/Effects/SpriteEffect.cs

@@ -1,51 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using OpenRA.Graphics;
-
-namespace OpenRA.Effects
-{
-	public class SpriteEffect : IEffect
-	{
-		readonly World world;
-		readonly string palette;
-		readonly Animation anim;
-		readonly WPos pos;
-		readonly bool visibleThroughFog;
-		readonly bool scaleSizeWithZoom;
-
-		public SpriteEffect(WPos pos, World world, string image, string sequence, string palette, bool visibleThroughFog = false, bool scaleSizeWithZoom = false)
-		{
-			this.world = world;
-			this.pos = pos;
-			this.palette = palette;
-			this.scaleSizeWithZoom = scaleSizeWithZoom;
-			this.visibleThroughFog = visibleThroughFog;
-			anim = new Animation(world, image);
-			anim.PlayThen(sequence, () => world.AddFrameEndTask(w => w.Remove(this)));
-		}
-
-		public void Tick(World world)
-		{
-			anim.Tick();
-		}
-
-		public IEnumerable<IRenderable> Render(WorldRenderer wr)
-		{
-			if (world.FogObscures(pos) && !visibleThroughFog)
-				return SpriteRenderable.None;
-
-			var zoom = scaleSizeWithZoom ? 1f / wr.Viewport.Zoom : 1f;
-			return anim.Render(pos, WVec.Zero, 0, wr.Palette(palette), zoom);
-		}
-	}
-}

OpenRA.Game/ExternalMods.cs

@@ -0,0 +1,244 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using OpenRA.Graphics;
+
+namespace OpenRA
+{
+	[Flags]
+	enum ModRegistration { User = 1, System = 2 }
+
+	public class ExternalMod
+	{
+		public readonly string Id;
+		public readonly string Version;
+		public readonly string Title;
+		public readonly string LaunchPath;
+		public readonly string[] LaunchArgs;
+		public Sprite Icon { get; internal set; }
+
+		public static string MakeKey(Manifest mod) { return MakeKey(mod.Id, mod.Metadata.Version); }
+		public static string MakeKey(ExternalMod mod) { return MakeKey(mod.Id, mod.Version); }
+		public static string MakeKey(string modId, string modVersion) { return modId + "-" + modVersion; }
+	}
+
+	public class ExternalMods : IReadOnlyDictionary<string, ExternalMod>
+	{
+		readonly Dictionary<string, ExternalMod> mods = new Dictionary<string, ExternalMod>();
+		readonly SheetBuilder sheetBuilder;
+
+		public ExternalMods()
+		{
+			sheetBuilder = new SheetBuilder(SheetType.BGRA, 256);
+
+			// If the player has defined a local support directory (in the game directory)
+			// then this will override both the regular and system support dirs
+			var sources = new[] { Platform.SystemSupportDir, Platform.SupportDir };
+			foreach (var source in sources.Distinct())
+			{
+				var metadataPath = Path.Combine(source, "ModMetadata");
+				if (!Directory.Exists(metadataPath))
+					continue;
+
+				foreach (var path in Directory.GetFiles(metadataPath, "*.yaml"))
+				{
+					try
+					{
+						var yaml = MiniYaml.FromStream(File.OpenRead(path), path).First().Value;
+						LoadMod(yaml, path);
+					}
+					catch (Exception e)
+					{
+						Log.Write("debug", "Failed to parse mod metadata file '{0}'", path);
+						Log.Write("debug", e.ToString());
+					}
+				}
+			}
+		}
+
+		void LoadMod(MiniYaml yaml, string path = null, bool forceRegistration = false)
+		{
+			var mod = FieldLoader.Load<ExternalMod>(yaml);
+			var iconNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon");
+			if (iconNode != null && !string.IsNullOrEmpty(iconNode.Value.Value))
+			{
+				using (var stream = new MemoryStream(Convert.FromBase64String(iconNode.Value.Value)))
+				using (var bitmap = new Bitmap(stream))
+					mod.Icon = sheetBuilder.Add(bitmap);
+			}
+
+			// Avoid possibly overwriting a valid mod with an obviously bogus one
+			var key = ExternalMod.MakeKey(mod);
+			if ((forceRegistration || File.Exists(mod.LaunchPath)) && (path == null || Path.GetFileNameWithoutExtension(path) == key))
+				mods[key] = mod;
+		}
+
+		internal void Register(Manifest mod, string launchPath, ModRegistration registration)
+		{
+			if (mod.Metadata.Hidden)
+				return;
+
+			var iconData = "";
+			using (var stream = mod.Package.GetStream("icon.png"))
+				if (stream != null)
+					iconData = Convert.ToBase64String(stream.ReadAllBytes());
+
+			var key = ExternalMod.MakeKey(mod);
+			var yaml = new List<MiniYamlNode>()
+			{
+				new MiniYamlNode("Registration", new MiniYaml("", new List<MiniYamlNode>()
+				{
+					new MiniYamlNode("Id", mod.Id),
+					new MiniYamlNode("Version", mod.Metadata.Version),
+					new MiniYamlNode("Title", mod.Metadata.Title),
+					new MiniYamlNode("Icon", iconData),
+					new MiniYamlNode("LaunchPath", launchPath),
+					new MiniYamlNode("LaunchArgs", "Game.Mod=" + mod.Id)
+				}))
+			};
+
+			var sources = new List<string>();
+			if (registration.HasFlag(ModRegistration.System))
+				sources.Add(Platform.SystemSupportDir);
+
+			if (registration.HasFlag(ModRegistration.User))
+				sources.Add(Platform.SupportDir);
+
+			// Make sure the mod is available for this session, even if saving it fails
+			LoadMod(yaml.First().Value, forceRegistration: true);
+
+			foreach (var source in sources.Distinct())
+			{
+				var metadataPath = Path.Combine(source, "ModMetadata");
+
+				try
+				{
+					Directory.CreateDirectory(metadataPath);
+					File.WriteAllLines(Path.Combine(metadataPath, key + ".yaml"), yaml.ToLines().ToArray());
+				}
+				catch (Exception e)
+				{
+					Log.Write("debug", "Failed to register current mod metadata");
+					Log.Write("debug", e.ToString());
+				}
+			}
+		}
+
+		/// <summary>
+		/// Removes invalid mod registrations:
+		/// * LaunchPath no longer exists
+		/// * LaunchPath and mod id matches the active mod, but the version is different
+		/// * Filename doesn't match internal key
+		/// * Fails to parse as a mod registration
+		/// </summary>
+		internal void ClearInvalidRegistrations(ExternalMod activeMod, ModRegistration registration)
+		{
+			var sources = new List<string>();
+			if (registration.HasFlag(ModRegistration.System))
+				sources.Add(Platform.SystemSupportDir);
+
+			if (registration.HasFlag(ModRegistration.User))
+				sources.Add(Platform.SupportDir);
+
+			var activeModKey = ExternalMod.MakeKey(activeMod);
+			foreach (var source in sources.Distinct())
+			{
+				var metadataPath = Path.Combine(source, "ModMetadata");
+				if (!Directory.Exists(metadataPath))
+					continue;
+
+				foreach (var path in Directory.GetFiles(metadataPath, "*.yaml"))
+				{
+					string modKey = null;
+					try
+					{
+						var yaml = MiniYaml.FromStream(File.OpenRead(path), path).First().Value;
+						var m = FieldLoader.Load<ExternalMod>(yaml);
+						modKey = ExternalMod.MakeKey(m);
+
+						// Continue to the next entry if it is the active mod (even if the LaunchPath is bogus)
+						if (modKey == activeModKey)
+							continue;
+
+						// Continue to the next entry if this one is valid
+						if (File.Exists(m.LaunchPath) && Path.GetFileNameWithoutExtension(path) == modKey &&
+							!(activeMod != null && m.LaunchPath == activeMod.LaunchPath && m.Id == activeMod.Id && m.Version != activeMod.Version))
+							continue;
+					}
+					catch (Exception e)
+					{
+						Log.Write("debug", "Failed to parse mod metadata file '{0}'", path);
+						Log.Write("debug", e.ToString());
+					}
+
+					// Remove from the ingame mod switcher
+					if (Path.GetFileNameWithoutExtension(path) == modKey)
+						mods.Remove(modKey);
+
+					// Remove stale or corrupted metadata
+					try
+					{
+						File.Delete(path);
+						Log.Write("debug", "Removed invalid mod metadata file '{0}'", path);
+					}
+					catch (Exception e)
+					{
+						Log.Write("debug", "Failed to remove mod metadata file '{0}'", path);
+						Log.Write("debug", e.ToString());
+					}
+				}
+			}
+		}
+
+		internal void Unregister(Manifest mod, ModRegistration registration)
+		{
+			var sources = new List<string>();
+			if (registration.HasFlag(ModRegistration.System))
+				sources.Add(Platform.SystemSupportDir);
+
+			if (registration.HasFlag(ModRegistration.User))
+				sources.Add(Platform.SupportDir);
+
+			var key = ExternalMod.MakeKey(mod);
+			mods.Remove(key);
+
+			foreach (var source in sources.Distinct())
+			{
+				var path = Path.Combine(source, "ModMetadata", key + ".yaml");
+				try
+				{
+					if (File.Exists(path))
+						File.Delete(path);
+				}
+				catch (Exception e)
+				{
+					Log.Write("debug", "Failed to remove mod metadata file '{0}'", path);
+					Log.Write("debug", e.ToString());
+				}
+			}
+		}
+
+		public ExternalMod this[string key] { get { return mods[key]; } }
+		public int Count { get { return mods.Count; } }
+		public ICollection<string> Keys { get { return mods.Keys; } }
+		public ICollection<ExternalMod> Values { get { return mods.Values; } }
+		public bool ContainsKey(string key) { return mods.ContainsKey(key); }
+		public IEnumerator<KeyValuePair<string, ExternalMod>> GetEnumerator() { return mods.GetEnumerator(); }
+		public bool TryGetValue(string key, out ExternalMod value) { return mods.TryGetValue(key, out value); }
+		IEnumerator IEnumerable.GetEnumerator() { return mods.GetEnumerator(); }
+	}
+}

OpenRA.Game/Exts.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -375,6 +375,10 @@ namespace OpenRA
 				var key = keySelector(item);
 				var element = elementSelector(item);
 
+				// Discard elements with null keys
+				if (!typeof(TKey).IsValueType && key == null)
+					continue;
+
 				// Check for a key conflict:
 				if (d.ContainsKey(key))
 				{
@@ -484,19 +488,45 @@ namespace OpenRA
 			return int.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
 		}
 
+		public static byte ParseByte(string s)
+		{
+			return byte.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
+		}
+
 		public static bool TryParseIntegerInvariant(string s, out int i)
 		{
 			return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
 		}
 
-		public static bool IsTraitEnabled(this object trait)
+		public static bool TryParseInt64Invariant(string s, out long i)
 		{
-			return trait as IDisabledTrait == null || !(trait as IDisabledTrait).IsTraitDisabled;
+			return long.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
 		}
 
-		public static bool IsTraitEnabled<T>(T t)
+		public static bool IsTraitEnabled<T>(this T trait)
 		{
-			return IsTraitEnabled(t as object);
+			var disabledTrait = trait as IDisabledTrait;
+			return disabledTrait == null || !disabledTrait.IsTraitDisabled;
+		}
+
+		public static T FirstEnabledTraitOrDefault<T>(this IEnumerable<T> ts)
+		{
+			// PERF: Avoid LINQ.
+			foreach (var t in ts)
+				if (t.IsTraitEnabled())
+					return t;
+
+			return default(T);
+		}
+
+		public static T FirstEnabledTraitOrDefault<T>(this T[] ts)
+		{
+			// PERF: Avoid LINQ.
+			foreach (var t in ts)
+				if (t.IsTraitEnabled())
+					return t;
+
+			return default(T);
 		}
 	}
 

OpenRA.Game/FieldLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -15,12 +15,14 @@ using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
+using OpenRA.Support;
 
 namespace OpenRA
 {
@@ -69,6 +71,11 @@ namespace OpenRA
 		static readonly ConcurrentCache<MemberInfo, bool> MemberHasTranslateAttribute =
 			new ConcurrentCache<MemberInfo, bool>(member => member.HasAttribute<TranslateAttribute>());
 
+		static readonly ConcurrentCache<string, BooleanExpression> BooleanExpressionCache =
+			new ConcurrentCache<string, BooleanExpression>(expression => new BooleanExpression(expression));
+		static readonly ConcurrentCache<string, IntegerExpression> IntegerExpressionCache =
+			new ConcurrentCache<string, IntegerExpression>(expression => new IntegerExpression(expression));
+
 		static readonly object TranslationsLock = new object();
 		static Dictionary<string, string> translations;
 
@@ -271,6 +278,10 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(HotkeyReference))
+			{
+				return Game.ModData.Hotkeys[value];
+			}
 			else if (fieldType == typeof(WDist))
 			{
 				WDist res;
@@ -347,7 +358,7 @@ namespace OpenRA
 					if (parts.Length == 3)
 					{
 						int rr, rp, ry;
-						if (Exts.TryParseIntegerInvariant(value, out rr) && Exts.TryParseIntegerInvariant(value, out rp) && Exts.TryParseIntegerInvariant(value, out ry))
+						if (Exts.TryParseIntegerInvariant(parts[0], out rr) && Exts.TryParseIntegerInvariant(parts[1], out rp) && Exts.TryParseIntegerInvariant(parts[2], out ry))
 							return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
 					}
 				}
@@ -396,6 +407,38 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(BooleanExpression))
+			{
+				if (value != null)
+				{
+					try
+					{
+						return BooleanExpressionCache[value];
+					}
+					catch (InvalidDataException e)
+					{
+						throw new YamlException(e.Message);
+					}
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
+			else if (fieldType == typeof(IntegerExpression))
+			{
+				if (value != null)
+				{
+					try
+					{
+						return IntegerExpressionCache[value];
+					}
+					catch (InvalidDataException e)
+					{
+						throw new YamlException(e.Message);
+					}
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType.IsEnum)
 			{
 				try
@@ -432,12 +475,31 @@ namespace OpenRA
 			}
 			else if (fieldType == typeof(bool))
 				return ParseYesNo(value, fieldType, fieldName);
+			else if (fieldType == typeof(int2[]))
+			{
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					if (parts.Length % 2 != 0)
+						return InvalidValueAction(value, fieldType, fieldName);
+
+					var ints = new int2[parts.Length / 2];
+					for (var i = 0; i < ints.Length; i++)
+						ints[i] = new int2(Exts.ParseIntegerInvariant(parts[2 * i]), Exts.ParseIntegerInvariant(parts[2 * i + 1]));
+
+					return ints;
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType.IsArray && fieldType.GetArrayRank() == 1)
 			{
 				if (value == null)
 					return Array.CreateInstance(fieldType.GetElementType(), 0);
 
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				var options = field != null && field.HasAttribute<AllowEmptyEntriesAttribute>() ?
+					StringSplitOptions.None : StringSplitOptions.RemoveEmptyEntries;
+				var parts = value.Split(new char[] { ',' }, options);
 
 				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
 				for (var i = 0; i < parts.Length; i++)
@@ -486,6 +548,9 @@ namespace OpenRA
 				if (value != null)
 				{
 					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					if (parts.Length != 2)
+						return InvalidValueAction(value, fieldType, fieldName);
+
 					return new int2(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
 				}
 
@@ -508,6 +573,26 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(float3))
+			{
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					float x = 0;
+					float y = 0;
+					float z = 0;
+					float.TryParse(parts[0], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out x);
+					float.TryParse(parts[1], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out y);
+
+					// z component is optional for compatibility with older float2 definitions
+					if (parts.Length > 2)
+						float.TryParse(parts[2], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out z);
+
+					return new float3(x, y, z);
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(Rectangle))
 			{
 				if (value != null)
@@ -522,14 +607,13 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
+			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(BitSet<>))
 			{
 				if (value != null)
 				{
 					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-					var argTypes = new Type[] { typeof(string[]) };
-					var argValues = new object[] { parts };
-					return fieldType.GetConstructor(argTypes).Invoke(argValues);
+					var ctor = fieldType.GetConstructor(new[] { typeof(string[]) });
+					return ctor.Invoke(new object[] { parts.Select(p => p.Trim()).ToArray() });
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
@@ -641,6 +725,13 @@ namespace OpenRA
 				: base(true, true) { }
 		}
 
+		[AttributeUsage(AttributeTargets.Field)]
+		public sealed class AllowEmptyEntriesAttribute : SerializeAttribute
+		{
+			public AllowEmptyEntriesAttribute()
+				: base(allowEmptyEntries: true) { }
+		}
+
 		[AttributeUsage(AttributeTargets.Field)]
 		public sealed class LoadUsingAttribute : SerializeAttribute
 		{
@@ -664,11 +755,13 @@ namespace OpenRA
 			public bool FromYamlKey;
 			public bool DictionaryFromYamlKey;
 			public bool Required;
+			public bool AllowEmptyEntries;
 
-			public SerializeAttribute(bool serialize = true, bool required = false)
+			public SerializeAttribute(bool serialize = true, bool required = false, bool allowEmptyEntries = false)
 			{
 				Serialize = serialize;
 				Required = required;
+				AllowEmptyEntries = allowEmptyEntries;
 			}
 
 			internal Func<MiniYaml, object> GetLoader(Type type)

OpenRA.Game/FieldSaver.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -18,6 +18,7 @@ using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using OpenRA.Graphics;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -98,6 +99,11 @@ namespace OpenRA
 				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
 			}
 
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(BitSet<>))
+			{
+				return ((IEnumerable<string>)v).Select(FormatValue).JoinWith(", ");
+			}
+
 			if (t.IsArray && t.GetArrayRank() == 1)
 			{
 				return ((Array)v).Cast<object>().Select(FormatValue).JoinWith(", ");

OpenRA.Game/FileFormats/PngLoader.cs

@@ -1,206 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.IO.Compression;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace OpenRA.FileFormats
-{
-	public static class PngLoader
-	{
-		public static Bitmap Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return Load(s);
-		}
-
-		public static Bitmap Load(Stream s)
-		{
-			using (var br = new BinaryReader(s))
-			{
-				var signature = new byte[] { 137, 80, 78, 71, 13, 10, 26, 10 };
-				foreach (var b in signature)
-					if (br.ReadByte() != b)
-						throw new InvalidDataException("PNG Signature is bogus");
-
-				Bitmap bitmap = null;
-				Color[] palette = null;
-				var data = new List<byte>();
-
-				try
-				{
-					for (;;)
-					{
-						var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
-						var type = Encoding.UTF8.GetString(br.ReadBytes(4));
-						var content = br.ReadBytes(length);
-						/*var crc = */br.ReadInt32();
-
-						if (bitmap == null && type != "IHDR")
-							throw new InvalidDataException("Invalid PNG file - header does not appear first.");
-
-						using (var ms = new MemoryStream(content))
-						using (var cr = new BinaryReader(ms))
-							switch (type)
-							{
-								case "IHDR":
-									{
-										if (bitmap != null)
-											throw new InvalidDataException("Invalid PNG file - duplicate header.");
-
-										var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-										var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-										var bitDepth = cr.ReadByte();
-										var colorType = (PngColorType)cr.ReadByte();
-										var compression = cr.ReadByte();
-										/*var filter = */cr.ReadByte();
-										var interlace = cr.ReadByte();
-
-										if (compression != 0) throw new InvalidDataException("Compression method not supported");
-										if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
-
-										bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
-									}
-
-									break;
-
-								case "PLTE":
-									{
-										palette = new Color[256];
-										for (var i = 0; i < 256; i++)
-										{
-											var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
-											palette[i] = Color.FromArgb(r, g, b);
-										}
-									}
-
-									break;
-
-								case "tRNS":
-									{
-										if (palette == null)
-											throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-										for (var i = 0; i < length; i++)
-											palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
-									}
-
-									break;
-
-								case "IDAT":
-									{
-										data.AddRange(content);
-									}
-
-									break;
-
-								case "IEND":
-									{
-										var bits = bitmap.LockBits(bitmap.Bounds(),
-											ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-										using (var ns = new MemoryStream(data.ToArray()))
-										{
-											// 'zlib' flags bytes; confuses the DeflateStream.
-											/*var flags = (byte)*/ns.ReadByte();
-											/*var moreFlags = (byte)*/ns.ReadByte();
-
-											using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
-											using (var dr = new BinaryReader(ds))
-											{
-												var prevLine = new byte[bitmap.Width];  // all zero
-												for (var y = 0; y < bitmap.Height; y++)
-												{
-													var filter = (PngFilter)dr.ReadByte();
-													var line = dr.ReadBytes(bitmap.Width);
-
-													for (var i = 0; i < bitmap.Width; i++)
-														line[i] = i > 0
-															? UnapplyFilter(filter, line[i], line[i - 1], prevLine[i], prevLine[i - 1])
-															: UnapplyFilter(filter, line[i], 0, prevLine[i], 0);
-
-													Marshal.Copy(line, 0, new IntPtr(bits.Scan0.ToInt64() + y * bits.Stride), line.Length);
-													prevLine = line;
-												}
-											}
-										}
-
-										bitmap.UnlockBits(bits);
-
-										if (palette == null)
-											throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-										using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-										{
-											var cp = temp.Palette;
-											for (var i = 0; i < 256; i++)
-												cp.Entries[i] = palette[i];     // finalize the palette.
-											bitmap.Palette = cp;
-											return bitmap;
-										}
-									}
-							}
-					}
-				}
-				catch
-				{
-					if (bitmap != null)
-						bitmap.Dispose();
-					throw;
-				}
-			}
-		}
-
-		static byte UnapplyFilter(PngFilter f, byte x, byte a, byte b, byte c)
-		{
-			switch (f)
-			{
-				case PngFilter.None: return x;
-				case PngFilter.Sub: return (byte)(x + a);
-				case PngFilter.Up: return (byte)(x + b);
-				case PngFilter.Average: return (byte)(x + (a + b) / 2);
-				case PngFilter.Paeth: return (byte)(x + Paeth(a, b, c));
-				default:
-					throw new InvalidOperationException("Unsupported Filter");
-			}
-		}
-
-		static byte Paeth(byte a, byte b, byte c)
-		{
-			var p = a + b - c;
-			var pa = Math.Abs(p - a);
-			var pb = Math.Abs(p - b);
-			var pc = Math.Abs(p - c);
-
-			return (pa <= pb && pa <= pc) ? a :
-				(pb <= pc) ? b : c;
-		}
-
-		[Flags]
-		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 }
-		enum PngFilter { None, Sub, Up, Average, Paeth }
-
-		static PixelFormat MakePixelFormat(byte bitDepth, PngColorType colorType)
-		{
-			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
-				return PixelFormat.Format8bppIndexed;
-
-			throw new InvalidDataException("Unknown pixel format");
-		}
-	}
-}

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -79,45 +79,27 @@ namespace OpenRA.FileFormats
 
 		public static ReplayMetadata Read(string path)
 		{
-			using (var fs = new FileStream(path, FileMode.Open))
-				return Read(fs, path);
-		}
-
-		static ReplayMetadata Read(FileStream fs, string path)
-		{
-			if (!fs.CanSeek)
-				return null;
-
-			if (fs.Length < 20)
-				return null;
-
 			try
 			{
-				fs.Seek(-(4 + 4), SeekOrigin.End);
-				var dataLength = fs.ReadInt32();
-				if (fs.ReadInt32() == MetaEndMarker)
+				using (var fs = new FileStream(path, FileMode.Open))
 				{
-					// go back by (end marker + length storage + data + version + start marker) bytes
-					fs.Seek(-(4 + 4 + dataLength + 4 + 4), SeekOrigin.Current);
-					try
+					if (!fs.CanSeek)
+						return null;
+
+					if (fs.Length < 20)
+						return null;
+
+					fs.Seek(-(4 + 4), SeekOrigin.End);
+					var dataLength = fs.ReadInt32();
+					if (fs.ReadInt32() == MetaEndMarker)
 					{
+						// Go back by (end marker + length storage + data + version + start marker) bytes
+						fs.Seek(-(4 + 4 + dataLength + 4 + 4), SeekOrigin.Current);
 						return new ReplayMetadata(fs, path);
 					}
-					catch (YamlException ex)
-					{
-						Log.Write("debug", ex.ToString());
-					}
-					catch (InvalidOperationException ex)
-					{
-						Log.Write("debug", ex.ToString());
-					}
-					catch (NotSupportedException ex)
-					{
-						Log.Write("debug", ex.ToString());
-					}
 				}
 			}
-			catch (IOException ex)
+			catch (Exception ex)
 			{
 				Log.Write("debug", ex.ToString());
 			}

OpenRA.Game/FileFormats/WavLoader.cs

@@ -1,248 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public class WavLoader : ISoundLoader
-	{
-		bool IsWave(Stream s)
-		{
-			var start = s.Position;
-			var type = s.ReadASCII(4);
-			s.Position += 4;
-			var format = s.ReadASCII(4);
-			s.Position = start;
-
-			return type == "RIFF" && format == "WAVE";
-		}
-
-		bool ISoundLoader.TryParseSound(Stream stream, out ISoundFormat sound)
-		{
-			try
-			{
-				if (IsWave(stream))
-				{
-					sound = new WavFormat(stream);
-					return true;
-				}
-			}
-			catch
-			{
-				// Not a (supported) WAV
-			}
-
-			sound = null;
-			return false;
-		}
-	}
-
-	public class WavFormat : ISoundFormat
-	{
-		public int Channels { get { return reader.Value.Channels; } }
-		public int SampleBits { get { return reader.Value.BitsPerSample; } }
-		public int SampleRate { get { return reader.Value.SampleRate; } }
-		public float LengthInSeconds { get { return WavReader.WaveLength(stream); } }
-		public Stream GetPCMInputStream() { return new MemoryStream(reader.Value.RawOutput); }
-
-		Lazy<WavReader> reader;
-
-		readonly Stream stream;
-
-		public WavFormat(Stream stream)
-		{
-			this.stream = stream;
-
-			var position = stream.Position;
-			reader = Exts.Lazy(() =>
-			{
-				var wavReader = new WavReader();
-				try
-				{
-					if (!wavReader.LoadSound(stream))
-						throw new InvalidDataException();
-				}
-				finally
-				{
-					stream.Position = position;
-				}
-
-				return wavReader;
-			});
-		}
-	}
-
-	public class WavReader
-	{
-		public int FileSize;
-		public string Format;
-
-		public int FmtChunkSize;
-		public int AudioFormat;
-		public int Channels;
-		public int SampleRate;
-		public int ByteRate;
-		public int BlockAlign;
-		public int BitsPerSample;
-
-		public int UncompressedSize;
-		public int DataSize;
-		public byte[] RawOutput;
-
-		public enum WaveType { Pcm = 0x1, ImaAdpcm = 0x11 }
-		public static WaveType Type { get; private set; }
-
-		public bool LoadSound(Stream s)
-		{
-			var type = s.ReadASCII(4);
-			if (type != "RIFF")
-				return false;
-
-			FileSize = s.ReadInt32();
-			Format = s.ReadASCII(4);
-			if (Format != "WAVE")
-				return false;
-			while (s.Position < s.Length)
-			{
-				if ((s.Position & 1) == 1)
-					s.ReadByte(); // Alignment
-
-				type = s.ReadASCII(4);
-				switch (type)
-				{
-					case "fmt ":
-						FmtChunkSize = s.ReadInt32();
-						AudioFormat = s.ReadInt16();
-						Type = (WaveType)AudioFormat;
-
-						if (!Enum.IsDefined(typeof(WaveType), Type))
-							throw new NotSupportedException("Compression type {0} is not supported.".F(AudioFormat));
-
-						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();
-						RawOutput = s.ReadBytes(DataSize);
-						break;
-					default:
-						var unknownChunkSize = s.ReadInt32();
-						s.ReadBytes(unknownChunkSize);
-						break;
-				}
-			}
-
-			if (Type == WaveType.ImaAdpcm)
-			{
-				RawOutput = DecodeImaAdpcmData();
-				BitsPerSample = 16;
-			}
-
-			return true;
-		}
-
-		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/FileSystem/BagFile.cs

@@ -1,127 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
-using OpenRA.Primitives;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class BagFile : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Stream s;
-		readonly Dictionary<string, IdxEntry> index;
-
-		public BagFile(FileSystem context, string filename)
-		{
-			Name = filename;
-
-			// 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");
-
-			// Build the index and dispose the stream, it is no longer needed after this
-			List<IdxEntry> entries;
-			using (var indexStream = context.Open(indexFilename))
-				entries = new IdxReader(indexStream).Entries;
-
-			index = entries.ToDictionaryWithConflictLog(x => x.Filename,
-				"{0} (bag format)".F(filename),
-				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
-
-			s = context.Open(filename);
-		}
-
-		public Stream GetStream(string filename)
-		{
-			IdxEntry entry;
-			if (!index.TryGetValue(filename, 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)WavReader.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)WavReader.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;
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/BigFile.cs

@@ -1,105 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class BigFile : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
-		readonly Stream s;
-
-		public BigFile(FileSystem context, string filename)
-		{
-			Name = filename;
-
-			s = context.Open(filename);
-			try
-			{
-				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);
-					index.Add(entry.Path, entry);
-				}
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		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 GetStream(string filename)
-		{
-			return index[filename].GetData();
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/D2kSoundResources.cs

@@ -1,81 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using OpenRA.Primitives;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class D2kSoundResources : IReadOnlyPackage
-	{
-		struct Entry
-		{
-			public readonly uint Offset;
-			public readonly uint Length;
-
-			public Entry(uint offset, uint length)
-			{
-				Offset = offset;
-				Length = length;
-			}
-		}
-
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Stream s;
-		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
-
-		public D2kSoundResources(FileSystem context, string filename)
-		{
-			Name = filename;
-
-			s = context.Open(filename);
-			try
-			{
-				var headerLength = s.ReadUInt32();
-				while (s.Position < headerLength + 4)
-				{
-					var name = s.ReadASCIIZ();
-					var offset = s.ReadUInt32();
-					var length = s.ReadUInt32();
-					index.Add(name, new Entry(offset, length));
-				}
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		public Stream GetStream(string filename)
-		{
-			Entry e;
-			if (!index.TryGetValue(filename, out e))
-				return null;
-
-			s.Seek(e.Offset, SeekOrigin.Begin);
-			return new MemoryStream(s.ReadBytes((int)e.Length));
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/FileSystem.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -13,7 +13,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using OpenRA.Primitives;
 
 namespace OpenRA.FileSystem
@@ -24,6 +23,7 @@ namespace OpenRA.FileSystem
 		bool TryGetPackageContaining(string path, out IReadOnlyPackage package, out string filename);
 		bool TryOpen(string filename, out Stream s);
 		bool Exists(string filename);
+		bool IsExternalModFile(string filename);
 	}
 
 	public class FileSystem : IReadOnlyFileSystem
@@ -31,105 +31,85 @@ namespace OpenRA.FileSystem
 		public IEnumerable<IReadOnlyPackage> MountedPackages { get { return mountedPackages.Keys; } }
 		readonly Dictionary<IReadOnlyPackage, int> mountedPackages = new Dictionary<IReadOnlyPackage, int>();
 		readonly Dictionary<string, IReadOnlyPackage> explicitMounts = new Dictionary<string, IReadOnlyPackage>();
+		readonly string modID;
 
 		// Mod packages that should not be disposed
 		readonly List<IReadOnlyPackage> modPackages = new List<IReadOnlyPackage>();
+		readonly IReadOnlyDictionary<string, Manifest> installedMods;
+		readonly IPackageLoader[] packageLoaders;
 
 		Cache<string, List<IReadOnlyPackage>> fileIndex = new Cache<string, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
 
+		public FileSystem(string modID, IReadOnlyDictionary<string, Manifest> installedMods, IPackageLoader[] packageLoaders)
+		{
+			this.modID = modID;
+			this.installedMods = installedMods;
+			this.packageLoaders = packageLoaders
+				.Append(new ZipFileLoader())
+				.ToArray();
+		}
+
+		public bool TryParsePackage(Stream stream, string filename, out IReadOnlyPackage package)
+		{
+			package = null;
+			foreach (var packageLoader in packageLoaders)
+				if (packageLoader.TryParsePackage(stream, filename, this, out package))
+					return true;
+
+			return false;
+		}
+
 		public IReadOnlyPackage OpenPackage(string filename)
 		{
-			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-				return new MixFile(this, filename);
-			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename);
-			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename);
-			if (filename.EndsWith(".oramod", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename);
-			if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
-				return new D2kSoundResources(this, filename);
-			if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				return new InstallShieldPackage(this, filename);
-			if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
-				return new PakFile(this, filename);
-			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
-				return new BigFile(this, filename);
-			if (filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
-				return new BagFile(this, filename);
-			if (filename.EndsWith(".hdr", StringComparison.InvariantCultureIgnoreCase))
-				return new InstallShieldCABExtractor(this, filename);
+			// Raw directories are the easiest and one of the most common cases, so try these first
+			var resolvedPath = Platform.ResolvePath(filename);
+			if (!filename.Contains("|") && Directory.Exists(resolvedPath))
+				return new Folder(resolvedPath);
 
+			// Children of another package require special handling
 			IReadOnlyPackage parent;
 			string subPath = null;
 			if (TryGetPackageContaining(filename, out parent, out subPath))
-				return OpenPackage(subPath, parent);
+				return parent.OpenPackage(subPath, this);
 
-			return new Folder(Platform.ResolvePath(filename));
-		}
+			// Try and open it normally
+			IReadOnlyPackage package;
+			var stream = Open(filename);
+			if (TryParsePackage(stream, filename, out package))
+				return package;
 
-		public IReadOnlyPackage OpenPackage(string filename, IReadOnlyPackage parent)
-		{
-			// HACK: limit support to zip and folder until we generalize the PackageLoader support
-			if (parent is Folder)
-			{
-				var path = Path.Combine(parent.Name, filename);
-
-				// HACK: work around SharpZipLib's lack of support for writing to in-memory files
-				if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-					return new ZipFile(this, path);
-				if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-					return new ZipFile(this, path);
-
-				var subFolder = Platform.ResolvePath(path);
-				if (Directory.Exists(subFolder))
-					return new Folder(subFolder);
-			}
-
-			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename, parent.GetStream(filename));
-			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename, parent.GetStream(filename));
-
-			if (parent is ZipFile)
-				return new ZipFolder(this, (ZipFile)parent, filename, filename);
-
-			if (parent is ZipFolder)
-			{
-				var folder = (ZipFolder)parent;
-				return new ZipFolder(this, folder.Parent, folder.Name + "/" + filename, filename);
-			}
+			// No package loaders took ownership of the stream, so clean it up
+			stream.Dispose();
 
 			return null;
 		}
 
-		public IReadWritePackage OpenWritablePackage(string filename)
-		{
-			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename);
-			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename);
-
-			return new Folder(filename);
-		}
-
 		public void Mount(string name, string explicitName = null)
 		{
-			var optional = name.StartsWith("~");
+			var optional = name.StartsWith("~", StringComparison.Ordinal);
 			if (optional)
 				name = name.Substring(1);
 
 			try
 			{
 				IReadOnlyPackage package;
-				if (name.StartsWith("$"))
+				if (name.StartsWith("$", StringComparison.Ordinal))
 				{
 					name = name.Substring(1);
-					package = ModMetadata.AllMods[name].Package;
+
+					Manifest mod;
+					if (!installedMods.TryGetValue(name, out mod))
+						throw new InvalidOperationException("Could not load mod '{0}'. Available mods: {1}".F(name, installedMods.Keys.JoinWith(", ")));
+
+					package = mod.Package;
 					modPackages.Add(package);
 				}
 				else
+				{
 					package = OpenPackage(name);
+					if (package == null)
+						throw new InvalidOperationException("Could not open package '{0}', file not found or its format is not supported.".F(name));
+				}
 
 				Mount(package, explicitName);
 			}
@@ -271,9 +251,15 @@ namespace OpenRA.FileSystem
 			if (s != null)
 				return true;
 
+			// The file should be in an explicit package (but we couldn't find it)
+			// Thus don't try to find it using the filename (which contains the invalid '|' char)
+			// This can be removed once the TODO below is resolved
+			if (explicitSplit > 0)
+				return false;
+
 			// Ask each package individually
 			// TODO: This fallback can be removed once the filesystem cleanups are complete
-			var	package = mountedPackages.Keys.LastOrDefault(x => x.Contains(filename));
+			var package = mountedPackages.Keys.LastOrDefault(x => x.Contains(filename));
 			if (package != null)
 			{
 				s = package.GetStream(filename);
@@ -297,5 +283,64 @@ namespace OpenRA.FileSystem
 
 			return fileIndex.ContainsKey(filename);
 		}
+
+		/// <summary>
+		/// Returns true if the given filename references an external mod via an explicit mount
+		/// </summary>
+		public bool IsExternalModFile(string filename)
+		{
+			var explicitSplit = filename.IndexOf('|');
+			if (explicitSplit < 0)
+				return false;
+
+			IReadOnlyPackage explicitPackage;
+			if (!explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out explicitPackage))
+				return false;
+
+			if (installedMods[modID].Package == explicitPackage)
+				return false;
+
+			return modPackages.Contains(explicitPackage);
+		}
+
+		/// <summary>
+		/// Resolves a filesystem for an assembly, accounting for explicit and mod mounts.
+		/// Assemblies must exist in the native OS file system (not inside an OpenRA-defined package).
+		/// </summary>
+		public static string ResolveAssemblyPath(string path, Manifest manifest, InstalledMods installedMods)
+		{
+			var explicitSplit = path.IndexOf('|');
+			if (explicitSplit > 0)
+			{
+				var parent = path.Substring(0, explicitSplit);
+				var filename = path.Substring(explicitSplit + 1);
+
+				var parentPath = manifest.Packages.FirstOrDefault(kv => kv.Value == parent).Key;
+				if (parentPath == null)
+					return null;
+
+				if (parentPath.StartsWith("$", StringComparison.Ordinal))
+				{
+					Manifest mod;
+					if (!installedMods.TryGetValue(parentPath.Substring(1), out mod))
+						return null;
+
+					if (!(mod.Package is Folder))
+						return null;
+
+					 path = Path.Combine(mod.Package.Name, filename);
+				}
+				else
+					path = Path.Combine(parentPath, filename);
+			}
+
+			var resolvedPath = Platform.ResolvePath(path);
+			return File.Exists(resolvedPath) ? resolvedPath : null;
+		}
+
+		public string GetPrefix(IReadOnlyPackage package)
+		{
+			return explicitMounts.ContainsValue(package) ? explicitMounts.First(f => f.Value == package).Key : null;
+		}
 	}
 }

OpenRA.Game/FileSystem/Folder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 
@@ -47,15 +48,44 @@ namespace OpenRA.FileSystem
 		public bool Contains(string filename)
 		{
 			var combined = Path.Combine(path, filename);
-			return combined.StartsWith(path) && File.Exists(combined);
+			return combined.StartsWith(path, StringComparison.Ordinal) && File.Exists(combined);
+		}
+
+		public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
+		{
+			var resolvedPath = Platform.ResolvePath(Path.Combine(Name, filename));
+			if (Directory.Exists(resolvedPath))
+				return new Folder(resolvedPath);
+
+			// Zip files loaded from Folders (and *only* from Folders) can be read-write
+			IReadWritePackage readWritePackage;
+			if (ZipFileLoader.TryParseReadWritePackage(resolvedPath, out readWritePackage))
+				return readWritePackage;
+
+			// Other package types can be loaded normally
+			IReadOnlyPackage package;
+			var s = GetStream(filename);
+			if (s == null)
+				return null;
+
+			if (context.TryParsePackage(s, filename, out package))
+				return package;
+
+			s.Dispose();
+			return null;
 		}
 
 		public void Update(string filename, byte[] contents)
 		{
-			if (!Directory.Exists(path))
-				Directory.CreateDirectory(path);
+			// HACK: ZipFiles can't be loaded as read-write from a stream, so we are
+			// forced to bypass the parent package and load them with their full path
+			// in FileSystem.OpenPackage.  Their internal name therefore contains the
+			// full parent path too.  We need to be careful to not add a second path
+			// prefix to these hacked packages.
+			var filePath = filename.StartsWith(path) ? filename : Path.Combine(path, filename);
 
-			using (var s = File.Create(Path.Combine(path, filename)))
+			Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+			using (var s = File.Create(filePath))
 				s.Write(contents, 0, contents.Length);
 		}
 

OpenRA.Game/FileSystem/IPackage.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -15,12 +15,23 @@ using System.IO;
 
 namespace OpenRA.FileSystem
 {
+	public interface IPackageLoader
+	{
+		/// <summary>
+		/// Attempt to parse a stream as this type of package.
+		/// If successful, the loader is expected to take ownership of `s` and dispose it once done.
+		/// If unsuccessful, the loader is expected to return the stream position to where it started.
+		/// </summary>
+		bool TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package);
+	}
+
 	public interface IReadOnlyPackage : IDisposable
 	{
 		string Name { get; }
 		IEnumerable<string> Contents { get; }
 		Stream GetStream(string filename);
 		bool Contains(string filename);
+		IReadOnlyPackage OpenPackage(string filename, FileSystem context);
 	}
 
 	public interface IReadWritePackage : IReadOnlyPackage

OpenRA.Game/FileSystem/InstallShieldCABExtractor.cs

@@ -1,508 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using ICSharpCode.SharpZipLib.Zip.Compression;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class InstallShieldCABExtractor : IReadOnlyPackage
-	{
-		const uint FileSplit = 0x1;
-		const uint FileObfuscated = 0x2;
-		const uint FileCompressed = 0x4;
-		const uint FileInvalid = 0x8;
-
-		const uint LinkPrev = 0x1;
-		const uint LinkNext = 0x2;
-		const uint MaxFileGroupCount = 71;
-
-#region Nested Structs
-
-		struct FileGroup
-		{
-			public readonly string Name;
-			public readonly uint FirstFile;
-			public readonly uint LastFile;
-
-			public FileGroup(Stream reader, long offset)
-			{
-				var nameOffset = reader.ReadUInt32();
-				/*   unknown  */ reader.ReadBytes(18);
-				FirstFile = reader.ReadUInt32();
-				LastFile = reader.ReadUInt32();
-
-				reader.Seek(offset + nameOffset, SeekOrigin.Begin);
-				Name = reader.ReadASCIIZ();
-			}
-		}
-
-		struct VolumeHeader
-		{
-			public readonly uint DataOffset;
-			public readonly uint DataOffsetHigh;
-			public readonly uint FirstFileIndex;
-			public readonly uint LastFileIndex;
-
-			public readonly uint FirstFileOffset;
-			public readonly uint FirstFileOffsetHigh;
-			public readonly uint FirstFileSizeExpanded;
-			public readonly uint FirstFileSizeExpandedHigh;
-
-			public readonly uint FirstFileSizeCompressed;
-			public readonly uint FirstFileSizeCompressedHigh;
-			public readonly uint LastFileOffset;
-			public readonly uint LastFileOffsetHigh;
-
-			public readonly uint LastFileSizeExpanded;
-			public readonly uint LastFileSizeExpandedHigh;
-			public readonly uint LastFileSizeCompressed;
-			public readonly uint LastFileSizeCompressedHigh;
-
-			public VolumeHeader(Stream reader)
-			{
-				DataOffset = reader.ReadUInt32();
-				DataOffsetHigh = reader.ReadUInt32();
-
-				FirstFileIndex = reader.ReadUInt32();
-				LastFileIndex = reader.ReadUInt32();
-				FirstFileOffset = reader.ReadUInt32();
-				FirstFileOffsetHigh = reader.ReadUInt32();
-
-				FirstFileSizeExpanded = reader.ReadUInt32();
-				FirstFileSizeExpandedHigh = reader.ReadUInt32();
-				FirstFileSizeCompressed = reader.ReadUInt32();
-				FirstFileSizeCompressedHigh = reader.ReadUInt32();
-
-				LastFileOffset = reader.ReadUInt32();
-				LastFileOffsetHigh = reader.ReadUInt32();
-				LastFileSizeExpanded = reader.ReadUInt32();
-				LastFileSizeExpandedHigh = reader.ReadUInt32();
-
-				LastFileSizeCompressed = reader.ReadUInt32();
-				LastFileSizeCompressedHigh = reader.ReadUInt32();
-			}
-		}
-
-		struct CommonHeader
-		{
-			public const long Size = 16;
-			public readonly uint Version;
-			public readonly uint VolumeInfo;
-			public readonly long CabDescriptorOffset;
-			public readonly uint CabDescriptorSize;
-
-			public CommonHeader(Stream reader)
-			{
-				Version = reader.ReadUInt32();
-				VolumeInfo = reader.ReadUInt32();
-				CabDescriptorOffset = reader.ReadUInt32();
-				CabDescriptorSize = reader.ReadUInt32();
-			}
-		}
-
-		struct CabDescriptor
-		{
-			public readonly long FileTableOffset;
-			public readonly uint FileTableSize;
-			public readonly uint FileTableSize2;
-			public readonly uint DirectoryCount;
-
-			public readonly uint FileCount;
-			public readonly long FileTableOffset2;
-
-			public CabDescriptor(Stream reader, CommonHeader commonHeader)
-			{
-				reader.Seek(commonHeader.CabDescriptorOffset + 12, SeekOrigin.Begin);
-				FileTableOffset = reader.ReadUInt32();
-				/*    unknown  */ reader.ReadUInt32();
-				FileTableSize = reader.ReadUInt32();
-
-				FileTableSize2 = reader.ReadUInt32();
-				DirectoryCount = reader.ReadUInt32();
-				/*   unknown  */ reader.ReadBytes(8);
-				FileCount = reader.ReadUInt32();
-
-				FileTableOffset2 = reader.ReadUInt32();
-			}
-		}
-
-		struct FileDescriptor
-		{
-			public readonly ushort	Flags;
-			public readonly uint	ExpandedSize;
-			public readonly uint	CompressedSize;
-			public readonly uint	DataOffset;
-
-			public readonly byte[]	MD5;
-			public readonly uint	NameOffset;
-			public readonly ushort	DirectoryIndex;
-			public readonly uint	LinkToPrevious;
-
-			public readonly uint	LinkToNext;
-			public readonly byte	LinkFlags;
-			public readonly ushort	Volume;
-			public readonly string	Filename;
-
-			public FileDescriptor(Stream reader, long tableOffset)
-			{
-				Flags = reader.ReadUInt16();
-				ExpandedSize = reader.ReadUInt32();
-				/*    unknown   */ reader.ReadUInt32();
-				CompressedSize = reader.ReadUInt32();
-
-				/*  unknown */ reader.ReadUInt32();
-				DataOffset   = reader.ReadUInt32();
-				/*  unknown */ reader.ReadUInt32();
-				MD5          = reader.ReadBytes(16);
-
-				/*   unknown  */ reader.ReadBytes(16);
-				NameOffset     = reader.ReadUInt32();
-				DirectoryIndex = reader.ReadUInt16();
-				/*   unknown  */ reader.ReadBytes(12);
-				LinkToPrevious = reader.ReadUInt32();
-				LinkToNext = reader.ReadUInt32();
-
-				LinkFlags = reader.ReadBytes(1)[0];
-				Volume = reader.ReadUInt16();
-				var posSave = reader.Position;
-
-				reader.Seek(tableOffset + NameOffset, SeekOrigin.Begin);
-				Filename = reader.ReadASCIIZ();
-				reader.Seek(posSave, SeekOrigin.Begin);
-			}
-		}
-
-		class CabReader : IDisposable
-		{
-			readonly FileSystem context;
-			readonly FileDescriptor fileDes;
-			public uint RemainingArchiveStream;
-			public uint RemainingFileStream;
-			readonly uint index;
-			readonly string commonName;
-			ushort volumeNumber;
-			Stream cabFile;
-
-			public CabReader(FileSystem context, FileDescriptor fileDes, uint index, string commonName)
-			{
-				this.fileDes = fileDes;
-				this.index = index;
-				this.commonName = commonName;
-				this.context = context;
-				volumeNumber = (ushort)(fileDes.Volume - 1u);
-				RemainingArchiveStream = 0;
-				if ((fileDes.Flags & FileCompressed) > 0)
-					RemainingFileStream = fileDes.CompressedSize;
-				else
-					RemainingFileStream = fileDes.ExpandedSize;
-
-				cabFile = null;
-				NextFile(context);
-			}
-
-			public void CopyTo(Stream dest)
-			{
-				if ((fileDes.Flags & FileCompressed) != 0)
-				{
-					var inf = new Inflater(true);
-					var buffer = new byte[165535];
-					do
-					{
-						var bytesToExtract = cabFile.ReadUInt16();
-						RemainingArchiveStream -= 2u;
-						RemainingFileStream -= 2u;
-						inf.SetInput(GetBytes(bytesToExtract));
-						RemainingFileStream -= bytesToExtract;
-						while (!inf.IsNeedingInput)
-						{
-							var inflated = inf.Inflate(buffer);
-							dest.Write(buffer, 0, inflated);
-						}
-
-						inf.Reset();
-					}
-					while (RemainingFileStream > 0);
-				}
-				else
-				{
-					do
-					{
-						RemainingFileStream -= RemainingArchiveStream;
-						dest.Write(GetBytes(RemainingArchiveStream), 0, (int)RemainingArchiveStream);
-					}
-					while (RemainingFileStream > 0);
-				}
-			}
-
-			public byte[] GetBytes(uint count)
-			{
-				if (count < RemainingArchiveStream)
-				{
-					RemainingArchiveStream -= count;
-					return cabFile.ReadBytes((int)count);
-				}
-				else
-				{
-					var outArray = new byte[count];
-					var read = cabFile.Read(outArray, 0, (int)RemainingArchiveStream);
-					if (RemainingFileStream > RemainingArchiveStream)
-					{
-						NextFile(context);
-						RemainingArchiveStream -= (uint)cabFile.Read(outArray, read, (int)count - read);
-					}
-
-					return outArray;
-				}
-			}
-
-			public void Dispose()
-			{
-				cabFile.Dispose();
-			}
-
-			void NextFile(FileSystem context)
-			{
-				if (cabFile != null)
-					cabFile.Dispose();
-
-				++volumeNumber;
-				cabFile = context.Open("{0}{1}.cab".F(commonName, volumeNumber));
-				if (cabFile.ReadUInt32() != 0x28635349)
-					throw new InvalidDataException("Not an Installshield CAB package");
-
-				uint fileOffset;
-				if ((fileDes.Flags & FileSplit) != 0)
-				{
-					cabFile.Seek(CommonHeader.Size, SeekOrigin.Current);
-					var head = new VolumeHeader(cabFile);
-					if (index == head.LastFileIndex)
-					{
-						if ((fileDes.Flags & FileCompressed) != 0)
-							RemainingArchiveStream = head.LastFileSizeCompressed;
-						else
-							RemainingArchiveStream = head.LastFileSizeExpanded;
-
-						fileOffset = head.LastFileOffset;
-					}
-					else if (index == head.FirstFileIndex)
-					{
-						if ((fileDes.Flags & FileCompressed) != 0)
-							RemainingArchiveStream = head.FirstFileSizeCompressed;
-						else
-							RemainingArchiveStream = head.FirstFileSizeExpanded;
-
-						fileOffset = head.FirstFileOffset;
-					}
-					else
-						throw new Exception("Cannot Resolve Remaining Stream");
-				}
-				else
-				{
-					if ((fileDes.Flags & FileCompressed) != 0)
-						RemainingArchiveStream = fileDes.CompressedSize;
-					else
-						RemainingArchiveStream = fileDes.ExpandedSize;
-
-					fileOffset = fileDes.DataOffset;
-				}
-
-				cabFile.Seek(fileOffset, SeekOrigin.Begin);
-			}
-		}
-#endregion
-
-		readonly Stream hdrFile;
-		readonly CommonHeader commonHeader;
-		readonly CabDescriptor cabDescriptor;
-		readonly List<uint> directoryTable;
-		readonly Dictionary<uint, string> directoryNames = new Dictionary<uint, string>();
-		readonly Dictionary<uint, FileDescriptor> fileDescriptors = new Dictionary<uint, FileDescriptor>();
-		readonly Dictionary<string, uint> index = new Dictionary<string, uint>();
-		readonly FileSystem context;
-
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		public InstallShieldCABExtractor(FileSystem context, string hdrFilename)
-		{
-			var fileGroups = new List<FileGroup>();
-			var fileGroupOffsets = new List<uint>();
-
-			hdrFile = context.Open(hdrFilename);
-			this.context = context;
-
-			// Strips archive number AND file extension
-			Name = Regex.Replace(hdrFilename, @"\d*\.[^\.]*$", "");
-			var signature = hdrFile.ReadUInt32();
-
-			if (signature != 0x28635349)
-				throw new InvalidDataException("Not an Installshield CAB package");
-
-			commonHeader = new CommonHeader(hdrFile);
-			cabDescriptor = new CabDescriptor(hdrFile, commonHeader);
-			/*    unknown   */ hdrFile.ReadBytes(14);
-
-			for (var i = 0U; i < MaxFileGroupCount; ++i)
-				fileGroupOffsets.Add(hdrFile.ReadUInt32());
-
-			hdrFile.Seek(commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset, SeekOrigin.Begin);
-			directoryTable = new List<uint>();
-
-			for (var i = 0U; i < cabDescriptor.DirectoryCount; ++i)
-				directoryTable.Add(hdrFile.ReadUInt32());
-
-			foreach (var offset in fileGroupOffsets)
-			{
-				var nextOffset = offset;
-				while (nextOffset != 0)
-				{
-					hdrFile.Seek((long)nextOffset + 4 + commonHeader.CabDescriptorOffset, SeekOrigin.Begin);
-					var descriptorOffset = hdrFile.ReadUInt32();
-					nextOffset = hdrFile.ReadUInt32();
-					hdrFile.Seek(descriptorOffset + commonHeader.CabDescriptorOffset, SeekOrigin.Begin);
-
-					fileGroups.Add(new FileGroup(hdrFile, commonHeader.CabDescriptorOffset));
-				}
-			}
-
-			hdrFile.Seek(commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset + cabDescriptor.FileTableOffset2, SeekOrigin.Begin);
-			foreach (var fileGroup in fileGroups)
-			{
-				for (var i = fileGroup.FirstFile; i <= fileGroup.LastFile; ++i)
-				{
-					AddFileDescriptorToList(i);
-					var fileDescriptor = fileDescriptors[i];
-					var fullFilePath   = "{0}\\{1}\\{2}".F(fileGroup.Name, DirectoryName(fileDescriptor.DirectoryIndex), fileDescriptor.Filename);
-					index.Add(fullFilePath, i);
-				}
-			}
-		}
-
-		public string DirectoryName(uint index)
-		{
-			if (directoryNames.ContainsKey(index))
-				return directoryNames[index];
-
-			hdrFile.Seek(commonHeader.CabDescriptorOffset +
-					cabDescriptor.FileTableOffset +
-					directoryTable[(int)index],
-					SeekOrigin.Begin);
-
-			var test = hdrFile.ReadASCIIZ();
-			return test;
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public uint DirectoryCount()
-		{
-			return cabDescriptor.DirectoryCount;
-		}
-
-		public string FileName(uint index)
-		{
-			if (!fileDescriptors.ContainsKey(index))
-				AddFileDescriptorToList(index);
-
-			return fileDescriptors[index].Filename;
-		}
-
-		void AddFileDescriptorToList(uint index)
-		{
-			hdrFile.Seek(commonHeader.CabDescriptorOffset +
-					cabDescriptor.FileTableOffset +
-					cabDescriptor.FileTableOffset2 +
-					index * 0x57,
-					SeekOrigin.Begin);
-
-			var fd = new FileDescriptor(hdrFile,
-				commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset);
-
-			fileDescriptors.Add(index, fd);
-		}
-
-		public uint FileCount()
-		{
-			return cabDescriptor.FileCount;
-		}
-
-		public void ExtractFile(uint index, string fileName)
-		{
-			Directory.CreateDirectory(Path.GetDirectoryName(fileName));
-			using (var destfile = File.Open(fileName, FileMode.Create))
-				GetContentById(index, destfile);
-		}
-
-		public Stream GetContentById(uint index)
-		{
-			var fileDes = fileDescriptors[index];
-			if ((fileDes.Flags & FileInvalid) != 0)
-				throw new Exception("File Invalid");
-
-			if ((fileDes.LinkFlags & LinkPrev) != 0)
-				return GetContentById(fileDes.LinkToPrevious);
-
-			if ((fileDes.Flags & FileObfuscated) != 0)
-				throw new NotImplementedException("Haven't implemented obfuscated files");
-
-			var output = new MemoryStream((int)fileDes.ExpandedSize);
-
-			using (var reader = new CabReader(context, fileDes, index, Name))
-				reader.CopyTo(output);
-
-			if (output.Length != fileDes.ExpandedSize)
-				throw new Exception("Did not fully extract Expected = {0}, Got = {1}".F(fileDes.ExpandedSize, output.Length));
-
-			output.Position = 0;
-			return output;
-		}
-
-		public void GetContentById(uint index, Stream output)
-		{
-			var fileDes = fileDescriptors[index];
-			if ((fileDes.Flags & FileInvalid) != 0)
-				throw new Exception("File Invalid");
-
-			if ((fileDes.LinkFlags & LinkPrev) != 0)
-			{
-				GetContentById(fileDes.LinkToPrevious, output);
-				return;
-			}
-
-			if ((fileDes.Flags & FileObfuscated) != 0)
-				throw new NotImplementedException("Haven't implemented obfuscated files");
-
-			using (var reader = new CabReader(context, fileDes, index, Name))
-				reader.CopyTo(output);
-
-			if (output.Length != fileDes.ExpandedSize)
-				throw new Exception("Did not fully extract Expected = {0}, Got = {1}".F(fileDes.ExpandedSize, output.Length));
-		}
-
-		public Stream GetStream(string fileName)
-		{
-			return GetContentById(index[fileName]);
-		}
-
-		public void Dispose()
-		{
-			hdrFile.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/InstallShieldPackage.cs

@@ -1,132 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using OpenRA.FileFormats;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class InstallShieldPackage : IReadOnlyPackage
-	{
-		struct Entry
-		{
-			public readonly uint Offset;
-			public readonly uint Length;
-
-			public Entry(uint offset, uint length)
-			{
-				Offset = offset;
-				Length = length;
-			}
-		}
-
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
-		readonly Stream s;
-		readonly long dataStart = 255;
-
-		public InstallShieldPackage(FileSystem context, string filename)
-		{
-			Name = filename;
-
-			s = context.Open(filename);
-			try
-			{
-				// Parse package header
-				var signature = s.ReadUInt32();
-				if (signature != 0x8C655D13)
-					throw new InvalidDataException("Not an Installshield package");
-
-				s.Position += 8;
-				/*var FileCount = */s.ReadUInt16();
-				s.Position += 4;
-				/*var ArchiveSize = */s.ReadUInt32();
-				s.Position += 19;
-				var tocAddress = s.ReadInt32();
-				s.Position += 4;
-				var dirCount = s.ReadUInt16();
-
-				// Parse the directory list
-				s.Position = tocAddress;
-
-				// Parse directories
-				var directories = new Dictionary<string, uint>();
-				for (var i = 0; i < dirCount; i++)
-				{
-					// Parse directory header
-					var fileCount = s.ReadUInt16();
-					var chunkSize = s.ReadUInt16();
-					var nameLength = s.ReadUInt16();
-					var dirName = s.ReadASCII(nameLength);
-
-					// Skip to the end of the chunk
-					s.ReadBytes(chunkSize - nameLength - 6);
-					directories.Add(dirName, fileCount);
-				}
-
-				// Parse files
-				foreach (var dir in directories)
-					for (var i = 0; i < dir.Value; i++)
-						ParseFile(s, dir.Key);
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		uint accumulatedData = 0;
-		void ParseFile(Stream s, string dirName)
-		{
-			s.Position += 7;
-			var compressedSize = s.ReadUInt32();
-			s.Position += 12;
-			var chunkSize = s.ReadUInt16();
-			s.Position += 4;
-			var nameLength = s.ReadByte();
-			var fileName = dirName + "\\" + s.ReadASCII(nameLength);
-
-			// Use index syntax to overwrite any duplicate entries with the last value
-			index[fileName] = new Entry(accumulatedData, compressedSize);
-			accumulatedData += compressedSize;
-
-			// Skip to the end of the chunk
-			s.Position += chunkSize - nameLength - 30;
-		}
-
-		public Stream GetStream(string filename)
-		{
-			Entry e;
-			if (!index.TryGetValue(filename, out e))
-				return null;
-
-			s.Seek(dataStart + e.Offset, SeekOrigin.Begin);
-			var data = s.ReadBytes((int)e.Length);
-
-			return new MemoryStream(Blast.Decompress(data));
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/MixFile.cs

@@ -1,216 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Primitives;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class MixFile : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Dictionary<string, PackageEntry> index;
-		readonly long dataStart;
-		readonly Stream s;
-		readonly FileSystem context;
-
-		public MixFile(FileSystem context, string filename)
-		{
-			Name = filename;
-			this.context = context;
-
-			s = context.Open(filename);
-			try
-			{
-				// Detect format type
-				var isCncMix = s.ReadUInt16() != 0;
-
-				// The C&C mix format doesn't contain any flags or encryption
-				var isEncrypted = false;
-				if (!isCncMix)
-					isEncrypted = (s.ReadUInt16() & 0x2) != 0;
-
-				List<PackageEntry> entries;
-				if (isEncrypted)
-				{
-					long unused;
-					entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out unused);
-				}
-				else
-					entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
-
-				index = ParseIndex(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)));
-			}
-			catch (Exception)
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		Dictionary<string, PackageEntry> ParseIndex(Dictionary<uint, PackageEntry> entries)
-		{
-			var classicIndex = new Dictionary<string, PackageEntry>();
-			var crcIndex = new Dictionary<string, PackageEntry>();
-			var allPossibleFilenames = new HashSet<string>();
-
-			// Try and find a local mix database
-			var dbNameClassic = PackageEntry.HashFilename("local mix database.dat", PackageHashType.Classic);
-			var dbNameCRC = PackageEntry.HashFilename("local mix database.dat", PackageHashType.CRC32);
-			foreach (var kv in entries)
-			{
-				if (kv.Key == dbNameClassic || kv.Key == dbNameCRC)
-				{
-					var db = new XccLocalDatabase(GetContent(kv.Value));
-					foreach (var e in db.Entries)
-						allPossibleFilenames.Add(e);
-
-					break;
-				}
-			}
-
-			// Load the global mix database
-			// TODO: This should be passed to the mix file ctor
-			if (context.Exists("global mix database.dat"))
-			{
-				var db = new XccGlobalDatabase(context.Open("global mix database.dat"));
-				foreach (var e in db.Entries)
-					allPossibleFilenames.Add(e);
-			}
-
-			foreach (var filename in allPossibleFilenames)
-			{
-				var classicHash = PackageEntry.HashFilename(filename, PackageHashType.Classic);
-				var crcHash = PackageEntry.HashFilename(filename, PackageHashType.CRC32);
-				PackageEntry e;
-
-				if (entries.TryGetValue(classicHash, out e))
-					classicIndex.Add(filename, e);
-
-				if (entries.TryGetValue(crcHash, out e))
-					crcIndex.Add(filename, e);
-			}
-
-			var bestIndex = crcIndex.Count > classicIndex.Count ? crcIndex : classicIndex;
-
-			var unknown = entries.Count - bestIndex.Count;
-			if (unknown > 0)
-				Log.Write("debug", "{0}: failed to resolve filenames for {1} unknown hashes".F(Name, unknown));
-
-			return bestIndex;
-		}
-
-		static List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
-		{
-			s.Seek(offset, SeekOrigin.Begin);
-			var numFiles = s.ReadUInt16();
-			/*uint dataSize = */s.ReadUInt32();
-
-			var items = new List<PackageEntry>();
-			for (var i = 0; i < numFiles; i++)
-				items.Add(new PackageEntry(s));
-
-			headerEnd = offset + 6 + numFiles * PackageEntry.Size;
-			return items;
-		}
-
-		static MemoryStream DecryptHeader(Stream s, long offset, out long headerEnd)
-		{
-			s.Seek(offset, SeekOrigin.Begin);
-
-			// Decrypt blowfish key
-			var keyblock = s.ReadBytes(80);
-			var blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
-			var fish = new Blowfish(blowfishKey);
-
-			// Decrypt first block to work out the header length
-			var ms = Decrypt(ReadBlocks(s, offset + 80, 1), fish);
-			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;
-
-			return Decrypt(ReadBlocks(s, offset + 80, blockCount), fish);
-		}
-
-		static MemoryStream Decrypt(uint[] h, Blowfish fish)
-		{
-			var decrypted = fish.Decrypt(h);
-
-			var ms = new MemoryStream();
-			var writer = new BinaryWriter(ms);
-			foreach (var t in decrypted)
-				writer.Write(t);
-			writer.Flush();
-
-			ms.Seek(0, SeekOrigin.Begin);
-			return ms;
-		}
-
-		static uint[] ReadBlocks(Stream s, long offset, int count)
-		{
-			if (offset < 0)
-				throw new ArgumentOutOfRangeException("offset", "Non-negative number required.");
-
-			if (count < 0)
-				throw new ArgumentOutOfRangeException("count", "Non-negative number required.");
-
-			if (offset + (count * 2) > s.Length)
-				throw new ArgumentException("Bytes to read {0} and offset {1} greater than stream length {2}.".F(count * 2, offset, s.Length));
-
-			s.Seek(offset, SeekOrigin.Begin);
-
-			// A block is a single encryption unit (represented as two 32-bit integers)
-			var ret = new uint[2 * count];
-			for (var i = 0; i < ret.Length; i++)
-				ret[i] = s.ReadUInt32();
-
-			return ret;
-		}
-
-		public Stream GetContent(PackageEntry entry)
-		{
-			Stream parentStream;
-			var offset = dataStart + entry.Offset + SegmentStream.GetOverallNestedOffset(s, out parentStream);
-			var path = ((FileStream)parentStream).Name;
-			return new SegmentStream(File.OpenRead(path), offset, entry.Length);
-		}
-
-		public Stream GetStream(string filename)
-		{
-			PackageEntry e;
-			if (!index.TryGetValue(filename, out e))
-				return null;
-
-			return GetContent(e);
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/Pak.cs

@@ -1,84 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-
-namespace OpenRA.FileSystem
-{
-	struct Entry
-	{
-		public uint Offset;
-		public uint Length;
-		public string Filename;
-	}
-
-	public sealed class PakFile : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Dictionary<string, Entry> index;
-		readonly Stream stream;
-
-		public PakFile(FileSystem context, string filename)
-		{
-			Name = filename;
-			index = new Dictionary<string, Entry>();
-
-			stream = context.Open(filename);
-			try
-			{
-				index = new Dictionary<string, Entry>();
-				var offset = stream.ReadUInt32();
-				while (offset != 0)
-				{
-					var file = stream.ReadASCIIZ();
-					var next = stream.ReadUInt32();
-					var length = (next == 0 ? (uint)stream.Length : next) - offset;
-
-					// Ignore duplicate files
-					if (index.ContainsKey(file))
-						continue;
-
-					index.Add(file, new Entry { Offset = offset, Length = length, Filename = file });
-					offset = next;
-				}
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		public Stream GetStream(string filename)
-		{
-			Entry entry;
-			if (!index.TryGetValue(filename, out entry))
-				return null;
-
-			stream.Seek(entry.Offset, SeekOrigin.Begin);
-			var data = stream.ReadBytes((int)entry.Length);
-			return new MemoryStream(data);
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			stream.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/ZipFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -9,105 +9,231 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
+using System.Linq;
 using ICSharpCode.SharpZipLib.Zip;
-using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
+using OpenRA.Primitives;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class ZipFile : IReadWritePackage
+	public class ZipFileLoader : IPackageLoader
 	{
-		public string Name { get; private set; }
-		SZipFile pkg;
+		static readonly string[] Extensions = { ".zip", ".oramap" };
 
-		static ZipFile()
+		class ReadOnlyZipFile : IReadOnlyPackage
 		{
-			ZipConstants.DefaultCodePage = Encoding.UTF8.CodePage;
-		}
+			public string Name { get; protected set; }
+			protected ZipFile pkg;
 
-		public ZipFile(FileSystem context, string filename, Stream stream, bool createOrClearContents = false)
-		{
-			Name = filename;
+			// Dummy constructor for use with ReadWriteZipFile
+			protected ReadOnlyZipFile() { }
 
-			if (createOrClearContents)
-				pkg = SZipFile.Create(stream);
-			else
-				pkg = new SZipFile(stream);
-		}
+			public ReadOnlyZipFile(Stream s, string filename)
+			{
+				Name = filename;
+				pkg = ZipFileHelper.Create(s);
+			}
 
-		public ZipFile(IReadOnlyFileSystem context, string filename, bool createOrClearContents = false)
-		{
-			Name = filename;
+			public Stream GetStream(string filename)
+			{
+				var entry = pkg.GetEntry(filename);
+				if (entry == null)
+					return null;
 
-			if (createOrClearContents)
-				pkg = SZipFile.Create(filename);
-			else
-				pkg = new SZipFile(filename);
-		}
+				using (var z = pkg.GetInputStream(entry))
+				{
+					var ms = new MemoryStream((int)entry.Size);
+					z.CopyTo(ms);
+					ms.Seek(0, SeekOrigin.Begin);
+					return ms;
+				}
+			}
 
-		public Stream GetStream(string filename)
-		{
-			var entry = pkg.GetEntry(filename);
-			if (entry == null)
+			public IEnumerable<string> Contents
+			{
+				get
+				{
+					foreach (ZipEntry entry in pkg)
+						yield return entry.Name;
+				}
+			}
+
+			public bool Contains(string filename)
+			{
+				return pkg.GetEntry(filename) != null;
+			}
+
+			public void Dispose()
+			{
+				if (pkg != null)
+					pkg.Close();
+			}
+
+			public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
+			{
+				// Directories are stored with a trailing "/" in the index
+				var entry = pkg.GetEntry(filename) ?? pkg.GetEntry(filename + "/");
+				if (entry == null)
+					return null;
+
+				if (entry.IsDirectory)
+					return new ZipFolder(this, filename);
+
+				// Other package types can be loaded normally
+				IReadOnlyPackage package;
+				var s = GetStream(filename);
+				if (s == null)
+					return null;
+
+				if (context.TryParsePackage(s, filename, out package))
+					return package;
+
+				s.Dispose();
 				return null;
-
-			using (var z = pkg.GetInputStream(entry))
-			{
-				var ms = new MemoryStream();
-				z.CopyTo(ms);
-				ms.Seek(0, SeekOrigin.Begin);
-				return ms;
 			}
 		}
 
-		public IEnumerable<string> Contents
+		sealed class ReadWriteZipFile : ReadOnlyZipFile, IReadWritePackage
 		{
-			get
+			readonly MemoryStream pkgStream = new MemoryStream();
+
+			public ReadWriteZipFile(string filename, bool create = false)
 			{
-				foreach (ZipEntry entry in pkg)
-					yield return entry.Name;
+				// SharpZipLib breaks when asked to update archives loaded from outside streams or files
+				// We can work around this by creating a clean in-memory-only file, cutting all outside references
+				if (!create)
+				{
+					using (var copy = new MemoryStream(File.ReadAllBytes(filename)))
+					{
+						pkgStream.Capacity = (int)copy.Length;
+						copy.CopyTo(pkgStream);
+					}
+				}
+
+				pkgStream.Position = 0;
+				pkg = ZipFileHelper.Create(pkgStream);
+				Name = filename;
+			}
+
+			void Commit()
+			{
+				var pos = pkgStream.Position;
+				pkgStream.Position = 0;
+				File.WriteAllBytes(Name, pkgStream.ReadBytes((int)pkgStream.Length));
+				pkgStream.Position = pos;
+			}
+
+			public void Update(string filename, byte[] contents)
+			{
+				pkg.BeginUpdate();
+				pkg.Add(new StaticStreamDataSource(new MemoryStream(contents)), filename);
+				pkg.CommitUpdate();
+				Commit();
+			}
+
+			public void Delete(string filename)
+			{
+				pkg.BeginUpdate();
+				pkg.Delete(filename);
+				pkg.CommitUpdate();
+				Commit();
 			}
 		}
 
-		public bool Contains(string filename)
+		sealed class ZipFolder : IReadOnlyPackage
 		{
-			return pkg.GetEntry(filename) != null;
+			public string Name { get { return path; } }
+			public ReadOnlyZipFile Parent { get; private set; }
+			readonly string path;
+
+			public ZipFolder(ReadOnlyZipFile parent, string path)
+			{
+				if (path.EndsWith("/", StringComparison.Ordinal))
+					path = path.Substring(0, path.Length - 1);
+
+				Parent = parent;
+				this.path = path;
+			}
+
+			public Stream GetStream(string filename)
+			{
+				// Zip files use '/' as a path separator
+				return Parent.GetStream(path + '/' + filename);
+			}
+
+			public IEnumerable<string> Contents
+			{
+				get
+				{
+					foreach (var entry in Parent.Contents)
+					{
+						if (entry.StartsWith(path, StringComparison.Ordinal) && entry != path)
+						{
+							var filename = entry.Substring(path.Length + 1);
+							var dirLevels = filename.Split('/').Count(c => !string.IsNullOrEmpty(c));
+							if (dirLevels == 1)
+								yield return filename;
+						}
+					}
+				}
+			}
+
+			public bool Contains(string filename)
+			{
+				return Parent.Contains(path + '/' + filename);
+			}
+
+			public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
+			{
+				return Parent.OpenPackage(path + '/' + filename, context);
+			}
+
+			public void Dispose() { /* nothing to do */ }
 		}
 
-		public void Update(string filename, byte[] contents)
+		class StaticStreamDataSource : IStaticDataSource
 		{
-			pkg.BeginUpdate();
-			pkg.Add(new StaticMemoryDataSource(contents), filename);
-			pkg.CommitUpdate();
+			readonly Stream s;
+			public StaticStreamDataSource(Stream s)
+			{
+				this.s = s;
+			}
+
+			public Stream GetSource()
+			{
+				return s;
+			}
 		}
 
-		public void Delete(string filename)
+		public bool TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package)
 		{
-			pkg.BeginUpdate();
-			pkg.Delete(filename);
-			pkg.CommitUpdate();
+			if (!Extensions.Any(e => filename.EndsWith(e, StringComparison.InvariantCultureIgnoreCase)))
+			{
+				package = null;
+				return false;
+			}
+
+			package = new ReadOnlyZipFile(s, filename);
+			return true;
 		}
 
-		public void Dispose()
+		public static bool TryParseReadWritePackage(string filename, out IReadWritePackage package)
 		{
-			if (pkg != null)
-				pkg.Close();
-		}
-	}
+			if (!Extensions.Any(e => filename.EndsWith(e, StringComparison.InvariantCultureIgnoreCase)))
+			{
+				package = null;
+				return false;
+			}
 
-	class StaticMemoryDataSource : IStaticDataSource
-	{
-		byte[] data;
-		public StaticMemoryDataSource(byte[] data)
-		{
-			this.data = data;
+			package = new ReadWriteZipFile(filename);
+			return true;
 		}
 
-		public Stream GetSource()
+		public static IReadWritePackage Create(string filename)
 		{
-			return new MemoryStream(data);
+			return new ReadWriteZipFile(filename, true);
 		}
 	}
 }

OpenRA.Game/FileSystem/ZipFolder.cs

@@ -1,75 +0,0 @@
-#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;
-using System.Text;
-using ICSharpCode.SharpZipLib.Zip;
-using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class ZipFolder : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public ZipFile Parent { get; private set; }
-		readonly string path;
-
-		static ZipFolder()
-		{
-			ZipConstants.DefaultCodePage = Encoding.UTF8.CodePage;
-		}
-
-		public ZipFolder(FileSystem context, ZipFile parent, string path, string filename)
-		{
-			if (filename.EndsWith("/"))
-				filename = filename.Substring(0, filename.Length - 1);
-
-			Name = filename;
-			Parent = parent;
-			if (path.EndsWith("/"))
-				path = path.Substring(0, path.Length - 1);
-
-			this.path = path;
-		}
-
-		public Stream GetStream(string filename)
-		{
-			// Zip files use '/' as a path separator
-			return Parent.GetStream(path + '/' + filename);
-		}
-
-		public IEnumerable<string> Contents
-		{
-			get
-			{
-				foreach (var entry in Parent.Contents)
-				{
-					if (entry.StartsWith(path) && entry != path)
-					{
-						var filename = entry.Substring(path.Length + 1);
-						var dirLevels = filename.Split('/').Count(c => !string.IsNullOrEmpty(c));
-						if (dirLevels == 1)
-							yield return filename;
-					}
-				}
-			}
-		}
-
-		public bool Contains(string filename)
-		{
-			return Parent.Contains(path + '/' + filename);
-		}
-
-		public void Dispose() { /* nothing to do */ }
-	}
-}

OpenRA.Game/Game.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -14,11 +14,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Reflection;
 using System.Threading;
-using OpenRA.Chat;
+using System.Threading.Tasks;
 using OpenRA.Graphics;
 using OpenRA.Network;
 using OpenRA.Primitives;
@@ -33,6 +35,9 @@ namespace OpenRA
 		public const int Timestep = 40;
 		public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
 
+		public static InstalledMods Mods { get; private set; }
+		public static ExternalMods ExternalMods { get; private set; }
+
 		public static ModData ModData;
 		public static Settings Settings;
 		public static ICursor Cursor;
@@ -49,22 +54,29 @@ namespace OpenRA
 
 		public static bool BenchmarkMode = false;
 
-		public static GlobalChat GlobalChat;
+		public static string EngineVersion { get; private set; }
+		public static LocalPlayerProfile LocalPlayerProfile;
+
+		static Task discoverNat;
+		static bool takeScreenshot = false;
+
+		public static event Action OnShellmapLoaded = () => { };
 
 		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
 			var connection = new NetworkConnection(host, port);
 			if (recordReplay)
-				connection.StartRecording(TimestampedFilename);
+				connection.StartRecording(() => { return TimestampedFilename(); });
 
 			var om = new OrderManager(host, port, password, connection);
 			JoinInner(om);
 			return om;
 		}
 
-		static string TimestampedFilename()
+		static string TimestampedFilename(bool includemilliseconds = false)
 		{
-			return DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddTHHmmssZ");
+			var format = includemilliseconds ? "yyyy-MM-ddTHHmmssfffZ" : "yyyy-MM-ddTHHmmssZ";
+			return "OpenRA-" + DateTime.UtcNow.ToString(format, CultureInfo.InvariantCulture);
 		}
 
 		static void JoinInner(OrderManager om)
@@ -87,7 +99,7 @@ namespace OpenRA
 
 		// More accurate replacement for Environment.TickCount
 		static Stopwatch stopwatch = Stopwatch.StartNew();
-		public static int RunTime { get { return (int)stopwatch.ElapsedMilliseconds; } }
+		public static long RunTime { get { return stopwatch.ElapsedMilliseconds; } }
 
 		public static int RenderFrame = 0;
 		public static int NetFrameNumber { get { return OrderManager.NetFrameNumber; } }
@@ -154,13 +166,17 @@ namespace OpenRA
 			using (new PerfTimer("PrepareMap"))
 				map = ModData.PrepareMap(mapUID);
 			using (new PerfTimer("NewWorld"))
-				OrderManager.World = new World(map, OrderManager, type);
+				OrderManager.World = new World(ModData, map, OrderManager, type);
 
-			worldRenderer = new WorldRenderer(OrderManager.World);
+			worldRenderer = new WorldRenderer(ModData, OrderManager.World);
+
+			GC.Collect();
 
 			using (new PerfTimer("LoadComplete"))
 				OrderManager.World.LoadComplete(worldRenderer);
 
+			GC.Collect();
+
 			if (OrderManager.GameStarted)
 				return;
 
@@ -197,7 +213,7 @@ namespace OpenRA
 				CreateAndStartLocalServer(lobbyInfo.GlobalSettings.Map, orders);
 		}
 
-		public static void CreateAndStartLocalServer(string mapUID, IEnumerable<Order> setupOrders, Action onStart = null)
+		public static void CreateAndStartLocalServer(string mapUID, IEnumerable<Order> setupOrders)
 		{
 			OrderManager om = null;
 
@@ -207,10 +223,8 @@ namespace OpenRA
 				LobbyInfoChanged -= lobbyReady;
 				foreach (var o in setupOrders)
 					om.IssueOrder(o);
-
-				if (onStart != null)
-					onStart();
 			};
+
 			LobbyInfoChanged += lobbyReady;
 
 			om = JoinServer(IPAddress.Loopback.ToString(), CreateLocalServer(mapUID), "");
@@ -232,77 +246,130 @@ namespace OpenRA
 
 		public static void InitializeSettings(Arguments args)
 		{
-			Settings = new Settings(Platform.ResolvePath(Path.Combine("^", "settings.yaml")), args);
+			Settings = new Settings(Platform.ResolvePath(Path.Combine(Platform.SupportDirPrefix, "settings.yaml")), args);
 		}
 
-		internal static void Initialize(Arguments args)
+		public static RunStatus InitializeAndRun(string[] args)
 		{
+			Initialize(new Arguments(args));
+			GC.Collect();
+			return Run();
+		}
+
+		static void Initialize(Arguments args)
+		{
+			var supportDirArg = args.GetValue("Engine.SupportDir", null);
+			if (supportDirArg != null)
+				Platform.OverrideSupportDir(supportDirArg);
+
 			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
 
+			// Load the engine version as early as possible so it can be written to exception logs
+			try
+			{
+				EngineVersion = File.ReadAllText(Platform.ResolvePath(Path.Combine(".", "VERSION"))).Trim();
+			}
+			catch { }
+
+			if (string.IsNullOrEmpty(EngineVersion))
+				EngineVersion = "Unknown";
+
+			Console.WriteLine("Engine version is {0}", EngineVersion);
+
+			// Special case handling of Game.Mod argument: if it matches a real filesystem path
+			// then we use this to override the mod search path, and replace it with the mod id
+			var modID = args.GetValue("Game.Mod", null);
+			var explicitModPaths = new string[0];
+			if (modID != null && (File.Exists(modID) || Directory.Exists(modID)))
+			{
+				explicitModPaths = new[] { modID };
+				modID = Path.GetFileNameWithoutExtension(modID);
+			}
+
 			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");
-			Log.AddChannel("irc", "irc.log");
+			Log.AddChannel("nat", "nat.log");
 
-			if (Settings.Server.DiscoverNatDevices)
-				UPnP.TryNatDiscovery();
-			else
+			var platforms = new[] { Settings.Game.Platform, "Default", null };
+			foreach (var p in platforms)
 			{
-				Settings.Server.NatDeviceAvailable = false;
-				Settings.Server.AllowPortForward = false;
-			}
+				if (p == null)
+					throw new InvalidOperationException("Failed to initialize platform-integration library. Check graphics.log for details.");
 
-			GeoIP.Initialize();
-
-			var renderers = new[] { Settings.Graphics.Renderer, "Default", 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;
+				Settings.Game.Platform = p;
 				try
 				{
-					Renderer = new Renderer(Settings.Graphics, Settings.Server);
+					var rendererPath = Platform.ResolvePath(Path.Combine(".", "OpenRA.Platforms." + p + ".dll"));
+					var assembly = Assembly.LoadFile(rendererPath);
+
+					var platformType = assembly.GetTypes().SingleOrDefault(t => typeof(IPlatform).IsAssignableFrom(t));
+					if (platformType == null)
+						throw new InvalidOperationException("Platform dll must include exactly one IPlatform implementation.");
+
+					var platform = (IPlatform)platformType.GetConstructor(Type.EmptyTypes).Invoke(null);
+					Renderer = new Renderer(platform, Settings.Graphics);
+					Sound = new Sound(platform, Settings.Sound);
+
 					break;
 				}
 				catch (Exception e)
 				{
 					Log.Write("graphics", "{0}", e);
-					Console.WriteLine("Renderer initialization failed. Fallback in place. Check graphics.log for details.");
+					Console.WriteLine("Renderer initialization failed. Check graphics.log for details.");
+
+					if (Renderer != null)
+						Renderer.Dispose();
+
+					if (Sound != null)
+						Sound.Dispose();
 				}
 			}
 
-			Sound = new Sound(Settings.Sound.Engine);
-
-			GlobalChat = new GlobalChat();
-
-			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);
+			GeoIP.Initialize();
 
 			if (Settings.Server.DiscoverNatDevices)
-				RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.StoppingNatDiscovery);
-		}
+				discoverNat = UPnP.DiscoverNatDevices(Settings.Server.NatDiscoveryTimeout);
 
-		public static bool IsModInstalled(string modId)
-		{
-			return ModMetadata.AllMods[modId].RequiresMods.All(IsModInstalled);
-		}
+			var modSearchArg = args.GetValue("Engine.ModSearchPaths", null);
+			var modSearchPaths = modSearchArg != null ?
+				FieldLoader.GetValue<string[]>("Engine.ModsPath", modSearchArg) :
+				new[] { Path.Combine(".", "mods") };
 
-		public static bool IsModInstalled(KeyValuePair<string, string> mod)
-		{
-			return ModMetadata.AllMods.ContainsKey(mod.Key)
-				&& ModMetadata.AllMods[mod.Key].Version == mod.Value
-				&& IsModInstalled(mod.Key);
+			Mods = new InstalledMods(modSearchPaths, explicitModPaths);
+			Console.WriteLine("Internal mods:");
+			foreach (var mod in Mods)
+				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Metadata.Title, mod.Value.Metadata.Version);
+
+			ExternalMods = new ExternalMods();
+
+			Manifest currentMod;
+			if (modID != null && Mods.TryGetValue(modID, out currentMod))
+			{
+				var launchPath = args.GetValue("Engine.LaunchPath", Assembly.GetEntryAssembly().Location);
+
+				// Sanitize input from platform-specific launchers
+				// Process.Start requires paths to not be quoted, even if they contain spaces
+				if (launchPath.First() == '"' && launchPath.Last() == '"')
+					launchPath = launchPath.Substring(1, launchPath.Length - 2);
+
+				ExternalMods.Register(Mods[modID], launchPath, ModRegistration.User);
+
+				ExternalMod activeMod;
+				if (ExternalMods.TryGetValue(ExternalMod.MakeKey(Mods[modID]), out activeMod))
+					ExternalMods.ClearInvalidRegistrations(activeMod, ModRegistration.User);
+			}
+
+			Console.WriteLine("External mods:");
+			foreach (var mod in ExternalMods)
+				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
+
+			InitializeMod(modID, args);
 		}
 
 		public static void InitializeMod(string mod, Arguments args)
@@ -332,33 +399,32 @@ namespace OpenRA
 
 			ModData = null;
 
-			// Fall back to default if the mod doesn't exist or has missing prerequisites.
-			if (!ModMetadata.AllMods.ContainsKey(mod) || !IsModInstalled(mod))
-				mod = new GameSettings().Mod;
+			if (mod == null)
+				throw new InvalidOperationException("Game.Mod argument missing.");
+
+			if (!Mods.ContainsKey(mod))
+				throw new InvalidOperationException("Unknown or invalid mod '{0}'.".F(mod));
 
 			Console.WriteLine("Loading mod: {0}", mod);
-			Settings.Game.Mod = mod;
 
 			Sound.StopVideo();
 
-			ModData = new ModData(mod, true);
+			ModData = new ModData(Mods[mod], Mods, true);
+
+			LocalPlayerProfile = new LocalPlayerProfile(Platform.ResolvePath(Path.Combine("^", Settings.Game.AuthProfile)), ModData.Manifest.Get<PlayerDatabase>());
+
+			if (!ModData.LoadScreen.BeforeLoad())
+				return;
 
 			using (new PerfTimer("LoadMaps"))
 				ModData.MapCache.LoadMaps();
 
-			var installData = ModData.Manifest.Get<ContentInstaller>();
-			var isModContentInstalled = installData.TestFiles.All(f => File.Exists(Platform.ResolvePath(f)));
-
-			// Mod assets are missing!
-			if (!isModContentInstalled)
-			{
-				InitializeMod("modchooser", new Arguments());
-				return;
-			}
-
 			ModData.InitializeLoaders(ModData.DefaultFileSystem);
 			Renderer.InitializeFonts(ModData);
 
+			var grid = ModData.Manifest.Contains<MapGrid>() ? ModData.Manifest.Get<MapGrid>() : null;
+			Renderer.InitializeDepthBuffer(grid);
+
 			if (Cursor != null)
 				Cursor.Dispose();
 
@@ -389,6 +455,17 @@ namespace OpenRA
 
 			JoinLocal();
 
+			try
+			{
+				if (discoverNat != null)
+					discoverNat.Wait();
+			}
+			catch (Exception e)
+			{
+				Console.WriteLine("NAT discovery failed: {0}", e.Message);
+				Log.Write("nat", e.ToString());
+			}
+
 			ModData.LoadScreen.StartGame(args);
 		}
 
@@ -402,7 +479,10 @@ namespace OpenRA
 			var shellmap = ChooseShellmap();
 
 			using (new PerfTimer("StartGame"))
+			{
 				StartGame(shellmap, WorldType.Shellmap);
+				OnShellmapLoaded();
+			}
 		}
 
 		static string ChooseShellmap()
@@ -417,6 +497,28 @@ namespace OpenRA
 			return shellmaps.Random(CosmeticRandom);
 		}
 
+		public static void SwitchToExternalMod(ExternalMod mod, string[] launchArguments = null, Action onFailed = null)
+		{
+			try
+			{
+				var args = launchArguments != null ? mod.LaunchArgs.Append(launchArguments) : mod.LaunchArgs;
+				var p = Process.Start(mod.LaunchPath, args.Select(a => "\"" + a + "\"").JoinWith(" "));
+				if (p == null || p.HasExited)
+					onFailed();
+				else
+				{
+					p.Close();
+					Exit();
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to switch to external mod.");
+				Log.Write("debug", "Error was: " + e.Message);
+				onFailed();
+			}
+		}
+
 		static RunStatus state = RunStatus.Running;
 		public static event Action OnQuit = () => { };
 
@@ -432,15 +534,15 @@ namespace OpenRA
 
 			Bitmap bitmap;
 			using (new PerfTimer("Renderer.TakeScreenshot"))
-				bitmap = Renderer.Device.TakeScreenshot();
+				bitmap = Renderer.Context.TakeScreenshot();
 
 			ThreadPool.QueueUserWorkItem(_ =>
 			{
-				var mod = ModData.Manifest.Mod;
-				var directory = Platform.ResolvePath("^", "Screenshots", mod.Id, mod.Version);
+				var mod = ModData.Manifest.Metadata;
+				var directory = Platform.ResolvePath(Platform.SupportDirPrefix, "Screenshots", ModData.Manifest.Id, mod.Version);
 				Directory.CreateDirectory(directory);
 
-				var filename = TimestampedFilename();
+				var filename = TimestampedFilename(true);
 				var format = Settings.Graphics.ScreenshotFormat;
 				var extension = ImageCodecInfo.GetImageEncoders().FirstOrDefault(x => x.FormatID == format.Guid)
 					.FilenameExtension.Split(';').First().ToLowerInvariant().Substring(1);
@@ -468,9 +570,7 @@ namespace OpenRA
 				var integralTickTimestep = (uiTickDelta / Timestep) * Timestep;
 				Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Timestep;
 
-				Viewport.TicksSinceLastMove += uiTickDelta / Timestep;
-
-				Sync.CheckSyncUnchanged(world, Ui.Tick);
+				Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, Ui.Tick);
 				Cursor.Tick();
 			}
 
@@ -488,45 +588,41 @@ namespace OpenRA
 					orderManager.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : worldTimestep;
 
 					Sound.Tick();
-					Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);
+					Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, orderManager.TickImmediate);
 
 					if (world == null)
 						return;
 
-					// Don't tick when the shellmap is disabled
-					if (world.ShouldTick)
+					var isNetTick = LocalTick % NetTickScale == 0;
+
+					if (!isNetTick || orderManager.IsReadyForNextFrame)
 					{
-						var isNetTick = LocalTick % NetTickScale == 0;
+						++orderManager.LocalFrameNumber;
 
-						if (!isNetTick || orderManager.IsReadyForNextFrame)
+						Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
+
+						if (BenchmarkMode)
+							Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
+
+						if (isNetTick)
+							orderManager.Tick();
+
+						Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, () =>
 						{
-							++orderManager.LocalFrameNumber;
+							world.OrderGenerator.Tick(world);
+							world.Selection.Tick(world);
+						});
 
-							Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
+						world.Tick();
 
-							if (BenchmarkMode)
-								Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
-
-							if (isNetTick)
-								orderManager.Tick();
-
-							Sync.CheckSyncUnchanged(world, () =>
-							{
-								world.OrderGenerator.Tick(world);
-								world.Selection.Tick(world);
-							});
-
-							world.Tick();
-
-							PerfHistory.Tick();
-						}
-						else if (orderManager.NetFrameNumber == 0)
-							orderManager.LastTickTime = RunTime;
-
-						Sync.CheckSyncUnchanged(world, () => world.TickRender(worldRenderer));
-					}
-					else
 						PerfHistory.Tick();
+					}
+					else if (orderManager.NetFrameNumber == 0)
+						orderManager.LastTickTime = RunTime;
+
+					// Wait until we have done our first world Tick before TickRendering
+					if (orderManager.LocalFrameNumber > 0)
+						Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, () => world.TickRender(worldRenderer));
 				}
 			}
 		}
@@ -546,7 +642,10 @@ namespace OpenRA
 				InnerLogicTick(worldRenderer.World.OrderManager);
 		}
 
-		public static bool TakeScreenshot = false;
+		public static void TakeScreenshot()
+		{
+			takeScreenshot = true;
+		}
 
 		static void RenderTick()
 		{
@@ -566,9 +665,9 @@ namespace OpenRA
 
 				using (new PerfSample("render_widgets"))
 				{
-					Renderer.WorldVoxelRenderer.BeginFrame();
+					Renderer.WorldModelRenderer.BeginFrame();
 					Ui.PrepareRenderables();
-					Renderer.WorldVoxelRenderer.EndFrame();
+					Renderer.WorldModelRenderer.EndFrame();
 
 					Ui.Draw();
 
@@ -582,9 +681,9 @@ namespace OpenRA
 				using (new PerfSample("render_flip"))
 					Renderer.EndFrame(new DefaultInputHandler(OrderManager.World));
 
-				if (TakeScreenshot)
+				if (takeScreenshot)
 				{
-					TakeScreenshot = false;
+					takeScreenshot = false;
 					TakeScreenshotInner();
 				}
 			}
@@ -694,11 +793,11 @@ namespace OpenRA
 					}
 				}
 				else
-					Thread.Sleep(nextUpdate - now);
+					Thread.Sleep((int)(nextUpdate - now));
 			}
 		}
 
-		internal static RunStatus Run()
+		static RunStatus Run()
 		{
 			if (Settings.Graphics.MaxFramerate < 1)
 			{
@@ -722,7 +821,6 @@ namespace OpenRA
 			ModData.Dispose();
 			ChromeProvider.Deinitialize();
 
-			GlobalChat.Dispose();
 			Sound.Dispose();
 			Renderer.Dispose();
 
@@ -736,11 +834,6 @@ namespace OpenRA
 			state = RunStatus.Success;
 		}
 
-		public static void Restart()
-		{
-			state = RunStatus.Restart;
-		}
-
 		public static void AddChatLine(Color color, string name, string text)
 		{
 			OrderManager.AddChatLine(color, name, text);
@@ -783,8 +876,7 @@ namespace OpenRA
 			{
 				Name = "Skirmish Game",
 				Map = map,
-				AdvertiseOnline = false,
-				AllowPortForward = false
+				AdvertiseOnline = false
 			};
 
 			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, ModData, false);
@@ -796,5 +888,10 @@ namespace OpenRA
 		{
 			return OrderManager != null && OrderManager.World == world && !world.Disposing;
 		}
+
+		public static bool SetClipboardText(string text)
+		{
+			return Renderer.Window.SetClipboardText(text);
+		}
 	}
 }

OpenRA.Game/GameInformation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -24,6 +24,7 @@ namespace OpenRA
 
 		public string MapUid;
 		public string MapTitle;
+		public int FinalGameTick;
 
 		/// <summary>Game start timestamp (when the recoding started).</summary>
 		public DateTime StartTimeUtc;

OpenRA.Game/GameRules/ActorInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -22,6 +22,8 @@ namespace OpenRA
 	/// </summary>
 	public class ActorInfo
 	{
+		public const string AbstractActorPrefix = "^";
+
 		/// <summary>
 		/// The actor name can be anything, but the sprites used in the Render*: traits default to this one.
 		/// If you add an ^ in front of the name, the engine will recognize this as a collection of traits
@@ -38,7 +40,6 @@ namespace OpenRA
 			{
 				Name = name;
 
-				var abstractActorType = name.StartsWith("^");
 				foreach (var t in node.Nodes)
 				{
 					try
@@ -47,10 +48,11 @@ namespace OpenRA
 					}
 					catch (FieldLoader.MissingFieldsException e)
 					{
-						if (!abstractActorType)
-							throw new YamlException(e.Message);
+						throw new YamlException(e.Message);
 					}
 				}
+
+				traits.TrimExcess();
 			}
 			catch (YamlException e)
 			{
@@ -63,6 +65,7 @@ namespace OpenRA
 			Name = name;
 			foreach (var t in traitInfos)
 				traits.Add(t);
+			traits.TrimExcess();
 		}
 
 		static ITraitInfo LoadTraitInfo(ObjectCreator creator, string traitName, MiniYaml my)
@@ -144,23 +147,18 @@ namespace OpenRA
 				.Select(t => t.GetGenericArguments()[0]);
 		}
 
-		public IEnumerable<Pair<string, Type>> GetInitKeys()
-		{
-			var inits = traits.WithInterface<ITraitInfo>().SelectMany(
-				t => t.GetType().GetInterfaces()
-					.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 */
-
-			return inits.Select(
-				i => Pair.New(
-					i.Name.Replace("Init", ""), i));
-		}
-
 		public bool HasTraitInfo<T>() where T : ITraitInfoInterface { return traits.Contains<T>(); }
 		public T TraitInfo<T>() where T : ITraitInfoInterface { return traits.Get<T>(); }
 		public T TraitInfoOrDefault<T>() where T : ITraitInfoInterface { return traits.GetOrDefault<T>(); }
 		public IEnumerable<T> TraitInfos<T>() where T : ITraitInfoInterface { return traits.WithInterface<T>(); }
+
+		public BitSet<TargetableType> GetAllTargetTypes()
+		{
+			// PERF: Avoid LINQ.
+			var targetTypes = new BitSet<TargetableType>();
+			foreach (var targetable in TraitInfos<ITargetableInfo>())
+				targetTypes = targetTypes.Union(targetable.GetTargetTypes());
+			return targetTypes;
+		}
 	}
 }

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -10,7 +10,6 @@
 #endregion
 
 using System.IO;
-using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 
 namespace OpenRA.GameRules
@@ -20,6 +19,7 @@ namespace OpenRA.GameRules
 		public readonly string Filename;
 		public readonly string Title;
 		public readonly bool Hidden;
+		public readonly float VolumeModifier = 1f;
 
 		public int Length { get; private set; } // seconds
 		public bool Exists { get; private set; }
@@ -32,6 +32,9 @@ namespace OpenRA.GameRules
 			if (nd.ContainsKey("Hidden"))
 				bool.TryParse(nd["Hidden"].Value, out Hidden);
 
+			if (nd.ContainsKey("VolumeModifier"))
+				VolumeModifier = FieldLoader.GetValue<float>("VolumeModifier", nd["VolumeModifier"].Value);
+
 			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
 			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
 		}
@@ -42,18 +45,24 @@ namespace OpenRA.GameRules
 			if (!fileSystem.TryOpen(Filename, out stream))
 				return;
 
-			Exists = true;
-			ISoundFormat soundFormat;
-			foreach (var loader in Game.ModData.SoundLoaders)
+			try
 			{
-				if (loader.TryParseSound(stream, out soundFormat))
+				Exists = true;
+				foreach (var loader in Game.ModData.SoundLoaders)
 				{
-					Length = (int)soundFormat.LengthInSeconds;
-					break;
+					ISoundFormat soundFormat;
+					if (loader.TryParseSound(stream, out soundFormat))
+					{
+						Length = (int)soundFormat.LengthInSeconds;
+						soundFormat.Dispose();
+						break;
+					}
 				}
 			}
-
-			stream.Dispose();
+			finally
+			{
+				stream.Dispose();
+			}
 		}
 	}
 }

OpenRA.Game/GameRules/Ruleset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -29,6 +29,7 @@ namespace OpenRA
 		public readonly IReadOnlyDictionary<string, MusicInfo> Music;
 		public readonly TileSet TileSet;
 		public readonly SequenceProvider Sequences;
+		public readonly IReadOnlyDictionary<string, MiniYamlNode> ModelSequences;
 
 		public Ruleset(
 			IReadOnlyDictionary<string, ActorInfo> actors,
@@ -37,7 +38,8 @@ namespace OpenRA
 			IReadOnlyDictionary<string, SoundInfo> notifications,
 			IReadOnlyDictionary<string, MusicInfo> music,
 			TileSet tileSet,
-			SequenceProvider sequences)
+			SequenceProvider sequences,
+			IReadOnlyDictionary<string, MiniYamlNode> modelSequences)
 		{
 			Actors = actors;
 			Weapons = weapons;
@@ -46,6 +48,7 @@ namespace OpenRA
 			Music = music;
 			TileSet = tileSet;
 			Sequences = sequences;
+			ModelSequences = modelSequences;
 
 			foreach (var a in Actors.Values)
 			{
@@ -64,6 +67,19 @@ namespace OpenRA
 
 			foreach (var weapon in Weapons)
 			{
+				var projectileLoaded = weapon.Value.Projectile as IRulesetLoaded<WeaponInfo>;
+				if (projectileLoaded != null)
+				{
+					try
+					{
+						projectileLoaded.RulesetLoaded(this, weapon.Value);
+					}
+					catch (YamlException e)
+					{
+						throw new YamlException("Projectile type {0}: {1}".F(weapon.Key, e.Message));
+					}
+				}
+
 				foreach (var warhead in weapon.Value.Warheads)
 				{
 					var cacher = warhead as IRulesetLoaded<WeaponInfo>;
@@ -84,16 +100,24 @@ namespace OpenRA
 
 		public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }
 
-		static IReadOnlyDictionary<string, T> MergeOrDefault<T>(string name, IReadOnlyFileSystem fileSystem, IEnumerable<string> files, MiniYaml additional,
-			IReadOnlyDictionary<string, T> defaults, Func<MiniYamlNode, T> makeObject)
+		static IReadOnlyDictionary<string, T> MergeOrDefault<T>(string name,
+			IReadOnlyFileSystem fileSystem,
+			IEnumerable<string> files,
+			MiniYaml additional,
+			IReadOnlyDictionary<string, T> defaults,
+			Func<MiniYamlNode, T> makeObject,
+			Func<MiniYamlNode, bool> filterNode = null)
 		{
 			if (additional == null && defaults != null)
 				return defaults;
 
-			var result = MiniYaml.Load(fileSystem, files, additional)
-				.ToDictionaryWithConflictLog(k => k.Key.ToLowerInvariant(), makeObject, "LoadFromManifest<" + name + ">");
+			IEnumerable<MiniYamlNode> yamlNodes = MiniYaml.Load(fileSystem, files, additional);
 
-			return new ReadOnlyDictionary<string, T>(result);
+			// Optionally, the caller can filter out elements from the loaded set of nodes. Default behavior is unfiltered.
+			if (filterNode != null)
+				yamlNodes = yamlNodes.Where(k => !filterNode(k));
+
+			return new ReadOnlyDictionary<string, T>(yamlNodes.ToDictionaryWithConflictLog(k => k.Key.ToLowerInvariant(), makeObject, "LoadFromManifest<" + name + ">"));
 		}
 
 		public static Ruleset LoadDefaults(ModData modData)
@@ -105,7 +129,8 @@ namespace OpenRA
 			Action f = () =>
 			{
 				var actors = MergeOrDefault("Manifest,Rules", fs, m.Rules, null, null,
-					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value));
+					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value),
+					filterNode: n => n.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal));
 
 				var weapons = MergeOrDefault("Manifest,Weapons", fs, m.Weapons, null, null,
 					k => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
@@ -119,8 +144,11 @@ namespace OpenRA
 				var music = MergeOrDefault("Manifest,Music", fs, m.Music, null, null,
 					k => new MusicInfo(k.Key, k.Value));
 
+				var modelSequences = MergeOrDefault("Manifest,ModelSequences", fs, m.ModelSequences, null, null,
+					k => k);
+
 				// The default ruleset does not include a preferred tileset or sequence set
-				ruleset = new Ruleset(actors, weapons, voices, notifications, music, null, null);
+				ruleset = new Ruleset(actors, weapons, voices, notifications, music, null, null, modelSequences);
 			};
 
 			if (modData.IsOnMainThread)
@@ -145,12 +173,13 @@ namespace OpenRA
 			var dr = modData.DefaultRules;
 			var ts = modData.DefaultTileSets[tileSet];
 			var sequences = modData.DefaultSequences[tileSet];
-			return new Ruleset(dr.Actors, dr.Weapons, dr.Voices, dr.Notifications, dr.Music, ts, sequences);
+
+			return new Ruleset(dr.Actors, dr.Weapons, dr.Voices, dr.Notifications, dr.Music, ts, sequences, dr.ModelSequences);
 		}
 
 		public static Ruleset Load(ModData modData, IReadOnlyFileSystem fileSystem, string tileSet,
 			MiniYaml mapRules, MiniYaml mapWeapons, MiniYaml mapVoices, MiniYaml mapNotifications,
-			MiniYaml mapMusic, MiniYaml mapSequences)
+			MiniYaml mapMusic, MiniYaml mapSequences, MiniYaml mapModelSequences)
 		{
 			var m = modData.Manifest;
 			var dr = modData.DefaultRules;
@@ -159,7 +188,8 @@ namespace OpenRA
 			Action f = () =>
 			{
 				var actors = MergeOrDefault("Rules", fileSystem, m.Rules, mapRules, dr.Actors,
-					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value));
+					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value),
+					filterNode: n => n.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal));
 
 				var weapons = MergeOrDefault("Weapons", fileSystem, m.Weapons, mapWeapons, dr.Weapons,
 					k => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
@@ -180,8 +210,12 @@ namespace OpenRA
 				var sequences = mapSequences == null ? modData.DefaultSequences[tileSet] :
 					new SequenceProvider(fileSystem, modData, ts, mapSequences);
 
-				// TODO: Add support for custom voxel sequences
-				ruleset = new Ruleset(actors, weapons, voices, notifications, music, ts, sequences);
+				var modelSequences = dr.ModelSequences;
+				if (mapModelSequences != null)
+					modelSequences = MergeOrDefault("ModelSequences", fileSystem, m.ModelSequences, mapModelSequences, dr.ModelSequences,
+						k => k);
+
+				ruleset = new Ruleset(actors, weapons, voices, notifications, music, ts, sequences, modelSequences);
 			};
 
 			if (modData.IsOnMainThread)
@@ -200,5 +234,58 @@ namespace OpenRA
 
 			return ruleset;
 		}
+
+		static bool AnyCustomYaml(MiniYaml yaml)
+		{
+			return yaml != null && (yaml.Value != null || yaml.Nodes.Any());
+		}
+
+		static bool AnyFlaggedTraits(ModData modData, List<MiniYamlNode> actors)
+		{
+			foreach (var actorNode in actors)
+			{
+				foreach (var traitNode in actorNode.Value.Nodes)
+				{
+					try
+					{
+						var traitName = traitNode.Key.Split('@')[0];
+						var traitType = modData.ObjectCreator.FindType(traitName + "Info");
+						if (traitType != null && traitType.GetInterface("ILobbyCustomRulesIgnore") == null)
+							return true;
+					}
+					catch (Exception ex)
+					{
+						Log.Write("debug", "Error in AnyFlaggedTraits\r\n" + ex.ToString());
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool DefinesUnsafeCustomRules(ModData modData, IReadOnlyFileSystem fileSystem,
+			MiniYaml mapRules, MiniYaml mapWeapons, MiniYaml mapVoices, MiniYaml mapNotifications, MiniYaml mapSequences)
+		{
+			// Maps that define any weapon, voice, notification, or sequence overrides are always flagged
+			if (AnyCustomYaml(mapWeapons) || AnyCustomYaml(mapVoices) || AnyCustomYaml(mapNotifications) || AnyCustomYaml(mapSequences))
+				return true;
+
+			// Any trait overrides that aren't explicitly whitelisted are flagged
+			if (mapRules != null)
+			{
+				if (AnyFlaggedTraits(modData, mapRules.Nodes))
+					return true;
+
+				if (mapRules.Value != null)
+				{
+					var mapFiles = FieldLoader.GetValue<string[]>("value", mapRules.Value);
+					foreach (var f in mapFiles)
+						if (AnyFlaggedTraits(modData, MiniYaml.FromStream(fileSystem.Open(f), f)))
+							return true;
+				}
+			}
+
+			return false;
+		}
 	}
 }

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -33,19 +33,48 @@ namespace OpenRA.GameRules
 		{
 			FieldLoader.Load(this, y);
 
-			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)));
+			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(0, 1f, a.Value)));
+			NotificationsPools = Exts.Lazy(() => ParseSoundPool(y, "Notifications"));
+		}
+
+		Dictionary<string, SoundPool> ParseSoundPool(MiniYaml y, string key)
+		{
+			var ret = new Dictionary<string, SoundPool>();
+			var classifiction = y.Nodes.First(x => x.Key == key);
+			foreach (var t in classifiction.Value.Nodes)
+			{
+				var rateLimit = 0;
+				var rateLimitNode = t.Value.Nodes.FirstOrDefault(x => x.Key == "RateLimit");
+				if (rateLimitNode != null)
+					rateLimit = FieldLoader.GetValue<int>(rateLimitNode.Key, rateLimitNode.Value.Value);
+
+				var volumeModifier = 1f;
+				var volumeModifierNode = t.Value.Nodes.FirstOrDefault(x => x.Key == "VolumeModifier");
+				if (volumeModifierNode != null)
+					volumeModifier = FieldLoader.GetValue<float>(volumeModifierNode.Key, volumeModifierNode.Value.Value);
+
+				var names = FieldLoader.GetValue<string[]>(t.Key, t.Value.Value);
+				var sp = new SoundPool(rateLimit, volumeModifier, names);
+				ret.Add(t.Key, sp);
+			}
+
+			return ret;
 		}
 	}
 
 	public class SoundPool
 	{
+		public readonly float VolumeModifier;
 		readonly string[] clips;
+		readonly int rateLimit;
 		readonly List<string> liveclips = new List<string>();
+		long lastPlayed = 0;
 
-		public SoundPool(params string[] clips)
+		public SoundPool(int rateLimit, float volumeModifier, params string[] clips)
 		{
+			VolumeModifier = volumeModifier;
 			this.clips = clips;
+			this.rateLimit = rateLimit;
 		}
 
 		public string GetNext()
@@ -53,8 +82,19 @@ namespace OpenRA.GameRules
 			if (liveclips.Count == 0)
 				liveclips.AddRange(clips);
 
+			// Avoid crashing if there's no clips at all
 			if (liveclips.Count == 0)
-				return null;		/* avoid crashing if there's no clips at all */
+				return null;
+
+			// Perform rate limiting if necessary
+			if (rateLimit != 0)
+			{
+				var now = Game.RunTime;
+				if (lastPlayed != 0 && now < lastPlayed + rateLimit)
+					return null;
+
+				lastPlayed = now;
+			}
 
 			var i = Game.CosmeticRandom.Next(liveclips.Count);
 			var s = liveclips[i];

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -13,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.GameRules
@@ -24,6 +25,7 @@ namespace OpenRA.GameRules
 		public int[] InaccuracyModifiers;
 		public int[] RangeModifiers;
 		public int Facing;
+		public Func<int> CurrentMuzzleFacing;
 		public WPos Source;
 		public Func<WPos> CurrentSource;
 		public Actor SourceActor;
@@ -31,16 +33,32 @@ namespace OpenRA.GameRules
 		public Target GuidedTarget;
 	}
 
-	public interface IProjectileInfo { IEffect Create(ProjectileArgs args); }
+	public interface IProjectile : IEffect { }
+	public interface IProjectileInfo { IProjectile Create(ProjectileArgs args); }
 
 	public sealed class WeaponInfo
 	{
 		[Desc("The maximum range the weapon can fire.")]
 		public readonly WDist Range = WDist.Zero;
 
-		[Desc("The sound played when the weapon is fired.")]
+		[Desc("First burst is aimed at this offset relative to target position.")]
+		public readonly WVec FirstBurstTargetOffset = WVec.Zero;
+
+		[Desc("Each burst after the first lands by this offset away from the previous burst.")]
+		public readonly WVec FollowingBurstTargetOffset = WVec.Zero;
+
+		[Desc("The sound played each time the weapon is fired.")]
 		public readonly string[] Report = null;
 
+		[Desc("Sound played only on first burst in a salvo.")]
+		public readonly string[] StartBurstReport = null;
+
+		[Desc("The sound played when the weapon is reloaded.")]
+		public readonly string[] AfterFireSound = null;
+
+		[Desc("Delay in ticks to play reloading sound.")]
+		public readonly int AfterFireSoundDelay = 0;
+
 		[Desc("Delay in ticks between reloading ammo magazines.")]
 		public readonly int ReloadDelay = 1;
 
@@ -48,17 +66,21 @@ namespace OpenRA.GameRules
 		public readonly int Burst = 1;
 
 		[Desc("What types of targets are affected.")]
-		public readonly HashSet<string> ValidTargets = new HashSet<string> { "Ground", "Water" };
+		public readonly BitSet<TargetableType> ValidTargets = new BitSet<TargetableType>("Ground", "Water");
 
 		[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
-		public readonly HashSet<string> InvalidTargets = new HashSet<string>();
+		public readonly BitSet<TargetableType> InvalidTargets;
 
-		[Desc("Delay in ticks between firing shots from the same ammo magazine.")]
-		public readonly int BurstDelay = 5;
+		[Desc("Delay in ticks between firing shots from the same ammo magazine. If one entry, it will be used for all bursts.",
+			"If multiple entries, their number needs to match Burst - 1.")]
+		public readonly int[] BurstDelays = { 5 };
 
 		[Desc("The minimum range the weapon can fire.")]
 		public readonly WDist MinRange = WDist.Zero;
 
+		[Desc("Does this weapon aim at the target's center regardless of other targetable offsets?")]
+		public readonly bool TargetActorCenter = false;
+
 		[FieldLoader.LoadUsing("LoadProjectile")]
 		public readonly IProjectileInfo Projectile;
 
@@ -67,6 +89,9 @@ namespace OpenRA.GameRules
 
 		public WeaponInfo(string name, MiniYaml content)
 		{
+			// Resolve any weapon-level yaml inheritance or removals
+			// HACK: The "Defaults" sequence syntax prevents us from doing this generally during yaml parsing
+			content.Nodes = MiniYaml.Merge(new[] { content.Nodes });
 			FieldLoader.Load(this, content);
 		}
 
@@ -93,7 +118,7 @@ namespace OpenRA.GameRules
 			return retList;
 		}
 
-		public bool IsValidTarget(IEnumerable<string> targetTypes)
+		public bool IsValidTarget(BitSet<TargetableType> targetTypes)
 		{
 			return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes);
 		}
@@ -158,11 +183,10 @@ namespace OpenRA.GameRules
 			{
 				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)));
+					firedBy.World.AddFrameEndTask(w => w.Add(new DelayedImpact(wh.Delay, wh, target, firedBy, damageModifiers)));
 				else
-					a();
+					wh.DoImpact(target, firedBy, damageModifiers);
 			}
 		}
 	}

OpenRA.Game/GameSpeed.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/GlobalChat.cs

@@ -1,391 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Linq;
-using System.Threading;
-using Meebey.SmartIrc4net;
-using OpenRA.Primitives;
-
-namespace OpenRA.Chat
-{
-	public enum ChatConnectionStatus { Disconnected, Connecting, Connected, Disconnecting, Joined, Error }
-	public enum ChatMessageType { Message, Notification }
-
-	public sealed class ChatUser
-	{
-		public readonly string Name;
-		public bool IsOp;
-		public bool IsVoiced;
-
-		public ChatUser(string name, bool isOp, bool isVoice)
-		{
-			Name = name;
-			IsOp = isOp;
-			IsVoiced = isVoice;
-		}
-	}
-
-	public sealed class ChatMessage
-	{
-		static long nextUID;
-
-		public readonly DateTime Time;
-		public readonly ChatMessageType Type;
-		public readonly string Nick;
-		public readonly string Message;
-		public readonly string UID;
-
-		public ChatMessage(DateTime time, ChatMessageType type, string nick, string message)
-		{
-			Time = time;
-			Type = type;
-			Nick = nick;
-			Message = message;
-
-			UID = Interlocked.Increment(ref nextUID).ToString();
-		}
-
-		public override string ToString()
-		{
-			var time = Time.ToString(Game.Settings.Chat.TimestampFormat);
-			if (Type == ChatMessageType.Notification)
-				return "{0} {1}".F(time, Message);
-
-			return "{0} {1}: {2}".F(time, Nick, Message);
-		}
-	}
-
-	public sealed class GlobalChat : IDisposable
-	{
-		readonly IrcClient client = new IrcClient();
-		volatile Channel channel;
-
-		public readonly ObservableSortedDictionary<string, ChatUser> Users = new ObservableSortedDictionary<string, ChatUser>(StringComparer.InvariantCultureIgnoreCase);
-		public readonly ObservableList<ChatMessage> History = new ObservableList<ChatMessage>();
-
-		volatile string topic;
-		public string Topic { get { return topic; } }
-
-		volatile ChatConnectionStatus connectionStatus = ChatConnectionStatus.Disconnected;
-		public ChatConnectionStatus ConnectionStatus { get { return connectionStatus; } }
-
-		public GlobalChat()
-		{
-			client.Encoding = System.Text.Encoding.UTF8;
-			client.SendDelay = 100;
-			client.ActiveChannelSyncing = true;
-
-			client.OnConnecting += OnConnecting;
-			client.OnConnected += OnConnected;
-			client.OnDisconnecting += OnDisconnecting;
-			client.OnDisconnected += OnDisconnected;
-			client.OnError += OnError;
-			client.OnKick += OnKick;
-
-			client.OnRawMessage += (_, e) => Game.RunAfterTick(() => Log.Write("irc", e.Data.RawMessage));
-			client.OnJoin += OnJoin;
-			client.OnChannelActiveSynced += OnChannelActiveSynced;
-			client.OnTopic += (_, e) => topic = e.Topic;
-			client.OnTopicChange += (_, e) => topic = e.NewTopic;
-			client.OnNickChange += OnNickChange;
-
-			client.OnChannelMessage += (_, e) => AddMessage(e.Data.Nick, e.Data.Message);
-			client.OnOp += (_, e) => SetUserOp(e.Whom, true);
-			client.OnDeop += (_, e) => SetUserOp(e.Whom, false);
-			client.OnVoice += (_, e) => SetUserVoiced(e.Whom, true);
-			client.OnDevoice += (_, e) => SetUserVoiced(e.Whom, false);
-			client.OnPart += OnPart;
-			client.OnQuit += OnQuit;
-
-			TrySetNickname(Game.Settings.Player.Name);
-		}
-
-		void SetUserOp(string whom, bool isOp)
-		{
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (Users.TryGetValue(whom, out user))
-					user.IsOp = isOp;
-			});
-		}
-
-		void SetUserVoiced(string whom, bool isVoiced)
-		{
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (Users.TryGetValue(whom, out user))
-					user.IsVoiced = isVoiced;
-			});
-		}
-
-		public void Connect()
-		{
-			if (client.IsConnected)
-				return;
-
-			new Thread(() =>
-			{
-				try
-				{
-					client.Connect(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port);
-				}
-				catch (Exception e)
-				{
-					connectionStatus = ChatConnectionStatus.Error;
-					AddNotification(e.Message);
-					Game.RunAfterTick(() => Log.Write("irc", e.ToString()));
-
-					return;
-				}
-
-				client.Listen();
-			}) { Name = "IrcListenThread", IsBackground = true }.Start();
-		}
-
-		void AddNotification(string text)
-		{
-			var message = new ChatMessage(DateTime.Now, ChatMessageType.Notification, null, text);
-			Game.RunAfterTick(() =>
-			{
-				History.Add(message);
-				Log.Write("irc", text);
-			});
-		}
-
-		void AddMessage(string nick, string text)
-		{
-			var message = new ChatMessage(DateTime.Now, ChatMessageType.Message, nick, text);
-			Game.RunAfterTick(() =>
-			{
-				History.Add(message);
-				Log.Write("irc", text);
-			});
-		}
-
-		void OnConnecting(object sender, EventArgs e)
-		{
-			AddNotification("Connecting to {0}:{1}...".F(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port));
-			connectionStatus = ChatConnectionStatus.Connecting;
-		}
-
-		void OnConnected(object sender, EventArgs e)
-		{
-			AddNotification("Connected.");
-			connectionStatus = ChatConnectionStatus.Connected;
-
-			// Guard against settings.yaml modification
-			var nick = SanitizedName(Game.Settings.Chat.Nickname);
-			if (nick != Game.Settings.Chat.Nickname)
-				Game.RunAfterTick(() => Game.Settings.Chat.Nickname = nick);
-
-			client.Login(nick, "in-game IRC client", 0, "OpenRA");
-			client.RfcJoin("#" + Game.Settings.Chat.Channel);
-		}
-
-		void OnDisconnecting(object sender, EventArgs e)
-		{
-			if (connectionStatus != ChatConnectionStatus.Error)
-				connectionStatus = ChatConnectionStatus.Disconnecting;
-		}
-
-		void OnDisconnected(object sender, EventArgs e)
-		{
-			Game.RunAfterTick(Users.Clear);
-
-			// Keep the chat window open if there is an error
-			// It will be cleared by the Disconnect button
-			if (connectionStatus != ChatConnectionStatus.Error)
-			{
-				Game.RunAfterTick(History.Clear);
-				topic = null;
-				connectionStatus = ChatConnectionStatus.Disconnected;
-			}
-		}
-
-		void OnError(object sender, ErrorEventArgs e)
-		{
-			// Ignore any errors that happen during disconnect
-			if (connectionStatus != ChatConnectionStatus.Disconnecting)
-			{
-				connectionStatus = ChatConnectionStatus.Error;
-				AddNotification("Error: " + e.ErrorMessage);
-			}
-		}
-
-		void OnKick(object sender, KickEventArgs e)
-		{
-			if (e.Whom == client.Nickname)
-			{
-				Disconnect();
-				connectionStatus = ChatConnectionStatus.Error;
-				AddNotification("You were kicked from the chat by {0}. ({1})".F(e.Who, e.KickReason));
-			}
-			else
-			{
-				Users.Remove(e.Whom);
-				AddNotification("{0} was kicked from the chat by {1}. ({2})".F(e.Whom, e.Who, e.KickReason));
-			}
-		}
-
-		void OnJoin(object sender, JoinEventArgs e)
-		{
-			if (e.Who == client.Nickname || e.Channel != channel.Name)
-				return;
-
-			AddNotification("{0} joined the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Add(e.Who, new ChatUser(e.Who, false, false)));
-		}
-
-		void OnChannelActiveSynced(object sender, IrcEventArgs e)
-		{
-			channel = client.GetChannel(e.Data.Channel);
-			AddNotification("{0} users online".F(channel.Users.Count));
-			connectionStatus = ChatConnectionStatus.Joined;
-
-			foreach (DictionaryEntry user in channel.Users)
-			{
-				var u = (ChannelUser)user.Value;
-				Game.RunAfterTick(() => Users.Add(u.Nick, new ChatUser(u.Nick, u.IsOp, u.IsVoice)));
-			}
-		}
-
-		void OnNickChange(object sender, NickChangeEventArgs e)
-		{
-			AddNotification("{0} is now known as {1}.".F(e.OldNickname, e.NewNickname));
-
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (!Users.TryGetValue(e.OldNickname, out user))
-					return;
-
-				Users.Remove(e.OldNickname);
-				Users.Add(e.NewNickname, new ChatUser(e.NewNickname, user.IsOp, user.IsVoiced));
-			});
-		}
-
-		void OnQuit(object sender, QuitEventArgs e)
-		{
-			AddNotification("{0} left the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Remove(e.Who));
-		}
-
-		void OnPart(object sender, PartEventArgs e)
-		{
-			if (e.Data.Channel != channel.Name)
-				return;
-
-			AddNotification("{0} left the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Remove(e.Who));
-		}
-
-		public string SanitizedName(string dirty)
-		{
-			if (string.IsNullOrEmpty(dirty))
-				return null;
-
-			// There is no need to mangle the nick if it is already valid
-			if (Rfc2812.IsValidNickname(dirty))
-				return dirty;
-
-			// TODO: some special chars are allowed as well, but not at every position
-			var clean = new string(dirty.Where(c => char.IsLetterOrDigit(c)).ToArray());
-
-			if (string.IsNullOrEmpty(clean))
-				return null;
-
-			if (char.IsDigit(clean[0]))
-				return SanitizedName(clean.Substring(1));
-
-			// Source: https://tools.ietf.org/html/rfc2812#section-1.2.1
-			if (clean.Length > 9)
-				clean = clean.Substring(0, 9);
-
-			return clean;
-		}
-
-		public bool IsValidNickname(string name)
-		{
-			return Rfc2812.IsValidNickname(name);
-		}
-
-		public void SendMessage(string text)
-		{
-			if (connectionStatus != ChatConnectionStatus.Joined)
-				return;
-
-			// Guard against a last-moment disconnection
-			try
-			{
-				client.SendMessage(SendType.Message, channel.Name, text);
-				AddMessage(client.Nickname, text);
-			}
-			catch (NotConnectedException) { }
-		}
-
-		public bool TrySetNickname(string nick)
-		{
-			// TODO: This is inconsistent with the other check
-			if (Rfc2812.IsValidNickname(nick))
-			{
-				client.RfcNick(nick);
-				Game.Settings.Chat.Nickname = nick;
-				return true;
-			}
-
-			return false;
-		}
-
-		public void Disconnect()
-		{
-			// Error is an alias for disconnect, but keeps the panel open
-			// so that clients can see the error
-			if (connectionStatus == ChatConnectionStatus.Error)
-			{
-				Game.RunAfterTick(History.Clear);
-				topic = null;
-				connectionStatus = ChatConnectionStatus.Disconnected;
-			}
-			else
-				connectionStatus = ChatConnectionStatus.Disconnecting;
-
-			if (!client.IsConnected)
-				return;
-
-			client.RfcQuit(Game.Settings.Chat.QuitMessage);
-
-			AddNotification("Disconnecting from {0}...".F(client.Address));
-
-			Game.RunAfterTick(() => Game.Settings.Chat.ConnectAutomatically = false);
-		}
-
-		public void Dispose()
-		{
-			// HACK: The IRC library we are using has terrible thread-handling code that relies on Thread.Abort.
-			// There is a thread reading from the network socket which is aborted, however on Windows this is inside
-			// native code so this abort call hangs until the network socket reads something and returns to managed
-			// code where it can then be aborted.
-			//
-			// This means we may hang for several seconds during shutdown (until we receive something over IRC!) before
-			// closing.
-			//
-			// Since our IRC client currently lives forever, the only time we call this Dispose method is during the
-			// shutdown of our process. Therefore, we can work around the problem by just not bothering to disconnect
-			// properly. Since our process is about to die anyway, it's not like anyone will care.
-			////if (client.IsConnected)
-			////	client.Disconnect();
-		}
-	}
-}

OpenRA.Game/Graphics/Animation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using OpenRA.Support;
 
@@ -49,10 +49,10 @@ namespace OpenRA.Graphics
 			this.paused = paused;
 		}
 
-		public int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
+		public int CurrentFrame { get { return backwards ? CurrentSequence.Length - frame - 1 : frame; } }
 		public Sprite Image { get { return CurrentSequence.GetSprite(CurrentFrame, facingFunc()); } }
 
-		public IEnumerable<IRenderable> Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
+		public IRenderable[] Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
 		{
 			var imageRenderable = new SpriteRenderable(Image, pos, offset, CurrentSequence.ZOffset + zOffset, palette, scale, IsDecoration);
 
@@ -66,7 +66,18 @@ namespace OpenRA.Graphics
 			return new IRenderable[] { imageRenderable };
 		}
 
-		public IEnumerable<IRenderable> Render(WPos pos, PaletteReference palette)
+		public Rectangle ScreenBounds(WorldRenderer wr, WPos pos, WVec offset, float scale)
+		{
+			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset);
+			var cb = CurrentSequence.Bounds;
+			return Rectangle.FromLTRB(
+				xy.X + (int)(cb.Left * scale),
+				xy.Y + (int)(cb.Top * scale),
+				xy.X + (int)(cb.Right * scale),
+				xy.Y + (int)(cb.Bottom * scale));
+		}
+
+		public IRenderable[] Render(WPos pos, PaletteReference palette)
 		{
 			return Render(pos, WVec.Zero, 0, palette, 1f);
 		}

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
+using System.Drawing;
 
 namespace OpenRA.Graphics
 {
@@ -35,7 +35,7 @@ namespace OpenRA.Graphics
 			ZOffset = zOffset;
 		}
 
-		public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
+		public IRenderable[] Render(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
 		{
 			var center = self.CenterPosition;
 			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
@@ -44,6 +44,14 @@ namespace OpenRA.Graphics
 			return Animation.Render(center, offset, z, pal, scale);
 		}
 
+		public Rectangle ScreenBounds(Actor self, WorldRenderer wr, float scale)
+		{
+			var center = self.CenterPosition;
+			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
+
+			return Animation.ScreenBounds(wr, center, offset, scale);
+		}
+
 		public static implicit operator AnimationWithOffset(Animation a)
 		{
 			return new AnimationWithOffset(a, null, null, null);

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -38,7 +38,7 @@ namespace OpenRA.Graphics
 			cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();
 
 			var chrome = MiniYaml.Merge(modData.Manifest.Chrome
-				.Select(s => MiniYaml.FromStream(fileSystem.Open(s))));
+				.Select(s => MiniYaml.FromStream(fileSystem.Open(s), s)));
 
 			foreach (var c in chrome)
 				LoadCollection(c.Key, c.Value);

OpenRA.Game/Graphics/CursorProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -12,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
@@ -24,23 +25,20 @@ namespace OpenRA.Graphics
 		{
 			var fileSystem = modData.DefaultFileSystem;
 			var sequenceYaml = MiniYaml.Merge(modData.Manifest.Cursors.Select(
-				s => MiniYaml.FromStream(fileSystem.Open(s))));
-
-			var shadowIndex = new int[] { };
+				s => MiniYaml.FromStream(fileSystem.Open(s), s)));
 
 			var nodesDict = new MiniYaml(null, sequenceYaml).ToDictionary();
-			if (nodesDict.ContainsKey("ShadowIndex"))
-			{
-				Array.Resize(ref shadowIndex, shadowIndex.Length + 1);
-				Exts.TryParseIntegerInvariant(nodesDict["ShadowIndex"].Value,
-					out shadowIndex[shadowIndex.Length - 1]);
-			}
 
-			var palettes = new Dictionary<string, ImmutablePalette>();
-			foreach (var p in nodesDict["Palettes"].Nodes)
-				palettes.Add(p.Key, new ImmutablePalette(fileSystem.Open(p.Value.Value), shadowIndex));
+			// Overwrite previous definitions if there are duplicates
+			var pals = new Dictionary<string, IProvidesCursorPaletteInfo>();
+			foreach (var p in modData.DefaultRules.Actors["world"].TraitInfos<IProvidesCursorPaletteInfo>())
+				if (p.Palette != null)
+					pals[p.Palette] = p;
 
-			Palettes = palettes.AsReadOnly();
+			Palettes = nodesDict["Cursors"].Nodes.Select(n => n.Value.Value)
+				.Distinct()
+				.ToDictionary(p => p, p => pals[p].ReadPalette(modData.DefaultFileSystem))
+				.AsReadOnly();
 
 			var frameCache = new FrameCache(fileSystem, modData.SpriteLoaders);
 			var cursors = new Dictionary<string, CursorSequence>();

OpenRA.Game/Graphics/CursorSequence.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/Graphics/HSLColor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -95,7 +95,8 @@ namespace OpenRA.Graphics
 
 		public static bool operator ==(HSLColor me, HSLColor other)
 		{
-			return me.H == other.H && me.S == other.S && me.L == other.L;
+			// Binary floating point numbers (float, double) calculations can yield the same RGB color created by different functions with little different HSL representation
+			return (me.H == other.H && me.S == other.S && me.L == other.L) || me.RGB == other.RGB;
 		}
 
 		public static bool operator !=(HSLColor me, HSLColor other) { return !(me == other); }

OpenRA.Game/Graphics/HardwareCursor.cs

@@ -1,11 +1,12 @@
 #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.
-*/
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
 #endregion
 
 using System;
@@ -79,7 +80,7 @@ namespace OpenRA.Graphics
 				}
 			}
 
-			return Game.Renderer.Device.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot);
+			return Game.Renderer.Window.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot);
 		}
 
 		public void SetCursor(string cursorName)
@@ -112,13 +113,13 @@ namespace OpenRA.Graphics
 		void Update()
 		{
 			if (cursor == null)
-				Game.Renderer.Device.SetHardwareCursor(null);
+				Game.Renderer.Window.SetHardwareCursor(null);
 			else
 			{
 				if (frame >= cursor.Length)
 					frame = frame % cursor.Length;
 
-				Game.Renderer.Device.SetHardwareCursor(hardwareCursors[cursor.Name][frame]);
+				Game.Renderer.Window.SetHardwareCursor(hardwareCursors[cursor.Name][frame]);
 			}
 		}
 

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -27,7 +27,7 @@ namespace OpenRA.Graphics
 
 		public HardwarePalette()
 		{
-			Texture = Game.Renderer.Device.CreateTexture();
+			Texture = Game.Renderer.Context.CreateTexture();
 			readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly();
 		}
 

OpenRA.Game/Graphics/MappedImage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -29,7 +29,7 @@ namespace OpenRA.Graphics
 
 		public Sprite GetImage(Sheet s)
 		{
-			return new Sprite(s, rect, TextureChannel.Alpha);
+			return new Sprite(s, rect, TextureChannel.RGBA);
 		}
 
 		public MiniYaml Save(string defaultSrc)

OpenRA.Game/Graphics/Model.cs

@@ -0,0 +1,87 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using OpenRA.FileSystem;
+
+namespace OpenRA.Graphics
+{
+	public interface IModel
+	{
+		uint Frames { get; }
+		uint Sections { get; }
+
+		float[] TransformationMatrix(uint section, uint frame);
+		float[] Size { get; }
+		float[] Bounds(uint frame);
+		ModelRenderData RenderData(uint section);
+
+		/// <summary>Returns the smallest rectangle that covers all rotations of all frames in a model</summary>
+		Rectangle AggregateBounds { get; }
+	}
+
+	public struct ModelRenderData
+	{
+		public readonly int Start;
+		public readonly int Count;
+		public readonly Sheet Sheet;
+
+		public ModelRenderData(int start, int count, Sheet sheet)
+		{
+			Start = start;
+			Count = count;
+			Sheet = sheet;
+		}
+	}
+
+	public interface IModelCache : IDisposable
+	{
+		IModel GetModelSequence(string model, string sequence);
+		bool HasModelSequence(string model, string sequence);
+		IVertexBuffer<Vertex> VertexBuffer { get; }
+	}
+
+	public interface IModelSequenceLoader
+	{
+		Action<string> OnMissingModelError { get; set; }
+		IModelCache CacheModels(IReadOnlyFileSystem fileSystem, ModData modData, IReadOnlyDictionary<string, MiniYamlNode> modelDefinitions);
+	}
+
+	public class PlaceholderModelSequenceLoader : IModelSequenceLoader
+	{
+		public Action<string> OnMissingModelError { get; set; }
+
+		class PlaceholderModelCache : IModelCache
+		{
+			public IVertexBuffer<Vertex> VertexBuffer { get { throw new NotImplementedException(); } }
+
+			public void Dispose() { }
+
+			public IModel GetModelSequence(string model, string sequence)
+			{
+				throw new NotImplementedException();
+			}
+
+			public bool HasModelSequence(string model, string sequence)
+			{
+				throw new NotImplementedException();
+			}
+		}
+
+		public PlaceholderModelSequenceLoader(ModData modData) { }
+
+		public IModelCache CacheModels(IReadOnlyFileSystem fileSystem, ModData modData, IReadOnlyDictionary<string, MiniYamlNode> modelDefinitions)
+		{
+			return new PlaceholderModelCache();
+		}
+	}
+}

OpenRA.Game/Graphics/ModelAnimation.cs

@@ -0,0 +1,58 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace OpenRA.Graphics
+{
+	public struct ModelAnimation
+	{
+		public readonly IModel Model;
+		public readonly Func<WVec> OffsetFunc;
+		public readonly Func<IEnumerable<WRot>> RotationFunc;
+		public readonly Func<bool> DisableFunc;
+		public readonly Func<uint> FrameFunc;
+		public readonly bool ShowShadow;
+
+		public ModelAnimation(IModel model, Func<WVec> offset, Func<IEnumerable<WRot>> rotation, Func<bool> disable, Func<uint> frame, bool showshadow)
+		{
+			Model = model;
+			OffsetFunc = offset;
+			RotationFunc = rotation;
+			DisableFunc = disable;
+			FrameFunc = frame;
+			ShowShadow = showshadow;
+		}
+
+		public Rectangle ScreenBounds(WPos pos, WorldRenderer wr, float scale)
+		{
+			var r = Model.AggregateBounds;
+			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
+			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset);
+
+			return Rectangle.FromLTRB(
+				xy.X + (int)(r.Left * scale),
+				xy.Y + (int)(r.Top * scale),
+				xy.X + (int)(r.Right * scale),
+				xy.Y + (int)(r.Bottom * scale));
+		}
+
+		public bool IsVisible
+		{
+			get
+			{
+				return DisableFunc == null || !DisableFunc();
+			}
+		}
+	}
+}

OpenRA.Game/Graphics/ModelRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -17,14 +17,14 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	public class VoxelRenderProxy
+	public class ModelRenderProxy
 	{
 		public readonly Sprite Sprite;
 		public readonly Sprite ShadowSprite;
 		public readonly float ShadowDirection;
-		public readonly float2[] ProjectedShadowBounds;
+		public readonly float3[] ProjectedShadowBounds;
 
-		public VoxelRenderProxy(Sprite sprite, Sprite shadowSprite, float2[] projectedShadowBounds, float shadowDirection)
+		public ModelRenderProxy(Sprite sprite, Sprite shadowSprite, float3[] projectedShadowBounds, float shadowDirection)
 		{
 			Sprite = sprite;
 			ShadowSprite = shadowSprite;
@@ -33,7 +33,7 @@ namespace OpenRA.Graphics
 		}
 	}
 
-	public sealed class VoxelRenderer : IDisposable
+	public sealed class ModelRenderer : IDisposable
 	{
 		// Static constants
 		static readonly float[] ShadowDiffuse = new float[] { 0, 0, 0 };
@@ -51,9 +51,10 @@ namespace OpenRA.Graphics
 		readonly Stack<KeyValuePair<Sheet, IFrameBuffer>> unmappedBuffers = new Stack<KeyValuePair<Sheet, IFrameBuffer>>();
 		readonly List<Pair<Sheet, Action>> doRender = new List<Pair<Sheet, Action>>();
 
-		SheetBuilder sheetBuilder;
+		SheetBuilder sheetBuilderForFrame;
+		bool isInFrame;
 
-		public VoxelRenderer(Renderer renderer, IShader shader)
+		public ModelRenderer(Renderer renderer, IShader shader)
 		{
 			this.renderer = renderer;
 			this.shader = shader;
@@ -78,11 +79,14 @@ namespace OpenRA.Graphics
 			shader.SetMatrix("View", view);
 		}
 
-		public VoxelRenderProxy RenderAsync(
-			WorldRenderer wr, IEnumerable<VoxelAnimation> voxels, WRot camera, float scale,
+		public ModelRenderProxy RenderAsync(
+			WorldRenderer wr, IEnumerable<ModelAnimation> models, WRot camera, float scale,
 			float[] groundNormal, WRot lightSource, float[] lightAmbientColor, float[] lightDiffuseColor,
 			PaletteReference color, PaletteReference normals, PaletteReference shadowPalette)
 		{
+			if (!isInFrame)
+				throw new InvalidOperationException("BeginFrame has not been called. You cannot render until a frame has been started.");
+
 			// Correct for inverted y-axis
 			var scaleTransform = Util.ScaleMatrix(scale, scale, scale);
 
@@ -94,6 +98,8 @@ namespace OpenRA.Graphics
 			var invShadowTransform = Util.MatrixInverse(shadowTransform);
 			var cameraTransform = Util.MakeFloatMatrix(camera.AsMatrix());
 			var invCameraTransform = Util.MatrixInverse(cameraTransform);
+			if (invCameraTransform == null)
+				throw new InvalidOperationException("Failed to invert the cameraTransform matrix during RenderAsync.");
 
 			// Sprite rectangle
 			var tl = new float2(float.MaxValue, float.MaxValue);
@@ -103,18 +109,18 @@ namespace OpenRA.Graphics
 			var stl = new float2(float.MaxValue, float.MaxValue);
 			var sbr = new float2(float.MinValue, float.MinValue);
 
-			foreach (var v in voxels)
+			foreach (var m in models)
 			{
 				// Convert screen offset back to world coords
-				var offsetVec = Util.MatrixVectorMultiply(invCameraTransform, wr.ScreenVector(v.OffsetFunc()));
+				var offsetVec = Util.MatrixVectorMultiply(invCameraTransform, wr.ScreenVector(m.OffsetFunc()));
 				var offsetTransform = Util.TranslationMatrix(offsetVec[0], offsetVec[1], offsetVec[2]);
 
-				var worldTransform = v.RotationFunc().Aggregate(Util.IdentityMatrix(),
+				var worldTransform = m.RotationFunc().Aggregate(Util.IdentityMatrix(),
 					(x, y) => Util.MatrixMultiply(Util.MakeFloatMatrix(y.AsMatrix()), x));
 				worldTransform = Util.MatrixMultiply(scaleTransform, worldTransform);
 				worldTransform = Util.MatrixMultiply(offsetTransform, worldTransform);
 
-				var bounds = v.Voxel.Bounds(v.FrameFunc());
+				var bounds = m.Model.Bounds(m.FrameFunc());
 				var worldBounds = Util.MatrixAABBMultiply(worldTransform, bounds);
 				var screenBounds = Util.MatrixAABBMultiply(cameraTransform, worldBounds);
 				var shadowBounds = Util.MatrixAABBMultiply(shadowTransform, worldBounds);
@@ -143,7 +149,7 @@ namespace OpenRA.Graphics
 
 			var shadowScreenTransform = Util.MatrixMultiply(cameraTransform, invShadowTransform);
 			var shadowGroundNormal = Util.MatrixVectorMultiply(shadowTransform, groundNormal);
-			var screenCorners = new float2[4];
+			var screenCorners = new float3[4];
 			for (var j = 0; j < 4; j++)
 			{
 				// Project to ground plane
@@ -152,7 +158,7 @@ namespace OpenRA.Graphics
 
 				// Rotate to camera-space
 				corners[j] = Util.MatrixVectorMultiply(shadowScreenTransform, corners[j]);
-				screenCorners[j] = new float2(corners[j][0], corners[j][1]);
+				screenCorners[j] = new float3(corners[j][0], corners[j][1], 0);
 			}
 
 			// Shadows are rendered at twice the resolution to reduce artifacts
@@ -161,8 +167,11 @@ namespace OpenRA.Graphics
 			CalculateSpriteGeometry(tl, br, 1, out spriteSize, out spriteOffset);
 			CalculateSpriteGeometry(stl, sbr, 2, out shadowSpriteSize, out shadowSpriteOffset);
 
-			var sprite = sheetBuilder.Allocate(spriteSize, spriteOffset);
-			var shadowSprite = sheetBuilder.Allocate(shadowSpriteSize, shadowSpriteOffset);
+			if (sheetBuilderForFrame == null)
+				sheetBuilderForFrame = new SheetBuilder(SheetType.BGRA, AllocateSheet);
+
+			var sprite = sheetBuilderForFrame.Allocate(spriteSize, 0, spriteOffset);
+			var shadowSprite = sheetBuilderForFrame.Allocate(shadowSpriteSize, 0, shadowSpriteOffset);
 			var sb = sprite.Bounds;
 			var ssb = shadowSprite.Bounds;
 			var spriteCenter = new float2(sb.Left + sb.Width / 2, sb.Top + sb.Height / 2);
@@ -175,13 +184,13 @@ namespace OpenRA.Graphics
 
 			doRender.Add(Pair.New<Sheet, Action>(sprite.Sheet, () =>
 			{
-				foreach (var v in voxels)
+				foreach (var m in models)
 				{
 					// Convert screen offset to world offset
-					var offsetVec = Util.MatrixVectorMultiply(invCameraTransform, wr.ScreenVector(v.OffsetFunc()));
+					var offsetVec = Util.MatrixVectorMultiply(invCameraTransform, wr.ScreenVector(m.OffsetFunc()));
 					var offsetTransform = Util.TranslationMatrix(offsetVec[0], offsetVec[1], offsetVec[2]);
 
-					var rotations = v.RotationFunc().Aggregate(Util.IdentityMatrix(),
+					var rotations = m.RotationFunc().Aggregate(Util.IdentityMatrix(),
 						(x, y) => Util.MatrixMultiply(Util.MakeFloatMatrix(y.AsMatrix()), x));
 					var worldTransform = Util.MatrixMultiply(scaleTransform, rotations);
 					worldTransform = Util.MatrixMultiply(offsetTransform, worldTransform);
@@ -194,28 +203,32 @@ namespace OpenRA.Graphics
 
 					var lightTransform = Util.MatrixMultiply(Util.MatrixInverse(rotations), invShadowTransform);
 
-					var frame = v.FrameFunc();
-					for (uint i = 0; i < v.Voxel.Limbs; i++)
+					var frame = m.FrameFunc();
+					for (uint i = 0; i < m.Model.Sections; i++)
 					{
-						var rd = v.Voxel.RenderData(i);
-						var t = v.Voxel.TransformationMatrix(i, frame);
+						var rd = m.Model.RenderData(i);
+						var t = m.Model.TransformationMatrix(i, frame);
+						var it = Util.MatrixInverse(t);
+						if (it == null)
+							throw new InvalidOperationException("Failed to invert the transformed matrix of frame {0} during RenderAsync.".F(i));
 
 						// Transform light vector from shadow -> world -> limb coords
-						var lightDirection = ExtractRotationVector(Util.MatrixMultiply(Util.MatrixInverse(t), lightTransform));
+						var lightDirection = ExtractRotationVector(Util.MatrixMultiply(it, lightTransform));
 
-						Render(rd, Util.MatrixMultiply(transform, t), lightDirection,
+						Render(rd, wr.World.ModelCache, Util.MatrixMultiply(transform, t), lightDirection,
 							lightAmbientColor, lightDiffuseColor, color.TextureMidIndex, normals.TextureMidIndex);
 
 						// Disable shadow normals by forcing zero diffuse and identity ambient light
-						Render(rd, Util.MatrixMultiply(shadow, t), lightDirection,
-							ShadowAmbient, ShadowDiffuse, shadowPalette.TextureMidIndex, normals.TextureMidIndex);
+						if (m.ShowShadow)
+							Render(rd, wr.World.ModelCache, Util.MatrixMultiply(shadow, t), lightDirection,
+								ShadowAmbient, ShadowDiffuse, shadowPalette.TextureMidIndex, normals.TextureMidIndex);
 					}
 				}
 			}));
 
 			var screenLightVector = Util.MatrixVectorMultiply(invShadowTransform, ZVector);
 			screenLightVector = Util.MatrixVectorMultiply(cameraTransform, screenLightVector);
-			return new VoxelRenderProxy(sprite, shadowSprite, screenCorners, -screenLightVector[2] / screenLightVector[1]);
+			return new ModelRenderProxy(sprite, shadowSprite, screenCorners, -screenLightVector[2] / screenLightVector[1]);
 		}
 
 		static void CalculateSpriteGeometry(float2 tl, float2 br, float scale, out Size size, out int2 offset)
@@ -252,7 +265,8 @@ namespace OpenRA.Graphics
 		}
 
 		void Render(
-			VoxelRenderData renderData,
+			ModelRenderData renderData,
+			IModelCache cache,
 			float[] t, float[] lightDirection,
 			float[] ambientLight, float[] diffuseLight,
 			float colorPaletteTextureMidIndex, float normalsPaletteTextureMidIndex)
@@ -264,17 +278,20 @@ namespace OpenRA.Graphics
 			shader.SetVec("AmbientLight", ambientLight, 3);
 			shader.SetVec("DiffuseLight", diffuseLight, 3);
 
-			shader.Render(() => renderer.DrawBatch(Game.ModData.VoxelLoader.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList));
+			shader.PrepareRender();
+			renderer.DrawBatch(cache.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList);
 		}
 
 		public void BeginFrame()
 		{
+			if (isInFrame)
+				throw new InvalidOperationException("BeginFrame has already been called. A new frame cannot be started until EndFrame has been called.");
+
+			isInFrame = true;
+
 			foreach (var kv in mappedBuffers)
 				unmappedBuffers.Push(kv);
 			mappedBuffers.Clear();
-
-			sheetBuilder = new SheetBuilder(SheetType.BGRA, AllocateSheet);
-			doRender.Clear();
 		}
 
 		IFrameBuffer EnableFrameBuffer(Sheet s)
@@ -283,19 +300,25 @@ namespace OpenRA.Graphics
 			Game.Renderer.Flush();
 			fbo.Bind();
 
-			Game.Renderer.Device.EnableDepthBuffer();
+			Game.Renderer.Context.EnableDepthBuffer();
 			return fbo;
 		}
 
 		void DisableFrameBuffer(IFrameBuffer fbo)
 		{
 			Game.Renderer.Flush();
-			Game.Renderer.Device.DisableDepthBuffer();
+			Game.Renderer.Context.DisableDepthBuffer();
 			fbo.Unbind();
 		}
 
 		public void EndFrame()
 		{
+			if (!isInFrame)
+				throw new InvalidOperationException("BeginFrame has not been called. There is no frame to end.");
+
+			isInFrame = false;
+			sheetBuilderForFrame = null;
+
 			if (doRender.Count == 0)
 				return;
 
@@ -318,6 +341,8 @@ namespace OpenRA.Graphics
 
 			if (fbo != null)
 				DisableFrameBuffer(fbo);
+
+			doRender.Clear();
 		}
 
 		public Sheet AllocateSheet()
@@ -331,8 +356,8 @@ namespace OpenRA.Graphics
 			}
 
 			var size = new Size(renderer.SheetSize, renderer.SheetSize);
-			var framebuffer = renderer.Device.CreateFrameBuffer(size);
-			var sheet = new Sheet(SheetType.DualIndexed, framebuffer.Texture);
+			var framebuffer = renderer.Context.CreateFrameBuffer(size);
+			var sheet = new Sheet(SheetType.BGRA, framebuffer.Texture);
 			mappedBuffers.Add(sheet, framebuffer);
 
 			return sheet;

OpenRA.Game/Graphics/Palette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -45,11 +45,6 @@ namespace OpenRA.Graphics
 			for (var i = 0; i < Size; i++)
 				pal.Entries[i] = palette.GetColor(i);
 
-			// hack around a mono bug -- the palette flags get set wrong.
-			if (Platform.CurrentPlatform != PlatformType.Windows)
-				typeof(ColorPalette).GetField("flags",
-					BindingFlags.Instance | BindingFlags.NonPublic).SetValue(pal, 1);
-
 			return pal;
 		}
 
@@ -117,6 +112,12 @@ namespace OpenRA.Graphics
 					var r = (byte)(reader.ReadByte() << 2);
 					var g = (byte)(reader.ReadByte() << 2);
 					var b = (byte)(reader.ReadByte() << 2);
+
+					// Replicate high bits into the (currently zero) low bits.
+					r |= (byte)(r >> 6);
+					g |= (byte)(g >> 6);
+					b |= (byte)(b >> 6);
+
 					colors[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 				}
 

OpenRA.Game/Graphics/PaletteReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/Graphics/PlatformInterfaces.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -15,23 +15,10 @@ using OpenRA.Graphics;
 
 namespace OpenRA
 {
-	[AttributeUsage(AttributeTargets.Assembly)]
-	public sealed class PlatformAttribute : Attribute
+	public interface IPlatform
 	{
-		public readonly Type Type;
-
-		public PlatformAttribute(Type graphicsDeviceType)
-		{
-			if (!typeof(IDeviceFactory).IsAssignableFrom(graphicsDeviceType))
-				throw new InvalidOperationException("Incorrect type in RendererAttribute");
-			Type = graphicsDeviceType;
-		}
-	}
-
-	public interface IDeviceFactory
-	{
-		IGraphicsDevice CreateGraphics(Size size, WindowMode windowMode);
-		ISoundEngine CreateSound();
+		IPlatformWindow CreateWindow(Size size, WindowMode windowMode, int batchSize);
+		ISoundEngine CreateSound(string device);
 	}
 
 	public interface IHardwareCursor : IDisposable { }
@@ -47,38 +34,42 @@ namespace OpenRA
 		DoubleMultiplicative
 	}
 
-	public interface IGraphicsDevice : IDisposable
+	public interface IPlatformWindow : IDisposable
 	{
-		IVertexBuffer<Vertex> CreateVertexBuffer(int length);
-		ITexture CreateTexture(Bitmap bitmap);
-		ITexture CreateTexture();
-		IFrameBuffer CreateFrameBuffer(Size s);
-		IShader CreateShader(string name);
+		IGraphicsContext Context { get; }
 
 		Size WindowSize { get; }
+		float WindowScale { get; }
+		event Action<float, float> OnWindowScaleChanged;
 
-		void Clear();
-		void Present();
-		Bitmap TakeScreenshot();
 		void PumpInput(IInputHandler inputHandler);
 		string GetClipboardText();
 		bool SetClipboardText(string text);
-		void DrawPrimitives(PrimitiveType type, int firstVertex, int numVertices);
-
-		void EnableScissor(int left, int top, int width, int height);
-		void DisableScissor();
-
-		void EnableDepthBuffer();
-		void DisableDepthBuffer();
-
-		void SetBlendMode(BlendMode mode);
 
 		void GrabWindowMouseFocus();
 		void ReleaseWindowMouseFocus();
 
 		IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot);
 		void SetHardwareCursor(IHardwareCursor cursor);
+	}
 
+	public interface IGraphicsContext : IDisposable
+	{
+		IVertexBuffer<Vertex> CreateVertexBuffer(int size);
+		ITexture CreateTexture();
+		ITexture CreateTexture(Bitmap bitmap);
+		IFrameBuffer CreateFrameBuffer(Size s);
+		IShader CreateShader(string name);
+		void EnableScissor(int left, int top, int width, int height);
+		void DisableScissor();
+		Bitmap TakeScreenshot();
+		void Present();
+		void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices);
+		void Clear();
+		void EnableDepthBuffer();
+		void DisableDepthBuffer();
+		void ClearDepthBuffer();
+		void SetBlendMode(BlendMode mode);
 		string GLVersion { get; }
 	}
 
@@ -95,10 +86,11 @@ namespace OpenRA
 		void SetBool(string name, bool value);
 		void SetVec(string name, float x);
 		void SetVec(string name, float x, float y);
+		void SetVec(string name, float x, float y, float z);
 		void SetVec(string name, float[] vec, int length);
 		void SetTexture(string param, ITexture texture);
 		void SetMatrix(string param, float[] mtx);
-		void Render(Action a);
+		void PrepareRender();
 	}
 
 	public enum TextureScaleFilter { Nearest, Linear }

OpenRA.Game/Graphics/PlayerColorRemap.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/Graphics/Renderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/Graphics/RgbaColorRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -16,46 +16,22 @@ using System.Linq;
 
 namespace OpenRA.Graphics
 {
-	public class RgbaColorRenderer : Renderer.IBatchRenderer
+	public class RgbaColorRenderer
 	{
-		static readonly float2 Offset = new float2(0.5f, 0.5f);
+		static readonly float3 Offset = new float3(0.5f, 0.5f, 0f);
 
-		readonly Renderer renderer;
-		readonly IShader shader;
-		readonly Action renderAction;
+		readonly SpriteRenderer parent;
+		readonly Vertex[] vertices = new Vertex[6];
 
-		readonly Vertex[] vertices;
-		int nv = 0;
-
-		public RgbaColorRenderer(Renderer renderer, IShader shader)
+		public RgbaColorRenderer(SpriteRenderer parent)
 		{
-			this.renderer = renderer;
-			this.shader = shader;
-			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
+			this.parent = parent;
 		}
 
-		public void Flush()
+		public void DrawLine(float3 start, float3 end, float width, Color startColor, Color endColor)
 		{
-			if (nv > 0)
-			{
-				renderer.Device.SetBlendMode(BlendMode.Alpha);
-				shader.Render(renderAction);
-				renderer.Device.SetBlendMode(BlendMode.None);
-
-				nv = 0;
-			}
-		}
-
-		public void DrawLine(float2 start, float2 end, float width, Color startColor, Color endColor)
-		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
-			var delta = (end - start) / (end - start).Length;
-			var corner = width / 2 * new float2(-delta.Y, delta.X);
+			var delta = (end - start) / (end - start).XY.Length;
+			var corner = width / 2 * new float3(-delta.Y, delta.X, delta.Z);
 
 			startColor = Util.PremultiplyAlpha(startColor);
 			var sr = startColor.R / 255.0f;
@@ -69,22 +45,19 @@ namespace OpenRA.Graphics
 			var eb = endColor.B / 255.0f;
 			var ea = endColor.A / 255.0f;
 
-			vertices[nv++] = new Vertex(start - corner + Offset, sr, sg, sb, sa);
-			vertices[nv++] = new Vertex(start + corner + Offset, sr, sg, sb, sa);
-			vertices[nv++] = new Vertex(end + corner + Offset, er, eg, eb, ea);
-			vertices[nv++] = new Vertex(end + corner + Offset, er, eg, eb, ea);
-			vertices[nv++] = new Vertex(end - corner + Offset, er, eg, eb, ea);
-			vertices[nv++] = new Vertex(start - corner + Offset, sr, sg, sb, sa);
+			vertices[0] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[1] = new Vertex(start + corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[2] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[3] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[4] = new Vertex(end - corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[5] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+
+			parent.DrawRGBAVertices(vertices);
 		}
 
-		public void DrawLine(float2 start, float2 end, float width, Color color)
+		public void DrawLine(float3 start, float3 end, float width, Color color)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
-			var delta = (end - start) / (end - start).Length;
+			var delta = (end - start) / (end - start).XY.Length;
 			var corner = width / 2 * new float2(-delta.Y, delta.X);
 
 			color = Util.PremultiplyAlpha(color);
@@ -93,29 +66,31 @@ namespace OpenRA.Graphics
 			var b = color.B / 255.0f;
 			var a = color.A / 255.0f;
 
-			vertices[nv++] = new Vertex(start - corner + Offset, r, g, b, a);
-			vertices[nv++] = new Vertex(start + corner + Offset, r, g, b, a);
-			vertices[nv++] = new Vertex(end + corner + Offset, r, g, b, a);
-			vertices[nv++] = new Vertex(end + corner + Offset, r, g, b, a);
-			vertices[nv++] = new Vertex(end - corner + Offset, r, g, b, a);
-			vertices[nv++] = new Vertex(start - corner + Offset, r, g, b, a);
+			vertices[0] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			vertices[1] = new Vertex(start + corner + Offset, r, g, b, a, 0, 0);
+			vertices[2] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
+			vertices[3] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
+			vertices[4] = new Vertex(end - corner + Offset, r, g, b, a, 0, 0);
+			vertices[5] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			parent.DrawRGBAVertices(vertices);
 		}
 
 		/// <summary>
-		/// Calculate the intersection of two lines.
-		/// Will behave badly if the lines are parallel
+		/// Calculate the 2D intersection of two lines.
+		/// Will behave badly if the lines are parallel.
+		/// Z position is the average of a and b (ignores actual intersection point if it exists)
 		/// </summary>
-		float2 IntersectionOf(float2 a, float2 da, float2 b, float2 db)
+		float3 IntersectionOf(float3 a, float3 da, float3 b, float3 db)
 		{
 			var crossA = a.X * (a.Y + da.Y) - a.Y * (a.X + da.X);
 			var crossB = b.X * (b.Y + db.Y) - b.Y * (b.X + db.X);
 			var x = da.X * crossB - db.X * crossA;
 			var y = da.Y * crossB - db.Y * crossA;
 			var d = da.X * db.Y - da.Y * db.X;
-			return new float2(x, y) / d;
+			return new float3(x / d, y / d, 0.5f * (a.Z + b.Z));
 		}
 
-		void DrawDisconnectedLine(IEnumerable<float2> points, float width, Color color)
+		void DrawDisconnectedLine(IEnumerable<float3> points, float width, Color color)
 		{
 			using (var e = points.GetEnumerator())
 			{
@@ -132,7 +107,7 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		void DrawConnectedLine(float2[] points, float width, Color color, bool closed)
+		void DrawConnectedLine(float3[] points, float width, Color color, bool closed)
 		{
 			// Not a line
 			if (points.Length < 2)
@@ -145,7 +120,6 @@ namespace OpenRA.Graphics
 				return;
 			}
 
-			renderer.CurrentBatchRenderer = this;
 			color = Util.PremultiplyAlpha(color);
 			var r = color.R / 255.0f;
 			var g = color.G / 255.0f;
@@ -154,8 +128,8 @@ namespace OpenRA.Graphics
 
 			var start = points[0];
 			var end = points[1];
-			var dir = (end - start) / (end - start).Length;
-			var corner = width / 2 * new float2(-dir.Y, dir.X);
+			var dir = (end - start) / (end - start).XY.Length;
+			var corner = width / 2 * new float3(-dir.Y, dir.X, dir.Z);
 
 			// Corners for start of line segment
 			var ca = start - corner;
@@ -165,8 +139,8 @@ namespace OpenRA.Graphics
 			if (closed)
 			{
 				var prev = points[points.Length - 1];
-				var prevDir = (start - prev) / (start - prev).Length;
-				var prevCorner = width / 2 * new float2(-prevDir.Y, prevDir.X);
+				var prevDir = (start - prev) / (start - prev).XY.Length;
+				var prevCorner = width / 2 * new float3(-prevDir.Y, prevDir.X, prevDir.Z);
 				ca = IntersectionOf(start - prevCorner, prevDir, start - corner, dir);
 				cb = IntersectionOf(start + prevCorner, prevDir, start + corner, dir);
 			}
@@ -175,23 +149,21 @@ namespace OpenRA.Graphics
 			for (var i = 0; i < limit; i++)
 			{
 				var next = points[(i + 2) % points.Length];
-				var nextDir = (next - end) / (next - end).Length;
-				var nextCorner = width / 2 * new float2(-nextDir.Y, nextDir.X);
+				var nextDir = (next - end) / (next - end).XY.Length;
+				var nextCorner = width / 2 * new float3(-nextDir.Y, nextDir.X, nextDir.Z);
 
 				// Vertices for the corners joining start-end to end-next
 				var cc = closed || i < limit ? IntersectionOf(end + corner, dir, end + nextCorner, nextDir) : end + corner;
 				var cd = closed || i < limit ? IntersectionOf(end - corner, dir, end - nextCorner, nextDir) : end - corner;
 
 				// Fill segment
-				if (nv + 6 > renderer.TempBufferSize)
-					Flush();
-
-				vertices[nv++] = new Vertex(ca + Offset, r, g, b, a);
-				vertices[nv++] = new Vertex(cb + Offset, r, g, b, a);
-				vertices[nv++] = new Vertex(cc + Offset, r, g, b, a);
-				vertices[nv++] = new Vertex(cc + Offset, r, g, b, a);
-				vertices[nv++] = new Vertex(cd + Offset, r, g, b, a);
-				vertices[nv++] = new Vertex(ca + Offset, r, g, b, a);
+				vertices[0] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				vertices[1] = new Vertex(cb + Offset, r, g, b, a, 0, 0);
+				vertices[2] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
+				vertices[3] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
+				vertices[4] = new Vertex(cd + Offset, r, g, b, a, 0, 0);
+				vertices[5] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				parent.DrawRGBAVertices(vertices);
 
 				// Advance line segment
 				end = next;
@@ -203,73 +175,82 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public void DrawLine(IEnumerable<float2> points, float width, Color color, bool connectSegments = false)
+		public void DrawLine(IEnumerable<float3> points, float width, Color color, bool connectSegments = false)
 		{
 			if (!connectSegments)
 				DrawDisconnectedLine(points, width, color);
 			else
-				DrawConnectedLine(points as float2[] ?? points.ToArray(), width, color, false);
+				DrawConnectedLine(points as float3[] ?? points.ToArray(), width, color, false);
 		}
 
-		public void DrawPolygon(float2[] vertices, float width, Color color)
+		public void DrawPolygon(float3[] vertices, float width, Color color)
 		{
 			DrawConnectedLine(vertices, width, color, true);
 		}
 
-		public void DrawRect(float2 tl, float2 br, float width, Color color)
+		public void DrawPolygon(float2[] vertices, float width, Color color)
 		{
-			var tr = new float2(br.X, tl.Y);
-			var bl = new float2(tl.X, br.Y);
+			DrawConnectedLine(vertices.Select(v => new float3(v, 0)).ToArray(), width, color, true);
+		}
+
+		public void DrawRect(float3 tl, float3 br, float width, Color color)
+		{
+			var tr = new float3(br.X, tl.Y, tl.Z);
+			var bl = new float3(tl.X, br.Y, br.Z);
 			DrawPolygon(new[] { tl, tr, br, bl }, width, color);
 		}
 
-		public void FillRect(float2 tl, float2 br, Color color)
+		public void FillTriangle(float3 a, float3 b, float3 c, Color color)
 		{
-			var tr = new float2(br.X, tl.Y);
-			var bl = new float2(tl.X, br.Y);
-			FillRect(tl, tr, br, bl, color);
-		}
-
-		public void FillRect(float2 a, float2 b, float2 c, float2 d, Color color)
-		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
 			color = Util.PremultiplyAlpha(color);
 			var cr = color.R / 255.0f;
 			var cg = color.G / 255.0f;
 			var cb = color.B / 255.0f;
 			var ca = color.A / 255.0f;
 
-			vertices[nv++] = new Vertex(a + Offset, cr, cg, cb, ca);
-			vertices[nv++] = new Vertex(b + Offset, cr, cg, cb, ca);
-			vertices[nv++] = new Vertex(c + Offset, cr, cg, cb, ca);
-			vertices[nv++] = new Vertex(c + Offset, cr, cg, cb, ca);
-			vertices[nv++] = new Vertex(d + Offset, cr, cg, cb, ca);
-			vertices[nv++] = new Vertex(a + Offset, cr, cg, cb, ca);
+			vertices[0] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[1] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[2] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			parent.DrawRGBAVertices(vertices);
 		}
 
-		public void FillEllipse(RectangleF r, Color color, int vertices = 32)
+		public void FillRect(float3 tl, float3 br, Color color)
+		{
+			var tr = new float3(br.X, tl.Y, tl.Z);
+			var bl = new float3(tl.X, br.Y, br.Z);
+			FillRect(tl, tr, br, bl, color);
+		}
+
+		public void FillRect(float3 a, float3 b, float3 c, float3 d, Color color)
+		{
+			color = Util.PremultiplyAlpha(color);
+			var cr = color.R / 255.0f;
+			var cg = color.G / 255.0f;
+			var cb = color.B / 255.0f;
+			var ca = color.A / 255.0f;
+
+			vertices[0] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[1] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[2] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[3] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[4] = new Vertex(d + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[5] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			parent.DrawRGBAVertices(vertices);
+		}
+
+		public void FillEllipse(float3 tl, float3 br, Color color, int vertices = 32)
 		{
 			// TODO: Create an ellipse polygon instead
-			var a = (r.Right - r.Left) / 2;
-			var b = (r.Bottom - r.Top) / 2;
-			var xc = (r.Right + r.Left) / 2;
-			var yc = (r.Bottom + r.Top) / 2;
-			for (var y = r.Top; y <= r.Bottom; y++)
+			var a = (br.X - tl.X) / 2;
+			var b = (br.Y - tl.Y) / 2;
+			var xc = (br.X + tl.X) / 2;
+			var yc = (br.Y + tl.Y) / 2;
+			for (var y = tl.Y; y <= br.Y; y++)
 			{
+				var z = float2.Lerp(tl.Z, br.Z, (y - tl.Y) / (br.Y - tl.Y));
 				var dx = a * (float)Math.Sqrt(1 - (y - yc) * (y - yc) / b / b);
-				DrawLine(new float2(xc - dx, y), new float2(xc + dx, y), 1, color);
+				DrawLine(new float3(xc - dx, y, z), new float3(xc + dx, y, z), 1, color);
 			}
 		}
-
-		public void SetViewportParams(Size screen, float zoom, int2 scroll)
-		{
-			shader.SetVec("Scroll", scroll.X, scroll.Y);
-			shader.SetVec("r1", zoom * 2f / screen.Width, -zoom * 2f / screen.Height);
-			shader.SetVec("r2", -1, 1);
-		}
 	}
 }

OpenRA.Game/Graphics/RgbaSpriteRenderer.cs

@@ -0,0 +1,49 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA.Graphics
+{
+	public class RgbaSpriteRenderer
+	{
+		readonly SpriteRenderer parent;
+
+		public RgbaSpriteRenderer(SpriteRenderer parent)
+		{
+			this.parent = parent;
+		}
+
+		public void DrawSprite(Sprite s, float3 location, float3 size)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, location, 0, size);
+		}
+
+		public void DrawSprite(Sprite s, float3 location)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, location, 0, s.Size);
+		}
+
+		public void DrawSprite(Sprite s, float3 a, float3 b, float3 c, float3 d)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, a, b, c, d);
+		}
+	}
+}

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -11,7 +11,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Drawing;
 using OpenRA.FileSystem;
 
 namespace OpenRA.Graphics
@@ -31,6 +31,7 @@ namespace OpenRA.Graphics
 		int ShadowStart { get; }
 		int ShadowZOffset { get; }
 		int[] Frames { get; }
+		Rectangle Bounds { get; }
 
 		Sprite GetSprite(int frame);
 		Sprite GetSprite(int frame, int facing);

OpenRA.Game/Graphics/Sheet.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -66,7 +66,7 @@ namespace OpenRA.Graphics
 		{
 			if (texture == null)
 			{
-				texture = Game.Renderer.Device.CreateTexture();
+				texture = Game.Renderer.Context.CreateTexture();
 				dirty = true;
 			}
 
@@ -153,6 +153,10 @@ namespace OpenRA.Graphics
 				return;
 			dirty = true;
 			releaseBufferOnCommit = true;
+
+			// Commit data from the buffer to the texture, allowing the buffer to be released and reclaimed by GC.
+			if (Game.Renderer != null)
+				GetTexture();
 		}
 
 		public void Dispose()

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -22,10 +22,11 @@ namespace OpenRA.Graphics
 			: base(message) { }
 	}
 
+	// The enum values indicate the number of channels used by the type
+	// They are not arbitrary IDs!
 	public enum SheetType
 	{
 		Indexed = 1,
-		DualIndexed = 2,
 		BGRA = 4,
 	}
 
@@ -53,22 +54,22 @@ namespace OpenRA.Graphics
 
 		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet)
 		{
-			channel = TextureChannel.Red;
+			channel = t == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
 			Type = t;
 			current = allocateSheet();
 			sheets.Add(current);
 			this.allocateSheet = allocateSheet;
 		}
 
-		public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Size, frame.Offset); }
-		public Sprite Add(byte[] src, Size size) { return Add(src, size, float2.Zero); }
-		public Sprite Add(byte[] src, Size size, float2 spriteOffset)
+		public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Size, 0, frame.Offset); }
+		public Sprite Add(byte[] src, Size size) { return Add(src, size, 0, float3.Zero); }
+		public Sprite Add(byte[] src, Size size, float zRamp, float3 spriteOffset)
 		{
 			// Don't bother allocating empty sprites
 			if (size.Width == 0 || size.Height == 0)
-				return new Sprite(current, Rectangle.Empty, spriteOffset, channel, BlendMode.Alpha);
+				return new Sprite(current, Rectangle.Empty, 0, spriteOffset, channel, BlendMode.Alpha);
 
-			var rect = Allocate(size, spriteOffset);
+			var rect = Allocate(size, zRamp, spriteOffset);
 			Util.FastCopyIntoChannel(rect, src);
 			current.CommitBufferedData();
 			return rect;
@@ -100,8 +101,8 @@ namespace OpenRA.Graphics
 			return (TextureChannel)nextChannel;
 		}
 
-		public Sprite Allocate(Size imageSize) { return Allocate(imageSize, float2.Zero); }
-		public Sprite Allocate(Size imageSize, float2 spriteOffset)
+		public Sprite Allocate(Size imageSize) { return Allocate(imageSize, 0, float3.Zero); }
+		public Sprite Allocate(Size imageSize, float zRamp, float3 spriteOffset)
 		{
 			if (imageSize.Width + p.X > current.Size.Width)
 			{
@@ -120,7 +121,7 @@ namespace OpenRA.Graphics
 					current.ReleaseBuffer();
 					current = allocateSheet();
 					sheets.Add(current);
-					channel = TextureChannel.Red;
+					channel = Type == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
 				}
 				else
 					channel = next.Value;
@@ -129,13 +130,15 @@ namespace OpenRA.Graphics
 				p = new Point(0, 0);
 			}
 
-			var rect = new Sprite(current, new Rectangle(p, imageSize), spriteOffset, channel, BlendMode.Alpha);
+			var rect = new Sprite(current, new Rectangle(p, imageSize), zRamp, spriteOffset, channel, BlendMode.Alpha);
 			p.X += imageSize.Width;
 
 			return rect;
 		}
 
 		public Sheet Current { get { return current; } }
+		public TextureChannel CurrentChannel { get { return channel; } }
+		public IEnumerable<Sheet> AllSheets { get { return sheets; } }
 
 		public void Dispose()
 		{

OpenRA.Game/Graphics/SoftwareCursor.cs

@@ -1,11 +1,12 @@
 #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.
-*/
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
 #endregion
 
 using System;
@@ -49,7 +50,7 @@ namespace OpenRA.Graphics
 
 			sheetBuilder.Current.ReleaseBuffer();
 
-			Game.Renderer.Device.SetHardwareCursor(null);
+			Game.Renderer.Window.SetHardwareCursor(null);
 		}
 
 		PaletteReference CreatePaletteReference(string name)
@@ -80,8 +81,8 @@ namespace OpenRA.Graphics
 			var cursorSize = CursorProvider.CursorViewportZoomed ? 2.0f * cursorSprite.Size : cursorSprite.Size;
 
 			var cursorOffset = CursorProvider.CursorViewportZoomed ?
-				(2 * cursorSequence.Hotspot) + cursorSprite.Size.ToInt2() :
-				cursorSequence.Hotspot + (0.5f * cursorSprite.Size).ToInt2();
+				(2 * cursorSequence.Hotspot) + cursorSprite.Size.XY.ToInt2() :
+				cursorSequence.Hotspot + (0.5f * cursorSprite.Size.XY).ToInt2();
 
 			renderer.SetPalette(palette);
 			renderer.SpriteRenderer.DrawSprite(cursorSprite,

OpenRA.Game/Graphics/Sprite.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -20,24 +20,26 @@ namespace OpenRA.Graphics
 		public readonly Sheet Sheet;
 		public readonly BlendMode BlendMode;
 		public readonly TextureChannel Channel;
-		public readonly float2 Size;
-		public readonly float2 Offset;
-		public readonly float2 FractionalOffset;
+		public readonly float ZRamp;
+		public readonly float3 Size;
+		public readonly float3 Offset;
+		public readonly float3 FractionalOffset;
 		public readonly float Top, Left, Bottom, Right;
 
 		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
-			: this(sheet, bounds, float2.Zero, channel) { }
+			: this(sheet, bounds, 0, float2.Zero, channel) { }
 
-		public Sprite(Sheet sheet, Rectangle bounds, float2 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha)
+		public Sprite(Sheet sheet, Rectangle bounds, float zRamp, float3 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha)
 		{
 			Sheet = sheet;
 			Bounds = bounds;
 			Offset = offset;
+			ZRamp = zRamp;
 			Channel = channel;
-			Size = new float2(bounds.Size);
+			Size = new float3(bounds.Size.Width, bounds.Size.Height, bounds.Size.Height * zRamp);
 			BlendMode = blendMode;
-
-			FractionalOffset = offset / Size;
+			FractionalOffset = Size.Z != 0 ? offset / Size :
+				new float3(offset.X / Size.X, offset.Y / Size.Y, 0);
 
 			Left = (float)Math.Min(bounds.Left, bounds.Right) / sheet.Size.Width;
 			Top = (float)Math.Min(bounds.Top, bounds.Bottom) / sheet.Size.Height;
@@ -46,11 +48,32 @@ namespace OpenRA.Graphics
 		}
 	}
 
+	public class SpriteWithSecondaryData : Sprite
+	{
+		public readonly Sheet SecondarySheet;
+		public readonly Rectangle SecondaryBounds;
+		public readonly TextureChannel SecondaryChannel;
+		public readonly float SecondaryTop, SecondaryLeft, SecondaryBottom, SecondaryRight;
+
+		public SpriteWithSecondaryData(Sprite s, Sheet secondarySheet, Rectangle secondaryBounds, TextureChannel secondaryChannel)
+			: base(s.Sheet, s.Bounds, s.ZRamp, s.Offset, s.Channel, s.BlendMode)
+		{
+			SecondarySheet = secondarySheet;
+			SecondaryBounds = secondaryBounds;
+			SecondaryChannel = secondaryChannel;
+			SecondaryLeft = (float)Math.Min(secondaryBounds.Left, secondaryBounds.Right) / s.Sheet.Size.Width;
+			SecondaryTop = (float)Math.Min(secondaryBounds.Top, secondaryBounds.Bottom) / s.Sheet.Size.Height;
+			SecondaryRight = (float)Math.Max(secondaryBounds.Left, secondaryBounds.Right) / s.Sheet.Size.Width;
+			SecondaryBottom = (float)Math.Max(secondaryBounds.Top, secondaryBounds.Bottom) / s.Sheet.Size.Height;
+		}
+	}
+
 	public enum TextureChannel : byte
 	{
 		Red = 0,
 		Green = 1,
 		Blue = 2,
 		Alpha = 3,
+		RGBA = 4
 	}
 }

OpenRA.Game/Graphics/SpriteFont.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -14,6 +14,7 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Primitives;
 using OpenRA.Support;
+using OpenRA.Widgets;
 using SharpFont;
 
 namespace OpenRA.Graphics
@@ -28,25 +29,35 @@ namespace OpenRA.Graphics
 		readonly Face face;
 		readonly Cache<Pair<char, Color>, GlyphInfo> glyphs;
 
-		public SpriteFont(string name, byte[] data, int size, SheetBuilder builder)
+		float deviceScale;
+
+		public SpriteFont(string name, byte[] data, int size, float scale, SheetBuilder builder)
 		{
 			if (builder.Type != SheetType.BGRA)
 				throw new ArgumentException("The sheet builder must create BGRA sheets.", "builder");
 
+			deviceScale = scale;
 			this.size = size;
 			this.builder = builder;
 
 			face = new Face(Library, data, 0);
-			face.SetPixelSizes((uint)size, (uint)size);
+			face.SetPixelSizes((uint)(size * deviceScale), (uint)(size * deviceScale));
 
 			glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph, Pair<char, Color>.EqualityComparer);
 
 			// PERF: Cache these delegates for Measure calls.
 			Func<char, float> characterWidth = character => glyphs[Pair.New(character, Color.White)].Advance;
-			lineWidth = line => line.Sum(characterWidth);
+			lineWidth = line => line.Sum(characterWidth) / deviceScale;
 
-			PrecacheColor(Color.White, name);
-			PrecacheColor(Color.Red, name);
+			if (size <= 24)
+				PrecacheColor(Color.White, name);
+		}
+
+		public void SetScale(float scale)
+		{
+			deviceScale = scale;
+			face.SetPixelSizes((uint)(size * deviceScale), (uint)(size * deviceScale));
+			glyphs.Clear();
 		}
 
 		void PrecacheColor(Color c, string name)
@@ -59,24 +70,28 @@ namespace OpenRA.Graphics
 
 		public void DrawText(string text, float2 location, Color c)
 		{
-			location.Y += size;	// baseline vs top
+			// Offset from the baseline position to the top-left of the glyph for rendering
+			location += new float2(0, size);
 
 			var p = location;
 			foreach (var s in text)
 			{
 				if (s == '\n')
 				{
-					location.Y += size;
+					location += new float2(0, size);
 					p = location;
 					continue;
 				}
 
 				var g = glyphs[Pair.New(s, c)];
-				Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite,
-					new float2(
-						(int)Math.Round(p.X + g.Offset.X, 0),
-						p.Y + g.Offset.Y));
-				p.X += g.Advance;
+				if (g.Sprite != null)
+					Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite,
+						new float2(
+							(int)Math.Round(p.X * deviceScale + g.Offset.X, 0) / deviceScale,
+							p.Y + g.Offset.Y / deviceScale),
+							g.Sprite.Size / deviceScale);
+
+				p += new float2(g.Advance / deviceScale, 0);
 			}
 		}
 
@@ -84,15 +99,33 @@ namespace OpenRA.Graphics
 		{
 			if (offset > 0)
 			{
-				DrawText(text, location + new float2(-offset, 0), bg);
-				DrawText(text, location + new float2(offset, 0), bg);
-				DrawText(text, location + new float2(0, -offset), bg);
-				DrawText(text, location + new float2(0, offset), bg);
+				DrawText(text, location + new float2(-offset / deviceScale, 0), bg);
+				DrawText(text, location + new float2(offset / deviceScale, 0), bg);
+				DrawText(text, location + new float2(0, -offset / deviceScale), bg);
+				DrawText(text, location + new float2(0, offset / deviceScale), bg);
 			}
 
 			DrawText(text, location, fg);
 		}
 
+		public void DrawTextWithContrast(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
+		{
+			DrawTextWithContrast(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
+		}
+
+		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bg, int offset)
+		{
+			if (offset != 0)
+				DrawText(text, location + new float2(offset, offset), bg);
+
+			DrawText(text, location, fg);
+		}
+
+		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
+		{
+			DrawTextWithShadow(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
+		}
+
 		public int2 Measure(string text)
 		{
 			if (string.IsNullOrEmpty(text))
@@ -104,7 +137,20 @@ namespace OpenRA.Graphics
 
 		GlyphInfo CreateGlyph(Pair<char, Color> c)
 		{
-			face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
+			try
+			{
+				face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
+			}
+			catch (FreeTypeException)
+			{
+				return new GlyphInfo
+				{
+					Sprite = null,
+					Advance = 0,
+					Offset = int2.Zero
+				};
+			}
+
 			face.Glyph.RenderGlyph(RenderMode.Normal);
 
 			var size = new Size((int)face.Glyph.Metrics.Width, (int)face.Glyph.Metrics.Height);

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -9,6 +9,8 @@
  */
 #endregion
 
+using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -19,7 +21,7 @@ namespace OpenRA.Graphics
 {
 	public interface ISpriteLoader
 	{
-		bool TryParseSprite(Stream s, out ISpriteFrame[] frames);
+		bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata);
 	}
 
 	public interface ISpriteFrame
@@ -43,16 +45,91 @@ namespace OpenRA.Graphics
 	public class SpriteCache
 	{
 		public readonly SheetBuilder SheetBuilder;
-		readonly Cache<string, Sprite[]> sprites;
+		readonly ISpriteLoader[] loaders;
+		readonly IReadOnlyFileSystem fileSystem;
+
+		readonly Dictionary<string, List<Sprite[]>> sprites = new Dictionary<string, List<Sprite[]>>();
+		readonly Dictionary<string, ISpriteFrame[]> unloadedFrames = new Dictionary<string, ISpriteFrame[]>();
+		readonly Dictionary<string, TypeDictionary> metadata = new Dictionary<string, TypeDictionary>();
 
 		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
 		{
 			SheetBuilder = sheetBuilder;
-
-			sprites = new Cache<string, Sprite[]>(filename => SpriteLoader.GetSprites(fileSystem, filename, loaders, sheetBuilder));
+			this.fileSystem = fileSystem;
+			this.loaders = loaders;
 		}
 
-		public Sprite[] this[string filename] { get { return sprites[filename]; } }
+		/// <summary>
+		/// Returns the first set of sprites with the given filename.
+		/// If getUsedFrames is defined then the indices returned by the function call
+		/// are guaranteed to be loaded.  The value of other indices in the returned
+		/// array are undefined and should never be accessed.
+		/// </summary>
+		public Sprite[] this[string filename, Func<int, IEnumerable<int>> getUsedFrames = null]
+		{
+			get
+			{
+				var allSprites = sprites.GetOrAdd(filename);
+				var sprite = allSprites.FirstOrDefault();
+
+				ISpriteFrame[] unloaded;
+				if (!unloadedFrames.TryGetValue(filename, out unloaded))
+					unloaded = null;
+
+				// This is the first time that the file has been requested
+				// Load all of the frames into the unused buffer and initialize
+				// the loaded cache (initially empty)
+				if (sprite == null)
+				{
+					TypeDictionary fileMetadata = null;
+					unloaded = FrameLoader.GetFrames(fileSystem, filename, loaders, out fileMetadata);
+					unloadedFrames[filename] = unloaded;
+					metadata[filename] = fileMetadata;
+
+					sprite = new Sprite[unloaded.Length];
+					allSprites.Add(sprite);
+				}
+
+				// HACK: The sequency code relies on side-effects from getUsedFrames
+				var indices = getUsedFrames != null ? getUsedFrames(sprite.Length) :
+					Enumerable.Range(0, sprite.Length);
+
+				// Load any unused frames into the SheetBuilder
+				if (unloaded != null)
+				{
+					foreach (var i in indices)
+					{
+						if (unloaded[i] != null)
+						{
+							sprite[i] = SheetBuilder.Add(unloaded[i]);
+							unloaded[i] = null;
+						}
+					}
+
+					// All frames have been loaded
+					if (unloaded.All(f => f == null))
+						unloadedFrames.Remove(filename);
+				}
+
+				return sprite;
+			}
+		}
+
+		/// <summary>
+		/// Returns a TypeDictionary containing any metadata defined by the frame
+		/// or null if the frame does not define metadata.
+		/// </summary>
+		public TypeDictionary FrameMetadata(string filename)
+		{
+			TypeDictionary fileMetadata;
+			if (!metadata.TryGetValue(filename, out fileMetadata))
+			{
+				FrameLoader.GetFrames(fileSystem, filename, loaders, out fileMetadata);
+				metadata[filename] = fileMetadata;
+			}
+
+			return fileMetadata;
+		}
 	}
 
 	public class FrameCache
@@ -61,24 +138,20 @@ namespace OpenRA.Graphics
 
 		public FrameCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
 		{
-			frames = new Cache<string, ISpriteFrame[]>(filename => SpriteLoader.GetFrames(fileSystem, filename, loaders));
+			TypeDictionary metadata;
+			frames = new Cache<string, ISpriteFrame[]>(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out metadata));
 		}
 
 		public ISpriteFrame[] this[string filename] { get { return frames[filename]; } }
 	}
 
-	public static class SpriteLoader
+	public static class FrameLoader
 	{
-		public static Sprite[] GetSprites(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
-		{
-			return GetFrames(fileSystem, filename, loaders).Select(a => sheetBuilder.Add(a)).ToArray();
-		}
-
-		public static ISpriteFrame[] GetFrames(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders)
+		public static ISpriteFrame[] GetFrames(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders, out TypeDictionary metadata)
 		{
 			using (var stream = fileSystem.Open(filename))
 			{
-				var spriteFrames = GetFrames(stream, loaders);
+				var spriteFrames = GetFrames(stream, loaders, out metadata);
 				if (spriteFrames == null)
 					throw new InvalidDataException(filename + " is not a valid sprite file!");
 
@@ -86,11 +159,13 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public static ISpriteFrame[] GetFrames(Stream stream, ISpriteLoader[] loaders)
+		public static ISpriteFrame[] GetFrames(Stream stream, ISpriteLoader[] loaders, out TypeDictionary metadata)
 		{
 			ISpriteFrame[] frames;
+			metadata = null;
+
 			foreach (var loader in loaders)
-				if (loader.TryParseSprite(stream, out frames))
+				if (loader.TryParseSprite(stream, out frames, out metadata))
 					return frames;
 
 			return null;

OpenRA.Game/Graphics/SpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -11,13 +11,12 @@
 
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 
 namespace OpenRA.Graphics
 {
 	public struct SpriteRenderable : IRenderable, IFinalizedRenderable
 	{
-		public static readonly IEnumerable<IRenderable> None = new IRenderable[0].AsEnumerable();
+		public static readonly IEnumerable<IRenderable> None = new IRenderable[0];
 
 		readonly Sprite sprite;
 		readonly WPos pos;
@@ -49,27 +48,30 @@ namespace OpenRA.Graphics
 		public IRenderable OffsetBy(WVec vec) { return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, isDecoration); }
 		public IRenderable AsDecoration() { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, true); }
 
-		float2 ScreenPosition(WorldRenderer wr)
+		float3 ScreenPosition(WorldRenderer wr)
 		{
-			return wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset) - (0.5f * scale * sprite.Size).ToInt2();
+			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset) - (0.5f * scale * sprite.Size.XY).ToInt2();
+
+			// HACK: The z offset needs to be applied somewhere, but this probably is the wrong place.
+			return new float3(xy, sprite.Offset.Z + wr.ScreenZPosition(pos, 0) - 0.5f * scale * sprite.Size.Z);
 		}
 
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
-			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite, ScreenPosition(wr), palette, sprite.Size * scale);
+			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite, ScreenPosition(wr), palette, scale * sprite.Size);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr)
 		{
-			var offset = ScreenPosition(wr) + sprite.Offset;
-			Game.Renderer.WorldRgbaColorRenderer.DrawRect(offset, offset + sprite.Size, 1 / wr.Viewport.Zoom, Color.Red);
+			var screenOffset = ScreenPosition(wr) + sprite.Offset;
+			Game.Renderer.WorldRgbaColorRenderer.DrawRect(screenOffset, screenOffset + sprite.Size, 1 / wr.Viewport.Zoom, Color.Red);
 		}
 
 		public Rectangle ScreenBounds(WorldRenderer wr)
 		{
-			var offset = ScreenPosition(wr) + sprite.Offset;
-			return new Rectangle((int)offset.X, (int)offset.Y, (int)sprite.Size.X, (int)sprite.Size.Y);
+			var screenOffset = ScreenPosition(wr) + sprite.Offset;
+			return new Rectangle((int)screenOffset.X, (int)screenOffset.Y, (int)sprite.Size.X, (int)sprite.Size.Y);
 		}
 	}
 }

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -18,95 +18,136 @@ namespace OpenRA.Graphics
 	{
 		readonly Renderer renderer;
 		readonly IShader shader;
-		readonly Action renderAction;
 
 		readonly Vertex[] vertices;
-		Sheet currentSheet;
+		readonly Sheet[] sheets = new Sheet[7];
+
 		BlendMode currentBlend = BlendMode.Alpha;
 		int nv = 0;
+		int ns = 0;
 
 		public SpriteRenderer(Renderer renderer, IShader shader)
 		{
 			this.renderer = renderer;
 			this.shader = shader;
 			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
 		}
 
 		public void Flush()
 		{
 			if (nv > 0)
 			{
-				shader.SetTexture("DiffuseTexture", currentSheet.GetTexture());
+				for (var i = 0; i < ns; i++)
+				{
+					shader.SetTexture("Texture{0}".F(i), sheets[i].GetTexture());
+					sheets[i] = null;
+				}
 
-				renderer.Device.SetBlendMode(currentBlend);
-				shader.Render(renderAction);
-				renderer.Device.SetBlendMode(BlendMode.None);
+				renderer.Context.SetBlendMode(currentBlend);
+				shader.PrepareRender();
+				renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
+				renderer.Context.SetBlendMode(BlendMode.None);
 
 				nv = 0;
-				currentSheet = null;
+				ns = 0;
 			}
 		}
 
-		void SetRenderStateForSprite(Sprite s)
+		int2 SetRenderStateForSprite(Sprite s)
 		{
 			renderer.CurrentBatchRenderer = this;
 
-			if (s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 6 > renderer.TempBufferSize)
+			if (s.BlendMode != currentBlend || nv + 6 > renderer.TempBufferSize)
 				Flush();
 
 			currentBlend = s.BlendMode;
-			currentSheet = s.Sheet;
+
+			// Check if the sheet (or secondary data sheet) have already been mapped
+			var sheet = s.Sheet;
+			var sheetIndex = 0;
+			for (; sheetIndex < ns; sheetIndex++)
+				if (sheets[sheetIndex] == sheet)
+					break;
+
+			var secondarySheetIndex = 0;
+			var ss = s as SpriteWithSecondaryData;
+			if (ss != null)
+			{
+				var secondarySheet = ss.SecondarySheet;
+				for (; secondarySheetIndex < ns; secondarySheetIndex++)
+					if (sheets[secondarySheetIndex] == secondarySheet)
+						break;
+			}
+
+			// Make sure that we have enough free samplers to map both if needed, otherwise flush
+			var needSamplers = (sheetIndex == ns ? 1 : 0) + (secondarySheetIndex == ns ? 1 : 0);
+			if (ns + needSamplers >= sheets.Length)
+			{
+				Flush();
+				sheetIndex = 0;
+				if (ss != null)
+					secondarySheetIndex = 1;
+			}
+
+			if (sheetIndex >= ns)
+			{
+				sheets[sheetIndex] = sheet;
+				ns += 1;
+			}
+
+			if (secondarySheetIndex >= ns && ss != null)
+			{
+				sheets[secondarySheetIndex] = ss.SecondarySheet;
+				ns += 1;
+			}
+
+			return new int2(sheetIndex, secondarySheetIndex);
 		}
 
-		public void DrawSprite(Sprite s, float2 location, PaletteReference pal)
+		internal void DrawSprite(Sprite s, float3 location, float paletteTextureIndex, float3 size)
+		{
+			var samplers = SetRenderStateForSprite(s);
+			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, samplers, paletteTextureIndex, nv, size);
+			nv += 6;
+		}
+
+		public void DrawSprite(Sprite s, float3 location, PaletteReference pal)
 		{
 			DrawSprite(s, location, pal.TextureIndex, s.Size);
 		}
 
-		public void DrawSprite(Sprite s, float2 location, PaletteReference pal, float2 size)
+		public void DrawSprite(Sprite s, float3 location, PaletteReference pal, float3 size)
 		{
 			DrawSprite(s, location, pal.TextureIndex, size);
 		}
 
-		void DrawSprite(Sprite s, float2 location, float paletteTextureIndex, float2 size)
+		public void DrawSprite(Sprite s, float3 a, float3 b, float3 c, float3 d)
 		{
-			SetRenderStateForSprite(s);
-			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, paletteTextureIndex, nv, size);
-			nv += 6;
-		}
-
-		// For RGBASpriteRenderer, which doesn't use palettes
-		public void DrawSprite(Sprite s, float2 location)
-		{
-			DrawSprite(s, location, 0, s.Size);
-		}
-
-		public void DrawSprite(Sprite s, float2 location, float2 size)
-		{
-			DrawSprite(s, location, 0, size);
-		}
-
-		public void DrawSprite(Sprite s, float2 a, float2 b, float2 c, float2 d)
-		{
-			SetRenderStateForSprite(s);
-			Util.FastCreateQuad(vertices, a, b, c, d, s, 0, nv);
-			nv += 6;
-		}
-
-		public void DrawSprite(Sprite s, Vertex[] sourceVertices, int offset)
-		{
-			SetRenderStateForSprite(s);
-			Array.Copy(sourceVertices, offset, vertices, nv, 6);
+			var samplers = SetRenderStateForSprite(s);
+			Util.FastCreateQuad(vertices, a, b, c, d, s, samplers, 0, nv);
 			nv += 6;
 		}
 
 		public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet, BlendMode blendMode)
 		{
-			shader.SetTexture("DiffuseTexture", sheet.GetTexture());
-			renderer.Device.SetBlendMode(blendMode);
-			shader.Render(() => renderer.DrawBatch(buffer, start, length, type));
-			renderer.Device.SetBlendMode(BlendMode.None);
+			shader.SetTexture("Texture0", sheet.GetTexture());
+			renderer.Context.SetBlendMode(blendMode);
+			shader.PrepareRender();
+			renderer.DrawBatch(buffer, start, length, type);
+			renderer.Context.SetBlendMode(BlendMode.None);
+		}
+
+		// For RGBAColorRenderer
+		internal void DrawRGBAVertices(Vertex[] v)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (currentBlend != BlendMode.Alpha || nv + v.Length > renderer.TempBufferSize)
+				Flush();
+
+			currentBlend = BlendMode.Alpha;
+			Array.Copy(v, 0, vertices, nv, v.Length);
+			nv += v.Length;
 		}
 
 		public void SetPalette(ITexture palette)
@@ -114,11 +155,17 @@ namespace OpenRA.Graphics
 			shader.SetTexture("Palette", palette);
 		}
 
-		public void SetViewportParams(Size screen, float zoom, int2 scroll)
+		public void SetViewportParams(Size screen, float depthScale, float depthOffset, float zoom, int2 scroll)
 		{
-			shader.SetVec("Scroll", scroll.X, scroll.Y);
-			shader.SetVec("r1", zoom * 2f / screen.Width, -zoom * 2f / screen.Height);
-			shader.SetVec("r2", -1, 1);
+			shader.SetVec("Scroll", scroll.X, scroll.Y, scroll.Y);
+			shader.SetVec("r1",
+				zoom * 2f / screen.Width,
+				-zoom * 2f / screen.Height,
+				-depthScale * zoom / screen.Height);
+			shader.SetVec("r2", -1, 1, 1 - depthOffset);
+
+			// Texture index is sampled as a float, so convert to pixels then scale
+			shader.SetVec("DepthTextureScale", 128 * depthScale * zoom / screen.Height);
 		}
 
 		public void SetDepthPreviewEnabled(bool enabled)

OpenRA.Game/Graphics/TargetLineRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -43,9 +43,9 @@ namespace OpenRA.Graphics
 				return;
 
 			var iz = 1 / wr.Viewport.Zoom;
-			var first = wr.ScreenPxPosition(waypoints.First());
+			var first = wr.Screen3DPosition(waypoints.First());
 			var a = first;
-			foreach (var b in waypoints.Skip(1).Select(pos => wr.ScreenPxPosition(pos)))
+			foreach (var b in waypoints.Skip(1).Select(pos => wr.Screen3DPosition(pos)))
 			{
 				Game.Renderer.WorldRgbaColorRenderer.DrawLine(a, b, iz, color);
 				DrawTargetMarker(wr, color, b);
@@ -55,7 +55,7 @@ namespace OpenRA.Graphics
 			DrawTargetMarker(wr, color, first);
 		}
 
-		public static void DrawTargetMarker(WorldRenderer wr, Color color, float2 location)
+		public static void DrawTargetMarker(WorldRenderer wr, Color color, float3 location)
 		{
 			var iz = 1 / wr.Viewport.Zoom;
 			var offset = new float2(iz, iz);

OpenRA.Game/Graphics/TerrainSpriteLayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -46,7 +46,7 @@ namespace OpenRA.Graphics
 			rowStride = 6 * map.MapSize.X;
 
 			vertices = new Vertex[rowStride * map.MapSize.Y];
-			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length);
+			vertexBuffer = Game.Renderer.Context.CreateVertexBuffer(vertices.Length);
 			emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha);
 
 			wr.PaletteInvalidated += UpdatePaletteIndices;
@@ -59,7 +59,7 @@ namespace OpenRA.Graphics
 			for (var i = 0; i < vertices.Length; i++)
 			{
 				var v = vertices[i];
-				vertices[i] = new Vertex(v.X, v.Y, v.Z, v.U, v.V, palette.TextureIndex, v.C);
+				vertices[i] = new Vertex(v.X, v.Y, v.Z, v.S, v.T, v.U, v.V, palette.TextureIndex, v.C);
 			}
 
 			for (var row = 0; row < map.MapSize.Y; row++)
@@ -68,12 +68,13 @@ namespace OpenRA.Graphics
 
 		public void Update(CPos cell, Sprite sprite)
 		{
-			var pos = sprite == null ? float2.Zero :
-				worldRenderer.ScreenPosition(map.CenterOfCell(cell)) + sprite.Offset - 0.5f * sprite.Size;
-			Update(cell.ToMPos(map.Grid.Type), sprite, pos);
+			var xyz = sprite == null ? float3.Zero :
+				worldRenderer.Screen3DPosition(map.CenterOfCell(cell)) + sprite.Offset - 0.5f * sprite.Size;
+
+			Update(cell.ToMPos(map.Grid.Type), sprite, xyz);
 		}
 
-		public void Update(MPos uv, Sprite sprite, float2 pos)
+		public void Update(MPos uv, Sprite sprite, float3 pos)
 		{
 			if (sprite != null)
 			{
@@ -86,8 +87,12 @@ namespace OpenRA.Graphics
 			else
 				sprite = emptySprite;
 
+			// The vertex buffer does not have geometry for cells outside the map
+			if (!map.Tiles.Contains(uv))
+				return;
+
 			var offset = rowStride * uv.V + 6 * uv.U;
-			Util.FastCreateQuad(vertices, pos, sprite, palette.TextureIndex, offset, sprite.Size);
+			Util.FastCreateQuad(vertices, pos, sprite, int2.Zero, palette.TextureIndex, offset, sprite.Size);
 
 			dirtyRows.Add(uv.V);
 		}

OpenRA.Game/Graphics/Theater.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -43,7 +43,6 @@ namespace OpenRA.Graphics
 		{
 			this.tileset = tileset;
 			var allocated = false;
-			var type = tileset.EnableDepth ? SheetType.DualIndexed : SheetType.Indexed;
 
 			Func<Sheet> allocate = () =>
 			{
@@ -51,10 +50,10 @@ namespace OpenRA.Graphics
 					throw new SheetOverflowException("Terrain sheet overflow. Try increasing the tileset SheetSize parameter.");
 				allocated = true;
 
-				return new Sheet(type, new Size(tileset.SheetSize, tileset.SheetSize));
+				return new Sheet(SheetType.Indexed, new Size(tileset.SheetSize, tileset.SheetSize));
 			};
 
-			sheetBuilder = new SheetBuilder(type, allocate);
+			sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate);
 			random = new MersenneTwister();
 
 			var frameCache = new FrameCache(Game.ModData.DefaultFileSystem, Game.ModData.SpriteLoaders);
@@ -70,11 +69,24 @@ namespace OpenRA.Graphics
 					variants.Add(indices.Select(j =>
 					{
 						var f = allFrames[j];
-						var s = sheetBuilder.Allocate(f.Size, f.Offset);
-						Util.FastCopyIntoChannel(s, 0, f.Data);
+						var tile = t.Value.Contains(j) ? t.Value[j] : null;
+
+						// The internal z axis is inverted from expectation (negative is closer)
+						var zOffset = tile != null ? -tile.ZOffset : 0;
+						var zRamp = tile != null ? tile.ZRamp : 1f;
+						var offset = new float3(f.Offset, zOffset);
+						var s = sheetBuilder.Allocate(f.Size, zRamp, offset);
+						Util.FastCopyIntoChannel(s, f.Data);
 
 						if (tileset.EnableDepth)
-							Util.FastCopyIntoChannel(s, 1, allFrames[j + frameCount].Data);
+						{
+							var ss = sheetBuilder.Allocate(f.Size, zRamp, offset);
+							Util.FastCopyIntoChannel(ss, allFrames[j + frameCount].Data);
+
+							// s and ss are guaranteed to use the same sheet
+							// because of the custom terrain sheet allocation
+							s = new SpriteWithSecondaryData(s, s.Sheet, ss.Bounds, ss.Channel);
+						}
 
 						return s;
 					}).ToArray());
@@ -84,7 +96,7 @@ namespace OpenRA.Graphics
 
 				// Ignore the offsets baked into R8 sprites
 				if (tileset.IgnoreTileSpriteOffsets)
-					allSprites = allSprites.Select(s => new Sprite(s.Sheet, s.Bounds, float2.Zero, s.Channel, s.BlendMode));
+					allSprites = allSprites.Select(s => new Sprite(s.Sheet, s.Bounds, s.ZRamp, new float3(float2.Zero, s.Offset.Z), s.Channel, s.BlendMode));
 
 				templates.Add(t.Value.Id, new TheaterTemplate(allSprites.ToArray(), variants.First().Count(), t.Value.Images.Length));
 			}

OpenRA.Game/Graphics/UISpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -48,13 +48,13 @@ namespace OpenRA.Graphics
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
-			Game.Renderer.SpriteRenderer.DrawSprite(sprite, screenPos, palette, sprite.Size * scale);
+			Game.Renderer.SpriteRenderer.DrawSprite(sprite, screenPos, palette, scale * sprite.Size);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr)
 		{
-			var offset = screenPos + sprite.Offset;
-			Game.Renderer.RgbaColorRenderer.DrawRect(offset, offset + sprite.Size, 1, Color.Red);
+			var offset = screenPos + sprite.Offset.XY;
+			Game.Renderer.RgbaColorRenderer.DrawRect(offset, offset + sprite.Size.XY, 1, Color.Red);
 		}
 
 		public Rectangle ScreenBounds(WorldRenderer wr)

OpenRA.Game/Graphics/Util.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -19,37 +19,52 @@ namespace OpenRA.Graphics
 	{
 		// yes, our channel order is nuts.
 		static readonly int[] ChannelMasks = { 2, 1, 0, 3 };
-		static readonly float[] ChannelSelect = { 0.2f, 0.4f, 0.6f, 0.8f };
 
-		public static void FastCreateQuad(Vertex[] vertices, float2 o, Sprite r, float paletteTextureIndex, int nv, float2 size)
+		public static void FastCreateQuad(Vertex[] vertices, float3 o, Sprite r, int2 samplers, float paletteTextureIndex, int nv, float3 size)
 		{
-			var b = new float2(o.X + size.X, o.Y);
-			var c = new float2(o.X + size.X, o.Y + size.Y);
-			var d = new float2(o.X, o.Y + size.Y);
-			FastCreateQuad(vertices, o, b, c, d, r, paletteTextureIndex, nv);
+			var b = new float3(o.X + size.X, o.Y, o.Z);
+			var c = new float3(o.X + size.X, o.Y + size.Y, o.Z + size.Z);
+			var d = new float3(o.X, o.Y + size.Y, o.Z + size.Z);
+			FastCreateQuad(vertices, o, b, c, d, r, samplers, paletteTextureIndex, nv);
 		}
 
-		public static void FastCreateQuad(Vertex[] vertices, float2 a, float2 b, float2 c, float2 d, Sprite r, float paletteTextureIndex, int nv)
+		public static void FastCreateQuad(Vertex[] vertices, float3 a, float3 b, float3 c, float3 d, Sprite r, int2 samplers, float paletteTextureIndex, int nv)
 		{
-			var attribC = ChannelSelect[(int)r.Channel];
-			if (r.Sheet.Type == SheetType.DualIndexed)
-				attribC *= -1;
+			float sl = 0;
+			float st = 0;
+			float sr = 0;
+			float sb = 0;
 
-			vertices[nv] = new Vertex(a, r.Left, r.Top, paletteTextureIndex, attribC);
-			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, paletteTextureIndex, attribC);
-			vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, paletteTextureIndex, attribC);
-			vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, paletteTextureIndex, attribC);
-			vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, paletteTextureIndex, attribC);
-			vertices[nv + 5] = new Vertex(a, r.Left, r.Top, paletteTextureIndex, attribC);
+			// See shp.vert for documentation on the channel attribute format
+			var attribC = r.Channel == TextureChannel.RGBA ? 0x02 : ((byte)r.Channel) << 1 | 0x01;
+			attribC |= samplers.X << 6;
+			var ss = r as SpriteWithSecondaryData;
+			if (ss != null)
+			{
+				sl = ss.SecondaryLeft;
+				st = ss.SecondaryTop;
+				sr = ss.SecondaryRight;
+				sb = ss.SecondaryBottom;
+
+				attribC |= ((byte)ss.SecondaryChannel) << 4 | 0x08;
+				attribC |= samplers.Y << 9;
+			}
+
+			var fAttribC = (float)attribC;
+			vertices[nv] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC);
+			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, sr, st, paletteTextureIndex, fAttribC);
+			vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, fAttribC);
+			vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, fAttribC);
+			vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, sl, sb, paletteTextureIndex, fAttribC);
+			vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC);
 		}
 
-		public static void FastCopyIntoChannel(Sprite dest, byte[] src) { FastCopyIntoChannel(dest, 0, src); }
-		public static void FastCopyIntoChannel(Sprite dest, int channelOffset, byte[] src)
+		public static void FastCopyIntoChannel(Sprite dest, byte[] src)
 		{
 			var data = dest.Sheet.GetData();
 			var srcStride = dest.Bounds.Width;
 			var destStride = dest.Sheet.Size.Width * 4;
-			var destOffset = destStride * dest.Bounds.Top + dest.Bounds.Left * 4 + ChannelMasks[(int)dest.Channel + channelOffset];
+			var destOffset = destStride * dest.Bounds.Top + dest.Bounds.Left * 4 + ChannelMasks[(int)dest.Channel];
 			var destSkip = destStride - 4 * srcStride;
 			var height = dest.Bounds.Height;
 
@@ -312,12 +327,31 @@ namespace OpenRA.Graphics
 			return mtx;
 		}
 
-		public static float[] MakeFloatMatrix(int[] imtx)
+		public static float[] MakeFloatMatrix(Int32Matrix4x4 imtx)
 		{
-			var fmtx = new float[16];
-			for (var i = 0; i < 16; i++)
-				fmtx[i] = imtx[i] * 1f / imtx[15];
-			return fmtx;
+			var multipler = 1f / imtx.M44;
+			return new float[]
+			{
+				imtx.M11 * multipler,
+				imtx.M12 * multipler,
+				imtx.M13 * multipler,
+				imtx.M14 * multipler,
+
+				imtx.M21 * multipler,
+				imtx.M22 * multipler,
+				imtx.M23 * multipler,
+				imtx.M24 * multipler,
+
+				imtx.M31 * multipler,
+				imtx.M32 * multipler,
+				imtx.M33 * multipler,
+				imtx.M34 * multipler,
+
+				imtx.M41 * multipler,
+				imtx.M42 * multipler,
+				imtx.M43 * multipler,
+				imtx.M44 * multipler,
+			};
 		}
 
 		public static float[] MatrixAABBMultiply(float[] mtx, float[] bounds)

OpenRA.Game/Graphics/Vertex.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -16,17 +16,15 @@ namespace OpenRA.Graphics
 	[StructLayout(LayoutKind.Sequential)]
 	public struct Vertex
 	{
-		public readonly float X, Y, Z, U, V, P, C;
+		public readonly float X, Y, Z, S, T, U, V, P, C;
 
-		public Vertex(float2 xy, float u, float v, float p, float c)
-			: this(xy.X, xy.Y, 0, u, v, p, c) { }
+		public Vertex(float3 xyz, float s, float t, float u, float v, float p, float c)
+			: this(xyz.X, xyz.Y, xyz.Z, s, t, u, v, p, c) { }
 
-		public Vertex(float[] xyz, float u, float v, float p, float c)
-			: this(xyz[0], xyz[1], xyz[2], u, v, p, c) { }
-
-		public Vertex(float x, float y, float z, float u, float v, float p, float c)
+		public Vertex(float x, float y, float z, float s, float t, float u, float v, float p, float c)
 		{
 			X = x; Y = y; Z = z;
+			S = s; T = t;
 			U = u; V = v;
 			P = p; C = c;
 		}

OpenRA.Game/Graphics/Viewport.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -80,7 +80,7 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public static int TicksSinceLastMove = 0;
+		public static long LastMoveRunTime = 0;
 		public static int2 LastMousePos;
 
 		float ClosestTo(float[] collection, float target)

OpenRA.Game/Graphics/VoxelAnimation.cs

@@ -1,34 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-
-namespace OpenRA.Graphics
-{
-	public struct VoxelAnimation
-	{
-		public readonly Voxel Voxel;
-		public readonly Func<WVec> OffsetFunc;
-		public readonly Func<IEnumerable<WRot>> RotationFunc;
-		public readonly Func<bool> DisableFunc;
-		public readonly Func<uint> FrameFunc;
-
-		public VoxelAnimation(Voxel voxel, Func<WVec> offset, Func<IEnumerable<WRot>> rotation, Func<bool> disable, Func<uint> frame)
-		{
-			Voxel = voxel;
-			OffsetFunc = offset;
-			RotationFunc = rotation;
-			DisableFunc = disable;
-			FrameFunc = frame;
-		}
-	}
-}

OpenRA.Game/Graphics/VoxelProvider.cs

@@ -1,84 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using OpenRA.FileSystem;
-
-namespace OpenRA.Graphics
-{
-	public static class VoxelProvider
-	{
-		static Dictionary<string, Dictionary<string, Voxel>> units;
-
-		public static void Initialize(VoxelLoader loader, IReadOnlyFileSystem fileSystem, List<MiniYamlNode> sequences)
-		{
-			units = new Dictionary<string, Dictionary<string, Voxel>>();
-			foreach (var s in sequences)
-				LoadVoxelsForUnit(loader, s.Key, s.Value);
-
-			loader.RefreshBuffer();
-		}
-
-		static Voxel LoadVoxel(VoxelLoader voxelLoader, string unit, MiniYaml info)
-		{
-			var vxl = unit;
-			var hva = unit;
-			if (info.Value != null)
-			{
-				var fields = info.Value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				if (fields.Length >= 1)
-					vxl = hva = fields[0].Trim();
-
-				if (fields.Length >= 2)
-					hva = fields[1].Trim();
-			}
-
-			return voxelLoader.Load(vxl, hva);
-		}
-
-		static void LoadVoxelsForUnit(VoxelLoader loader, string unit, MiniYaml sequences)
-		{
-			Game.ModData.LoadScreen.Display();
-			try
-			{
-				var seq = sequences.ToDictionary(my => LoadVoxel(loader, unit, my));
-				units.Add(unit, seq);
-			}
-			catch (FileNotFoundException) { } // Do nothing; we can crash later if we actually wanted art
-		}
-
-		public static Voxel GetVoxel(string unitName, string voxelName)
-		{
-			try { return units[unitName][voxelName]; }
-			catch (KeyNotFoundException)
-			{
-				if (units.ContainsKey(unitName))
-					throw new InvalidOperationException(
-						"Unit `{0}` does not have a voxel `{1}`".F(unitName, voxelName));
-				else
-					throw new InvalidOperationException(
-						"Unit `{0}` does not have any voxels defined.".F(unitName));
-			}
-		}
-
-		public static bool HasVoxel(string unit, string seq)
-		{
-			if (!units.ContainsKey(unit))
-				throw new InvalidOperationException(
-					"Unit `{0}` does not have any voxels defined.".F(unit));
-
-			return units[unit].ContainsKey(seq);
-		}
-	}
-}

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -13,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Effects;
 using OpenRA.Traits;
 
 namespace OpenRA.Graphics
@@ -23,26 +24,35 @@ namespace OpenRA.Graphics
 			r => ZPosition(r.Pos, r.ZOffset);
 
 		public readonly Size TileSize;
+		public readonly int TileScale;
 		public readonly World World;
 		public readonly Theater Theater;
 		public Viewport Viewport { get; private set; }
 
 		public event Action PaletteInvalidated = null;
 
+		readonly HashSet<Actor> onScreenActors = new HashSet<Actor>();
 		readonly HardwarePalette palette = new HardwarePalette();
 		readonly Dictionary<string, PaletteReference> palettes = new Dictionary<string, PaletteReference>();
-		readonly TerrainRenderer terrainRenderer;
-		readonly Lazy<DeveloperMode> devTrait;
+		readonly IRenderTerrain terrainRenderer;
+		readonly Lazy<DebugVisualizations> debugVis;
 		readonly Func<string, PaletteReference> createPaletteReference;
+		readonly bool enableDepthBuffer;
 
-		internal WorldRenderer(World world)
+		bool lastDepthPreviewEnabled;
+
+		internal WorldRenderer(ModData modData, World world)
 		{
 			World = world;
 			TileSize = World.Map.Grid.TileSize;
+			TileScale = World.Map.Grid.Type == MapGridType.RectangularIsometric ? 1448 : 1024;
 			Viewport = new Viewport(this, world.Map);
 
 			createPaletteReference = CreatePaletteReference;
 
+			var mapGrid = modData.Manifest.Get<MapGrid>();
+			enableDepthBuffer = mapGrid.EnableDepthBuffer;
+
 			foreach (var pal in world.TraitDict.ActorsWithTrait<ILoadsPalettes>())
 				pal.Trait.LoadPalettes(this);
 
@@ -52,9 +62,9 @@ namespace OpenRA.Graphics
 			palette.Initialize();
 
 			Theater = new Theater(world.Map.Rules.TileSet);
-			terrainRenderer = new TerrainRenderer(world, this);
+			terrainRenderer = world.WorldActor.TraitOrDefault<IRenderTerrain>();
 
-			devTrait = Exts.Lazy(() => world.LocalPlayer != null ? world.LocalPlayer.PlayerActor.Trait<DeveloperMode>() : null);
+			debugVis = Exts.Lazy(() => world.WorldActor.TraitOrDefault<DebugVisualizations>());
 		}
 
 		public void UpdatePalettesForPlayer(string internalName, HSLColor color, bool replaceExisting)
@@ -95,7 +105,7 @@ namespace OpenRA.Graphics
 
 		List<IFinalizedRenderable> GenerateRenderables()
 		{
-			var actors = World.ScreenMap.ActorsInBox(Viewport.TopLeft, Viewport.BottomRight).Append(World.WorldActor);
+			var actors = onScreenActors.Append(World.WorldActor);
 			if (World.RenderPlayer != null)
 				actors = actors.Append(World.RenderPlayer.PlayerActor);
 
@@ -103,98 +113,139 @@ namespace OpenRA.Graphics
 			if (World.OrderGenerator != null)
 				worldRenderables = worldRenderables.Concat(World.OrderGenerator.Render(this, World));
 
-			worldRenderables = worldRenderables.Concat(World.Effects.SelectMany(e => e.Render(this)));
+			// Unpartitioned effects
+			worldRenderables = worldRenderables.Concat(World.UnpartitionedEffects.SelectMany(e => e.Render(this)));
+
+			// Partitioned, currently on-screen effects
+			var effectRenderables = World.ScreenMap.RenderableEffectsInBox(Viewport.TopLeft, Viewport.BottomRight);
+			worldRenderables = worldRenderables.Concat(effectRenderables.SelectMany(e => e.Render(this)));
+
 			worldRenderables = worldRenderables.OrderBy(RenderableScreenZPositionComparisonKey);
 
-			if (World.OrderGenerator != null)
-				worldRenderables = worldRenderables.Concat(World.OrderGenerator.RenderAfterWorld(this, World));
-
-			Game.Renderer.WorldVoxelRenderer.BeginFrame();
+			Game.Renderer.WorldModelRenderer.BeginFrame();
 			var renderables = worldRenderables.Select(r => r.PrepareRender(this)).ToList();
-			Game.Renderer.WorldVoxelRenderer.EndFrame();
+			Game.Renderer.WorldModelRenderer.EndFrame();
 
 			return renderables;
 		}
 
+		List<IFinalizedRenderable> GenerateOverlayRenderables()
+		{
+			var aboveShroud = World.ActorsWithTrait<IRenderAboveShroud>()
+				.Where(a => a.Actor.IsInWorld && !a.Actor.Disposed && (!a.Trait.SpatiallyPartitionable || onScreenActors.Contains(a.Actor)))
+					.SelectMany(a => a.Trait.RenderAboveShroud(a.Actor, this));
+
+			var aboveShroudSelected = World.Selection.Actors.Where(a => a.IsInWorld && !a.Disposed)
+				.SelectMany(a => a.TraitsImplementing<IRenderAboveShroudWhenSelected>()
+					.Where(t => !t.SpatiallyPartitionable || onScreenActors.Contains(a))
+					.SelectMany(t => t.RenderAboveShroud(a, this)));
+
+			var aboveShroudEffects = World.Effects.Select(e => e as IEffectAboveShroud)
+				.Where(e => e != null)
+				.SelectMany(e => e.RenderAboveShroud(this));
+
+			var aboveShroudOrderGenerator = SpriteRenderable.None;
+			if (World.OrderGenerator != null)
+				aboveShroudOrderGenerator = World.OrderGenerator.RenderAboveShroud(this, World);
+
+			var overlayRenderables = aboveShroud
+				.Concat(aboveShroudSelected)
+				.Concat(aboveShroudEffects)
+				.Concat(aboveShroudOrderGenerator);
+
+			Game.Renderer.WorldModelRenderer.BeginFrame();
+			var finalOverlayRenderables = overlayRenderables.Select(r => r.PrepareRender(this)).ToList();
+			Game.Renderer.WorldModelRenderer.EndFrame();
+
+			return finalOverlayRenderables;
+		}
+
 		public void Draw()
 		{
 			if (World.WorldActor.Disposed)
 				return;
 
-			if (devTrait.Value != null)
-				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
+			if (debugVis.Value != null && lastDepthPreviewEnabled != debugVis.Value.DepthBuffer)
+			{
+				lastDepthPreviewEnabled = debugVis.Value.DepthBuffer;
+				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(lastDepthPreviewEnabled);
+			}
 
 			RefreshPalette();
 
-			if (World.Type == WorldType.Shellmap && !Game.Settings.Game.ShowShellmap)
-				return;
-
+			onScreenActors.UnionWith(World.ScreenMap.RenderableActorsInBox(Viewport.TopLeft, Viewport.BottomRight));
 			var renderables = GenerateRenderables();
 			var bounds = Viewport.GetScissorBounds(World.Type != WorldType.Editor);
 			Game.Renderer.EnableScissor(bounds);
 
-			terrainRenderer.Draw(this, Viewport);
+			if (enableDepthBuffer)
+				Game.Renderer.Context.EnableDepthBuffer();
+
+			if (terrainRenderer != null)
+				terrainRenderer.RenderTerrain(this, Viewport);
+
 			Game.Renderer.Flush();
 
 			for (var i = 0; i < renderables.Count; i++)
 				renderables[i].Render(this);
 
-			foreach (var a in World.ActorsWithTrait<IPostRender>())
+			if (enableDepthBuffer)
+				Game.Renderer.ClearDepthBuffer();
+
+			foreach (var a in World.ActorsWithTrait<IRenderAboveWorld>())
 				if (a.Actor.IsInWorld && !a.Actor.Disposed)
-					a.Trait.RenderAfterWorld(this, a.Actor);
+					a.Trait.RenderAboveWorld(a.Actor, this);
 
 			var renderShroud = World.RenderPlayer != null ? World.RenderPlayer.Shroud : null;
 
-			foreach (var a in World.ActorsWithTrait<IRenderShroud>())
-				a.Trait.RenderShroud(this, renderShroud);
+			if (enableDepthBuffer)
+				Game.Renderer.ClearDepthBuffer();
 
-			if (devTrait.Value != null && devTrait.Value.ShowDebugGeometry)
-				for (var i = 0; i < renderables.Count; i++)
-					renderables[i].RenderDebugGeometry(this);
+			foreach (var a in World.ActorsWithTrait<IRenderShroud>())
+				a.Trait.RenderShroud(renderShroud, this);
+
+			if (enableDepthBuffer)
+				Game.Renderer.Context.DisableDepthBuffer();
 
 			Game.Renderer.DisableScissor();
 
-			var overlayRenderables = World.Selection.Actors.Where(a => !a.Disposed)
-				.SelectMany(a => a.TraitsImplementing<IPostRenderSelection>())
-				.SelectMany(t => t.RenderAfterWorld(this));
-
-			Game.Renderer.WorldVoxelRenderer.BeginFrame();
-			var finalOverlayRenderables = overlayRenderables.Select(r => r.PrepareRender(this));
-			Game.Renderer.WorldVoxelRenderer.EndFrame();
+			var finalOverlayRenderables = GenerateOverlayRenderables();
 
 			// HACK: Keep old grouping behaviour
-			foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
+			var groupedOverlayRenderables = finalOverlayRenderables.GroupBy(prs => prs.GetType());
+			foreach (var g in groupedOverlayRenderables)
 				foreach (var r in g)
 					r.Render(this);
 
-			if (devTrait.Value != null && devTrait.Value.ShowDebugGeometry)
-				foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
+			if (debugVis.Value != null && debugVis.Value.RenderGeometry)
+			{
+				for (var i = 0; i < renderables.Count; i++)
+					renderables[i].RenderDebugGeometry(this);
+
+				foreach (var g in groupedOverlayRenderables)
 					foreach (var r in g)
 						r.RenderDebugGeometry(this);
+			}
 
-			if (World.Type == WorldType.Regular)
+			if (debugVis.Value != null && debugVis.Value.ScreenMap)
 			{
-				foreach (var g in World.ActorsHavingTrait<Selectable>().Where(a => !a.Disposed
-					&& !World.FogObscures(a)
-					&& !World.Selection.Actors.Contains(a)))
-				{
-					if (Game.Settings.Game.StatusBars == StatusBarsType.Standard)
-						new SelectionBarsRenderable(g, false, false).Render(this);
+				foreach (var r in World.ScreenMap.RenderBounds(World.RenderPlayer))
+					Game.Renderer.WorldRgbaColorRenderer.DrawRect(
+						new float3(r.Left, r.Top, r.Bottom),
+						new float3(r.Right, r.Bottom, r.Bottom),
+						1 / Viewport.Zoom, Color.MediumSpringGreen);
 
-					if (Game.Settings.Game.StatusBars == StatusBarsType.AlwaysShow)
-						new SelectionBarsRenderable(g, true, true).Render(this);
-
-					if (Game.Settings.Game.StatusBars == StatusBarsType.DamageShow)
-					{
-						if (g.GetDamageState() != DamageState.Undamaged)
-							new SelectionBarsRenderable(g, true, true).Render(this);
-						else
-							new SelectionBarsRenderable(g, false, true).Render(this);
-					}
-				}
+				foreach (var r in World.ScreenMap.MouseBounds(World.RenderPlayer))
+					Game.Renderer.WorldRgbaColorRenderer.DrawRect(
+						new float3(r.Left, r.Top, r.Bottom),
+						new float3(r.Right, r.Bottom, r.Bottom),
+						1 / Viewport.Zoom, Color.OrangeRed);
 			}
 
 			Game.Renderer.Flush();
+
+			// PERF: Reuse collection to avoid allocations.
+			onScreenActors.Clear();
 		}
 
 		public void RefreshPalette()
@@ -206,7 +257,13 @@ namespace OpenRA.Graphics
 		// Conversion between world and screen coordinates
 		public float2 ScreenPosition(WPos pos)
 		{
-			return new float2(TileSize.Width * pos.X / 1024f, TileSize.Height * (pos.Y - pos.Z) / 1024f);
+			return new float2((float)TileSize.Width * pos.X / TileScale, (float)TileSize.Height * (pos.Y - pos.Z) / TileScale);
+		}
+
+		public float3 Screen3DPosition(WPos pos)
+		{
+			var z = ZPosition(pos, 0) * (float)TileSize.Height / TileScale;
+			return new float3((float)TileSize.Width * pos.X / TileScale, (float)TileSize.Height * (pos.Y - pos.Z) / TileScale, z);
 		}
 
 		public int2 ScreenPxPosition(WPos pos)
@@ -216,33 +273,39 @@ namespace OpenRA.Graphics
 			return new int2((int)Math.Round(px.X), (int)Math.Round(px.Y));
 		}
 
-		// For scaling vectors to pixel sizes in the voxel renderer
-		public void ScreenVectorComponents(WVec vec, out float x, out float y, out float z)
+		public float3 Screen3DPxPosition(WPos pos)
 		{
-			x = TileSize.Width * vec.X / 1024f;
-			y = TileSize.Height * (vec.Y - vec.Z) / 1024f;
-			z = TileSize.Height * vec.Z / 1024f;
+			// Round to nearest pixel
+			var px = Screen3DPosition(pos);
+			return new float3((float)Math.Round(px.X), (float)Math.Round(px.Y), px.Z);
 		}
 
-		// For scaling vectors to pixel sizes in the voxel renderer
+		// For scaling vectors to pixel sizes in the model renderer
+		public float3 ScreenVectorComponents(WVec vec)
+		{
+			return new float3(
+				(float)TileSize.Width * vec.X / TileScale,
+				(float)TileSize.Height * (vec.Y - vec.Z) / TileScale,
+				(float)TileSize.Height * vec.Z / TileScale);
+		}
+
+		// For scaling vectors to pixel sizes in the model renderer
 		public float[] ScreenVector(WVec vec)
 		{
-			float x, y, z;
-			ScreenVectorComponents(vec, out x, out y, out z);
-			return new[] { x, y, z, 1f };
+			var xyz = ScreenVectorComponents(vec);
+			return new[] { xyz.X, xyz.Y, xyz.Z, 1f };
 		}
 
 		public int2 ScreenPxOffset(WVec vec)
 		{
 			// Round to nearest pixel
-			float x, y, z;
-			ScreenVectorComponents(vec, out x, out y, out z);
-			return new int2((int)Math.Round(x), (int)Math.Round(y));
+			var xyz = ScreenVectorComponents(vec);
+			return new int2((int)Math.Round(xyz.X), (int)Math.Round(xyz.Y));
 		}
 
 		public float ScreenZPosition(WPos pos, int offset)
 		{
-			return ZPosition(pos, offset) * TileSize.Height / 1024f;
+			return ZPosition(pos, offset) * (float)TileSize.Height / TileScale;
 		}
 
 		static int ZPosition(WPos pos, int offset)
@@ -256,7 +319,7 @@ namespace OpenRA.Graphics
 		/// </summary>
 		public WPos ProjectedPosition(int2 screenPx)
 		{
-			return new WPos(1024 * screenPx.X / TileSize.Width, 1024 * screenPx.Y / TileSize.Height, 0);
+			return new WPos(TileScale * screenPx.X / TileSize.Width, TileScale * screenPx.Y / TileSize.Height, 0);
 		}
 
 		public void Dispose()
@@ -269,7 +332,6 @@ namespace OpenRA.Graphics
 
 			palette.Dispose();
 			Theater.Dispose();
-			terrainRenderer.Dispose();
 		}
 	}
 }

OpenRA.Game/Group.cs

@@ -1,45 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA
-{
-	public class Group
-	{
-		readonly Actor[] actors;
-		readonly int id;
-
-		static int nextGroup;
-
-		public IEnumerable<Actor> Actors { get { return actors; } }
-
-		public Group(IEnumerable<Actor> actors)
-		{
-			this.actors = actors.ToArray();
-
-			foreach (var a in actors)
-				a.Group = this;
-
-			id = nextGroup++;
-		}
-
-		public void Dump()
-		{
-			/* debug crap */
-			Game.Debug("Group #{0}: {1}".F(
-				id, actors.Select(a => "#{0} {1}".F(a.ActorID, a.Info.Name)).JoinWith(",")));
-		}
-
-		/* TODO: add lazy group path crap, groupleader, pruning, etc */
-	}
-}

OpenRA.Game/HotkeyDefinition.cs

@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA
+{
+	public sealed class HotkeyDefinition
+	{
+		public readonly string Name;
+		public readonly Hotkey Default = Hotkey.Invalid;
+		public readonly string Description = "";
+		public readonly HashSet<string> Types = new HashSet<string>();
+
+		public HotkeyDefinition(string name, MiniYaml node)
+		{
+			Name = name;
+
+			if (!string.IsNullOrEmpty(node.Value))
+				Default = FieldLoader.GetValue<Hotkey>("value", node.Value);
+
+			var descriptionNode = node.Nodes.FirstOrDefault(n => n.Key == "Description");
+			if (descriptionNode != null)
+				Description = descriptionNode.Value.Value;
+
+			var typesNode = node.Nodes.FirstOrDefault(n => n.Key == "Types");
+			if (typesNode != null)
+				Types = FieldLoader.GetValue<HashSet<string>>("Types", typesNode.Value.Value);
+		}
+	}
+}

OpenRA.Game/HotkeyManager.cs

@@ -0,0 +1,77 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using OpenRA.FileSystem;
+
+namespace OpenRA
+{
+	public sealed class HotkeyManager
+	{
+		readonly Dictionary<string, Hotkey> settings;
+		readonly Dictionary<string, HotkeyDefinition> definitions = new Dictionary<string, HotkeyDefinition>();
+		readonly Dictionary<string, Hotkey> keys = new Dictionary<string, Hotkey>();
+
+		public HotkeyManager(IReadOnlyFileSystem fileSystem, Dictionary<string, Hotkey> settings, Manifest manifest)
+		{
+			this.settings = settings;
+
+			var keyDefinitions = MiniYaml.Load(fileSystem, manifest.Hotkeys, null);
+			foreach (var kd in keyDefinitions)
+			{
+				var definition = new HotkeyDefinition(kd.Key, kd.Value);
+				definitions[kd.Key] = definition;
+				keys[kd.Key] = definition.Default;
+			}
+
+			foreach (var kv in settings)
+				keys[kv.Key] = kv.Value;
+		}
+
+		internal Func<Hotkey> GetHotkeyReference(string name)
+		{
+			// Is this a mod-defined hotkey?
+			if (keys.ContainsKey(name))
+				return () => keys[name];
+
+			// Try and parse as a hardcoded definition
+			Hotkey key;
+			if (!Hotkey.TryParse(name, out key))
+				key = Hotkey.Invalid;
+
+			return () => key;
+		}
+
+		public void Set(string name, Hotkey value)
+		{
+			HotkeyDefinition definition;
+			if (!definitions.TryGetValue(name, out definition))
+				return;
+
+			keys[name] = value;
+			if (value != definition.Default)
+				settings[name] = value;
+			else
+				settings.Remove(name);
+		}
+
+		public HotkeyReference this[string name]
+		{
+			get
+			{
+				return new HotkeyReference(GetHotkeyReference(name));
+			}
+		}
+
+		public IEnumerable<HotkeyDefinition> Definitions { get { return definitions.Values; } }
+	}
+}

OpenRA.Game/IUtilityCommand.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -9,8 +9,23 @@
  */
 #endregion
 
+using OpenRA.Traits;
+
 namespace OpenRA
 {
+	public class Utility
+	{
+		public readonly ModData ModData;
+		public readonly InstalledMods Mods;
+
+		public Utility(ModData modData, InstalledMods mods)
+		{
+			ModData = modData;
+			Mods = mods;
+		}
+	}
+
+	[RequireExplicitImplementation]
 	public interface IUtilityCommand
 	{
 		/// <summary>
@@ -20,6 +35,6 @@ namespace OpenRA
 
 		bool ValidateArguments(string[] args);
 
-		void Run(ModData modData, string[] args);
+		void Run(Utility utility, string[] args);
 	}
 }

OpenRA.Game/Input/Hotkey.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of

OpenRA.Game/Input/HotkeyReference.cs

@@ -0,0 +1,46 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA
+{
+	/// <summary>
+	/// A reference to either a named hotkey (defined in the game settings) or a statically assigned hotkey
+	/// </summary>
+	public class HotkeyReference
+	{
+		static readonly Func<Hotkey> Invalid = () => Hotkey.Invalid;
+
+		readonly Func<Hotkey> getValue;
+
+		public HotkeyReference()
+		{
+			getValue = Invalid;
+		}
+
+		internal HotkeyReference(Func<Hotkey> getValue)
+		{
+			this.getValue = getValue;
+		}
+
+		public Hotkey GetValue()
+		{
+			return getValue();
+		}
+
+		public bool IsActivatedBy(KeyInput e)
+		{
+			var currentValue = getValue();
+			return currentValue.Key == e.Key && currentValue.Modifiers == e.Modifiers;
+		}
+	}
+}

OpenRA.Game/Input/IInputHandler.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -69,5 +69,6 @@ namespace OpenRA
 		public Modifiers Modifiers;
 		public int MultiTapCount;
 		public char UnicodeChar;
+		public bool IsRepeat;
 	}
 }

OpenRA.Game/Input/InputHandler.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of
@@ -37,17 +37,17 @@ namespace OpenRA
 
 		public void OnKeyInput(KeyInput input)
 		{
-			Sync.CheckSyncUnchanged(world, () => Ui.HandleKeyPress(input));
+			Sync.RunUnsynced(Game.Settings.Debug.SyncCheckUnsyncedCode, world, () => Ui.HandleKeyPress(input));
 		}
 
 		public void OnTextInput(string text)
 		{
-			Sync.CheckSyncUnchanged(world, () => Ui.HandleTextInput(text));
+			Sync.RunUnsynced(Game.Settings.Debug.SyncCheckUnsyncedCode, world, () => Ui.HandleTextInput(text));
 		}
 
 		public void OnMouseInput(MouseInput input)
 		{
-			Sync.CheckSyncUnchanged(world, () => Ui.HandleInput(input));
+			Sync.RunUnsynced(Game.Settings.Debug.SyncCheckUnsyncedCode, world, () => Ui.HandleInput(input));
 		}
 	}