Build prep branches on Travis, too

The bug happens when a second (or third, fourth etc.) Conyard deploys while a building is placed from the first Conyard.

The `WithMakeAnimation` running on the second CY uses `Animation::PlayThen` to call `Building::Unlock` in a delegate.

`WithBuildingPlacedAnimation::BuildingPlaced` runs when a building placed and replaces the delegate from `WithMakeAnimation` with its own before it has a chance to run, and so the new Conyard never gets unlocked.

The fix is then to simply not run `BuildingPlaced` on conyards that haven't completed the make animation yet.

(cherry picked from commit a9339d91ea)

.editorconfig

@@ -1,213 +1,16 @@
 ; Top-most http://editorconfig.org/ file
 root = true
-charset=utf-8
 
 ; Unix-style newlines
 [*]
 end_of_line = LF
-insert_final_newline = true
-trim_trailing_whitespace = true
 
-; 4-column tab indentation and .NET coding conventions
+; 4-column tab indentation
 [*.cs]
 indent_style = tab
 indent_size = 4
 
-dotnet_separate_import_directive_groups = false
-dotnet_sort_system_directives_first = true
-
-csharp_style_var_elsewhere = true:suggestion
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-
-csharp_prefer_braces = when_multiline:suggestion
-csharp_using_directive_placement = outside_namespace:suggestion
-csharp_new_line_before_open_brace = all
-csharp_space_around_binary_operators = before_and_after
-
-## Naming styles:
-
-dotnet_naming_style.camel_case.capitalization = camel_case
-
-dotnet_naming_style.pascal_case.capitalization = pascal_case
-
-dotnet_naming_style.i_prefix_pascal_case.capitalization = pascal_case
-dotnet_naming_style.i_prefix_pascal_case.required_prefix = I
-
-## Symbol specifications:
-
-dotnet_naming_symbols.const_locals.applicable_kinds = local
-dotnet_naming_symbols.const_locals.applicable_accessibilities = *
-dotnet_naming_symbols.const_locals.required_modifiers = const
-
-dotnet_naming_symbols.const_fields.applicable_kinds = field
-dotnet_naming_symbols.const_fields.applicable_accessibilities = *
-dotnet_naming_symbols.const_fields.required_modifiers = const
-
-dotnet_naming_symbols.static_readonly_fields.applicable_kinds = field
-dotnet_naming_symbols.static_readonly_fields.applicable_accessibilities = *
-dotnet_naming_symbols.static_readonly_fields.required_modifiers = static, readonly
-
-dotnet_naming_symbols.non_private_readonly_fields.applicable_kinds = field
-dotnet_naming_symbols.non_private_readonly_fields.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_private_readonly_fields.required_modifiers = readonly
-
-dotnet_naming_symbols.private_or_protected_fields.applicable_kinds = field
-dotnet_naming_symbols.private_or_protected_fields.applicable_accessibilities = private, protected, private_protected
-
-dotnet_naming_symbols.interfaces.applicable_kinds = interface
-dotnet_naming_symbols.interfaces.applicable_accessibilities = *
-
-dotnet_naming_symbols.parameters_and_locals.applicable_kinds = parameter, local
-dotnet_naming_symbols.parameters_and_locals.applicable_accessibilities = *
-
-dotnet_naming_symbols.most_symbols.applicable_kinds = namespace, class, struct, enum, field, property, method, local_function, event, delegate, type_parameter
-dotnet_naming_symbols.most_symbols.applicable_accessibilities = *
-
-## Naming rules:
-
-dotnet_naming_rule.const_locals_should_be_pascal_case.symbols = const_locals
-dotnet_naming_rule.const_locals_should_be_pascal_case.style = pascal_case
-dotnet_naming_rule.const_locals_should_be_pascal_case.severity = warning
-
-dotnet_naming_rule.const_fields_should_be_pascal_case.symbols = const_fields
-dotnet_naming_rule.const_fields_should_be_pascal_case.style = pascal_case
-dotnet_naming_rule.const_fields_should_be_pascal_case.severity = warning
-
-dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.symbols = static_readonly_fields
-dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.style = pascal_case
-dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.severity = warning
-
-dotnet_naming_rule.non_private_readonly_fields_should_be_pascal_case.symbols = non_private_readonly_fields
-dotnet_naming_rule.non_private_readonly_fields_should_be_pascal_case.style = pascal_case
-dotnet_naming_rule.non_private_readonly_fields_should_be_pascal_case.severity = warning
-
-dotnet_naming_rule.private_or_protected_fields_should_be_camel_case.symbols = private_or_protected_fields
-dotnet_naming_rule.private_or_protected_fields_should_be_camel_case.style = camel_case
-dotnet_naming_rule.private_or_protected_fields_should_be_camel_case.severity = warning
-
-dotnet_naming_rule.interfaces_should_be_i_prefix_pascal_case.symbols = interfaces
-dotnet_naming_rule.interfaces_should_be_i_prefix_pascal_case.style = i_prefix_pascal_case
-dotnet_naming_rule.interfaces_should_be_i_prefix_pascal_case.severity = warning
-
-dotnet_naming_rule.parameters_and_locals_should_be_camel_case.symbols = parameters_and_locals
-dotnet_naming_rule.parameters_and_locals_should_be_camel_case.style = camel_case
-dotnet_naming_rule.parameters_and_locals_should_be_camel_case.severity = warning
-
-dotnet_naming_rule.most_symbols_should_be_pascal_case.symbols = most_symbols
-dotnet_naming_rule.most_symbols_should_be_pascal_case.style = pascal_case
-dotnet_naming_rule.most_symbols_should_be_pascal_case.severity = warning
-
-## Formatting:
-
-# Also handled by StyleCopAnalyzers - SA1024: ColonsMustBeSpacedCorrectly.
-csharp_space_after_colon_in_inheritance_clause = true
-
-# Also handled by StyleCopAnalyzers - SA1024: ColonsMustBeSpacedCorrectly.
-csharp_space_before_colon_in_inheritance_clause = true
-
-# Also handled by StyleCopAnalyzers - SA1000: KeywordsMustBeSpacedCorrectly.
-csharp_space_after_keywords_in_control_flow_statements = true
-
-# Leave code block on single line.
-csharp_preserve_single_line_blocks = true
-
-# Leave statements and member declarations on the same line.
-csharp_preserve_single_line_statements = true
-
-# IDE0049, IDE-only counterpart of StyleCopAnalyzers - SA1121: UseBuiltInTypeAlias.
-dotnet_style_predefined_type_for_member_access = true
-
-# IDE0049, IDE-only counterpart of StyleCopAnalyzers - SA1121: UseBuiltInTypeAlias.
-dotnet_style_predefined_type_for_locals_parameters_members = true
-
-## Others:
-
-# Show an IDE warning when default access modifiers are explicitly specified.
-dotnet_style_require_accessibility_modifiers = omit_if_default:warning
-
-# use 'var' instead of explicit type
-dotnet_diagnostic.IDE0007.severity = warning
-
-# Don't prefer braces (for one liners).
-dotnet_diagnostic.IDE0011.severity = silent
-
-# Object initialization can be simplified / Use object initializer.
-dotnet_diagnostic.IDE0017.severity = warning
-
-# Collection initialization can be simplified
-dotnet_diagnostic.IDE0028.severity = warning
-
-# Simplify 'default' expression
-dotnet_diagnostic.IDE0034.severity = warning
-
-# Modifiers are not ordered.
-dotnet_diagnostic.IDE0036.severity = warning
-
-# Raise a warning on build when default access modifiers are explicitly specified.
-dotnet_diagnostic.IDE0040.severity = warning
-
-# Make field readonly.
-dotnet_diagnostic.IDE0044.severity = warning
-
-# Unused private member.
-dotnet_diagnostic.IDE0052.severity = warning
-
-# Unnecessary value assignment.
-dotnet_diagnostic.IDE0059.severity = warning
-
-# Unused parameter.
-dotnet_diagnostic.IDE0060.severity = warning
-
-# Naming rule violation.
-dotnet_diagnostic.IDE1006.severity = warning
-
-# Avoid unnecessary zero-length array allocations.
-dotnet_diagnostic.CA1825.severity = warning
-
-# Do not use Enumerable methods on indexable collections. Instead use the collection directly.
-dotnet_diagnostic.CA1826.severity = warning
-
-# Count() is used where Any() could be used instead to improve performance.
-dotnet_diagnostic.CA1827.severity = warning
-
-# Use Length/Count property instead of Enumerable.Count method.
-dotnet_diagnostic.CA1829.severity = warning
-
-# Use string.Contains(char) instead of string.Contains(string) with single characters.
-dotnet_diagnostic.CA1847.severity = warning
-
 ; 4-column tab indentation
 [*.yaml]
 indent_style = tab
-indent_size = 4
-
-# Use 'Count' property instead of 'Any' method.
-dotnet_diagnostic.RCS1080.severity = warning
-
-# Use read-only auto-implemented property.
-dotnet_diagnostic.RCS1170.severity = warning
-
-# Unnecessary interpolated string.
-dotnet_diagnostic.RCS1214.severity = warning
-
-# Unnecessary usage of verbatim string literal.
-dotnet_diagnostic.RCS1192.severity = warning
-
-# Use pattern matching instead of combination of 'as' operator and null check.
-dotnet_diagnostic.RCS1221.severity = warning
-
-# Expression is always equal to 'true'.
-dotnet_diagnostic.RCS1215.severity = warning
-
-# Use StringComparison when comparing strings.
-dotnet_diagnostic.RCS1155.severity = warning
-
-# Abstract type should not have public constructors.
-dotnet_diagnostic.RCS1160.severity = warning
-
-# Optimize 'Dictionary<TKey, TValue>.ContainsKey' call.
-dotnet_diagnostic.RCS1235.severity = warning
-
-# Call extension method as instance method.
-dotnet_diagnostic.RCS1196.severity = warning
+indent_size = 4

.gitattributes

@@ -1,10 +1,12 @@
 # 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
 *.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Report unexpected behavior or any issues you experienced in OpenRA.
-title: ''
-labels: Bug
-assignees: ''
-
----
-
-<!-- This is a guideline that shall help you to include information we need to understand and fix the issue you experienced. Please follow the instructions and replace any placeholders that are written in capital letters. Instructions like this comment will not be visible in your report. -->
-
-<!-- Important: Help us to avoid duplicates and use the search function to find existing reports for your issue. Please do not submit duplicate reports! Try to help others to find your report by using a precise title. -->
-
-## Issue Summary
-<!-- Please provide a a clear and concise description of what the issue is below. -->
-
-DESCRIPTION
-
-
-## Reproduction
-<!-- Please provide information about how the issue can be reproduced below. -->
-
-STEPS TO REPRODUCE THE ISSUE
-
-
-## Expected behavior
-<!-- Please explain what you expected to happen below. -->
-
-EXPECTED BEHAVIOR
-
-
-## Screenshots / Screen recordings / Replays
-<!-- If applicable, attach screenshots, screen recordings or replays to help explain your problem. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Frequently Asked Questions
-    url: https://github.com/OpenRA/OpenRA/wiki/FAQ#frequently-asked-questions
-    about: Explanations for common problems and questions.
-  - name: OpenRA Forum
-    url: https://forum.openra.net/
-    about: Please ask questions about modding here.
-  - name: OpenRA Discord server
-    url: https://discord.openra.net/
-    about: Join the community Discord server for community discussion and support.
-  - name: OpenRA IRC Channel
-    url: https://web.libera.chat/#openra
-    about: Join our development IRC channel on Libera for discussion of development topics.

.github/ISSUE_TEMPLATE/crash-report.md

@@ -1,35 +0,0 @@
----
-name: Crash report
-about: Report a game crash. Check the FAQ first https://github.com/OpenRA/OpenRA/wiki/FAQ#common-issues
-title: My game crashed
-labels: Crash
-assignees: ''
-
----
-
-<!-- This is a guideline that shall help you to include all the required information we depend on to investigate and fix game-breaking bugs. Please follow the instructions and replace any placeholders that are written in capital letters. Instructions like this comment will not be visible in your report. -->
-
-## System Information
-<!-- Information about the operating system, engine version, game mod and package source are mandatory for investigating and fixing crashes. -->
-
-- Operating System:  OPERATING SYSTEM
-- OpenRA Version: ENGINE VERSION
-- OpenRA Mod: GAME MOD
-- Source: Official download package OR self-compiled OR third-party package
-- For self-compiled or third-party packages: Mono version
-
-
-## Exception log
-<!-- Please replace the placeholder below with the content of the exception.log file. The three backticks before and after the placeholder are used for formatting, so don't remove them. If you don't find the log folder consult https://github.com/OpenRA/OpenRA/wiki/FAQ#my-game-just-crashed. -->
-
-```
-PASTE LOG HERE
-```
-
-
-## Replay
-<!-- If you have a replay file for the game that crashed, and it crashes again when you play it back, it will be a great help for us to fix the issue. Please compress the replay into a zip file and drag it here to include it in the report. -->
-
-
-## Additional information
-<!-- Please tell us below everything that you think is important for us to know about the crash. Specifically, what you were doing in the moment before the crash or ideally steps to reproduce it are very valuable information. -->

.github/ISSUE_TEMPLATE/feature---enhancement-request.md

@@ -1,35 +0,0 @@
----
-name: Feature / Enhancement request
-about: Describe what you think is missing or could be improved in OpenRA.
-title: ''
-labels: Idea/Wishlist
-assignees: ''
-
----
-
-<!-- This is a guideline that shall help you to describe your idea for a missing feature or enhancement. Please follow the instructions and replace any placeholders that are written in capital letters. Instructions like this comment will not be visible in your report. -->
-
-<!-- Important: Help us to avoid duplicates and use the search function to find existing requests. Please do not submit duplicate requests! Try to help others to find your request by using a precise title. -->
-
-## Motivation
-<!-- Please provide a clear and concise description of the motivation behind the request. If your request is related to a problem or limitation, describe it below. -->
-
-REQUEST MOTIVATION
-
-
-## Proposed solution
-<!-- Please describe your idea and how it is intended to address the motivation of your request. Provide a clear and concise description of the proposed changes. -->
-
-PROPOSED SOLUTION
-
-
-## Side effects
-<!-- Changes often have side effects or unintended consequences. If you expect that your solution has any side effects, please describe them below. -->
-
-EXPECTED SIDE EFFECTS
-
-
-## Alternatives
-<!-- Please outline any alternative solutions you have considered. -->
-
-ALTERNATIVES

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +0,0 @@
-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 on Discord (https://discord.openra.net) or in the #openra IRC channel on Libera (not as active as Discord).

.github/workflows/ci.yml

@@ -1,77 +0,0 @@
-name: Continuous Integration
-
-on:
-  push:
-  pull_request:
-    branches: [ bleed, 'prep-*' ]
-
-jobs:
-  linux:
-    name: Linux (.NET 6.0)
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-
-      - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-
-      - name: Check Code
-        run: |
-          make check
-
-      - name: Check Mods
-        run: |
-          sudo apt-get install lua5.1
-          make check-scripts
-          make test
-
-  linux-mono:
-    name: Linux (mono)
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-
-      - name: Check Code
-        run: |
-          mono --version
-          make RUNTIME=mono check
-
-      - name: Check Mods
-        run: |
-          # check-scripts does not depend on .net/mono, so is not needed here
-          make RUNTIME=mono test
-
-  windows:
-    name: Windows (.NET 6.0)
-    runs-on: windows-2019
-
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-
-      - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-
-      - name: Check Code
-        shell: powershell
-        run: |
-          # Work around runtime failures on the GH Actions runner
-          dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org
-          .\make.ps1 check
-          dotnet build OpenRA.Test\OpenRA.Test.csproj -c Debug --nologo -p:TargetPlatform=win-x64
-          dotnet test bin\OpenRA.Test.dll --test-adapter-path:.
-
-      - name: Check Mods
-        run: |
-          chocolatey install lua --version 5.1.5.52
-          $ENV:Path = $ENV:Path + ";C:\Program Files (x86)\Lua\5.1\"
-          .\make.ps1 check-scripts
-          .\make.ps1 test

.github/workflows/documentation.yml

@@ -1,140 +0,0 @@
-name: Deploy Documentation
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Git Tag'
-        required: true
-        default: 'release-xxxxxxxx'
-
-jobs:
-  wiki:
-    name: Update Wiki
-    if: github.repository == 'openra/openra'
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.inputs.tag }}
-
-      - name: Install .NET 6
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-
-      - name: Prepare Environment
-        run: |
-          make all
-
-      - name: Clone Wiki
-        uses: actions/checkout@v2
-        with:
-          repository: openra/openra.wiki
-          token: ${{ secrets.DOCS_TOKEN }}
-          path: wiki
-
-      - name: Update Wiki (Playtest)
-        if: startsWith(github.event.inputs.tag, 'playtest-')
-        env:
-          GIT_TAG: ${{ github.event.inputs.tag }}
-        run: |
-          ./utility.sh all --settings-docs "${GIT_TAG}" > "wiki/Settings (playtest).md"
-
-      - name: Update Wiki (Release)
-        if: startsWith(github.event.inputs.tag, 'release-')
-        env:
-          GIT_TAG: ${{ github.event.inputs.tag }}
-        run: |
-          ./utility.sh all --settings-docs "${GIT_TAG}" > "wiki/Settings.md"
-
-      - name: Push Wiki
-        env:
-          GIT_TAG: ${{ github.event.inputs.tag }}
-        run: |
-          cd wiki
-          git config --local user.email "actions@github.com"
-          git config --local user.name "GitHub Actions"
-          git add --all
-          git commit -m "Update auto-generated documentation for ${GIT_TAG}"
-          git push origin master
-
-  docs:
-    name: Update docs.openra.net
-    if: github.repository == 'openra/openra'
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.inputs.tag }}
-
-      - name: Install .NET 6
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-
-      - name: Prepare Environment
-        run: |
-          make all
-
-      - name: Clone docs.openra.net (Playtest)
-        if: startsWith(github.event.inputs.tag, 'playtest-')
-        uses: actions/checkout@v2
-        with:
-          repository: openra/docs
-          token: ${{ secrets.DOCS_TOKEN }}
-          path: docs
-          ref: playtest
-
-      - name: Clone docs.openra.net (Release)
-        if: startsWith(github.event.inputs.tag, 'release-')
-        uses: actions/checkout@v2
-        with:
-          repository: openra/docs
-          token: ${{ secrets.DOCS_TOKEN }}
-          path: docs
-          ref: release
-
-      - name: Update docs.openra.net (Playtest)
-        if: startsWith(github.event.inputs.tag, 'playtest-')
-        env:
-          GIT_TAG: ${{ github.event.inputs.tag }}
-        run: |
-          ./utility.sh all --docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/traits.md"
-          ./utility.sh all --weapon-docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/weapons.md"
-          ./utility.sh all --sprite-sequence-docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/sprite-sequences.md"
-          ./utility.sh all --lua-docs "${GIT_TAG}" > "docs/api/lua.md"
-
-      - name: Update docs.openra.net (Release)
-        if: startsWith(github.event.inputs.tag, 'release-')
-        env:
-          GIT_TAG: ${{ github.event.inputs.tag }}
-        run: |
-          ./utility.sh all --docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/traits.md"
-          ./utility.sh all --weapon-docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/weapons.md"
-          ./utility.sh all --sprite-sequence-docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/sprite-sequences.md"
-          ./utility.sh all --lua-docs "${GIT_TAG}" > "docs/api/lua.md"
-
-      - name: Commit docs.openra.net
-        env:
-          GIT_TAG: ${{ github.event.inputs.tag }}
-        run: |
-          cd docs
-          git config --local user.email "actions@github.com"
-          git config --local user.name "GitHub Actions"
-          git add api/*.md
-          git commit -m "Update auto-generated documentation for ${GIT_TAG}"
-
-      - name: Push docs.openra.net (Release)
-        if: startsWith(github.event.inputs.tag, 'release-')
-        run: |
-          cd docs
-          git push origin release
-
-      - name: Push docs.openra.net (Playtest)
-        if: startsWith(github.event.inputs.tag, 'playtest-')
-        run: |
-          cd docs
-          git push origin playtest

.github/workflows/itch.yml

@@ -1,86 +0,0 @@
-name: Deploy itch.io Packages
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Git Tag'
-        required: true
-        default: 'release-xxxxxxxx'
-
-jobs:
-  itch:
-    name: Deploy to itch.io
-    runs-on: ubuntu-20.04
-    if: github.repository == 'openra/openra'
-    steps:
-      - name: Download Packages
-        run: |
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-${{ github.event.inputs.tag }}-x64.exe"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-${{ github.event.inputs.tag }}-x64-winportable.zip" -O "OpenRA-${{ github.event.inputs.tag }}-x64-win-itch.zip"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-${{ github.event.inputs.tag }}.dmg"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Dune-2000-x86_64.AppImage"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Red-Alert-x86_64.AppImage"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Tiberian-Dawn-x86_64.AppImage"
-          wget -q "https://raw.githubusercontent.com/${{ github.repository }}/${{ github.event.inputs.tag }}/packaging/.itch.toml"
-          zip -u "OpenRA-${{ github.event.inputs.tag }}-x64-win-itch.zip" .itch.toml
-
-      - name: Publish Windows Installer
-        uses: josephbmanley/butler-publish-itchio-action@master
-        env:
-          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
-          CHANNEL: win
-          ITCH_GAME: openra
-          ITCH_USER: openra
-          VERSION: ${{ github.event.inputs.tag }}
-          PACKAGE: OpenRA-${{ github.event.inputs.tag }}-x64.exe
-
-      - name: Publish Windows Itch Bundle
-        uses: josephbmanley/butler-publish-itchio-action@master
-        env:
-          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
-          CHANNEL: itch
-          ITCH_GAME: openra
-          ITCH_USER: openra
-          VERSION: ${{ github.event.inputs.tag }}
-          PACKAGE: OpenRA-${{ github.event.inputs.tag }}-x64-win-itch.zip
-
-      - name: Publish macOS Package
-        uses: josephbmanley/butler-publish-itchio-action@master
-        env:
-          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
-          CHANNEL: macos
-          ITCH_GAME: openra
-          ITCH_USER: openra
-          VERSION: ${{ github.event.inputs.tag }}
-          PACKAGE: OpenRA-${{ github.event.inputs.tag }}.dmg
-
-      - name: Publish RA AppImage
-        uses: josephbmanley/butler-publish-itchio-action@master
-        env:
-          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
-          CHANNEL: linux-ra
-          ITCH_GAME: openra
-          ITCH_USER: openra
-          VERSION: ${{ github.event.inputs.tag }}
-          PACKAGE: OpenRA-Red-Alert-x86_64.AppImage
-
-      - name: Publish TD AppImage
-        uses: josephbmanley/butler-publish-itchio-action@master
-        env:
-          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
-          CHANNEL: linux-cnc
-          ITCH_GAME: openra
-          ITCH_USER: openra
-          VERSION: ${{ github.event.inputs.tag }}
-          PACKAGE: OpenRA-Tiberian-Dawn-x86_64.AppImage
-
-      - name: Publish D2k AppImage
-        uses: josephbmanley/butler-publish-itchio-action@master
-        env:
-          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
-          CHANNEL: linux-d2k
-          ITCH_GAME: openra
-          ITCH_USER: openra
-          VERSION: ${{ github.event.inputs.tag }}
-          PACKAGE: OpenRA-Dune-2000-x86_64.AppImage

.github/workflows/packaging.yml

@@ -1,129 +0,0 @@
-name: Release Packaging
-
-on:
-  push:
-    tags:
-    - 'release-*'
-    - 'playtest-*'
-    - 'devtest-*'
-
-jobs:
-  source:
-    name: Source Tarball
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-
-      - name: Prepare Environment
-        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
-
-      - name: Package Source
-        run: |
-          mkdir -p build/source
-          ./packaging/source/buildpackage.sh "${GIT_TAG}" "${PWD}/build/source"
-
-      - name: Upload Packages
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true
-          file: build/source/*
-
-  linux:
-    name: Linux AppImages
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-
-      - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-
-      - name: Prepare Environment
-        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
-
-      - name: Package AppImages
-        run: |
-          mkdir -p build/linux
-          ./packaging/linux/buildpackage.sh "${GIT_TAG}" "${PWD}/build/linux"
-
-      - name: Upload Packages
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true
-          file: build/linux/*
-
-  macos:
-    name: macOS Disk Image
-    runs-on: macos-11
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-
-      - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-
-      - name: Prepare Environment
-        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
-
-      - name: Package Disk Image
-        env:
-          MACOS_DEVELOPER_IDENTITY: ${{ secrets.MACOS_DEVELOPER_IDENTITY }}
-          MACOS_DEVELOPER_CERTIFICATE_BASE64: ${{ secrets.MACOS_DEVELOPER_CERTIFICATE_BASE64 }}
-          MACOS_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_DEVELOPER_CERTIFICATE_PASSWORD }}
-          MACOS_DEVELOPER_USERNAME: ${{ secrets.MACOS_DEVELOPER_USERNAME }}
-          MACOS_DEVELOPER_PASSWORD: ${{ secrets.MACOS_DEVELOPER_PASSWORD }}
-        run: |
-          mkdir -p build/macos
-          ./packaging/macos/buildpackage.sh "${GIT_TAG}" "${PWD}/build/macos"
-
-      - name: Upload Package
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true
-          file: build/macos/*
-
-  windows:
-    name: Windows Installers
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-
-      - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-
-      - name: Prepare Environment
-        run: |
-          echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
-          sudo apt-get update
-          sudo apt-get install nsis wine64
-
-      - name: Package Installers
-        run: |
-          mkdir -p build/windows
-          ./packaging/windows/buildpackage.sh "${GIT_TAG}" "${PWD}/build/windows"
-
-      - name: Upload Packages
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true
-          file: build/windows/*

.gitignore

@@ -1,56 +1,72 @@
-# Visual Studio
-Release
-bin
-obj
-*.ncb
-*.vcproj*
-*.suo
-*.user
-*.sln.cache
-*.manifest
-*.CodeAnalysisLog.xml
-*.lastcodeanalysissucceeded
-_ReSharper.*/
-/.vs
-
-# Visual Studio Code
-/.vscode/settings.json
-
-# binaries
-IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
-
-# backup files by various editors
-*~
-*.orig
-\#*
-.*.sw?
-
-# Monodevelop
-*.pidb
-*.userprefs
-
-# Mac OS X
-.DS_Store
-
-# auto-generated documentation
-DOCUMENTATION.md
-WEAPONS.md
-Lua-API.md
-Settings.md
-*.html
-openra.6
-update.log
-
-# SublimeText
-*.sublime-project
-*.sublime-workspace
-
-# NUnit
-/TestResult.xml
-/lib/
-
-# Support directory
-/Support
-
-# IntelliJ files
-.idea
+# 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
+
+# StyleCop
+*.Cache
+StyleCopViolations.xml
+
+# SublimeText
+*.sublime-project
+*.sublime-workspace

.kateproject

@@ -1,9 +0,0 @@
-{
-  "name": "OpenRA"
-, "files": [ { "git": 1 } ]
-, "build": {
-  "directory": "."
-  , "build": "make all"
-  , "clean": "make clean"
-  }
-}

.travis.yml

@@ -0,0 +1,71 @@
+# Travis-CI Build for OpenRA
+# see travis-ci.org for details
+
+language: csharp
+mono: 3.12.0
+
+# Don't use the container based infrastructure
+sudo: true
+
+cache:
+  directories:
+  - thirdparty/download
+
+# Environment variables
+env:
+  secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs="
+
+# Fetch dependencies
+# Run the build script
+# Check source code with StyleCop
+# call OpenRA to check for YAML errors
+script:
+ - sudo apt-get remove nuget # https://github.com/travis-ci/travis-ci/issues/3940
+ - travis_retry make all-dependencies
+ - make all
+ - make check
+ - make test
+
+# Automatically update the trait documentation and Lua API
+after_success:
+ - test $TRAVIS_PULL_REQUEST == "false" && make docs && cd packaging && ./update-wiki.sh $TRAVIS_BRANCH; cd ..
+
+# Only watch the development branch and tagged release.
+branches:
+ only:
+   - /^release-.*$/
+   - /^playtest-.*$/
+   - /^pkgtest-.*$/
+   - /^prep-.*$/
+   - bleed
+
+# Notify developers when build passed/failed.
+notifications:
+  irc:
+    template:
+      - "%{repository}#%{build_number} %{commit} %{author}: %{message} %{build_url}"
+    channels:
+      - "irc.freenode.net#openra"
+    use_notice: true
+    skip_join: true
+
+before_deploy:
+ - sudo apt-get install nsis nsis-common dpkg markdown
+ - export PATH=$PATH:$HOME/usr/bin
+ - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
+ - cd packaging
+ - mkdir build
+ - ./package-all.sh ${TRAVIS_TAG} ${PWD}/build/
+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
+  skip_cleanup: true
+  on:
+    all_branches: true
+    tags: true
+    repo: OpenRA/OpenRA

.vscode/extensions.json

@@ -1,9 +0,0 @@
-{
-	"recommendations": [
-		"ms-dotnettools.csharp",
-		"openra.oraide-vscode",
-		"openra.vscode-openra-lua",
-		"EditorConfig.EditorConfig",
-		"macabeus.vscode-fluent",
-	]
-}

.vscode/launch.json

@@ -1,63 +0,0 @@
-{
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "Launch (TD)",
-			"type": "coreclr",
-			"request": "launch",
-			"program": "${workspaceRoot}/bin/OpenRA.dll",
-			"windows": {
-				"program": "${workspaceRoot}/bin/OpenRA.exe",
-			},
-			"args": ["Game.Mod=cnc", "Engine.EngineDir=.."],
-			"preLaunchTask": "build",
-		},
-		{
-			"name": "Launch (RA)",
-			"type": "coreclr",
-			"request": "launch",
-			"program": "${workspaceRoot}/bin/OpenRA.dll",
-			"windows": {
-				"program": "${workspaceRoot}/bin/OpenRA.exe",
-			},
-			"args": ["Game.Mod=ra", "Engine.EngineDir=.."],
-			"preLaunchTask": "build",
-		},
-		{
-			"name": "Launch (D2k)",
-			"type": "coreclr",
-			"request": "launch",
-			"program": "${workspaceRoot}/bin/OpenRA.dll",
-			"windows": {
-				"program": "${workspaceRoot}/bin/OpenRA.exe",
-			},
-			"args": ["Game.Mod=d2k", "Engine.EngineDir=.."],
-			"preLaunchTask": "build",
-		},
-		{
-			"name": "Launch (TS)",
-			"type": "coreclr",
-			"request": "launch",
-			"program": "${workspaceRoot}/bin/OpenRA.dll",
-			"windows": {
-				"program": "${workspaceRoot}/bin/OpenRA.exe",
-			},
-			"args": ["Game.Mod=ts", "Engine.EngineDir=.."],
-			"preLaunchTask": "build",
-		},
-		{
-			"name": "Launch Utility",
-			"type": "coreclr",
-			"request": "launch",
-			"program": "${workspaceRoot}/bin/OpenRA.Utility.dll",
-			"windows": {
-				"program": "${workspaceRoot}/bin/OpenRA.Utility.exe",
-			},
-			"args": ["all", "--docs", "{DEV_VERSION}"],
-			"env": {
-				"ENGINE_DIR": ".."
-			},
-			"preLaunchTask": "build",
-		},
-	]
-}

.vscode/tasks.json

@@ -1,36 +0,0 @@
-{
-	"version": "2.0.0",
-	"options": {
-		"env": {
-			"ENGINE_DIR": ".."
-		}
-	},
-	"tasks": [
-		{
-			"label": "build",
-			"command": "make",
-			"args": ["all", "CONFIGURATION=Debug"],
-			"windows": {
-				"command": "make.cmd"
-			}
-		},
-		{
-			"label": "Run Utility",
-			"command": "dotnet ${workspaceRoot}/bin/OpenRA.Utility.dll ${input:modId} ${input:command}",
-			"type": "shell",
-		}
-	],
-	"inputs": [
-		{
-			"id": "modId",
-			"description": "ID of the mod to run",
-			"default": "all",
-			"type": "promptString"
-		}, {
-			"id": "command",
-			"description": "Name of the command + parameters",
-			"default": "",
-			"type": "promptString"
-		},
-	]
-}

AUTHORS

@@ -2,34 +2,26 @@ OpenRA wouldn't be where it is today without the
 hard work of many contributors.
 
 The OpenRA developers are:
-    * Gustas Kažukauskas (PunkPun)
-    * Lukas Franke (abcdefg30)
+    * Chris Forbes (chrisf)
+    * Curtis Shmyr (hamb)
+    * Igor Popov (ihptru)
     * Matthias Mailänder (Mailaender)
+    * Oliver Brakmann (obrakmann)
+    * Paul Chote (pchote)
+    * ScottNZ
 
 Previous developers included:
     * Alli Witheford (alzeih)
     * Caleb Anderson (RobotCaleb)
-    * Chris Forbes (chrisf)
-    * Curtis Shmyr (hamb)
     * Daniel Hernandez (Mancano)
-    * Igor Popov (ihptru)
     * Megan Bowra-Dean (beedee)
     * Mike Bundy (kehaar)
-    * Oliver Brakmann (obrakmann)
-    * Paul Chote (pchote)
-    * Pavel Penev (penev92)
-    * Reaperrr
     * Robert Pepperell (ytinasni)
-    * ScottNZ
-    * Tom Roostan (RoosterDragon)
 
 Also thanks to:
-    * abmyii
-    * anvilvapre (anvilvapre)
     * Adam Valy (Tschokky)
     * Akseli Virtanen (RAGEQUIT)
     * Alexander Fast (mizipzor)
-    * Alexis Hunt (alercah)
     * Allen262
     * Andrew Aldridge (i80and)
     * Andrew Perkins
@@ -39,124 +31,82 @@ Also thanks to:
     * Arik Lirette (Angusm3)
     * Barnaby Smith (mvi)
     * Bellator
-    * Bernd Stellwag (burned42)
-    * Biofreak
     * Braxton Williams (Buddytex)
-    * Brendan Gluth (Mechanical_Man)
-    * Brent Gardner (bggardner)
-    * Bryan Wilbur
     * Bugra Cuhadaroglu (BugraC)
-    * Chris Cameron (Vesuvian)
-    * Chris Grant (Unit158)
     * Christer Ulfsparre (Holloweye)
-    * Christoph Lahner (chlah)
-    * clem
+    * Chris Grant (Unit158)
     * Cody Brittain (Generalcamo)
-    * Constantin Helmig (CH4Code)
     * D2k Sardaukar
-    * D'Arcy Rush (r34ch)
     * Daniel Derejvanik (Harisson)
     * Danny Keary (Dan9550)
     * David Jiménez (Rydra)
     * David Russell (DavidARussell)
     * DeadlySurprise
-    * Dmitri Suvorov (suvjunmd)
-    * dtluna
-    * Eduardo Cáceres (eduherminio)
     * Erasmus Schroder (rasco)
     * Eric Bajumpaa (SteelPhase)
-    * Evgeniy Sergeev (evgeniysergeev)
     * Fahrradkette
-    * Florian Wiesbauer (FiveAces)
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
-    * Glen Anderson (glen7)
+    * Glen Anderson (GlenAnderson)
     * Glenn Martin Jensen (Baxxster)
     * Gordon Martin (Happy0)
     * Guido Lipke (LipkeGu)
-    * Hervé Matysiak (Herve-M)
     * Huw Pascoe
     * Ian T. Jacobsen (Smilex)
     * Imago
     * Iran
-    * Ishan Bhargava (ishantheperson)
-    * Ivaylo Draganov (dragunoff)
     * 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
     * Kanar
     * Kenny Hoxworth (hoxworth)
-    * Kevin Azzam (ChaoticMind)
     * Krishnakanth Mallik
-    * Kyle Smith (Smitty)
     * Kyrre Soerensen (zypres)
     * Lawrence Wang
     * Lesueur Benjamin (Valkirie)
+    * Lukas Franke (abcdefg30)
     * Maarten Meuris (Nyerguds)
-    * Manuel Geiger (Ectras)
     * Mark Olson (markolson)
-    * Markus Hartung (hartmark)
     * Matija Hustic (matija-hustic)
     * Matthew Gatland (mgatland)
     * Matthew Uzzell (MUzzell)
     * Matthijs Benschop (Nerdie)
     * Max621
     * Max Ugrumov (katzsmile)
-    * Mazar Farran (mazarf)
-    * 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)
     * Olaf van der Spek
     * Paolo Chiodi (paolochiodi)
     * Paul Dovydaitis (pdovy)
+    * Pavel Penev (penev92)
     * Pavlos Touboulidis (pav)
-    * Pedro Ferreira Ramos (bateramos)
-    * Peter Amrehn (jongleur1983)
     * Pizzaoverhead
-    * Pi Delport (pjdelport)
     * Psydev
-    * Raphael Vogt (TheRaffy, Yellow)
     * Raymond Bedrossian (Squiggles211)
     * Raymond Martineau (mart0258)
+    * Reaperrr
     * Riderr3
-    * riiga
     * Rikhardur Bjarni Einarsson (WolfGaming)
     * Sascha Biedermann (bidifx)
-    * Sean Hunt (coppro)
+    * Sebastien Kerguen (xanax)
     * Shawn Collins (UberWaffe)
     * Simon Verbeke (Saticmotion)
-    * Stuart McHattie (SDJMcHattie)
     * Taryn Hill (Phrohdoh)
     * Teemu Nieminen (Temeez)
-    * Thomas Christlieb (ThomasChr)
     * Tim Mylemans (gecko)
     * Tirili
-    * Tomas Einarsson (Mesacer)
-    * Tom van Leth (tovl)
-    * Trevor Nichols (ocdi)
+    * Tom Roostan (RoosterDragon)
     * Tristan Keating (Kilkakon)
     * Tristan Mühlbacher (MicroBit)
-    * UnknownProgrammer
     * Vladimir Komarov (VrKomarov)
-    * Wojciech Walaszek (Voidwalker)
     * Wuschel
 
 Using GNU FreeFont distributed under the GNU GPL
@@ -170,8 +120,20 @@ FreeType License.
 
 Using OpenAL Soft distributed under the GNU LGPL.
 
-Using SDL2-CS and OpenAL-CS created by Ethan
-Lee and released under the zlib license.
+Using MaxMind GeoIP2 .NET API distributed under
+the Apache 2.0 license.
+
+Using GeoLite2 data created by MaxMind and
+distributed under the CC BY-SA 3.0 license.
+
+Using SharpFont created by Robert Rouhani and
+distributed under the MIT license.
+
+Using the Open Toolkit distributed under the
+MIT license.
+
+Using SDL2# created by Ethan Lee and released
+under the zlib license.
 
 Using Eluant created by Chris Howie and released
 under the MIT license.
@@ -179,41 +141,14 @@ under the MIT license.
 Using FuzzyLogicLibrary (fuzzynet) by Dmitry
 Kaluzhny and released under the GNU GPL terms.
 
-Using Mono.Nat by Alan McGovern, Ben Motmans,
-Nicholas Terry distributed under the MIT license.
-
-Using MP3Sharp by Robert Bruke and Zane Wagner
-licensed under the GNU LGPL Version 3.
-
-Using TagLib# by Stephen Shaw licensed under the
-GNU LGPL Version 2.1.
-
-Using NVorbis by Andrew Ward distributed under
-the MIT license.
+Using Mono.Nat by 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 rix0rrr.BeaconLib developed by Rico Huijbers
-distributed under MIT License.
-
-Using DiscordRichPresence developed by Lachee
-distributed under MIT License.
-
-Using Json.NET developed by James Newton-King
-distributed under MIT License.
-
-Using ANGLE distributed under the BS3 3-Clause license.
-
-Using Pfim developed by Nick Babcock
-distributed under the MIT license.
-
-Using Linguini by the Space Station 14 team
-licensed under Apache and MIT terms.
-
-This site or product includes IP2Location LITE data
-available from http://www.ip2location.com.
 
 Finally, special thanks goes to the original teams
 at Westwood Studios and EA for creating the classic
 games which OpenRA aims to reimagine.
+

CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# 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 Libera –
-[webchat](https://web.libera.chat/#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

@@ -1,16 +1,10 @@
 # OpenRA Contributing Guidelines
 
-## Participating
-Help us keep OpenRA open and inclusive. Please read and follow our [Code of Conduct](https://github.com/OpenRA/OpenRA/blob/bleed/CODE_OF_CONDUCT.md).
-
 ## Bug reports
 
 * Have you read the [FAQ](https://github.com/OpenRA/OpenRA/wiki/FAQ)?
 * Add the appropriate log files on crashes.
-* Mention the version you have tested against.
 * Please be specific on how to reproduce the problem.
-* Do not submit duplicate issues. Search first.
-* Avoid including multiple requests/bugs into a single issue.
 
 ## Patches
 
@@ -20,7 +14,7 @@ Help us keep OpenRA open and inclusive. Please read and follow our [Code of Cond
 
 Please `git rebase` to the latest revision of the bleed branch.
 
-Don't forget to add yourself to [AUTHORS](https://github.com/OpenRA/OpenRA/blob/bleed/AUTHORS).
+Don't forget to add youself 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.
 

Directory.Build.props

@@ -1,52 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <LangVersion>7.3</LangVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <EngineRootPath Condition="'$(EngineRootPath)' == ''">..</EngineRootPath>
-    <OutputPath>$(EngineRootPath)/bin</OutputPath>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ExternalConsole>false</ExternalConsole>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <CodeAnalysisRuleSet>$(EngineRootPath)/OpenRA.ruleset</CodeAnalysisRuleSet>
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TargetFramework Condition="'$(MSBuildRuntimeType)'!='Mono'">net6.0</TargetFramework>
-    <TargetFramework Condition="'$(MSBuildRuntimeType)'=='Mono'">netstandard2.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TargetPlatform Condition="$([MSBuild]::IsOsPlatform('Windows'))">win-x64</TargetPlatform>
-    <TargetPlatform Condition="$([MSBuild]::IsOsPlatform('Linux'))">linux-x64</TargetPlatform>
-    <TargetPlatform Condition="$([MSBuild]::IsOsPlatform('OSX'))">osx-x64</TargetPlatform>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
-    <Compile Include="**/*.cs" Exclude="$(DefaultItemExcludes)" />
-  </ItemGroup>
-
-  <Target Name="DisableAnalyzers" BeforeTargets="CoreCompile" Condition="'$(Configuration)'=='Release'">
-    <!-- Disable code style analysis on Release builds to improve compile-time performance -->
-    <ItemGroup Condition="'$(Configuration)'=='Release'">
-      <Analyzer Remove="@(Analyzer)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- StyleCop -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
-  </ItemGroup>
-</Project>

INSTALL.md

@@ -6,78 +6,68 @@ The following lists per-platform dependencies required to build from source.
 Windows
 =======
 
-Compiling OpenRA requires the following dependencies:
-* [Windows PowerShell >= 4.0](http://microsoft.com/powershell) (included by default in recent Windows 10 versions)
-* [.NET 6 SDK](https://dotnet.microsoft.com/download/dotnet/6.0) (or via Visual Studio)
+* [Windows PowerShell >= 4.0](http://microsoft.com/powershell)
+* [.NET Framework >= 4.0 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=17113)
+* [SDL 2](http://www.libsdl.org/download-2.0.php) (included)
+* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included)
+* [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included)
+* [OpenAL](http://kcat.strangesoft.net/openal.html) (included)
+* [liblua 5.1](http://luabinaries.sourceforge.net/download.html) (included)
 
-To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with `dotnet` or use the Makefile analogue command `make all` scripted in PowerShell syntax.
+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.
 
-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.
+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.
 
 Linux
 =====
 
-.NET 6 or Mono (version 6.4 or later) is required to compile OpenRA. We recommend using .NET 6 when possible, as Mono is poorly packaged by most Linux distributions (e.g. missing the required `msbuild` toolchain), and has been deprecated as a standalone project.
+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.
 
-The [.NET 6 download page](https://dotnet.microsoft.com/download/dotnet/6.0) provides repositories for various package managers and binary releases for several architectures. If you prefer to use Mono, we suggest adding the [upstream repository](https://www.mono-project.com/download/stable/#download-lin) for your distro to obtain the latest version and the `msbuild` toolchain.
+To compile OpenRA, run `make all` from the command line.
 
-To compile OpenRA, run `make` from the command line (or `make RUNTIME=mono` if using Mono). 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`.
 
-The default behaviour on the x86_64 architecture is to download several pre-compiled native libraries using the Nuget packaging manager. If you prefer to use system libraries, compile instead using `make TARGETPLATFORM=unix-generic`.
+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.
 
-If you choose to use system libraries, or your system is not x86_64, you will need to install [SDL 2](https://www.libsdl.org/download-2.0.php), [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm), [OpenAL](https://openal-soft.org/), and [liblua 5.1](http://luabinaries.sourceforge.net/download.html) before compiling OpenRA.
+Debian/Ubuntu
+-------------
 
-These can be installed using your package manager on various distros:
+* mono-dmcs
+* libmono-system-windows-forms4.0-cil
+* nuget
+* cli-common-dev (>= 2.10)
+* libfreetype6
+* libopenal1
+* liblua5.1-0
+* libsdl2-2.0-0
+* xdg-utils
+* zenity
 
-<details><summary>Arch Linux</summary>
+openSUSE
+--------
 
-```
-sudo pacman -S openal libgl freetype2 sdl2 lua51
-```
-</details>
-<details><summary>Debian/Ubuntu</summary>
+* mono-devel
+* nuget
+* openal
+* freetype2
+* SDL2
+* lua51
+* xdg-utils
+* zenity
 
-```
-sudo apt install libfreetype6 libopenal1 liblua5.1-0 libsdl2-2.0-0
-```
-</details>
-<details><summary>Fedora</summary>
+Gentoo
+------
 
-```
-sudo dnf install SDL2 freetype "lua = 5.1" openal-soft
-```
-</details>
-<details><summary>Gentoo</summary>
-
-```
-sudo emerge -av media-libs/freetype:2 media-libs/libsdl2 media-libs/openal virtual/opengl '=dev-lang/lua-5.1.5*'
-```
-</details>
-<details><summary>Mageia</summary>
-
-```
-sudo dnf install SDL2 freetype "lib*lua5.1" "lib*freetype2" "lib*sdl2.0_0" openal-soft
-```
-</details>
-<details><summary>openSUSE</summary>
-
-```
-sudo zypper in openal-soft freetype2 SDL2 lua51
-```
-</details>
-<details><summary>Red Hat Enterprise Linux (and rebuilds, e.g. CentOS)</summary>
-The EPEL repository is required in order for the following command to run properly.
-
-```
-sudo yum install SDL2 freetype "lua = 5.1" openal-soft
-```
-</details>
-
-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`.
-
-macOS
-=====
-
-[.NET 6](https://dotnet.microsoft.com/download/dotnet/6.0) or [Mono](https://www.mono-project.com/download/stable/#download-mac) (version 6.4 or later) is required to compile OpenRA. We recommend using .NET 6 unless you are running a very old version of macOS (10.9 through 10.14).
-
-To compile OpenRA, run `make` from the command line (or `make RUNTIME=mono` if using Mono). Run with `./launch-game.sh`.
+* 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

Makefile

@@ -3,209 +3,479 @@
 # to compile, run:
 #   make
 #
-# to compile using Mono (version 6.4 or greater) instead of .NET 6, run:
-#   make RUNTIME=mono
-#
-# to compile using system libraries for native dependencies, run:
-#   make [RUNTIME=net6] TARGETPLATFORM=unix-generic
+# to compile with development tools, run:
+#   make all
 #
 # to check the official mods for erroneous yaml files, run:
-#   make [RUNTIME=net6] test
+#   make test
 #
-# to check the engine and official mod dlls for code style violations, run:
-#   make [RUNTIME=net6] check
+# to check the official mod dlls for StyleCop violations, run:
+#   make check
 #
-# to compile and install Red Alert, Tiberian Dawn, and Dune 2000, run:
-#   make [RUNTIME=net6] [prefix=/foo] [bindir=/bar/bin] install
+# to generate documentation aimed at modders, run:
+#   make docs
 #
-# to compile and install Red Alert, Tiberian Dawn, and Dune 2000
-# using system libraries for native dependencies, run:
-#   make [prefix=/foo] [bindir=/bar/bin] TARGETPLATFORM=unix-generic install
+# to install, run:
+#   make [prefix=/foo] [bindir=/bar/bin] install
 #
-# to install FreeDesktop startup scripts, desktop files, icons, and MIME metadata
+# 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
 #
-# to install FreeDesktop AppStream metadata
-#   make install-linux-appdata
-#
-# to install the Unix man page
-#   make install-man
+# to uninstall, run:
+#   make uninstall
 #
 # for help, run:
 #   make help
 #
+# to start the game, run:
+#   openra
+
+
+
+############################## TOOLCHAIN ###############################
+#
+CSC         = dmcs
+CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
+DEFINE      = DEBUG;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
+
+
 
 ######################### UTILITIES/SETTINGS ###########################
 #
-# Install locations for local installs and downstream packaging
+# install locations
 prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
 datadir ?= $(datarootdir)
-mandir ?= $(datarootdir)/man/
 bindir ?= $(prefix)/bin
 libdir ?= $(prefix)/lib
 gameinstalldir ?= $(libdir)/openra
 
-# Toolchain
-CWD = $(shell pwd)
-MSBUILD = msbuild -verbosity:m -nologo
-DOTNET = dotnet
-MONO = mono
+BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
+DATA_INSTALL_DIR = $(DESTDIR)$(gameinstalldir)
+
+# install tools
 RM = rm
 RM_R = $(RM) -r
 RM_F = $(RM) -f
 RM_RF = $(RM) -rf
+CP = cp
+CP_R = $(CP) -r
+INSTALL = install
+INSTALL_DIR = $(INSTALL) -d
+INSTALL_PROGRAM = $(INSTALL) -m755
+INSTALL_DATA = $(INSTALL) -m644
 
-RUNTIME ?= net6
-CONFIGURATION ?= Release
-DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3)
-ARCH_X64 = $(shell echo ${DOTNET_RID} | grep x64)
+# program targets
+CORE = rsdl2 rnull game utility
+TOOLS = editor crashdialog
+VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
-# Only for use in target version:
-VERSION := $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || (c=$$(git rev-parse --short HEAD 2>/dev/null) && echo git-$$c))
-
-# Detect target platform for dependencies if not given by the user
-ifndef TARGETPLATFORM
+# dependencies
 UNAME_S := $(shell uname -s)
-UNAME_M := $(shell uname -m)
-ifeq ($(UNAME_S),Darwin)
-ifeq ($(ARCH_X64),)
-TARGETPLATFORM = osx-arm64
-else
-TARGETPLATFORM = osx-x64
-endif
-else
-ifeq ($(UNAME_M),x86_64)
-TARGETPLATFORM = linux-x64
-else
-ifeq ($(UNAME_M),aarch64)
-TARGETPLATFORM = linux-arm64
-else
-TARGETPLATFORM = unix-generic
-endif
-endif
-endif
+ifeq ($(UNAME_S),Linux)
+os-dependencies = linux-dependencies
+else ifeq ($(UNAME_S),Darwin)
+os-dependencies = osx-dependencies
 endif
 
-##################### DEVELOPMENT BUILDS AND TESTS #####################
+
+
+######################## PROGRAM TARGET RULES ##########################
 #
-all:
-	@echo "Compiling in ${CONFIGURATION} mode..."
-ifeq ($(RUNTIME), mono)
-	@command -v $(firstword $(MSBUILD)) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 6.4."; exit 1)
-	@$(MSBUILD) -t:Build -restore -p:Configuration=${CONFIGURATION} -p:TargetPlatform=$(TARGETPLATFORM)
-else
-	@$(DOTNET) build -c ${CONFIGURATION} -nologo -p:TargetPlatform=$(TARGETPLATFORM)
-endif
-ifeq ($(TARGETPLATFORM), unix-generic)
-	@./configure-system-libraries.sh
-endif
-	@./fetch-geoip.sh
+# Core binaries
 
-# dotnet clean and msbuild -t:Clean leave files that cause problems when switching between mono/dotnet
-# Deleting the intermediate / output directories ensures the build directory is actually clean
-clean:
-	@-$(RM_RF) ./bin ./*/obj
-	@-$(RM_F) IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
+game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
+game_TARGET = OpenRA.Game.exe
+game_KIND = winexe
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SDL2-CS.dll thirdparty/download/SharpFont.dll
+game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
+PROGRAMS += game
+game: $(game_TARGET)
 
-check:
-	@echo
-	@echo "Compiling in Debug mode..."
-ifeq ($(RUNTIME), mono)
-# Enabling EnforceCodeStyleInBuild and GenerateDocumentationFile as a workaround for some code style rules (in particular IDE0005) being bugged and not reporting warnings/errors otherwise.
-	@$(MSBUILD) -t:build -restore -p:Configuration=Debug -warnaserror -p:TargetPlatform=$(TARGETPLATFORM) -p:EnforceCodeStyleInBuild=true -p:GenerateDocumentationFile=true
-else
-# Enabling EnforceCodeStyleInBuild and GenerateDocumentationFile as a workaround for some code style rules (in particular IDE0005) being bugged and not reporting warnings/errors otherwise.
-	@$(DOTNET) build -c Debug -nologo -warnaserror -p:TargetPlatform=$(TARGETPLATFORM) -p:EnforceCodeStyleInBuild=true -p:GenerateDocumentationFile=true
-endif
-ifeq ($(TARGETPLATFORM), unix-generic)
-	@./configure-system-libraries.sh
-endif
-	@echo
-	@echo "Checking for explicit interface violations..."
-	@./utility.sh all --check-explicit-interfaces
-	@echo
-	@echo "Checking for incorrect conditional trait interface overrides..."
-	@./utility.sh all --check-conditional-trait-interface-overrides
+# Renderer dlls
+rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
+rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
+rsdl2_KIND = library
+rsdl2_DEPS = $(game_TARGET)
+rsdl2_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll $(rsdl2_DEPS)
 
-check-scripts:
-	@echo
-	@echo "Checking for Lua syntax errors..."
-	@find lua/ mods/*/{maps,scripts}/ -iname "*.lua" -print0 | xargs -0n1 luac -p
+rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
+rnull_TARGET = OpenRA.Renderer.Null.dll
+rnull_KIND = library
+rnull_DEPS = $(game_TARGET)
+rnull_LIBS = $(COMMON_LIBS) $(rnull_DEPS)
+PROGRAMS += rsdl2 rnull
+renderers: $(rsdl2_TARGET) $(rnull_TARGET)
 
-test: all
+# Mods Common
+mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
+mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
+mod_common_KIND = library
+mod_common_DEPS = $(game_TARGET)
+mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
+PROGRAMS += mod_common
+mod_common: $(mod_common_TARGET)
+
+##### Official Mods #####
+
+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_KIND = library
+mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+PROGRAMS += mod_cnc
+mod_cnc: $(mod_cnc_TARGET)
+
+# Dune 2000
+mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
+mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
+mod_d2k_KIND = library
+mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET) $(mod_cnc_TARGET)
+mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+PROGRAMS += mod_d2k
+mod_d2k: $(mod_d2k_TARGET)
+
+# 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_ra_TARGET)
+mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+PROGRAMS += mod_ts
+mod_ts: $(mod_ts_TARGET)
+
+##### Tools #####
+
+# Map Editor
+editor_SRCS := $(shell find OpenRA.Editor/ -iname '*.cs')
+editor_TARGET = OpenRA.Editor.exe
+editor_KIND = winexe
+editor_DEPS = $(game_TARGET) $(mod_common_TARGET)
+editor_LIBS = System.Windows.Forms.dll System.Data.dll System.Drawing.dll $(editor_DEPS) thirdparty/download/Eluant.dll
+editor_EXTRA = -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
+editor_FLAGS = -win32icon:OpenRA.Editor/OpenRA.Editor.Icon.ico
+
+PROGRAMS += editor
+OpenRA.Editor.MapSelect.resources:
+	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
+OpenRA.Editor.Form1.resources:
+	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
+editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
+
+check: utility mods
+	@echo
+	@echo "Checking for code style violations in OpenRA.Game..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game
+	@echo
+	@echo "Checking for code style violations in OpenRA.Renderer.Null..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Null
+	@echo
+	@echo "Checking for code style violations in OpenRA.GameMonitor..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.GameMonitor
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.Common..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Common
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.RA..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.Cnc..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Cnc
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.D2k..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.D2k
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.TS..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS
+	@echo
+	@echo "Checking for code style violations in OpenRA.Editor..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Editor
+	@echo
+	@echo "Checking for code style violations in OpenRA.Renderer.Sdl2..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Sdl2
+	@echo
+	@echo "Checking for code style violations in OpenRA.Utility..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
+	@echo
+	@echo "Checking for code style violations in OpenRA.Test..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
+
+test: utility mods
 	@echo
 	@echo "Testing Tiberian Sun mod MiniYAML..."
-	@./utility.sh ts --check-yaml
+	@mono --debug OpenRA.Utility.exe ts --check-yaml
 	@echo
 	@echo "Testing Dune 2000 mod MiniYAML..."
-	@./utility.sh d2k --check-yaml
+	@mono --debug OpenRA.Utility.exe d2k --check-yaml
 	@echo
 	@echo "Testing Tiberian Dawn mod MiniYAML..."
-	@./utility.sh cnc --check-yaml
+	@mono --debug OpenRA.Utility.exe cnc --check-yaml
 	@echo
 	@echo "Testing Red Alert mod MiniYAML..."
-	@./utility.sh ra --check-yaml
+	@mono --debug OpenRA.Utility.exe ra --check-yaml
 
-############# LOCAL INSTALLATION AND DOWNSTREAM PACKAGING ##############
+
+##### 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
+utility_DEPS = $(game_TARGET)
+utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.SharpZipLib.dll
+PROGRAMS += utility
+utility: $(utility_TARGET)
+
+# Patches binary headers to work around a mono bug
+fixheader.exe: packaging/fixheader.cs
+	@echo CSC fixheader.exe
+	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
+
+# Generate build rules for each target defined above in PROGRAMS
+define BUILD_ASSEMBLY
+
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
+	@echo CSC $$(@)
+	@$(CSC) $$($(1)_LIBS:%=-r:%) \
+		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
+		-define:"$(DEFINE)" \
+		-t:"$$($(1)_KIND)" \
+		$$($(1)_EXTRA) \
+		$$($(1)_SRCS)
+	@mono fixheader.exe $$(@) > /dev/null
+	@test `echo $$(@) | sed 's/^.*\.//'` = "dll" && chmod a-x $$(@) || ``
+	@$$($(1)_EXTRA_CMDS)
+endef
+
+$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
+
+
+
+########################## MAKE/INSTALL RULES ##########################
 #
-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
-ifeq ($(VERSION),)
-	$(error Unable to determine new version (requires git or override of variable VERSION))
+default: core
+
+core: game renderers mods utility
+
+tools: editor gamemonitor
+
+package: all-dependencies core tools docs version
+
+mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
+
+all: dependencies core tools
+
+clean:
+	@-$(RM_F) *.exe *.dll *.dylib *.dll.config ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-$(RM_RF) ./*/bin ./*/obj
+	@-$(RM_RF) ./thirdparty/download
+
+distclean: clean
+
+cli-dependencies:
+	@./thirdparty/fetch-thirdparty-deps.sh
+	@ $(CP_R) thirdparty/download/*.dll .
+	@ $(CP_R) thirdparty/download/*.dll.config .
+	@ $(CP) thirdparty/SDL2-CS.dll.config .
+
+linux-dependencies: cli-dependencies linux-native-dependencies
+
+linux-native-dependencies:
+	@./thirdparty/configure-linux-native-deps.sh
+
+windows-dependencies:
+	@./thirdparty/fetch-thirdparty-deps-windows.sh
+
+osx-dependencies: cli-dependencies
+	@./thirdparty/fetch-thirdparty-deps-osx.sh
+	@ $(CP_R) thirdparty/download/osx/*.dylib .
+	@ $(CP_R) thirdparty/download/osx/*.dll.config .
+
+dependencies: $(os-dependencies)
+	@./thirdparty/fetch-geoip-db.sh
+	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
+
+all-dependencies: cli-dependencies windows-dependencies osx-dependencies
+
+version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
+	@for i in $? ; do \
+		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
+		mv -f $${i}.tmp $${i} ; \
+	done
+
+docs: utility mods version
+	@mono --debug OpenRA.Utility.exe all --docs > DOCUMENTATION.md
+	@mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md
+
+install: install-core
+
+install-all: install-core install-tools
+
+install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
+
+install-core: default
+	@-echo "Installing OpenRA 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) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
+	@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
+
+	@$(CP_R) glsl "$(DATA_INSTALL_DIR)"
+	@$(CP_R) lua "$(DATA_INSTALL_DIR)"
+	@$(CP) SDL2-CS* "$(DATA_INSTALL_DIR)"
+	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
+	@$(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) 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)"
+
+ifeq ($(shell uname),Linux)
+	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
 endif
-	@sh -c '. ./packaging/functions.sh; set_engine_version "$(VERSION)" .'
-	@sh -c '. ./packaging/functions.sh; set_mod_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'
 
-install:
-	@sh -c '. ./packaging/functions.sh; install_assemblies $(CWD) $(DESTDIR)$(gameinstalldir) $(TARGETPLATFORM) $(RUNTIME) True True True'
-	@sh -c '. ./packaging/functions.sh; install_data $(CWD) $(DESTDIR)$(gameinstalldir) cnc d2k ra'
+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-shortcuts:
-	@sh -c '. ./packaging/functions.sh; install_linux_shortcuts $(CWD) "$(DESTDIR)" "$(gameinstalldir)" "$(bindir)" "$(datadir)" "$(shell head -n1 VERSION)" cnc d2k ra'
+install-linux-icons:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
+	@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
+
+install-linux-desktop:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
+
+install-linux-mime:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
+
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"
 
 install-linux-appdata:
-	@sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) "$(DESTDIR)" "$(datadir)" cnc d2k ra'
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
+	@$(INSTALL_DATA) packaging/linux/openra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
 
-install-man: all
-	@mkdir -p $(DESTDIR)$(mandir)/man6/
-	@./utility.sh all --man-page > $(DESTDIR)$(mandir)/man6/openra.6
+install-linux-scripts:
+	@echo "#!/bin/sh" > openra
+	@echo 'cd "$(gameinstalldir)"' >> openra
+	@echo 'mono OpenRA.Game.exe "$$@"' >> openra
+	@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
+	@echo 'then' >> openra
+	@echo 'ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."' >> openra
+	@echo '$$ZENITY --question --title "OpenRA" --text "OpenRA has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ' >> openra
+	@echo 'exit 1' >> openra
+	@echo 'fi' >> openra
+
+	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
+	@-$(RM) openra
+
+	@echo "#!/bin/sh" >  openra-editor
+	@echo 'cd "$(gameinstalldir)"' >> openra-editor
+	@echo 'exec mono OpenRA.Editor.exe "$$@"' >> openra-editor
+	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)"
+	@-$(RM) openra-editor
+
+uninstall:
+	@-$(RM_R) "$(DATA_INSTALL_DIR)"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-editor"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-editor.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/32x32/apps/openra-editor.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-editor.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
 
 help:
-	@echo 'to compile, run:'
-	@echo '  make'
+	@echo to compile, run:
+	@echo \ \ make
 	@echo
-	@echo 'to compile using Mono (version 6.4 or greater) instead of .NET 6, run:'
-	@echo '  make RUNTIME=mono'
+	@echo to compile with development tools, run:
+	@echo \ \ make all
 	@echo
-	@echo 'to compile using system libraries for native dependencies, run:'
-	@echo '  make [RUNTIME=net6] TARGETPLATFORM=unix-generic'
+	@echo to check the official mods for erroneous yaml files, run:
+	@echo \ \ make test
 	@echo
-	@echo 'to check the official mods for erroneous yaml files, run:'
-	@echo '  make [RUNTIME=net6] test'
+	@echo to generate documentation aimed at modders, run:
+	@echo \ \ make docs
 	@echo
-	@echo 'to check the engine and official mod dlls for code style violations, run:'
-	@echo '  make [RUNTIME=net6] check'
+	@echo to install, run:
+	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install
 	@echo
-	@echo 'to compile and install Red Alert, Tiberian Dawn, and Dune 2000 run:'
-	@echo '  make [RUNTIME=net6] [prefix=/foo] [TARGETPLATFORM=unix-generic] install'
+	@echo to install with development tools, run:
+	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all
 	@echo
-	@echo 'to compile and install Red Alert, Tiberian Dawn, and Dune 2000'
-	@echo 'using system libraries for native dependencies, run:'
-	@echo '   make [RUNTIME=net6] [prefix=/foo] [bindir=/bar/bin] TARGETPLATFORM=unix-generic install'
+	@echo to install Linux startup scripts, desktop files and icons
+	@echo \ \ make install-linux-shortcuts
 	@echo
-	@echo 'to install FreeDesktop startup scripts, desktop files, icons, and MIME metadata'
-	@echo '  make install-linux-shortcuts'
+	@echo to uninstall, run:
+	@echo \ \ make uninstall
 	@echo
-	@echo 'to install FreeDesktop AppStream metadata'
-	@echo '  make install-linux-appdata'
-	@echo
-	@echo 'to install a Unix man page'
-	@echo '  make install-man'
+	@echo to start the game, run:
+	@echo \ \ openra
+
+
+
 
 ########################### MAKEFILE SETTINGS ##########################
 #
-.DEFAULT_GOAL := all
+.DEFAULT_GOAL := default
 
 .SUFFIXES:
 
-.PHONY: all clean check check-scripts test version install install-linux-shortcuts install-linux-appdata install-man help
+.PHONY: core tools package all mods clean distclean dependencies version $(PROGRAMS)

OpenRA.Editor/ActorPropertiesDialog.Designer.cs

@@ -0,0 +1,90 @@
+namespace OpenRA.Editor
+{
+	partial class ActorPropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+				components.Dispose();
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+			this.SuspendLayout();
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(226, 333);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 0;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button2.Enabled = false;
+			this.button2.Location = new System.Drawing.Point(145, 333);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 0;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// flowLayoutPanel1
+			// 
+			this.flowLayoutPanel1.AutoScroll = true;
+			this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.flowLayoutPanel1.Location = new System.Drawing.Point(13, 13);
+			this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+			this.flowLayoutPanel1.Size = new System.Drawing.Size(288, 314);
+			this.flowLayoutPanel1.TabIndex = 1;
+			// 
+			// ActorPropertiesDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(313, 368);
+			this.Controls.Add(this.flowLayoutPanel1);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ActorPropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Actor Properties";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+	}
+}

OpenRA.Editor/ActorPropertiesDialog.cs

@@ -0,0 +1,48 @@
+#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.Drawing;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class ActorPropertiesDialog : Form
+	{
+		public ActorPropertiesDialog()
+		{
+			InitializeComponent();
+		}
+
+		public void AddRow(string name, Control c)
+		{
+			flowLayoutPanel1.Controls.Add(new Label
+			{
+				Text = name,
+				Width = flowLayoutPanel1.Width * 3 / 10,
+				Height = 25,
+				TextAlign = ContentAlignment.MiddleLeft,
+			});
+
+			c.Width = flowLayoutPanel1.Width * 6 / 10 - 25;
+			c.Height = 25;
+			flowLayoutPanel1.Controls.Add(c);
+		}
+
+		public Control MakeEditorControl(Type t, Func<object> getter, Action<object> setter)
+		{
+			var r = new TextBox();
+			r.Text = FieldSaver.FormatValue(getter(), t);
+			r.LostFocus += (e, _) => setter(FieldLoader.GetValue("<editor internals>", t, r.Text));
+			r.Enabled = false;
+			return r;
+		}
+	}
+}

OpenRA.Editor/ActorPropertiesDialog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

OpenRA.Editor/ActorTemplate.cs

@@ -0,0 +1,35 @@
+#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.Drawing;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	class ActorTemplate
+	{
+		public Bitmap Bitmap;
+		public ActorInfo Info;
+		public EditorAppearanceInfo Appearance;
+	}
+
+	class BrushTemplate
+	{
+		public Bitmap Bitmap;
+		public ushort N;
+	}
+
+	class ResourceTemplate
+	{
+		public Bitmap Bitmap;
+		public ResourceTypeInfo Info;
+		public int Value;
+	}
+}

OpenRA.Editor/ActorTool.cs

@@ -0,0 +1,51 @@
+#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.Linq;
+using SGraphics = System.Drawing.Graphics;
+
+namespace OpenRA.Editor
+{
+	class ActorTool : ITool
+	{
+		ActorTemplate actorTemplate;
+		public ActorTool(ActorTemplate actor) { this.actorTemplate = actor; }
+
+		public void Preview(Surface surface, SGraphics g)
+		{
+			surface.DrawActor(g, surface.GetBrushLocation(), actorTemplate,
+				surface.GetPaletteForPlayer(surface.NewActorOwner));
+		}
+
+		public void Apply(Surface surface)
+		{
+			if (surface.Actors.Any(a => a.Value.Location() == surface.GetBrushLocation()))
+				return;
+
+			var owner = surface.NewActorOwner;
+			var id = NextActorName(surface);
+			surface.Actors[id] = new ActorReference(actorTemplate.Info.Name.ToLowerInvariant())
+			{
+				new LocationInit(surface.GetBrushLocation()),
+				new OwnerInit(owner)
+			};
+		}
+
+		static string NextActorName(Surface surface)
+		{
+			var id = 0;
+			for (;;)
+			{
+				var possible = "Actor{0}".F(id++);
+				if (!surface.Actors.ContainsKey(possible)) return possible;
+			}
+		}
+	}
+}

OpenRA.Editor/BrushTool.cs

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

OpenRA.Editor/ErrorListDialog.Designer.cs

@@ -0,0 +1,98 @@
+#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
+
+namespace OpenRA.Editor
+{
+	partial class ErrorListDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+				components.Dispose();
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.label1 = new System.Windows.Forms.Label();
+			this.listBox1 = new System.Windows.Forms.ListBox();
+			this.button1 = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			//
+			// label1
+			//
+			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.label1.Location = new System.Drawing.Point(10, 9);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(610, 23);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "Your map import completed, but with errors:";
+			//
+			// listBox1
+			//
+			this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.listBox1.FormattingEnabled = true;
+			this.listBox1.Location = new System.Drawing.Point(13, 30);
+			this.listBox1.Name = "listBox1";
+			this.listBox1.Size = new System.Drawing.Size(607, 316);
+			this.listBox1.TabIndex = 1;
+			//
+			// button1
+			//
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(545, 359);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 2;
+			this.button1.Text = "Close";
+			this.button1.UseVisualStyleBackColor = true;
+			//
+			// ErrorListDialog
+			//
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(632, 394);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.listBox1);
+			this.Controls.Add(this.label1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "ErrorListDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Map Import Errors";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ListBox listBox1;
+		private System.Windows.Forms.Button button1;
+	}
+}

OpenRA.Editor/ErrorListDialog.cs

@@ -0,0 +1,25 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class ErrorListDialog : Form
+	{
+		public ErrorListDialog(IEnumerable<string> errors)
+		{
+			InitializeComponent();
+			foreach (var e in errors)
+				listBox1.Items.Add(e);
+		}
+	}
+}

OpenRA.Editor/Form1.cs

@@ -0,0 +1,735 @@
+#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.Drawing;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	public partial class Form1 : Form
+	{
+		public Form1(string[] args)
+		{
+			InitializeComponent();
+			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
+
+			currentMod = args.FirstOrDefault() ?? "ra";
+
+			toolStripComboBox1.Items.AddRange(ModMetadata.AllMods.Keys.ToArray());
+
+			toolStripComboBox1.SelectedIndexChanged += (_, e) =>
+			{
+				tilePalette.SuspendLayout();
+				actorPalette.SuspendLayout();
+				resourcePalette.SuspendLayout();
+				tilePalette.Controls.Clear();
+				actorPalette.Controls.Clear();
+				resourcePalette.Controls.Clear();
+				tilePalette.ResumeLayout();
+				actorPalette.ResumeLayout();
+				resourcePalette.ResumeLayout();
+				surface1.Bind(null, null, null, null, null);
+				miniMapBox.Image = null;
+				currentMod = toolStripComboBox1.SelectedItem as string;
+
+				Game.InitializeSettings(Arguments.Empty);
+				Game.ModData = new ModData(currentMod);
+				GlobalFileSystem.LoadFromManifest(Game.ModData.Manifest);
+				Program.Rules = Game.ModData.RulesetCache.LoadDefaultRules();
+
+				var mod = Game.ModData.Manifest.Mod;
+				Text = "{0} Mod Version: {1} - OpenRA Editor".F(mod.Title, mod.Version);
+
+				loadedMapName = null;
+			};
+
+			toolStripComboBox1.SelectedItem = currentMod;
+
+			surface1.AfterChange += OnMapChanged;
+			surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
+			surface1.ActorDoubleClicked += ActorDoubleClicked;
+
+			if (args.Length >= 2)
+				LoadMap(args[1]);
+		}
+
+		void OnMapChanged()
+		{
+			MakeDirty();
+			var tileSet = Program.Rules.TileSets[surface1.Map.Tileset];
+			miniMapBox.Image = Minimap.RenderMapPreview(tileSet, surface1.Map, true);
+			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
+		}
+
+		void ActorDoubleClicked(KeyValuePair<string, ActorReference> kv)
+		{
+			using (var apd = new ActorPropertiesDialog())
+			{
+				var name = kv.Key;
+				apd.AddRow("(Name)", apd.MakeEditorControl(typeof(string), () => name, v => name = (string)v));
+				apd.AddRow("(Type)", apd.MakeEditorControl(typeof(string), () => kv.Value.Type, v => kv.Value.Type = (string)v));
+
+				var objSaved = kv.Value.Save();
+
+				// TODO: make this work properly
+				foreach (var init in Program.Rules.Actors[kv.Value.Type].GetInitKeys())
+				{
+					var initName = init.First;
+					apd.AddRow(initName,
+						apd.MakeEditorControl(init.Second,
+							() =>
+							{
+								var nodesDict = objSaved.ToDictionary();
+								return nodesDict.ContainsKey(initName) ? nodesDict[initName].Value : null;
+							},
+							_ => { }));
+				}
+
+				apd.ShowDialog();
+
+				// TODO: writeback
+			}
+		}
+
+		void MakeDirty() { dirty = true; }
+
+		string loadedMapName;
+		string currentMod = "ra";
+		TileSet tileset;
+		TileSetRenderer tilesetRenderer;
+		bool dirty = false;
+
+		void LoadMap(string mapname)
+		{
+			tilePalette.Controls.Clear();
+			actorPalette.Controls.Clear();
+			resourcePalette.Controls.Clear();
+
+			loadedMapName = mapname;
+
+			// load the map
+			var map = new Map(mapname);
+
+			// upgrade maps that have no player definitions. editor doesnt care,
+			// but this breaks the game pretty badly.
+			if (map.PlayerDefinitions.Count == 0)
+			{
+				var players = new MapPlayers(map.Rules, map.SpawnPoints.Value.Length);
+				map.PlayerDefinitions = players.ToMiniYaml();
+			}
+
+			PrepareMapResources(Game.ModData, map);
+
+			// Calculate total net worth of resources in cash
+			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
+
+			dirty = false;
+		}
+
+		void NewMap(Map map)
+		{
+			tilePalette.Controls.Clear();
+			actorPalette.Controls.Clear();
+			resourcePalette.Controls.Clear();
+
+			loadedMapName = null;
+			PrepareMapResources(Game.ModData, map);
+
+			MakeDirty();
+		}
+
+		// this code is insanely stupid, and mostly my fault -- chrisf
+		void PrepareMapResources(ModData modData, Map map)
+		{
+			Program.Rules = map.Rules;
+
+			tileset = Program.Rules.TileSets[map.Tileset];
+			tilesetRenderer = new TileSetRenderer(tileset, modData.Manifest.TileSize);
+			var shadowIndex = new int[] { 3, 4 };
+			var palette = new ImmutablePalette(GlobalFileSystem.Open(tileset.Palette), shadowIndex);
+
+			// required for desert terrain in RA
+			var playerPalette = tileset.PlayerPalette ?? tileset.Palette;
+			var shadowedPalette = new ImmutablePalette(GlobalFileSystem.Open(playerPalette), shadowIndex);
+
+			surface1.Bind(map, tileset, tilesetRenderer, palette, shadowedPalette);
+
+			// construct the palette of tiles
+			var palettes = new[] { tilePalette, actorPalette, resourcePalette };
+			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
+
+			var templateOrder = tileset.EditorTemplateOrder ?? new string[] { };
+			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category).OrderBy(t => templateOrder.IndexOf(t.Key)))
+			{
+				var category = tc.Key ?? "(Uncategorized)";
+				var categoryHeader = new Label
+				{
+					BackColor = SystemColors.Highlight,
+					ForeColor = SystemColors.HighlightText,
+					Text = category,
+					AutoSize = false,
+					Height = 24,
+					TextAlign = ContentAlignment.MiddleLeft,
+					Width = tilePalette.ClientSize.Width,
+				};
+
+				// hook this manually, anchoring inside FlowLayoutPanel is flaky.
+				tilePalette.Resize += (_, e) => categoryHeader.Width = tilePalette.ClientSize.Width;
+
+				if (tilePalette.Controls.Count > 0)
+					tilePalette.SetFlowBreak(
+						tilePalette.Controls[tilePalette.Controls.Count - 1], true);
+				tilePalette.Controls.Add(categoryHeader);
+
+				foreach (var t in tc)
+				{
+					try
+					{
+						var bitmap = tilesetRenderer.RenderTemplate((ushort)t.Key, palette);
+						var ibox = new PictureBox
+						{
+							Image = bitmap,
+							Width = bitmap.Width / 2,
+							Height = bitmap.Height / 2,
+							SizeMode = PictureBoxSizeMode.StretchImage
+						};
+
+						var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
+						ibox.Click += (_, e) => surface1.SetTool(new BrushTool(brushTemplate));
+
+						var template = t.Value;
+						tilePalette.Controls.Add(ibox);
+						tt.SetToolTip(ibox, "{1}:{0} ({2}x{3})".F(template.Images[0], template.Id, template.Size.X, template.Size.Y));
+					}
+					catch { }
+				}
+			}
+
+			var actorTemplates = new List<ActorTemplate>();
+
+			foreach (var a in Program.Rules.Actors.Keys)
+			{
+				try
+				{
+					var info = Program.Rules.Actors[a];
+					if (!info.Traits.Contains<ILegacyEditorRenderInfo>()) continue;
+
+					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
+					if (etf != null && etf.ExcludeTilesets != null
+						&& etf.ExcludeTilesets.Contains(tileset.Id)) continue;
+					if (etf != null && etf.RequireTilesets != null
+						&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
+
+					var templatePalette = shadowedPalette;
+					var rsi = info.Traits.GetOrDefault<ILegacyEditorRenderInfo>();
+
+					// exception for desert buildings
+					if (rsi != null && rsi.EditorPalette != null && rsi.EditorPalette.Contains("terrain"))
+						templatePalette = palette;
+
+					var race = Program.Rules.Actors["world"].Traits.WithInterface<CountryInfo>().First().Race;
+					var sequenceProvider = Program.Rules.Sequences[tileset.Id];
+					var template = RenderUtils.RenderActor(info, sequenceProvider, tileset, templatePalette, race);
+					var ibox = new PictureBox
+					{
+						Image = template.Bitmap,
+						Width = 32,
+						Height = 32,
+						SizeMode = PictureBoxSizeMode.Zoom,
+						BorderStyle = BorderStyle.FixedSingle
+					};
+
+					ibox.Click += (_, e) => surface1.SetTool(new ActorTool(template));
+
+					actorPalette.Controls.Add(ibox);
+
+					tt.SetToolTip(ibox, "{0}".F(info.Name));
+
+					actorTemplates.Add(template);
+				}
+				catch { }
+			}
+
+			surface1.BindActorTemplates(actorTemplates);
+
+			var resourceTemplates = new List<ResourceTemplate>();
+
+			foreach (var a in Program.Rules.Actors["world"].Traits.WithInterface<ResourceTypeInfo>())
+			{
+				try
+				{
+					var template = RenderUtils.RenderResourceType(a, tileset, shadowedPalette);
+					var ibox = new PictureBox
+					{
+						Image = template.Bitmap,
+						Width = 32,
+						Height = 32,
+						SizeMode = PictureBoxSizeMode.Zoom,
+						BorderStyle = BorderStyle.FixedSingle
+					};
+
+					ibox.Click += (_, e) => surface1.SetTool(new ResourceTool(template));
+
+					resourcePalette.Controls.Add(ibox);
+
+					tt.SetToolTip(ibox, "{0}:{1}cr".F(template.Info.Name, template.Info.ValuePerUnit));
+
+					resourceTemplates.Add(template);
+				}
+				catch { }
+			}
+
+			surface1.BindResourceTemplates(resourceTemplates);
+
+			foreach (var p in palettes)
+			{
+				p.Visible = true;
+				p.ResumeLayout();
+			}
+
+			miniMapBox.Image = Minimap.RenderMapPreview(tileset, surface1.Map, true);
+
+			propertiesToolStripMenuItem.Enabled = true;
+			toolStripMenuItemProperties.Enabled = true;
+			resizeToolStripMenuItem.Enabled = true;
+			toolStripMenuItemResize.Enabled = true;
+			saveToolStripMenuItem.Enabled = true;
+			toolStripMenuItemSave.Enabled = true;
+			saveAsToolStripMenuItem.Enabled = true;
+			miniMapToPng.Enabled = true;
+
+			PopulateActorOwnerChooser();
+		}
+
+		void PopulateActorOwnerChooser()
+		{
+			actorOwnerChooser.Items.Clear();
+			actorOwnerChooser.Items.AddRange(new MapPlayers(surface1.Map.PlayerDefinitions).Players.Values.ToArray());
+			actorOwnerChooser.SelectedIndex = 0;
+			surface1.NewActorOwner = ((PlayerReference)actorOwnerChooser.SelectedItem).Name;
+		}
+
+		void ResizeClicked(object sender, EventArgs e)
+		{
+			using (var rd = new ResizeDialog())
+			{
+				rd.MapWidth.Value = surface1.Map.MapSize.X;
+				rd.MapHeight.Value = surface1.Map.MapSize.Y;
+				rd.CordonLeft.Value = surface1.Map.Bounds.Left;
+				rd.CordonTop.Value = surface1.Map.Bounds.Top;
+				rd.CordonRight.Value = surface1.Map.Bounds.Right;
+				rd.CordonBottom.Value = surface1.Map.Bounds.Bottom;
+
+				if (DialogResult.OK != rd.ShowDialog())
+					return;
+
+				surface1.Map.ResizeCordon((int)rd.CordonLeft.Value,
+					(int)rd.CordonTop.Value,
+					(int)rd.CordonRight.Value,
+					(int)rd.CordonBottom.Value);
+
+				if ((int)rd.MapWidth.Value != surface1.Map.MapSize.X || (int)rd.MapHeight.Value != surface1.Map.MapSize.Y)
+				{
+					surface1.Map.Resize((int)rd.MapWidth.Value, (int)rd.MapHeight.Value);
+					surface1.Bind(surface1.Map, surface1.TileSet, surface1.TileSetRenderer, surface1.Palette, surface1.PlayerPalette);	// rebind it to invalidate all caches
+				}
+
+				surface1.Invalidate();
+			}
+		}
+
+		void SaveClicked(object sender, EventArgs e)
+		{
+			if (loadedMapName == null)
+				SaveAsClicked(sender, e);
+			else
+			{
+				surface1.Map.RequiresMod = currentMod;
+				surface1.Map.Save(loadedMapName);
+				dirty = false;
+			}
+		}
+
+		void SaveAsClicked(object sender, EventArgs e)
+		{
+			using (var nms = new MapSelect(currentMod))
+			{
+				nms.NewText.ReadOnly = false;
+				nms.ButtonOkay.Text = "Save";
+				nms.NewText.Text = "unnamed";
+				nms.PathOutText.ReadOnly = false;
+
+				if (DialogResult.OK == nms.ShowDialog())
+				{
+					if (nms.NewText.Text == "")
+						nms.NewText.Text = "unnamed";
+
+					// TODO: Allow the user to choose map format (directory vs oramap)
+					loadedMapName = Path.Combine(nms.MapFolderPath, nms.NewText.Text + ".oramap");
+					SaveClicked(sender, e);
+				}
+			}
+		}
+
+		void OpenClicked(object sender, EventArgs e)
+		{
+			using (var nms = new MapSelect(currentMod))
+			{
+				nms.NewText.ReadOnly = true;
+				nms.PathOutText.ReadOnly = true;
+				nms.ButtonOkay.Text = "Open";
+
+				if (DialogResult.OK == nms.ShowDialog())
+					LoadMap((string)nms.NewText.Tag);
+			}
+		}
+
+		void NewClicked(object sender, EventArgs e)
+		{
+			using (var nmd = new NewMapDialog())
+			{
+				nmd.TheaterBox.Items.Clear();
+				nmd.TheaterBox.Items.AddRange(Program.Rules.TileSets.Select(a => a.Value.Id).ToArray());
+				nmd.TheaterBox.SelectedIndex = 0;
+
+				if (DialogResult.OK == nmd.ShowDialog())
+				{
+					var tileset = Program.Rules.TileSets[nmd.TheaterBox.SelectedItem as string];
+					var map = Map.FromTileset(tileset);
+
+					map.Resize((int)nmd.MapWidth.Value, (int)nmd.MapHeight.Value);
+					map.ResizeCordon((int)nmd.CordonLeft.Value, (int)nmd.CordonTop.Value,
+						(int)nmd.CordonRight.Value, (int)nmd.CordonBottom.Value);
+
+					var players = new MapPlayers(map.Rules, map.SpawnPoints.Value.Length);
+					map.PlayerDefinitions = players.ToMiniYaml();
+
+					map.FixOpenAreas(Program.Rules);
+
+					NewMap(map);
+				}
+			}
+		}
+
+		void PropertiesClicked(object sender, EventArgs e)
+		{
+			using (var pd = new PropertiesDialog())
+			{
+				pd.TitleBox.Text = surface1.Map.Title;
+				pd.DescBox.Text = surface1.Map.Description;
+				pd.AuthorBox.Text = surface1.Map.Author;
+				pd.MapVisibilityComboBox.SelectedIndex = pd.MapVisibilityComboBox.FindStringExact(Enum.GetName(typeof(MapVisibility), surface1.Map.Visibility));
+
+				if (DialogResult.OK != pd.ShowDialog())
+					return;
+
+				surface1.Map.Title = pd.TitleBox.Text;
+				surface1.Map.Description = pd.DescBox.Text;
+				surface1.Map.Author = pd.AuthorBox.Text;
+				surface1.Map.Visibility = (MapVisibility)Enum.Parse(typeof(MapVisibility), pd.MapVisibilityComboBox.SelectedItem.ToString());
+			}
+		}
+
+		void Form1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = true; }
+		void Form1_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = false; }
+
+		void CloseClicked(object sender, EventArgs e)
+		{
+			Close();
+		}
+
+		void OnFormClosing(object sender, FormClosingEventArgs e)
+		{
+			if (!dirty) return;
+
+			switch (MessageBox.Show("The map has been modified since it was last saved. " + "\r\n" + "Save changes now?",
+				"Unsaved Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
+			{
+				case DialogResult.Yes: SaveClicked(null, EventArgs.Empty); break;
+				case DialogResult.No: break;
+				case DialogResult.Cancel: e.Cancel = true; break;
+			}
+		}
+
+		void ExportMinimap(object sender, EventArgs e)
+		{
+			using (var sfd = new SaveFileDialog()
+			{
+				InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps"),
+				DefaultExt = "*.png",
+				Filter = "PNG Image (*.png)|*.png",
+				Title = "Export Minimap to PNG",
+				FileName = Path.ChangeExtension(loadedMapName, ".png"),
+				RestoreDirectory = true
+			})
+				if (DialogResult.OK == sfd.ShowDialog())
+					miniMapBox.Image.Save(sfd.FileName);
+		}
+
+		void ShowActorNamesClicked(object sender, EventArgs e)
+		{
+			showActorNamesToolStripMenuItem.Checked ^= true;
+			toolStripMenuItemShowActorNames.Checked ^= true;
+			surface1.ShowActorNames = showActorNamesToolStripMenuItem.Checked;
+		}
+
+		void ShowGridClicked(object sender, EventArgs e)
+		{
+			showGridToolStripMenuItem.Checked ^= true;
+			toolStripMenuItemShowGrid.Checked ^= true;
+			surface1.ShowGrid = showGridToolStripMenuItem.Checked;
+			surface1.Chunks.Clear();
+		}
+
+		void FixOpenAreas(object sender, EventArgs e)
+		{
+			dirty = true;
+			surface1.Map.FixOpenAreas(Program.Rules);
+			surface1.Chunks.Clear();
+			surface1.Invalidate();
+		}
+
+		void SetupDefaultPlayers(object sender, EventArgs e)
+		{
+			dirty = true;
+			var players = new MapPlayers(surface1.Map.Rules, surface1.Map.SpawnPoints.Value.Length);
+			surface1.Map.PlayerDefinitions = players.ToMiniYaml();
+
+			surface1.Chunks.Clear();
+			surface1.Invalidate();
+
+			PopulateActorOwnerChooser();
+		}
+
+		void DrawPlayerListItem(object sender, DrawItemEventArgs e)
+		{
+			// color block
+			var player = e.Index >= 0 ? (PlayerReference)((ComboBox)sender).Items[e.Index] : null;
+
+			e.DrawBackground();
+			e.DrawFocusRectangle();
+
+			if (player == null)
+				return;
+
+			var color = player.Color.RGB;
+			using (var brush = new SolidBrush(color))
+				e.Graphics.FillRectangle(brush, e.Bounds.Left + 2, e.Bounds.Top + 2, e.Bounds.Height + 6, e.Bounds.Height - 4);
+			using (var foreBrush = new SolidBrush(e.ForeColor))
+				e.Graphics.DrawString(player.Name, e.Font, foreBrush, e.Bounds.Left + e.Bounds.Height + 12, e.Bounds.Top);
+		}
+
+		void OnSelectedPlayerChanged(object sender, EventArgs e)
+		{
+			var player = actorOwnerChooser.SelectedItem as PlayerReference;
+			surface1.NewActorOwner = player.Name;
+		}
+
+		void CopySelectionToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			surface1.CopySelection();
+		}
+
+		void OpenRAWebsiteToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://www.openra.net");
+		}
+
+		void OpenRAResourcesToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://resource.openra.net");
+		}
+
+		void WikiDocumentationToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://wiki.openra.net");
+		}
+
+		void DiscussionForumsToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://www.sleipnirstuff.com/forum/viewforum.php?f=80");
+		}
+
+		void IssueTrackerToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://bugs.openra.net");
+		}
+
+		void DeveloperBountiesToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("https://www.bountysource.com/trackers/36085-openra");
+		}
+
+		void SourceCodeToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://github.com/OpenRA/OpenRA");
+		}
+
+		void AboutToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			MessageBox.Show(
+				"OpenRA and OpenRA Editor are Free/Libre Open Source Software released under the GNU General Public License version 3. See AUTHORS and COPYING for details.",
+				"About",
+				MessageBoxButtons.OK,
+				MessageBoxIcon.Asterisk);
+		}
+
+		void HelpToolStripButton_Click(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://wiki.openra.net/Mapping");
+		}
+
+		void ToolStripMenuItemNewClick(object sender, EventArgs e)
+		{
+			NewClicked(sender, e);
+		}
+
+		void ToolStripMenuItemOpenClick(object sender, EventArgs e)
+		{
+			OpenClicked(sender, e);
+		}
+
+		void ToolStripMenuItemSaveClick(object sender, EventArgs e)
+		{
+			SaveClicked(sender, e);
+		}
+
+		void ToolStripMenuItemPropertiesClick(object sender, EventArgs e)
+		{
+			PropertiesClicked(sender, e);
+		}
+
+		void ToolStripMenuItemResizeClick(object sender, EventArgs e)
+		{
+			ResizeClicked(sender, e);
+		}
+
+		void ToolStripMenuItemShowActorNamesClick(object sender, EventArgs e)
+		{
+			ShowActorNamesClicked(sender, e);
+		}
+
+		void ToolStripMenuItemFixOpenAreasClick(object sender, EventArgs e)
+		{
+			FixOpenAreas(sender, e);
+		}
+
+		void ToolStripMenuItemSetupDefaultPlayersClick(object sender, EventArgs e)
+		{
+			SetupDefaultPlayers(sender, e);
+		}
+
+		void ToolStripMenuItemCopySelectionClick(object sender, EventArgs e)
+		{
+			CopySelectionToolStripMenuItemClick(sender, e);
+		}
+
+		void ToolStripMenuItemShowGridClick(object sender, EventArgs e)
+		{
+			ShowGridClicked(sender, e);
+		}
+
+		public int CalculateTotalResource()
+		{
+			var totalResource = 0;
+			for (var i = 0; i < surface1.Map.MapSize.X; i++)
+				for (var j = 0; j < surface1.Map.MapSize.Y; j++)
+				{
+					var cell = new CPos(i, j);
+					if (surface1.Map.MapResources.Value[cell].Type != 0)
+						totalResource += GetResourceValue(i, j);
+				}
+
+			return totalResource;
+		}
+
+		int GetAdjecentCellsWith(int resourceType, int x, int y)
+		{
+			var sum = 0;
+			for (var u = -1; u < 2; u++)
+				for (var v = -1; v < 2; v++)
+				{
+					var cell = new CPos(x + u, y + v);
+
+					if (!surface1.Map.Contains(cell))
+						continue;
+
+					if (surface1.Map.MapResources.Value[cell].Type == resourceType)
+						++sum;
+				}
+
+			return sum;
+		}
+
+		int GetResourceValue(int x, int y)
+		{
+			var imageLength = 0;
+			var type = surface1.Map.MapResources.Value[new CPos(x, y)].Type;
+			var template = surface1.ResourceTemplates.FirstOrDefault(a => a.Value.Info.ResourceType == type).Value;
+			if (type == 1)
+				imageLength = 12;
+			else if (type == 2)
+				imageLength = 3;
+			var density = (GetAdjecentCellsWith(type, x, y) * imageLength - 1) / 9;
+			var value = template.Info.ValuePerUnit;
+			return density * value;
+		}
+
+		void ZoomInToolStripButtonClick(object sender, System.EventArgs e)
+		{
+			if (surface1.Map == null) return;
+
+			surface1.Zoom /= .75f;
+
+			surface1.Invalidate();
+		}
+
+		void ZoomOutToolStripButtonClick(object sender, System.EventArgs e)
+		{
+			if (surface1.Map == null) return;
+
+			surface1.Zoom *= .75f;
+
+			surface1.Invalidate();
+		}
+
+		void PanToolStripButtonClick(object sender, System.EventArgs e)
+		{
+			panToolStripButton.Checked ^= true;
+			surface1.IsPanning = panToolStripButton.Checked;
+		}
+
+		void ShowRulerToolStripMenuItemClick(object sender, EventArgs e)
+		{
+			showRulerToolStripMenuItem.Checked ^= true;
+			showRulerToolStripItem.Checked ^= true;
+			surface1.ShowRuler = showRulerToolStripMenuItem.Checked;
+			surface1.Chunks.Clear();
+		}
+
+		void ShowRulerToolStripItemClick(object sender, System.EventArgs e)
+		{
+			ShowRulerToolStripMenuItemClick(sender, e);
+		}
+
+		void EraserToolStripButtonClick(object sender, System.EventArgs e)
+		{
+			eraserToolStripButton.Checked ^= true;
+			surface1.IsErasing = eraserToolStripButton.Checked;
+		}
+	}
+}

OpenRA.Editor/ITool.cs

@@ -0,0 +1,20 @@
+#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 SGraphics = System.Drawing.Graphics;
+
+namespace OpenRA.Editor
+{
+	interface ITool
+	{
+		void Apply(Surface surface);
+		void Preview(Surface surface, SGraphics g);
+	}
+}

OpenRA.Editor/MapSelect.Designer.cs

@@ -0,0 +1,319 @@
+#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
+
+namespace OpenRA.Editor
+{
+	partial class MapSelect
+	{
+		// TODO:
+		private System.ComponentModel.IContainer components = null;
+
+		// TODO:
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+
+			base.Dispose(disposing);
+		}
+
+		// TODO:
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
+			this.MapList = new System.Windows.Forms.ListView();
+			this.ColumnMapName = new System.Windows.Forms.ColumnHeader("(none)");
+			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
+			this.ButtonCancel = new System.Windows.Forms.Button();
+			this.ButtonOkay = new System.Windows.Forms.Button();
+			this.NewLabel = new System.Windows.Forms.Label();
+			this.NewText = new System.Windows.Forms.TextBox();
+			this.MiniMapBox = new System.Windows.Forms.PictureBox();
+			this.BottomPanel = new System.Windows.Forms.Panel();
+			this.PathOutText = new System.Windows.Forms.TextBox();
+			this.PathOutLabel = new System.Windows.Forms.Label();
+			this.PathLabel = new System.Windows.Forms.Label();
+			this.SplitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.MapListLabel = new System.Windows.Forms.Label();
+			this.DescTxt = new System.Windows.Forms.TextBox();
+			this.DescLabel = new System.Windows.Forms.Label();
+			this.TheaterText = new System.Windows.Forms.TextBox();
+			this.TheaterLabel = new System.Windows.Forms.Label();
+			this.AuthorText = new System.Windows.Forms.TextBox();
+			this.AuthorLabel = new System.Windows.Forms.Label();
+			this.TitleText = new System.Windows.Forms.TextBox();
+			this.MapNameLabel = new System.Windows.Forms.Label();
+			this.MiniMapLabel = new System.Windows.Forms.Label();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			((System.ComponentModel.ISupportInitialize)this.MiniMapBox).BeginInit();
+			this.BottomPanel.SuspendLayout();
+			this.SplitContainer1.Panel1.SuspendLayout();
+			this.SplitContainer1.Panel2.SuspendLayout();
+			this.SplitContainer1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)this.pictureBox1).BeginInit();
+			this.SuspendLayout();
+
+			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {	this.ColumnMapName });
+			this.MapList.FullRowSelect = true;
+			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.MapList.LargeImageList = this.MapIconsList;
+			this.MapList.Location = new System.Drawing.Point(15, 25);
+			this.MapList.MultiSelect = false;
+			this.MapList.Name = "MapList";
+			this.MapList.Size = new System.Drawing.Size(273, 294);
+			this.MapList.SmallImageList = this.MapIconsList;
+			this.MapList.StateImageList = this.MapIconsList;
+			this.MapList.TabIndex = 0;
+			this.MapList.UseCompatibleStateImageBehavior = false;
+			this.MapList.View = System.Windows.Forms.View.Details;
+			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
+
+			this.ColumnMapName.Text = "Map name";
+			this.ColumnMapName.Width = 240;
+
+			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
+			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
+
+			this.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.ButtonCancel.Location = new System.Drawing.Point(407, 35);
+			this.ButtonCancel.Name = "btnCancel";
+			this.ButtonCancel.Size = new System.Drawing.Size(75, 23);
+			this.ButtonCancel.TabIndex = 3;
+			this.ButtonCancel.Text = "Cancel";
+			this.ButtonCancel.UseVisualStyleBackColor = true;
+
+			this.ButtonOkay.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.ButtonOkay.Location = new System.Drawing.Point(326, 35);
+			this.ButtonOkay.Name = "btnOk";
+			this.ButtonOkay.Size = new System.Drawing.Size(75, 23);
+			this.ButtonOkay.TabIndex = 2;
+			this.ButtonOkay.Text = "Open";
+			this.ButtonOkay.UseVisualStyleBackColor = true;
+
+			this.NewLabel.AutoSize = true;
+			this.NewLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, (byte)204);
+			this.NewLabel.Location = new System.Drawing.Point(12, 40);
+			this.NewLabel.Name = "lblNew";
+			this.NewLabel.Size = new System.Drawing.Size(69, 13);
+			this.NewLabel.TabIndex = 3;
+			this.NewLabel.Text = "Map name:";
+
+			this.NewText.BackColor = System.Drawing.SystemColors.Window;
+			this.NewText.Location = new System.Drawing.Point(88, 37);
+			this.NewText.Name = "txtNew";
+			this.NewText.ReadOnly = true;
+			this.NewText.Size = new System.Drawing.Size(232, 20);
+			this.NewText.TabIndex = 1;
+
+			this.MiniMapBox.BackColor = System.Drawing.Color.Black;
+			this.MiniMapBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.MiniMapBox.Location = new System.Drawing.Point(32, 25);
+			this.MiniMapBox.Name = "pbMinimap";
+			this.MiniMapBox.Size = new System.Drawing.Size(124, 124);
+			this.MiniMapBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.MiniMapBox.TabIndex = 5;
+			this.MiniMapBox.TabStop = false;
+
+			this.BottomPanel.Controls.Add(this.pictureBox1);
+			this.BottomPanel.Controls.Add(this.PathOutText);
+			this.BottomPanel.Controls.Add(this.PathOutLabel);
+			this.BottomPanel.Controls.Add(this.PathLabel);
+			this.BottomPanel.Controls.Add(this.ButtonCancel);
+			this.BottomPanel.Controls.Add(this.ButtonOkay);
+			this.BottomPanel.Controls.Add(this.NewText);
+			this.BottomPanel.Controls.Add(this.NewLabel);
+			this.BottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.BottomPanel.Location = new System.Drawing.Point(0, 332);
+			this.BottomPanel.MaximumSize = new System.Drawing.Size(0, 70);
+			this.BottomPanel.Name = "pnlBottom";
+			this.BottomPanel.Size = new System.Drawing.Size(494, 70);
+			this.BottomPanel.TabIndex = 6;
+
+			this.PathOutText.BackColor = System.Drawing.SystemColors.Window;
+			this.PathOutText.Location = new System.Drawing.Point(55, 10);
+			this.PathOutText.Name = "txtPathOut";
+			this.PathOutText.ReadOnly = true;
+			this.PathOutText.Size = new System.Drawing.Size(265, 20);
+			this.PathOutText.TabIndex = 0;
+			this.PathOutText.TextChanged += new System.EventHandler(this.PathOutTextChanged);
+
+			this.PathOutLabel.AutoSize = true;
+			this.PathOutLabel.Location = new System.Drawing.Point(55, 13);
+			this.PathOutLabel.Name = "lblPathOut";
+			this.PathOutLabel.Size = new System.Drawing.Size(0, 13);
+			this.PathOutLabel.TabIndex = 6;
+
+			this.PathLabel.AutoSize = true;
+			this.PathLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, (byte)204);
+			this.PathLabel.Location = new System.Drawing.Point(12, 13);
+			this.PathLabel.Name = "lblPath";
+			this.PathLabel.Size = new System.Drawing.Size(37, 13);
+			this.PathLabel.TabIndex = 5;
+			this.PathLabel.Text = "Path:";
+
+			this.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.SplitContainer1.Location = new System.Drawing.Point(0, 0);
+			this.SplitContainer1.Name = "splitContainer1";
+
+			this.SplitContainer1.Panel1.Controls.Add(this.MapListLabel);
+			this.SplitContainer1.Panel1.Controls.Add(this.MapList);
+
+			this.SplitContainer1.Panel2.Controls.Add(this.DescTxt);
+			this.SplitContainer1.Panel2.Controls.Add(this.DescLabel);
+			this.SplitContainer1.Panel2.Controls.Add(this.TheaterText);
+			this.SplitContainer1.Panel2.Controls.Add(this.TheaterLabel);
+			this.SplitContainer1.Panel2.Controls.Add(this.AuthorText);
+			this.SplitContainer1.Panel2.Controls.Add(this.AuthorLabel);
+			this.SplitContainer1.Panel2.Controls.Add(this.TitleText);
+			this.SplitContainer1.Panel2.Controls.Add(this.MapNameLabel);
+			this.SplitContainer1.Panel2.Controls.Add(this.MiniMapLabel);
+			this.SplitContainer1.Panel2.Controls.Add(this.MiniMapBox);
+			this.SplitContainer1.Size = new System.Drawing.Size(494, 332);
+			this.SplitContainer1.SplitterDistance = 300;
+			this.SplitContainer1.TabIndex = 7;
+
+			this.MapListLabel.AutoSize = true;
+			this.MapListLabel.Location = new System.Drawing.Point(12, 9);
+			this.MapListLabel.Name = "lblMapList";
+			this.MapListLabel.Size = new System.Drawing.Size(81, 13);
+			this.MapListLabel.TabIndex = 1;
+			this.MapListLabel.Text = "Available maps:";
+
+			this.DescTxt.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.DescTxt.Location = new System.Drawing.Point(16, 289);
+			this.DescTxt.Name = "txtDesc";
+			this.DescTxt.ReadOnly = true;
+			this.DescTxt.Size = new System.Drawing.Size(162, 20);
+			this.DescTxt.TabIndex = 14;
+
+			this.DescLabel.AutoSize = true;
+			this.DescLabel.Location = new System.Drawing.Point(13, 273);
+			this.DescLabel.Name = "lblDesc";
+			this.DescLabel.Size = new System.Drawing.Size(63, 13);
+			this.DescLabel.TabIndex = 13;
+			this.DescLabel.Text = "Description:";
+
+			this.TheaterText.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.TheaterText.Location = new System.Drawing.Point(16, 252);
+			this.TheaterText.Name = "txtTheater";
+			this.TheaterText.ReadOnly = true;
+			this.TheaterText.Size = new System.Drawing.Size(162, 20);
+			this.TheaterText.TabIndex = 12;
+
+			this.TheaterLabel.AutoSize = true;
+			this.TheaterLabel.Location = new System.Drawing.Point(13, 236);
+			this.TheaterLabel.Name = "lblTheater";
+			this.TheaterLabel.Size = new System.Drawing.Size(47, 13);
+			this.TheaterLabel.TabIndex = 11;
+			this.TheaterLabel.Text = "Tileset:";
+
+			this.AuthorText.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.AuthorText.Location = new System.Drawing.Point(16, 214);
+			this.AuthorText.Name = "txtAuthor";
+			this.AuthorText.ReadOnly = true;
+			this.AuthorText.Size = new System.Drawing.Size(162, 20);
+			this.AuthorText.TabIndex = 10;
+
+			this.AuthorLabel.AutoSize = true;
+			this.AuthorLabel.Location = new System.Drawing.Point(13, 198);
+			this.AuthorLabel.Name = "lblAuthor";
+			this.AuthorLabel.Size = new System.Drawing.Size(41, 13);
+			this.AuthorLabel.TabIndex = 9;
+			this.AuthorLabel.Text = "Author:";
+
+			this.TitleText.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.TitleText.Location = new System.Drawing.Point(16, 177);
+			this.TitleText.Name = "txtTitle";
+			this.TitleText.ReadOnly = true;
+			this.TitleText.Size = new System.Drawing.Size(162, 20);
+			this.TitleText.TabIndex = 8;
+
+			this.MapNameLabel.AutoSize = true;
+			this.MapNameLabel.Location = new System.Drawing.Point(13, 161);
+			this.MapNameLabel.Name = "lblMapName";
+			this.MapNameLabel.Size = new System.Drawing.Size(30, 13);
+			this.MapNameLabel.TabIndex = 7;
+			this.MapNameLabel.Text = "Title:";
+
+			this.MiniMapLabel.AutoSize = true;
+			this.MiniMapLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, (byte)204);
+			this.MiniMapLabel.Location = new System.Drawing.Point(29, 9);
+			this.MiniMapLabel.Name = "lblMinimap";
+			this.MiniMapLabel.Size = new System.Drawing.Size(71, 13);
+			this.MiniMapLabel.TabIndex = 6;
+			this.MiniMapLabel.Text = "Map preview:";
+
+			this.pictureBox1.Image = (System.Drawing.Image)resources.GetObject("pictureBox1.Image");
+			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
+			this.pictureBox1.TabIndex = 7;
+			this.pictureBox1.TabStop = false;
+			this.pictureBox1.Visible = false;
+
+			this.AcceptButton = this.ButtonOkay;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.ButtonCancel;
+			this.ClientSize = new System.Drawing.Size(494, 402);
+			this.Controls.Add(this.SplitContainer1);
+			this.Controls.Add(this.BottomPanel);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MapSelect";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Select map";
+			this.Load += new System.EventHandler(this.MapSelect_Load);
+			((System.ComponentModel.ISupportInitialize)this.MiniMapBox).EndInit();
+			this.BottomPanel.ResumeLayout(false);
+			this.BottomPanel.PerformLayout();
+			this.SplitContainer1.Panel1.ResumeLayout(false);
+			this.SplitContainer1.Panel1.PerformLayout();
+			this.SplitContainer1.Panel2.ResumeLayout(false);
+			this.SplitContainer1.Panel2.PerformLayout();
+			this.SplitContainer1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)this.pictureBox1).EndInit();
+			this.ResumeLayout(false);
+		}
+
+		public System.Windows.Forms.ListView MapList;
+		public System.Windows.Forms.Button ButtonCancel;
+		public System.Windows.Forms.Button ButtonOkay;
+		public System.Windows.Forms.Label NewLabel;
+		public System.Windows.Forms.TextBox NewText;
+		public System.Windows.Forms.ColumnHeader ColumnMapName;
+		public System.Windows.Forms.ImageList MapIconsList;
+		public System.Windows.Forms.PictureBox MiniMapBox;
+		public System.Windows.Forms.Panel BottomPanel;
+		public System.Windows.Forms.SplitContainer SplitContainer1;
+		public System.Windows.Forms.Label MiniMapLabel;
+		public System.Windows.Forms.TextBox TheaterText;
+		public System.Windows.Forms.Label TheaterLabel;
+		public System.Windows.Forms.TextBox AuthorText;
+		public System.Windows.Forms.Label AuthorLabel;
+		public System.Windows.Forms.TextBox TitleText;
+		public System.Windows.Forms.Label MapNameLabel;
+		public System.Windows.Forms.TextBox DescTxt;
+		public System.Windows.Forms.Label DescLabel;
+		public System.Windows.Forms.Label MapListLabel;
+		public System.Windows.Forms.Label PathOutLabel;
+		public System.Windows.Forms.Label PathLabel;
+		public System.Windows.Forms.TextBox PathOutText;
+		private System.Windows.Forms.PictureBox pictureBox1;
+	}
+}

OpenRA.Editor/MapSelect.cs

@@ -0,0 +1,92 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using OpenRA.Graphics;
+
+namespace OpenRA.Editor
+{
+	public partial class MapSelect : Form
+	{
+		public string MapFolderPath;
+
+		public bool DirectoryIsEmpty(string path)
+		{
+			return !Directory.GetFileSystemEntries(path).Any();
+		}
+
+		public MapSelect(string currentMod)
+		{
+			MapFolderPath = Platform.ResolvePath("^", "maps", currentMod);
+
+			if (!Directory.Exists(MapFolderPath))
+				Directory.CreateDirectory(MapFolderPath);
+
+			InitializeComponent();
+			MapIconsList.Images.Add(pictureBox1.Image);
+		}
+
+		void MapSelect_Load(object sender, EventArgs e)
+		{
+			MapList.Items.Clear();
+			PathOutText.Text = MapFolderPath;
+
+			if (DirectoryIsEmpty(MapFolderPath))
+				return;
+
+			foreach (var map in MapCache.FindMapsIn(MapFolderPath))
+			{
+				var map1 = new ListViewItem();
+				map1.Tag = map;
+				map1.Text = Path.GetFileNameWithoutExtension(map);
+				map1.ImageIndex = 0;
+				MapList.Items.Add(map1);
+			}
+
+			// hack
+			if (NewText.Text != "unnamed")
+				MapList.Items[0].Selected = true;
+		}
+
+		void MapList_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (MapList.SelectedItems.Count == 1)
+			{
+				NewText.Text = MapList.SelectedItems[0].Text;
+				NewText.Tag = MapList.SelectedItems[0].Tag;
+
+				var map = new Map((string)NewText.Tag);
+				TitleText.Text = map.Title;
+				AuthorText.Text = map.Author;
+				TheaterText.Text = map.Tileset;
+				DescTxt.Text = map.Description;
+				MiniMapBox.Image = null;
+
+				try
+				{
+					var tileset = Program.Rules.TileSets[map.Tileset];
+					MiniMapBox.Image = Minimap.RenderMapPreview(tileset, map, true);
+				}
+				catch (Exception ed)
+				{
+					Console.WriteLine("No map preview image found: {0}", ed);
+				}
+			}
+		}
+
+		void PathOutTextChanged(object sender, EventArgs e)
+		{
+			MapFolderPath = PathOutText.Text;
+		}
+	}
+}

OpenRA.Editor/MapSelect.resx

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
+        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
+        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
+        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
+        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
+        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
+        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
+        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
+        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
+        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
+        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
+        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
+        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
+        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
+        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
+        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
+        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
+        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
+        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
+        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
+        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
+        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
+        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
+        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
+        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
+        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
+        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
+        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
+        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
+        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
+        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
+        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
+        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
+        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
+        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
+        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
+        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
+        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
+        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
+        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
+        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
+        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
+        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
+        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
+        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
+        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
+        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
+        ga8AAAAASUVORK5CYII=
+</value>
+  </data>
+</root>

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -0,0 +1,295 @@
+#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
+
+namespace OpenRA.Editor
+{
+	partial class NewMapDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+				components.Dispose();
+
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.CordonBottom = new System.Windows.Forms.NumericUpDown();
+			this.CordonTop = new System.Windows.Forms.NumericUpDown();
+			this.CordonRight = new System.Windows.Forms.NumericUpDown();
+			this.CordonLeft = new System.Windows.Forms.NumericUpDown();
+			this.MapHeight = new System.Windows.Forms.NumericUpDown();
+			this.MapWidth = new System.Windows.Forms.NumericUpDown();
+			this.label4 = new System.Windows.Forms.Label();
+			this.TheaterBox = new System.Windows.Forms.ComboBox();
+			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).BeginInit();
+			this.SuspendLayout();
+			//
+			// button2
+			//
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(229, 160);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 7;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			//
+			// button1
+			//
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(310, 160);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 8;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			//
+			// label3
+			//
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(31, 77);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(107, 13);
+			this.label3.TabIndex = 9;
+			this.label3.Text = "Cordon Right/Bottom";
+			//
+			// label2
+			//
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(31, 51);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(86, 13);
+			this.label2.TabIndex = 11;
+			this.label2.Text = "Cordon Left/Top";
+			//
+			// label1
+			//
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(31, 25);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 10;
+			this.label1.Text = "Size";
+			//
+			// cordonBottom
+			//
+			this.CordonBottom.Location = new System.Drawing.Point(280, 75);
+			this.CordonBottom.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.CordonBottom.Name = "cordonBottom";
+			this.CordonBottom.Size = new System.Drawing.Size(105, 20);
+			this.CordonBottom.TabIndex = 5;
+			this.CordonBottom.Value = new decimal(new int[] {
+			112,
+			0,
+			0,
+			0});
+			this.CordonBottom.Enter += new System.EventHandler(this.SelectText);
+			//
+			// cordonTop
+			//
+			this.CordonTop.Location = new System.Drawing.Point(280, 49);
+			this.CordonTop.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.CordonTop.Name = "cordonTop";
+			this.CordonTop.Size = new System.Drawing.Size(105, 20);
+			this.CordonTop.TabIndex = 3;
+			this.CordonTop.Value = new decimal(new int[] {
+			16,
+			0,
+			0,
+			0});
+			this.CordonTop.Enter += new System.EventHandler(this.SelectText);
+			//
+			// cordonRight
+			//
+			this.CordonRight.Location = new System.Drawing.Point(169, 75);
+			this.CordonRight.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.CordonRight.Name = "cordonRight";
+			this.CordonRight.Size = new System.Drawing.Size(105, 20);
+			this.CordonRight.TabIndex = 4;
+			this.CordonRight.Value = new decimal(new int[] {
+			112,
+			0,
+			0,
+			0});
+			this.CordonRight.Enter += new System.EventHandler(this.SelectText);
+			//
+			// cordonLeft
+			//
+			this.CordonLeft.Location = new System.Drawing.Point(169, 49);
+			this.CordonLeft.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.CordonLeft.Name = "cordonLeft";
+			this.CordonLeft.Size = new System.Drawing.Size(105, 20);
+			this.CordonLeft.TabIndex = 2;
+			this.CordonLeft.Value = new decimal(new int[] {
+			16,
+			0,
+			0,
+			0});
+			this.CordonLeft.Enter += new System.EventHandler(this.SelectText);
+			//
+			// height
+			//
+			this.MapHeight.Increment = new decimal(new int[] {
+			8,
+			0,
+			0,
+			0});
+			this.MapHeight.Location = new System.Drawing.Point(280, 23);
+			this.MapHeight.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.MapHeight.Name = "height";
+			this.MapHeight.Size = new System.Drawing.Size(105, 20);
+			this.MapHeight.TabIndex = 1;
+			this.MapHeight.Value = new decimal(new int[] {
+			128,
+			0,
+			0,
+			0});
+			this.MapHeight.Enter += new System.EventHandler(this.SelectText);
+			//
+			// width
+			//
+			this.MapWidth.Increment = new decimal(new int[] {
+			8,
+			0,
+			0,
+			0});
+			this.MapWidth.Location = new System.Drawing.Point(169, 23);
+			this.MapWidth.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.MapWidth.Name = "width";
+			this.MapWidth.Size = new System.Drawing.Size(105, 20);
+			this.MapWidth.TabIndex = 0;
+			this.MapWidth.Value = new decimal(new int[] {
+			128,
+			0,
+			0,
+			0});
+			this.MapWidth.Enter += new System.EventHandler(this.SelectText);
+			//
+			// label4
+			//
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(31, 124);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(44, 13);
+			this.label4.TabIndex = 14;
+			this.label4.Text = "Tileset";
+			//
+			// theater
+			//
+			this.TheaterBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.TheaterBox.FormattingEnabled = true;
+			this.TheaterBox.Location = new System.Drawing.Point(169, 121);
+			this.TheaterBox.Name = "theater";
+			this.TheaterBox.Size = new System.Drawing.Size(216, 21);
+			this.TheaterBox.TabIndex = 6;
+			//
+			// NewMapDialog
+			//
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(418, 210);
+			this.Controls.Add(this.TheaterBox);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.CordonBottom);
+			this.Controls.Add(this.CordonTop);
+			this.Controls.Add(this.CordonRight);
+			this.Controls.Add(this.CordonLeft);
+			this.Controls.Add(this.MapHeight);
+			this.Controls.Add(this.MapWidth);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "NewMapDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "New Map";
+			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.NumericUpDown CordonBottom;
+		public System.Windows.Forms.NumericUpDown CordonTop;
+		public System.Windows.Forms.NumericUpDown CordonRight;
+		public System.Windows.Forms.NumericUpDown CordonLeft;
+		public System.Windows.Forms.NumericUpDown MapHeight;
+		public System.Windows.Forms.NumericUpDown MapWidth;
+		private System.Windows.Forms.Label label4;
+		public System.Windows.Forms.ComboBox TheaterBox;
+	}
+}

OpenRA.Editor/NewMapDialog.cs

@@ -0,0 +1,28 @@
+#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.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class NewMapDialog : Form
+	{
+		public NewMapDialog()
+		{
+			InitializeComponent();
+		}
+
+		void SelectText(object sender, System.EventArgs e)
+		{
+			var ud = sender as NumericUpDown;
+			ud.Select(0, ud.ToString().Length);
+		}
+	}
+}

OpenRA.Editor/NewMapDialog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

OpenRA.Editor/OpenRA.Editor.csproj

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{00038B75-405B-44F5-8691-BD2546DBE224}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA.Editor</RootNamespace>
+    <AssemblyName>OpenRA.Editor</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Eluant">
+      <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ActorPropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ActorPropertiesDialog.Designer.cs">
+      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ActorTemplate.cs" />
+    <Compile Include="ActorTool.cs" />
+    <Compile Include="BrushTool.cs" />
+    <Compile Include="ErrorListDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ErrorListDialog.Designer.cs">
+      <DependentUpon>ErrorListDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ITool.cs" />
+    <Compile Include="MapSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MapSelect.Designer.cs">
+      <DependentUpon>MapSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NewMapDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="NewMapDialog.Designer.cs">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="PropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PropertiesDialog.Designer.cs">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="ActorPropertiesDialog.resx">
+      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MapSelect.resx">
+      <DependentUpon>MapSelect.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NewMapDialog.resx">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PropertiesDialog.resx">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ResizeDialog.resx">
+      <DependentUpon>ResizeDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="RenderUtils.cs" />
+    <Compile Include="ResizeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ResizeDialog.Designer.cs">
+      <DependentUpon>ResizeDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ResourceTool.cs" />
+    <Compile Include="Surface.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TileSetRenderer.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+      <Name>OpenRA.Game</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
+      <Project>{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}</Project>
+      <Name>OpenRA.Mods.Common</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="OpenRA.Editor.Icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

OpenRA.Editor/Program.cs

@@ -0,0 +1,33 @@
+#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.Globalization;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	static class Program
+	{
+		public static Ruleset Rules;
+
+		[STAThread]
+		static void Main(string[] args)
+		{
+			Log.AddChannel("perf", null);
+
+			Application.CurrentCulture = CultureInfo.InvariantCulture;
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+			Application.Run(new Form1(args));
+		}
+	}
+}

OpenRA.Editor/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.269
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenRA.Editor.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.Editor.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

OpenRA.Editor/Properties/Resources.resx

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

OpenRA.Editor/Properties/Settings.Designer.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.269
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenRA.Editor.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}

OpenRA.Editor/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -0,0 +1,182 @@
+#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
+
+namespace OpenRA.Editor
+{
+	partial class PropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+				components.Dispose();
+
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.TitleBox = new System.Windows.Forms.TextBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.DescBox = new System.Windows.Forms.TextBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.AuthorBox = new System.Windows.Forms.TextBox();
+			this.MapVisibilityComboBox = new System.Windows.Forms.ComboBox();
+			this.label4 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			//
+			// button2
+			//
+			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(196, 193);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 14;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			//
+			// button1
+			//
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(277, 193);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 15;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			//
+			// label1
+			//
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 50);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 16;
+			this.label1.Text = "Title";
+			//
+			// title
+			//
+			this.TitleBox.Location = new System.Drawing.Point(66, 47);
+			this.TitleBox.Name = "title";
+			this.TitleBox.Size = new System.Drawing.Size(286, 20);
+			this.TitleBox.TabIndex = 17;
+			//
+			// label2
+			//
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 76);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(32, 13);
+			this.label2.TabIndex = 16;
+			this.label2.Text = "Desc";
+			//
+			// desc
+			//
+			this.DescBox.Location = new System.Drawing.Point(66, 73);
+			this.DescBox.Name = "desc";
+			this.DescBox.Size = new System.Drawing.Size(286, 20);
+			this.DescBox.TabIndex = 17;
+			//
+			// label3
+			//
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 102);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(38, 13);
+			this.label3.TabIndex = 16;
+			this.label3.Text = "Author";
+			//
+			// author
+			//
+			this.AuthorBox.Location = new System.Drawing.Point(66, 99);
+			this.AuthorBox.Name = "author";
+			this.AuthorBox.Size = new System.Drawing.Size(286, 20);
+			this.AuthorBox.TabIndex = 17;
+			//
+			//
+			// mapVisibilityComboBox
+			// 
+			this.MapVisibilityComboBox.FormattingEnabled = true;
+			this.MapVisibilityComboBox.Items.AddRange(new object[] {
+			"Lobby",
+			"Shellmap",
+			"MissionSelector"});
+			this.MapVisibilityComboBox.Location = new System.Drawing.Point(150, 137);
+			this.MapVisibilityComboBox.Name = "mapVisibilityComboBox";
+			this.MapVisibilityComboBox.Size = new System.Drawing.Size(121, 21);
+			this.MapVisibilityComboBox.TabIndex = 19;
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(90, 140);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(58, 13);
+			this.label4.TabIndex = 20;
+			this.label4.Text = "Map class:";
+			// PropertiesDialog
+			//
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(370, 228);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.MapVisibilityComboBox);
+			this.Controls.Add(this.AuthorBox);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.DescBox);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.TitleBox);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "PropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Map Properties";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.TextBox TitleBox;
+		private System.Windows.Forms.Label label2;
+		public System.Windows.Forms.TextBox DescBox;
+		private System.Windows.Forms.Label label3;
+		public System.Windows.Forms.TextBox AuthorBox;
+		public System.Windows.Forms.ComboBox MapVisibilityComboBox;
+		private System.Windows.Forms.Label label4;
+	}
+}

OpenRA.Editor/PropertiesDialog.cs

@@ -0,0 +1,22 @@
+#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.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class PropertiesDialog : Form
+	{
+		public PropertiesDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}

OpenRA.Editor/PropertiesDialog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

OpenRA.Editor/RenderUtils.cs

@@ -0,0 +1,112 @@
+#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.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
+using OpenRA.Mods.Common.Graphics;
+using OpenRA.Mods.Common.SpriteLoaders;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	static class RenderUtils
+	{
+		static Bitmap RenderShp(ShpTDSprite shp, IPalette p)
+		{
+			var frame = shp.Frames.First();
+
+			var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
+
+			bitmap.Palette = p.AsSystemPalette();
+
+			var data = bitmap.LockBits(bitmap.Bounds(),
+				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+			unsafe
+			{
+				var q = (byte*)data.Scan0.ToPointer();
+				var stride2 = data.Stride;
+
+				for (var i = 0; i < frame.Size.Width; i++)
+					for (var j = 0; j < frame.Size.Height; j++)
+						q[j * stride2 + i] = frame.Data[i + frame.Size.Width * j];
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		static readonly string[] LegacyExtensions = new[] { ".shp", ".tem", "" };
+
+		static string ResolveFilename(string name, TileSet tileSet)
+		{
+			var ssl = Game.ModData.SpriteSequenceLoader as TilesetSpecificSpriteSequenceLoader;
+			var extensions = ssl != null ? new[] { ssl.TilesetExtensions[tileSet.Id], ssl.DefaultSpriteExtension }.Append(LegacyExtensions) :
+				LegacyExtensions.AsEnumerable();
+
+			foreach (var e in extensions)
+				if (GlobalFileSystem.Exists(name + e))
+					return name + e;
+
+			return name;
+		}
+
+		public static ActorTemplate RenderActor(ActorInfo info, SequenceProvider sequenceProvider, TileSet tileset, IPalette p, string race)
+		{
+			var image = info.Traits.Get<ILegacyEditorRenderInfo>().EditorImage(info, sequenceProvider, race);
+			image = ResolveFilename(image, tileset);
+			using (var s = GlobalFileSystem.Open(image))
+			{
+				var shp = new ShpTDSprite(s);
+				var bitmap = RenderShp(shp, p);
+
+				return new ActorTemplate
+				{
+					Bitmap = bitmap,
+					Info = info,
+					Appearance = info.Traits.GetOrDefault<EditorAppearanceInfo>()
+				};
+			}
+		}
+
+		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, TileSet tileset, IPalette p)
+		{
+			var image = ResolveFilename(info.EditorSprite, tileset);
+			using (var s = GlobalFileSystem.Open(image))
+			{
+				// TODO: Do this properly
+				var shp = new ShpTDSprite(s);
+				var frame = shp.Frames.Last();
+
+				var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
+				bitmap.Palette = p.AsSystemPalette();
+				var data = bitmap.LockBits(bitmap.Bounds(),
+					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+				unsafe
+				{
+					var q = (byte*)data.Scan0.ToPointer();
+					var stride = data.Stride;
+
+					for (var i = 0; i < frame.Size.Width; i++)
+						for (var j = 0; j < frame.Size.Height; j++)
+							q[j * stride + i] = frame.Data[i + frame.Size.Width * j];
+				}
+
+				bitmap.UnlockBits(data);
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.Frames.Count - 1 };
+			}
+		}
+	}
+}

OpenRA.Editor/ResizeDialog.Designer.cs

@@ -0,0 +1,235 @@
+#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
+
+namespace OpenRA.Editor
+{
+	partial class ResizeDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+				components.Dispose();
+
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.MapWidth = new System.Windows.Forms.NumericUpDown();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.CordonLeft = new System.Windows.Forms.NumericUpDown();
+			this.CordonTop = new System.Windows.Forms.NumericUpDown();
+			this.CordonRight = new System.Windows.Forms.NumericUpDown();
+			this.CordonBottom = new System.Windows.Forms.NumericUpDown();
+			this.label3 = new System.Windows.Forms.Label();
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.MapHeight = new System.Windows.Forms.NumericUpDown();
+			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).BeginInit();
+			this.SuspendLayout();
+			//
+			// width
+			//
+			this.MapWidth.Increment = new decimal(new int[] {
+			8,
+			0,
+			0,
+			0});
+			this.MapWidth.Location = new System.Drawing.Point(161, 18);
+			this.MapWidth.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.MapWidth.Name = "width";
+			this.MapWidth.Size = new System.Drawing.Size(105, 20);
+			this.MapWidth.TabIndex = 0;
+			//
+			// label1
+			//
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(23, 20);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Size";
+			//
+			// label2
+			//
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(23, 46);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(86, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "Cordon Left/Top";
+			//
+			// cordonLeft
+			//
+			this.CordonLeft.Location = new System.Drawing.Point(161, 44);
+			this.CordonLeft.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.CordonLeft.Name = "cordonLeft";
+			this.CordonLeft.Size = new System.Drawing.Size(105, 20);
+			this.CordonLeft.TabIndex = 0;
+			//
+			// cordonTop
+			//
+			this.CordonTop.Location = new System.Drawing.Point(272, 44);
+			this.CordonTop.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.CordonTop.Name = "cordonTop";
+			this.CordonTop.Size = new System.Drawing.Size(105, 20);
+			this.CordonTop.TabIndex = 0;
+			//
+			// cordonRight
+			//
+			this.CordonRight.Location = new System.Drawing.Point(161, 70);
+			this.CordonRight.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.CordonRight.Name = "cordonRight";
+			this.CordonRight.Size = new System.Drawing.Size(105, 20);
+			this.CordonRight.TabIndex = 0;
+			//
+			// cordonBottom
+			//
+			this.CordonBottom.Location = new System.Drawing.Point(272, 70);
+			this.CordonBottom.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.CordonBottom.Name = "cordonBottom";
+			this.CordonBottom.Size = new System.Drawing.Size(105, 20);
+			this.CordonBottom.TabIndex = 0;
+			//
+			// label3
+			//
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(23, 72);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(107, 13);
+			this.label3.TabIndex = 1;
+			this.label3.Text = "Cordon Right/Bottom";
+			//
+			// button1
+			//
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(302, 111);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 2;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			//
+			// button2
+			//
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(221, 111);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 2;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			//
+			// height
+			//
+			this.MapHeight.Increment = new decimal(new int[] {
+			8,
+			0,
+			0,
+			0});
+			this.MapHeight.Location = new System.Drawing.Point(272, 18);
+			this.MapHeight.Maximum = new decimal(new int[] {
+			2048,
+			0,
+			0,
+			0});
+			this.MapHeight.Name = "height";
+			this.MapHeight.Size = new System.Drawing.Size(105, 20);
+			this.MapHeight.TabIndex = 0;
+			//
+			// ResizeDialog
+			//
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(409, 146);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.CordonBottom);
+			this.Controls.Add(this.CordonTop);
+			this.Controls.Add(this.CordonRight);
+			this.Controls.Add(this.CordonLeft);
+			this.Controls.Add(this.MapHeight);
+			this.Controls.Add(this.MapWidth);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "ResizeDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Resize Map";
+			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		public System.Windows.Forms.NumericUpDown MapWidth;
+		public System.Windows.Forms.NumericUpDown CordonLeft;
+		public System.Windows.Forms.NumericUpDown CordonTop;
+		public System.Windows.Forms.NumericUpDown CordonRight;
+		public System.Windows.Forms.NumericUpDown CordonBottom;
+		public System.Windows.Forms.NumericUpDown MapHeight;
+	}
+}

OpenRA.Editor/ResizeDialog.cs

@@ -0,0 +1,22 @@
+#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.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class ResizeDialog : Form
+	{
+		public ResizeDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}

OpenRA.Editor/ResizeDialog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

OpenRA.Editor/ResourceTool.cs

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

OpenRA.Editor/Surface.cs

@@ -0,0 +1,586 @@
+#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.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using System.Windows.Forms;
+using OpenRA.Graphics;
+using OpenRA.Primitives;
+using OpenRA.Traits;
+
+using SGraphics = System.Drawing.Graphics;
+
+namespace OpenRA.Editor
+{
+	static class ActorReferenceExts
+	{
+		public static CPos Location(this ActorReference ar)
+		{
+			return (CPos)ar.InitDict.Get<LocationInit>().Value(null);
+		}
+
+		public static void DrawStringContrast(this SGraphics g, Font f, string s, int x, int y, Brush fg, Brush bg)
+		{
+			g.DrawString(s, f, bg, x - 1, y - 1);
+			g.DrawString(s, f, bg, x + 1, y - 1);
+			g.DrawString(s, f, bg, x - 1, y + 1);
+			g.DrawString(s, f, bg, x + 1, y + 1);
+
+			g.DrawString(s, f, fg, x, y);
+		}
+	}
+
+	class Surface : Control
+	{
+		public Map Map { get; private set; }
+		public Dictionary<string, ActorReference> Actors { get; private set; }
+		public TileSet TileSet { get; private set; }
+		public TileSetRenderer TileSetRenderer { get; private set; }
+		public IPalette Palette { get; private set; }
+		public IPalette PlayerPalette { get; private set; }
+		public int2 Offset;
+
+		public int2 GetOffset() { return Offset; }
+
+		public float Zoom = 1.0f;
+
+		ITool currentTool;
+
+		public bool IsPanning;
+		public bool IsErasing;
+		public bool ShowActorNames;
+		public bool ShowGrid;
+		public bool ShowRuler;
+
+		public bool IsPaste { get { return TileSelection != null && ResourceSelection != null; } }
+		public TerrainTile[,] TileSelection;
+		public ResourceTile[,] ResourceSelection;
+		public CPos SelectionStart;
+		public CPos SelectionEnd;
+
+		public string NewActorOwner;
+
+		public event Action AfterChange = () => { };
+		public event Action<string> MousePositionChanged = _ => { };
+		public event Action<KeyValuePair<string, ActorReference>> ActorDoubleClicked = _ => { };
+
+		Dictionary<string, ActorTemplate> actorTemplates = new Dictionary<string, ActorTemplate>();
+		public Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
+
+		static readonly Font MarkerFont = new Font(FontFamily.GenericSansSerif, 12.0f, FontStyle.Regular);
+		static readonly SolidBrush TextBrush = new SolidBrush(Color.Red);
+
+		public Keys GetModifiers() { return ModifierKeys; }
+
+		public void Bind(Map m, TileSet ts, TileSetRenderer tsr, IPalette p, IPalette pp)
+		{
+			Map = m;
+			if (m != null)
+				Actors = m.ActorDefinitions.ToDictionary(n => n.Key, n => new ActorReference(n.Value.Value, n.Value.ToDictionary()));
+
+			TileSet = ts;
+			TileSetRenderer = tsr;
+			Palette = p;
+			PlayerPalette = pp;
+			playerPalettes = null;
+			Chunks.Clear();
+			currentTool = null;
+		}
+
+		public void SetTool(ITool tool) { currentTool = tool; ClearSelection(); }
+
+		public void BindActorTemplates(IEnumerable<ActorTemplate> templates)
+		{
+			actorTemplates = templates.ToDictionary(a => a.Info.Name.ToLowerInvariant());
+		}
+
+		public void BindResourceTemplates(IEnumerable<ResourceTemplate> templates)
+		{
+			ResourceTemplates = templates.ToDictionary(a => a.Info.ResourceType);
+		}
+
+		public Dictionary<int2, Bitmap> Chunks = new Dictionary<int2, Bitmap>();
+
+		public Surface()
+		{
+			BackColor = Color.Black;
+
+			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+			SetStyle(ControlStyles.ResizeRedraw, true);
+			UpdateStyles();
+		}
+
+		static readonly Pen SelectionPen = new Pen(Color.Blue);
+		static readonly Pen PastePen = new Pen(Color.Green);
+		static readonly Pen CordonPen = new Pen(Color.Red);
+
+		int2 mousePos;
+
+		public void Scroll(int2 dx)
+		{
+			Offset -= dx;
+			Invalidate();
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			base.OnDoubleClick(e);
+
+			var x = Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
+			if (x.Key != null)
+				ActorDoubleClicked(x);
+		}
+
+		protected override void OnMouseWheel(MouseEventArgs e)
+		{
+			base.OnMouseWheel(e);
+
+			if (Map == null) return;
+
+			Zoom *= e.Delta > 0 ? 4.0f / 3.0f : .75f;
+
+			Invalidate();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			this.Parent.Focus();
+
+			Invalidate();
+		}
+
+		protected override void OnMouseEnter(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			this.Focus();
+
+			Invalidate();
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			if (Map == null) return;
+
+			var oldMousePos = mousePos;
+			mousePos = new int2(e.Location);
+			MousePositionChanged(GetBrushLocation().ToString());
+
+			if (e.Button == MouseButtons.Middle || (e.Button != MouseButtons.None && IsPanning))
+				Scroll(oldMousePos - mousePos);
+			else
+			{
+				if (e.Button == MouseButtons.Right || (IsErasing && e.Button == MouseButtons.Left))
+					Erase();
+
+				if (e.Button == MouseButtons.Left && !IsErasing)
+					Draw();
+
+				Invalidate();
+			}
+		}
+
+		void Erase()
+		{
+			// Crash preventing
+			var brushLocation = GetBrushLocation();
+
+			if (Map == null || brushLocation.X >= Map.MapSize.X ||
+				brushLocation.Y >= Map.MapSize.Y ||
+				brushLocation.X < 0 ||
+				brushLocation.Y < 0)
+				return;
+
+			currentTool = null;
+
+			var key = Actors.FirstOrDefault(a => a.Value.Location() == brushLocation);
+			if (key.Key != null) Actors.Remove(key.Key);
+
+			if (Map.MapResources.Value[brushLocation].Type != 0)
+			{
+				Map.MapResources.Value[brushLocation] = new ResourceTile(0, 0);
+				var ch = new int2(brushLocation.X / ChunkSize, brushLocation.Y / ChunkSize);
+				if (Chunks.ContainsKey(ch))
+				{
+					Chunks[ch].Dispose();
+					Chunks.Remove(ch);
+				}
+			}
+
+			AfterChange();
+			ClearSelection();
+		}
+
+		void Draw()
+		{
+			if (currentTool != null)
+			{
+				currentTool.Apply(this);
+				AfterChange();
+			}
+			else if (IsPaste)
+				PasteSelection();
+			else
+				SelectionEnd = GetBrushLocationBR();
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			base.OnMouseDown(e);
+
+			if (Map == null) return;
+
+			if (!IsPanning)
+			{
+				if (e.Button == MouseButtons.Right) Erase();
+				if (e.Button == MouseButtons.Left && !IsErasing)
+				{
+					Draw();
+					if (!IsPaste)
+						SelectionStart = SelectionEnd = GetBrushLocation();
+				}
+			}
+
+			Invalidate();
+		}
+
+		public const int ChunkSize = 8;		// 8x8 chunks ==> 192x192 bitmaps.
+
+		Bitmap RenderChunk(int u, int v)
+		{
+			var bitmap = new Bitmap(ChunkSize * TileSetRenderer.TileSize, ChunkSize * TileSetRenderer.TileSize);
+
+			var data = bitmap.LockBits(bitmap.Bounds(),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				var p = (int*)data.Scan0.ToPointer();
+				var stride = data.Stride >> 2;
+
+				for (var i = 0; i < ChunkSize; i++)
+					for (var j = 0; j < ChunkSize; j++)
+					{
+						var ui = u * ChunkSize + i;
+						var vj = v * ChunkSize + j;
+						var uv = new MPos(ui, vj);
+						if (uv.U >= Map.MapSize.X || uv.V >= Map.MapSize.Y)
+						{
+							for (var x = 0; x < TileSetRenderer.TileSize; x++)
+								for (var y = 0; y < TileSetRenderer.TileSize; y++)
+									p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = 0;
+
+							continue;
+						}
+
+						var tr = Map.MapTiles.Value[uv];
+						var tile = TileSetRenderer.Data(tr.Type);
+						if (tile == null)
+							continue;
+
+						var index = (tr.Index < tile.Length) ? tr.Index : (byte)0;
+						var rawImage = tile[index];
+						for (var x = 0; x < TileSetRenderer.TileSize; x++)
+							for (var y = 0; y < TileSetRenderer.TileSize; y++)
+								p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] =
+									Palette.GetColor(rawImage[x + TileSetRenderer.TileSize * y]).ToArgb();
+
+						if (Map.MapResources.Value[uv].Type != 0)
+						{
+							var resourceImage = ResourceTemplates[Map.MapResources.Value[uv].Type].Bitmap;
+							var srcdata = resourceImage.LockBits(resourceImage.Bounds(),
+								ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+
+							var q = (int*)srcdata.Scan0.ToPointer();
+							var srcstride = srcdata.Stride >> 2;
+
+							for (var x = 0; x < TileSetRenderer.TileSize; x++)
+								for (var y = 0; y < TileSetRenderer.TileSize; y++)
+								{
+									var c = q[y * srcstride + x];
+									if ((c & 0xff000000) != 0)	/* quick & dirty, i cbf doing real alpha */
+										p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = c;
+								}
+
+							resourceImage.UnlockBits(srcdata);
+						}
+					}
+			}
+
+			bitmap.UnlockBits(data);
+
+			if (ShowGrid)
+			{
+				using (var g = SGraphics.FromImage(bitmap))
+				{
+					var ts = Game.ModData.Manifest.TileSize;
+					var rect = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
+					ControlPaint.DrawGrid(g, rect, new Size(2, ts.Height), Color.DarkRed);
+					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, 2), Color.DarkRed);
+					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, ts.Height), Color.Red);
+				}
+			}
+
+			return bitmap;
+		}
+
+		public CPos GetBrushLocation()
+		{
+			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
+			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
+			return new CPos(vX / TileSetRenderer.TileSize, vY / TileSetRenderer.TileSize);
+		}
+
+		public CPos GetBrushLocationBR()
+		{
+			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
+			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
+			return new CPos(
+				(vX + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize,
+				(vY + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize);
+		}
+
+		public void DrawActor(SGraphics g, CPos p, ActorTemplate t, ColorPalette cp)
+		{
+			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
+			var actorPalette = cp;
+			if (t.Appearance != null && t.Appearance.UseTerrainPalette)
+				actorPalette = Palette.AsSystemPalette();
+			DrawImage(g, t.Bitmap, p, centered, actorPalette);
+		}
+
+		float2 GetDrawPosition(CPos location, Bitmap bmp, bool centered)
+		{
+			float offsetX = centered ? bmp.Width / 2 - TileSetRenderer.TileSize / 2 : 0;
+			var drawX = TileSetRenderer.TileSize * location.X * Zoom + Offset.X - offsetX;
+
+			float offsetY = centered ? bmp.Height / 2 - TileSetRenderer.TileSize / 2 : 0;
+			var drawY = TileSetRenderer.TileSize * location.Y * Zoom + Offset.Y - offsetY;
+
+			return new float2(drawX, drawY);
+		}
+
+		public void DrawImage(SGraphics g, Bitmap bmp, CPos location, bool centered, ColorPalette cp)
+		{
+			var drawPos = GetDrawPosition(location, bmp, centered);
+
+			var sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
+			var destRect = new RectangleF(drawPos.X, drawPos.Y, bmp.Width * Zoom, bmp.Height * Zoom);
+
+			var restorePalette = bmp.Palette;
+			if (cp != null) bmp.Palette = cp;
+			g.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
+			if (cp != null) bmp.Palette = restorePalette;
+		}
+
+		void DrawActorBorder(SGraphics g, CPos p, ActorTemplate t)
+		{
+			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
+			var drawPos = GetDrawPosition(p, t.Bitmap, centered);
+
+			g.DrawRectangle(CordonPen,
+				drawPos.X, drawPos.Y,
+				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);
+		}
+
+		ColorPalette GetPaletteForPlayerInner(string name)
+		{
+			var pr = new MapPlayers(Map.PlayerDefinitions).Players[name];
+			var pcpi = Program.Rules.Actors["world"].Traits.Get<PlayerColorPaletteInfo>();
+			var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp);
+			return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette();
+		}
+
+		Cache<string, ColorPalette> playerPalettes;
+
+		public ColorPalette GetPaletteForPlayer(string player)
+		{
+			if (playerPalettes == null)
+				playerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayerInner);
+
+			return playerPalettes[player];
+		}
+
+		ColorPalette GetPaletteForActor(ActorReference ar)
+		{
+			var ownerInit = ar.InitDict.GetOrDefault<OwnerInit>();
+			if (ownerInit == null)
+				return null;
+
+			return GetPaletteForPlayer(ownerInit.PlayerName);
+		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if (Map == null) return;
+			if (TileSet == null) return;
+
+			for (var u = 0; u < Map.MapSize.X; u += ChunkSize)
+				for (var v = 0; v < Map.MapSize.Y; v += ChunkSize)
+				{
+					var x = new int2(u / ChunkSize, v / ChunkSize);
+					if (!Chunks.ContainsKey(x)) Chunks[x] = RenderChunk(u / ChunkSize, v / ChunkSize);
+
+					var bmp = Chunks[x];
+
+					var drawX = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
+					var drawY = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
+					var sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
+					var destRect = new RectangleF(drawX, drawY, bmp.Width * Zoom, bmp.Height * Zoom);
+					e.Graphics.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
+				}
+
+			e.Graphics.DrawRectangle(CordonPen,
+				Map.Bounds.Left * TileSetRenderer.TileSize * Zoom + Offset.X,
+				Map.Bounds.Top * TileSetRenderer.TileSize * Zoom + Offset.Y,
+				Map.Bounds.Width * TileSetRenderer.TileSize * Zoom,
+				Map.Bounds.Height * TileSetRenderer.TileSize * Zoom);
+
+			e.Graphics.DrawRectangle(SelectionPen,
+				(SelectionStart.X * TileSetRenderer.TileSize * Zoom) + Offset.X,
+				(SelectionStart.Y * TileSetRenderer.TileSize * Zoom) + Offset.Y,
+				(SelectionEnd - SelectionStart).X * TileSetRenderer.TileSize * Zoom,
+				(SelectionEnd - SelectionStart).Y * TileSetRenderer.TileSize * Zoom);
+
+			if (IsPaste)
+			{
+				var loc = GetBrushLocation();
+				var width = Math.Abs((SelectionStart - SelectionEnd).X);
+				var height = Math.Abs((SelectionStart - SelectionEnd).Y);
+
+				e.Graphics.DrawRectangle(PastePen,
+					(loc.X * TileSetRenderer.TileSize * Zoom) + Offset.X,
+					(loc.Y * TileSetRenderer.TileSize * Zoom) + Offset.Y,
+					width * (TileSetRenderer.TileSize * Zoom),
+					height * (TileSetRenderer.TileSize * Zoom));
+			}
+
+			foreach (var ar in Actors)
+			{
+				if (actorTemplates.ContainsKey(ar.Value.Type))
+					DrawActor(e.Graphics, ar.Value.Location(), actorTemplates[ar.Value.Type],
+						GetPaletteForActor(ar.Value));
+				else
+					Console.WriteLine("Warning: Unknown or excluded actor: {0}", ar.Value.Type);
+			}
+
+			if (ShowActorNames)
+				foreach (var ar in Actors)
+					if (!ar.Key.StartsWith("Actor"))	// if it has a custom name
+						e.Graphics.DrawStringContrast(Font, ar.Key,
+							(int)(ar.Value.Location().X * TileSetRenderer.TileSize * Zoom + Offset.X),
+							(int)(ar.Value.Location().Y * TileSetRenderer.TileSize * Zoom + Offset.Y),
+							Brushes.White,
+							Brushes.Black);
+
+			if (ShowRuler && Zoom > 0.2)
+			{
+				for (var i = Map.Bounds.Left; i <= Map.Bounds.Right; i += 8)
+				{
+					if (i % 8 == 0)
+					{
+						var point = new PointF(i * TileSetRenderer.TileSize * Zoom + Offset.X, (Map.Bounds.Top - 8) * TileSetRenderer.TileSize * Zoom + Offset.Y);
+						e.Graphics.DrawString((i - Map.Bounds.Left).ToString(), MarkerFont, TextBrush, point);
+					}
+				}
+
+				for (var i = Map.Bounds.Top; i <= Map.Bounds.Bottom; i += 8)
+				{
+					if (i % 8 == 0)
+					{
+						var point = new PointF((Map.Bounds.Left - 8) * TileSetRenderer.TileSize * Zoom + Offset.X, i * TileSetRenderer.TileSize * Zoom + Offset.Y);
+						e.Graphics.DrawString((i - Map.Bounds.Left).ToString(), MarkerFont, TextBrush, point);
+					}
+				}
+			}
+
+			if (currentTool != null)
+				currentTool.Preview(this, e.Graphics);
+
+			if (currentTool == null)
+			{
+				var x = Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
+				if (x.Key != null && actorTemplates.ContainsKey(x.Value.Type))
+					DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]);
+			}
+		}
+
+		public void CopySelection()
+		{
+			// Grab tiles and resources within selection (doesn't do actors)
+			var start = SelectionStart;
+			var end = SelectionEnd;
+
+			if (start == end) return;
+
+			var width = Math.Abs((start - end).X);
+			var height = Math.Abs((start - end).Y);
+
+			TileSelection = new TerrainTile[width, height];
+			ResourceSelection = new ResourceTile[width, height];
+
+			for (var x = 0; x < width; x++)
+			{
+				for (var y = 0; y < height; y++)
+				{
+					// TODO: crash prevention
+					var cell = new CPos(start.X + x, start.Y + y);
+					TileSelection[x, y] = Map.MapTiles.Value[cell];
+					ResourceSelection[x, y] = Map.MapResources.Value[cell];
+				}
+			}
+		}
+
+		void PasteSelection()
+		{
+			var loc = GetBrushLocation();
+			var width = Math.Abs((SelectionStart - SelectionEnd).X);
+			var height = Math.Abs((SelectionStart - SelectionEnd).Y);
+
+			for (var x = 0; x < width; x++)
+			{
+				for (var y = 0; y < height; y++)
+				{
+					var mapX = loc.X + x;
+					var mapY = loc.Y + y;
+					var cell = new CPos(mapX, mapY);
+
+					// TODO: crash prevention for outside of bounds
+					Map.MapTiles.Value[cell] = TileSelection[x, y];
+					Map.MapResources.Value[cell] = ResourceSelection[x, y];
+
+					var ch = new int2(mapX / ChunkSize, mapY / ChunkSize);
+					if (Chunks.ContainsKey(ch))
+					{
+						Chunks[ch].Dispose();
+						Chunks.Remove(ch);
+					}
+				}
+			}
+
+			AfterChange();
+		}
+
+		void ClearSelection()
+		{
+			SelectionStart = CPos.Zero;
+			SelectionEnd = CPos.Zero;
+			TileSelection = null;
+			ResourceSelection = null;
+		}
+	}
+}

OpenRA.Editor/TileSetRenderer.cs

@@ -0,0 +1,117 @@
+#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.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
+
+namespace OpenRA.Editor
+{
+	public class TileSetRenderer
+	{
+		public readonly int TileSize;
+		public TileSet TileSet;
+		Dictionary<ushort, byte[][]> templates;
+
+		// Extract a square tile that the editor can render
+		byte[] ExtractSquareTile(ISpriteFrame frame)
+		{
+			var data = new byte[TileSize * TileSize];
+
+			// Invalid tile size: return blank tile
+			if (frame.Size.Width < TileSize || frame.Size.Height < TileSize)
+				return new byte[0];
+
+			var frameData = frame.Data;
+			var xOffset = (frame.Size.Width - TileSize) / 2;
+			var yOffset = (frame.Size.Height - TileSize) / 2;
+
+			for (var y = 0; y < TileSize; y++)
+				for (var x = 0; x < TileSize; x++)
+					data[y * TileSize + x] = frameData[(yOffset + y) * frame.Size.Width + x + xOffset];
+
+			return data;
+		}
+
+		public TileSetRenderer(TileSet tileset, Size tileSize)
+		{
+			this.TileSet = tileset;
+			this.TileSize = Math.Min(tileSize.Width, tileSize.Height);
+
+			templates = new Dictionary<ushort, byte[][]>();
+			var frameCache = new FrameCache(Game.ModData.SpriteLoaders);
+			foreach (var t in tileset.Templates)
+			{
+				var allFrames = frameCache[t.Value.Images[0]];
+				var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
+				templates.Add(t.Value.Id, frames.Select(f => ExtractSquareTile(f)).ToArray());
+			}
+		}
+
+		public Bitmap RenderTemplate(ushort id, IPalette p)
+		{
+			var template = TileSet.Templates[id];
+			var templateData = templates[id];
+
+			var bitmap = new Bitmap(TileSize * template.Size.X, TileSize * template.Size.Y,
+				PixelFormat.Format8bppIndexed);
+
+			bitmap.Palette = p.AsSystemPalette();
+
+			var data = bitmap.LockBits(bitmap.Bounds(),
+				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+			unsafe
+			{
+				var q = (byte*)data.Scan0.ToPointer();
+				var stride = data.Stride;
+
+				for (var u = 0; u < template.Size.X; u++)
+				{
+					for (var v = 0; v < template.Size.Y; v++)
+					{
+						var rawImage = templateData[u + v * template.Size.X];
+						if (rawImage != null && rawImage.Length > 0)
+						{
+							for (var i = 0; i < TileSize; i++)
+								for (var j = 0; j < TileSize; j++)
+									q[(v * TileSize + j) * stride + u * TileSize + i] = rawImage[i + TileSize * j];
+						}
+						else
+						{
+							for (var i = 0; i < TileSize; i++)
+								for (var j = 0; j < TileSize; j++)
+									q[(v * TileSize + j) * stride + u * TileSize + i] = 0;
+						}
+					}
+				}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		public byte[][] Data(ushort id)
+		{
+			byte[][] template;
+			if (!templates.TryGetValue(id, out template))
+			{
+				Console.WriteLine("warning: Unknown tile template {0}", id);
+				return null;
+			}
+
+			return template;
+		}
+	}
+}

OpenRA.Game.exe.config

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

OpenRA.Game/Activities/Activity.cs

@@ -1,291 +1,54 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.Activities
 {
-	public enum ActivityState { Queued, Active, Canceling, Done }
-
-	public class TargetLineNode
+	public abstract class Activity
 	{
-		public readonly Target Target;
-		public readonly Color Color;
-		public readonly Sprite Tile;
+		public Activity NextActivity { get; set; }
+		protected bool IsCanceled { get; private set; }
 
-		public TargetLineNode(in Target target, Color color, Sprite tile = null)
+		public abstract Activity Tick(Actor self);
+
+		public virtual void Cancel(Actor self)
 		{
-			// Note: Not all activities are drawable. In that case, pass Target.Invalid as target,
-			// if "yield break" in TargetLineNode(Actor self) is not feasible.
-			Target = target;
-			Color = color;
-			Tile = tile;
-		}
-	}
-
-	/*
-	 * Things to be aware of when writing activities:
-	 *
-	 * - Use "return true" at least once somewhere in the tick method.
-	 * - Do not "reuse" activity objects (by queuing them as next or child, for example) that have already started running.
-	 *   Queue a new instance instead.
-	 * - Avoid calling actor.CancelActivity(). It is almost always a bug. Call activity.Cancel() instead.
-	 * - Do not evaluate dynamic state (an actor's location, health, conditions, etc.) in the activity's constructor,
-	 *   as that might change before the activity gets to tick for the first time.  Use the OnFirstRun() method instead.
-	 */
-	public abstract class Activity : IActivityInterface
-	{
-		public ActivityState State { get; private set; }
-
-		Activity childActivity;
-		protected Activity ChildActivity
-		{
-			get => SkipDoneActivities(childActivity);
-			private set => childActivity = value;
+			IsCanceled = true;
+			NextActivity = null;
 		}
 
-		Activity nextActivity;
-		public Activity NextActivity
+		public virtual void Queue(Activity activity)
 		{
-			get => SkipDoneActivities(nextActivity);
-			private set => nextActivity = value;
-		}
-
-		internal static Activity SkipDoneActivities(Activity first)
-		{
-			// If first.Cancel() was called while it was queued (i.e. before it first ticked), its state will be Done
-			// rather than Queued (the activity system guarantees that it cannot be Active or Canceling).
-			// An unknown number of ticks may have elapsed between the Cancel() call and now,
-			// so we cannot make any assumptions on the value of first.NextActivity.
-			// We must not return first (ticking it would be bogus), but returning null would potentially
-			// drop valid activities queued after it. Walk the queue until we find a valid activity or
-			// (more likely) run out of activities.
-			while (first != null && first.State == ActivityState.Done)
-				first = first.nextActivity;
-
-			return first;
-		}
-
-		public bool IsInterruptible { get; protected set; }
-		public bool ChildHasPriority { get; protected set; }
-		public bool IsCanceling => State == ActivityState.Canceling;
-		bool finishing;
-		bool firstRunCompleted;
-		bool lastRun;
-
-		public Activity()
-		{
-			IsInterruptible = true;
-			ChildHasPriority = true;
-		}
-
-		public Activity TickOuter(Actor self)
-		{
-			if (State == ActivityState.Done)
-				throw new InvalidOperationException($"Actor {self} attempted to tick activity {GetType()} after it had already completed.");
-
-			if (State == ActivityState.Queued)
-			{
-				OnFirstRun(self);
-				firstRunCompleted = true;
-				State = ActivityState.Active;
-			}
-
-			if (!firstRunCompleted)
-				throw new InvalidOperationException($"Actor {self} attempted to tick activity {GetType()} before running its OnFirstRun method.");
-
-			// Only run the parent tick when the child is done.
-			// We must always let the child finish on its own before continuing.
-			if (ChildHasPriority)
-			{
-				lastRun = TickChild(self) && (finishing || Tick(self));
-				finishing |= lastRun;
-			}
-
-			// The parent determines whether the child gets a chance at ticking.
+			if (NextActivity != null)
+				NextActivity.Queue(activity);
 			else
-				lastRun = Tick(self);
-
-			// Avoid a single tick delay if the childactivity was just queued.
-			var ca = ChildActivity;
-			if (ca != null && ca.State == ActivityState.Queued)
-			{
-				if (ChildHasPriority)
-					lastRun = TickChild(self) && finishing;
-				else
-					TickChild(self);
-			}
-
-			if (lastRun)
-			{
-				State = ActivityState.Done;
-				OnLastRun(self);
-				return NextActivity;
-			}
-
-			return this;
-		}
-
-		protected bool TickChild(Actor self)
-		{
-			ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
-			return ChildActivity == null;
-		}
-
-		/// <summary>
-		/// Called every tick to run activity logic. Returns false if the activity should
-		/// remain active, or true if it is complete. Cancelled activities must ensure they
-		/// return the actor to a consistent state before returning true.
-		///
-		/// Child activities can be queued using QueueChild, and these will be ticked
-		/// instead of the parent while they are active. Activities that need to run logic
-		/// in parallel with child activities should set ChildHasPriority to false and
-		/// manually call TickChildren.
-		///
-		/// Queuing one or more child activities and returning true is valid, and causes
-		/// the activity to be completed immediately (without ticking again) once the
-		/// children have completed.
-		/// </summary>
-		public virtual bool Tick(Actor self)
-		{
-			return true;
-		}
-
-		/// <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)
-		{
-			ChildActivity?.OnActorDisposeOuter(self);
-
-			OnActorDispose(self);
-		}
-
-		public virtual void Cancel(Actor self, bool keepQueue = false)
-		{
-			if (!keepQueue)
-				NextActivity = null;
-
-			if (!IsInterruptible)
-				return;
-
-			ChildActivity?.Cancel(self);
-
-			// Directly mark activities that are queued and therefore didn't run yet as done
-			State = State == ActivityState.Queued ? ActivityState.Done : ActivityState.Canceling;
-		}
-
-		public void Queue(Activity activity)
-		{
-			var it = this;
-			while (it.nextActivity != null)
-				it = it.nextActivity;
-			it.nextActivity = activity;
-		}
-
-		public void QueueChild(Activity activity)
-		{
-			if (childActivity != null)
-				childActivity.Queue(activity);
-			else
-				childActivity = activity;
-		}
-
-		/// <summary>
-		/// Prints the activity tree, starting from the top 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="self">The actor performing this activity.</param>
-		/// <param name="origin">Activity from which to start traversing, and which to mark. If null, mark the calling activity, and start traversal from the top.</param>
-		/// <param name="level">Initial level of indentation.</param>
-		protected void PrintActivityTree(Actor self, Activity origin = null, int level = 0)
-		{
-			if (origin == null)
-				self.CurrentActivity.PrintActivityTree(self, this);
-			else
-			{
-				Console.Write(new string(' ', level * 2));
-				if (origin == this)
-					Console.Write("*");
-
-				Console.WriteLine(GetType().ToString().Split('.').Last());
-
-				ChildActivity?.PrintActivityTree(self, origin, level + 1);
-
-				NextActivity?.PrintActivityTree(self, origin, level);
-			}
+				NextActivity = activity;
 		}
 
 		public virtual IEnumerable<Target> GetTargets(Actor self)
 		{
 			yield break;
 		}
+	}
 
-		public virtual IEnumerable<TargetLineNode> TargetLineNodes(Actor self)
+	public static class ActivityExts
+	{
+		public static IEnumerable<Target> GetTargetQueue(this Actor self)
 		{
-			yield break;
-		}
-
-		public IEnumerable<string> DebugLabelComponents()
-		{
-			var act = this;
-			while (act != null)
-			{
-				yield return act.GetType().Name;
-				act = act.ChildActivity;
-			}
-		}
-
-		public IEnumerable<T> ActivitiesImplementing<T>(bool includeChildren = true) where T : IActivityInterface
-		{
-			// Skips Done child and next activities
-			if (includeChildren)
-			{
-				var ca = ChildActivity;
-				if (ca != null)
-					foreach (var a in ca.ActivitiesImplementing<T>())
-						yield return a;
-			}
-
-			if (this is T)
-				yield return (T)(object)this;
-
-			var na = NextActivity;
-			if (na != null)
-				foreach (var a in na.ActivitiesImplementing<T>())
-					yield return a;
+			return self.GetCurrentActivity()
+				.Iterate(u => u.NextActivity)
+				.TakeWhile(u => u != null)
+				.SelectMany(u => u.GetTargets(self));
 		}
 	}
 }

OpenRA.Game/Activities/CallFunc.cs

@@ -1,11 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
@@ -16,18 +15,25 @@ namespace OpenRA.Activities
 	public class CallFunc : Activity
 	{
 		public CallFunc(Action a) { this.a = a; }
-		public CallFunc(Action a, bool interruptible)
+		public CallFunc(Action a, bool interruptable)
 		{
 			this.a = a;
-			IsInterruptible = interruptible;
+			this.interruptable = interruptable;
 		}
 
-		readonly Action a;
+		Action a;
+		bool interruptable;
 
-		public override bool Tick(Actor self)
+		public override Activity Tick(Actor self)
 		{
-			a.Invoke();
-			return true;
+			if (a != null) a();
+			return NextActivity;
+		}
+
+		public override void Cancel(Actor self)
+		{
+			if (interruptable)
+				base.Cancel(self);
 		}
 	}
 }

OpenRA.Game/Actor.cs

@@ -1,18 +1,16 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
+using System.Drawing;
 using System.Linq;
 using Eluant;
 using Eluant.ObjectBinding;
@@ -24,117 +22,64 @@ using OpenRA.Traits;
 
 namespace OpenRA
 {
-	[Flags]
-	public enum SystemActors
+	public class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>
 	{
-		Player = 0,
-		EditorPlayer = 1,
-		World = 2,
-		EditorWorld = 4
-	}
-
-	public sealed class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IDisposable
-	{
-		internal readonly struct SyncHash
-		{
-			public readonly ISync Trait;
-			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;
 
 		public readonly World World;
 
 		public readonly uint ActorID;
 
-		public Player Owner { get; internal set; }
+		[Sync] public Player Owner { get; set; }
 
 		public bool IsInWorld { get; internal set; }
-		public bool WillDispose { get; private set; }
-		public bool Disposed { get; private set; }
+		public bool Destroyed { get; private set; }
 
 		Activity currentActivity;
-		public Activity CurrentActivity
-		{
-			get => Activity.SkipDoneActivities(currentActivity);
-			private set => currentActivity = value;
-		}
 
+		public Group Group;
 		public int Generation;
-		public Actor ReplacedByActor;
 
-		public IEffectiveOwner EffectiveOwner { get; }
-		public IOccupySpace OccupiesSpace { get; }
-		public ITargetable[] Targetables { get; }
-		public IEnumerable<ITargetablePositions> EnabledTargetablePositions { get; private set; }
+		Lazy<Rectangle> bounds;
+		Lazy<IFacing> facing;
+		Lazy<Health> health;
+		Lazy<IOccupySpace> occupySpace;
+		Lazy<IEffectiveOwner> effectiveOwner;
 
-		public bool IsIdle => CurrentActivity == null;
-		public bool IsDead => Disposed || (health != null && health.IsDead);
+		public Rectangle Bounds { get { return bounds.Value; } }
+		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
+		public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } }
 
-		public CPos Location => OccupiesSpace.TopLeft;
-		public WPos CenterPosition => OccupiesSpace.CenterPosition;
+		public bool IsIdle { get { return currentActivity == null; } }
+		public bool IsDead { get { return Destroyed || (health.Value == null ? false : health.Value.IsDead); } }
 
-		public WRot Orientation => facing?.Orientation ?? WRot.None;
+		public CPos Location { get { return occupySpace.Value.TopLeft; } }
+		public WPos CenterPosition { get { return occupySpace.Value.CenterPosition; } }
 
-		/// <summary>Value used to represent an invalid token.</summary>
-		public static readonly int InvalidConditionToken = -1;
-
-		class ConditionState
+		public WRot Orientation
 		{
-			/// <summary>Delegates that have registered to be notified when this condition changes.</summary>
-			public readonly List<VariableObserverNotifier> Notifiers = new List<VariableObserverNotifier>();
-
-			/// <summary>Unique integers identifying granted instances of the condition.</summary>
-			public readonly HashSet<int> Tokens = new HashSet<int>();
+			get
+			{
+				// TODO: Support non-zero pitch/roll in IFacing (IOrientation?)
+				var facingValue = facing.Value != null ? facing.Value.Facing : 0;
+				return new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facingValue));
+			}
 		}
 
-		readonly Dictionary<string, ConditionState> conditionStates = new Dictionary<string, ConditionState>();
-
-		/// <summary>Each granted condition receives a unique token that is used when revoking.</summary>
-		readonly Dictionary<int, string> conditionTokens = new Dictionary<int, string>();
-
-		int nextConditionToken = 1;
-
-		/// <summary>Cache of condition -> enabled state for quick evaluation of token counter conditions.</summary>
-		readonly Dictionary<string, int> conditionCache = new Dictionary<string, int>();
-
-		/// <summary>Read-only version of conditionCache that is passed to IConditionConsumers.</summary>
-		readonly IReadOnlyDictionary<string, int> readOnlyConditionCache;
-
-		internal SyncHash[] SyncHashes { get; }
-
-		readonly IFacing facing;
-		readonly IHealth health;
-		readonly IResolveOrder[] resolveOrders;
 		readonly IRenderModifier[] renderModifiers;
 		readonly IRender[] renders;
-		readonly IMouseBounds[] mouseBounds;
-		readonly IVisibilityModifier[] visibilityModifiers;
-		readonly IDefaultVisibility defaultVisibility;
-		readonly INotifyBecomingIdle[] becomingIdles;
-		readonly INotifyIdle[] tickIdles;
-		readonly IEnumerable<WPos> enabledTargetableWorldPositions;
-		bool created;
+		readonly IDisable[] disables;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
-			var duplicateInit = initDict.WithInterface<ISingleInstanceInit>().GroupBy(i => i.GetType())
-				.FirstOrDefault(i => i.Count() > 1);
-
-			if (duplicateInit != null)
-				throw new InvalidDataException($"Duplicate initializer '{duplicateInit.Key.Name}'");
-
 			var init = new ActorInitializer(this, initDict);
 
-			readOnlyConditionCache = new ReadOnlyDictionary<string, int>(conditionCache);
-
 			World = world;
 			ActorID = world.NextAID();
-			var ownerInit = init.GetOrDefault<OwnerInit>();
-			if (ownerInit != null)
-				Owner = ownerInit.Value(world);
+			if (initDict.Contains<OwnerInit>())
+				Owner = init.Get<OwnerInit, Player>();
+
+			occupySpace = Exts.Lazy(() => TraitOrDefault<IOccupySpace>());
 
 			if (name != null)
 			{
@@ -144,142 +89,44 @@ namespace OpenRA
 					throw new NotImplementedException("No rules definition for unit " + name);
 
 				Info = world.Map.Rules.Actors[name];
-
-				var resolveOrdersList = new List<IResolveOrder>();
-				var renderModifiersList = new List<IRenderModifier>();
-				var rendersList = new List<IRender>();
-				var mouseBoundsList = new List<IMouseBounds>();
-				var visibilityModifiersList = new List<IVisibilityModifier>();
-				var becomingIdlesList = new List<INotifyBecomingIdle>();
-				var tickIdlesList = new List<INotifyIdle>();
-				var targetablesList = new List<ITargetable>();
-				var targetablePositionsList = new List<ITargetablePositions>();
-				var syncHashesList = new List<SyncHash>();
-
-				foreach (var traitInfo in Info.TraitsInConstructOrder())
-				{
-					var trait = traitInfo.Create(init);
-					AddTrait(trait);
-
-					// 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.
-					// Note: The blocks are required to limit the scope of the t's, so we make an exception to our normal style
-					// rules for spacing in order to keep these assignments compact and readable.
-					{ if (trait is IOccupySpace t) OccupiesSpace = t; }
-					{ if (trait is IEffectiveOwner t) EffectiveOwner = t; }
-					{ if (trait is IFacing t) facing = t; }
-					{ if (trait is IHealth t) health = t; }
-					{ if (trait is IResolveOrder t) resolveOrdersList.Add(t); }
-					{ if (trait is IRenderModifier t) renderModifiersList.Add(t); }
-					{ if (trait is IRender t) rendersList.Add(t); }
-					{ if (trait is IMouseBounds t) mouseBoundsList.Add(t); }
-					{ if (trait is IVisibilityModifier t) visibilityModifiersList.Add(t); }
-					{ if (trait is IDefaultVisibility t) defaultVisibility = t; }
-					{ if (trait is INotifyBecomingIdle t) becomingIdlesList.Add(t); }
-					{ if (trait is INotifyIdle t) tickIdlesList.Add(t); }
-					{ if (trait is ITargetable t) targetablesList.Add(t); }
-					{ if (trait is ITargetablePositions t) targetablePositionsList.Add(t); }
-					{ if (trait is ISync t) syncHashesList.Add(new SyncHash(t)); }
-				}
-
-				resolveOrders = resolveOrdersList.ToArray();
-				renderModifiers = renderModifiersList.ToArray();
-				renders = rendersList.ToArray();
-				mouseBounds = mouseBoundsList.ToArray();
-				visibilityModifiers = visibilityModifiersList.ToArray();
-				becomingIdles = becomingIdlesList.ToArray();
-				tickIdles = tickIdlesList.ToArray();
-				Targetables = targetablesList.ToArray();
-				var targetablePositions = targetablePositionsList.ToArray();
-				EnabledTargetablePositions = targetablePositions.Where(Exts.IsTraitEnabled);
-				enabledTargetableWorldPositions = EnabledTargetablePositions.SelectMany(tp => tp.TargetablePositions(this));
-				SyncHashes = syncHashesList.ToArray();
+				foreach (var trait in Info.TraitsInConstructOrder())
+					AddTrait(trait.Create(init));
 			}
-		}
 
-		internal void Initialize(bool addToWorld = true)
-		{
-			created = true;
+			facing = Exts.Lazy(() => TraitOrDefault<IFacing>());
+			health = Exts.Lazy(() => TraitOrDefault<Health>());
+			effectiveOwner = Exts.Lazy(() => TraitOrDefault<IEffectiveOwner>());
 
-			// Make sure traits are usable for condition notifiers
-			foreach (var t in TraitsImplementing<INotifyCreated>())
-				t.Created(this);
-
-			var allObserverNotifiers = new HashSet<VariableObserverNotifier>();
-			foreach (var provider in TraitsImplementing<IObservesVariables>())
+			bounds = Exts.Lazy(() =>
 			{
-				foreach (var variableUser in provider.GetVariableObservers())
-				{
-					allObserverNotifiers.Add(variableUser.Notifier);
-					foreach (var variable in variableUser.Variables)
-					{
-						var cs = conditionStates.GetOrAdd(variable);
-						cs.Notifiers.Add(variableUser.Notifier);
+				var si = Info.Traits.GetOrDefault<SelectableInfo>();
+				var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
+					TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
 
-						// Initialize conditions that have not yet been granted to 0
-						// NOTE: Some conditions may have already been granted by INotifyCreated calling GrantCondition,
-						// and we choose to assign the token count to safely cover both cases instead of adding an if branch.
-						conditionCache[variable] = cs.Tokens.Count;
-					}
-				}
-			}
+				var offset = -size / 2;
+				if (si != null && si.Bounds != null && si.Bounds.Length > 2)
+					offset += new int2(si.Bounds[2], si.Bounds[3]);
 
-			// Update all traits with their initial condition state
-			foreach (var notify in allObserverNotifiers)
-				notify(this, readOnlyConditionCache);
+				return new Rectangle(offset.X, offset.Y, size.X, size.Y);
+			});
 
-			// TODO: Other traits may need initialization after being notified of initial condition state.
-
-			// TODO: A post condition initialization notification phase may allow queueing activities instead.
-			// The initial activity should run before any activities queued by INotifyCreated.Created
-			// However, we need to know which traits are enabled (via conditions), so wait for after the calls and insert the activity as the first
-			ICreationActivity creationActivity = null;
-			foreach (var ica in TraitsImplementing<ICreationActivity>())
-			{
-				if (!ica.IsTraitEnabled())
-					continue;
-
-				if (creationActivity != null)
-					throw new InvalidOperationException($"More than one enabled ICreationActivity trait: {creationActivity.GetType().Name} and {ica.GetType().Name}");
-
-				var activity = ica.GetCreationActivity();
-				if (activity == null)
-					continue;
-
-				creationActivity = ica;
-
-				activity.Queue(CurrentActivity);
-				CurrentActivity = activity;
-			}
-
-			if (addToWorld)
-				World.Add(this);
+			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
+			renders = TraitsImplementing<IRender>().ToArray();
+			disables = TraitsImplementing<IDisable>().ToArray();
 		}
 
 		public void Tick()
 		{
 			var wasIdle = IsIdle;
-			CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
+			currentActivity = Traits.Util.RunActivity(this, currentActivity);
 
 			if (!wasIdle && IsIdle)
-			{
-				foreach (var n in becomingIdles)
+				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
 					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)
 		{
-			// PERF: Avoid LINQ.
 			var renderables = Renderables(wr);
 			foreach (var modifier in renderModifiers)
 				renderables = modifier.ModifyRender(this, wr, renderables);
@@ -288,69 +135,35 @@ namespace OpenRA
 
 		IEnumerable<IRenderable> Renderables(WorldRenderer wr)
 		{
-			// PERF: Avoid LINQ.
-			// Implementations of Render are permitted to return both an eagerly materialized collection or a lazily
-			// generated sequence.
-			// For large amounts of renderables, a lazily generated sequence (e.g. as returned by LINQ, or by using
-			// `yield`) will avoid the need to allocate a large collection.
-			// For small amounts of renderables, allocating a small collection can often be faster and require less
-			// memory than creating the objects needed to represent a sequence.
 			foreach (var render in renders)
 				foreach (var renderable in render.Render(this, wr))
 					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 Polygon MouseBounds(WorldRenderer wr)
-		{
-			foreach (var mb in mouseBounds)
-			{
-				var bounds = mb.MouseoverBounds(this, wr);
-				if (!bounds.IsEmpty)
-					return bounds;
-			}
-
-			return Polygon.Empty;
-		}
-
 		public void QueueActivity(bool queued, Activity nextActivity)
 		{
 			if (!queued)
 				CancelActivity();
-
 			QueueActivity(nextActivity);
 		}
 
 		public void QueueActivity(Activity nextActivity)
 		{
-			if (!created)
-				throw new InvalidOperationException("An activity was queued before the actor was created. Queue it inside the INotifyCreated.Created callback instead.");
-
-			if (CurrentActivity == null)
-				CurrentActivity = nextActivity;
+			if (currentActivity == null)
+				currentActivity = nextActivity;
 			else
-				CurrentActivity.Queue(nextActivity);
+				currentActivity.Queue(nextActivity);
 		}
 
 		public void CancelActivity()
 		{
-			CurrentActivity?.Cancel(this);
+			if (currentActivity != null)
+				currentActivity.Cancel(this);
+		}
+
+		public Activity GetCurrentActivity()
+		{
+			return currentActivity;
 		}
 
 		public override int GetHashCode()
@@ -360,7 +173,8 @@ namespace OpenRA
 
 		public override bool Equals(object obj)
 		{
-			return obj is Actor o && Equals(o);
+			var o = obj as Actor;
+			return o != null && Equals(o);
 		}
 
 		public bool Equals(Actor other)
@@ -370,7 +184,6 @@ namespace OpenRA
 
 		public override string ToString()
 		{
-			// PERF: Avoid format strings.
 			var name = Info.Name + " " + ActorID;
 			if (!IsInWorld)
 				name += " (not in world)";
@@ -392,209 +205,76 @@ namespace OpenRA
 			return World.TraitDict.WithInterface<T>(this);
 		}
 
+		public bool HasTrait<T>()
+		{
+			return World.TraitDict.Contains<T>(this);
+		}
+
 		public void AddTrait(object trait)
 		{
 			World.TraitDict.AddTrait(this, trait);
 		}
 
-		public void Dispose()
+		public void Destroy()
 		{
-			// If CurrentActivity isn't null, run OnActorDisposeOuter in case some cleanups are needed.
-			// This should be done before the FrameEndTask to avoid dependency issues.
-			CurrentActivity?.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)
+				if (Destroyed)
 					return;
 
 				if (IsInWorld)
 					World.Remove(this);
 
-				foreach (var t in TraitsImplementing<INotifyActorDisposing>())
-					t.Disposing(this);
-
 				World.TraitDict.RemoveActor(this);
-				Disposed = true;
+				Destroyed = true;
 
-				luaInterface?.Value.OnActorDestroyed();
+				if (luaInterface != null)
+					luaInterface.Value.OnActorDestroyed();
 			});
 		}
 
-		public void ResolveOrder(Order order)
-		{
-			foreach (var r in resolveOrders)
-				r.ResolveOrder(this, order);
-		}
-
 		// TODO: move elsewhere.
 		public void ChangeOwner(Player newOwner)
 		{
-			World.AddFrameEndTask(_ => ChangeOwnerSync(newOwner));
+			World.AddFrameEndTask(w =>
+			{
+				if (Destroyed)
+					return;
+
+				var oldOwner = Owner;
+				var wasInWorld = IsInWorld;
+
+				// momentarily remove from world so the ownership queries don't get confused
+				if (wasInWorld)
+					w.Remove(this);
+
+				Owner = newOwner;
+				Generation++;
+
+				if (wasInWorld)
+					w.Add(this);
+
+				foreach (var t in this.TraitsImplementing<INotifyOwnerChanged>())
+					t.OnOwnerChanged(this, oldOwner, newOwner);
+			});
 		}
 
-		/// <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)
+		public void Kill(Actor attacker)
 		{
-			if (Disposed)
+			if (health.Value == null)
 				return;
 
-			var oldOwner = Owner;
-			var wasInWorld = IsInWorld;
-
-			// momentarily remove from world so the ownership queries don't get confused
-			if (wasInWorld)
-				World.Remove(this);
-
-			Owner = newOwner;
-			Generation++;
-
-			foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
-				t.OnOwnerChanged(this, oldOwner, newOwner);
-
-			foreach (var t in World.WorldActor.TraitsImplementing<INotifyOwnerChanged>())
-				t.OnOwnerChanged(this, oldOwner, newOwner);
-
-			if (wasInWorld)
-				World.Add(this);
+			health.Value.InflictDamage(this, attacker, health.Value.MaxHP, null, true);
 		}
 
-		public DamageState GetDamageState()
+		public bool IsDisabled()
 		{
-			if (Disposed)
-				return DamageState.Dead;
-
-			return (health == null) ? DamageState.Undamaged : health.DamageState;
-		}
-
-		public void InflictDamage(Actor attacker, Damage damage)
-		{
-			if (Disposed || health == null)
-				return;
-
-			health.InflictDamage(this, attacker, damage, false);
-		}
-
-		public void Kill(Actor attacker, BitSet<DamageType> damageTypes = default)
-		{
-			if (Disposed || health == null)
-				return;
-
-			health.Kill(this, attacker, damageTypes);
-		}
-
-		public bool CanBeViewedByPlayer(Player player)
-		{
-			// PERF: Avoid LINQ.
-			foreach (var visibilityModifier in visibilityModifiers)
-				if (!visibilityModifier.IsVisible(this, player))
-					return false;
-
-			return defaultVisibility.IsVisible(this, player);
-		}
-
-		public BitSet<TargetableType> GetAllTargetTypes()
-		{
-			// PERF: Avoid LINQ.
-			var targetTypes = default(BitSet<TargetableType>);
-			foreach (var targetable in Targetables)
-				targetTypes = targetTypes.Union(targetable.TargetTypes);
-			return targetTypes;
-		}
-
-		public BitSet<TargetableType> GetEnabledTargetTypes()
-		{
-			// PERF: Avoid LINQ.
-			var targetTypes = default(BitSet<TargetableType>);
-			foreach (var targetable in Targetables)
-				if (targetable.IsTraitEnabled())
-					targetTypes = targetTypes.Union(targetable.TargetTypes);
-			return targetTypes;
-		}
-
-		public bool IsTargetableBy(Actor byActor)
-		{
-			// PERF: Avoid LINQ.
-			foreach (var targetable in Targetables)
-				if (targetable.TargetableBy(this, byActor))
+			foreach (var disable in disables)
+				if (disable.Disabled)
 					return true;
-
 			return false;
 		}
 
-		public IEnumerable<WPos> GetTargetablePositions()
-		{
-			if (EnabledTargetablePositions.Any())
-				return enabledTargetableWorldPositions;
-
-			return new[] { CenterPosition };
-		}
-
-		#region Conditions
-
-		void UpdateConditionState(string condition, int token, bool isRevoke)
-		{
-			var conditionState = conditionStates.GetOrAdd(condition);
-
-			if (isRevoke)
-				conditionState.Tokens.Remove(token);
-			else
-				conditionState.Tokens.Add(token);
-
-			conditionCache[condition] = conditionState.Tokens.Count;
-
-			// Conditions may be granted or revoked before the state is initialized.
-			// These notifications will be processed after INotifyCreated.Created.
-			if (created)
-				foreach (var notify in conditionState.Notifiers)
-					notify(this, readOnlyConditionCache);
-		}
-
-		/// <summary>
-		/// Grants a specified condition if it is valid.
-		/// Otherwise, just returns InvalidConditionToken.
-		/// </summary>
-		/// <returns>The token that is used to revoke this condition.</returns>
-		public int GrantCondition(string condition)
-		{
-			if (string.IsNullOrEmpty(condition))
-				return InvalidConditionToken;
-
-			var token = nextConditionToken++;
-			conditionTokens.Add(token, condition);
-			UpdateConditionState(condition, token, false);
-			return token;
-		}
-
-		/// <summary>
-		/// Revokes a previously granted condition.
-		/// </summary>
-		/// <param name="token">The token ID returned by GrantCondition.</param>
-		/// <returns>The invalid token ID.</returns>
-		public int RevokeCondition(int token)
-		{
-			if (!conditionTokens.TryGetValue(token, out var condition))
-				throw new InvalidOperationException($"Attempting to revoke condition with invalid token {token} for {this}.");
-
-			conditionTokens.Remove(token);
-			UpdateConditionState(condition, token, true);
-			return InvalidConditionToken;
-		}
-
-		/// <summary>Returns whether the specified token is valid for RevokeCondition</summary>
-		public bool TokenValid(int token)
-		{
-			return conditionTokens.ContainsKey(token);
-		}
-
-		#endregion
-
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;
@@ -606,13 +286,14 @@ namespace OpenRA
 
 		public LuaValue this[LuaRuntime runtime, LuaValue keyValue]
 		{
-			get => luaInterface.Value[runtime, keyValue];
-			set => luaInterface.Value[runtime, keyValue] = value;
+			get { return luaInterface.Value[runtime, keyValue]; }
+			set { luaInterface.Value[runtime, keyValue] = value; }
 		}
 
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			if (!left.TryGetClrValue(out Actor a) || !right.TryGetClrValue(out Actor b))
+			Actor a, b;
+			if (!left.TryGetClrValue<Actor>(out a) || !right.TryGetClrValue<Actor>(out b))
 				return false;
 
 			return a == b;
@@ -620,7 +301,7 @@ namespace OpenRA
 
 		public LuaValue ToString(LuaRuntime runtime)
 		{
-			return $"Actor ({this})";
+			return "Actor ({0})".F(this);
 		}
 
 		public bool HasScriptProperty(string name)

OpenRA.Game/CPos.cs

@@ -1,11 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
@@ -16,67 +15,44 @@ using OpenRA.Scripting;
 
 namespace OpenRA
 {
-	public readonly struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
+	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
 	{
-		// 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 readonly int X, Y;
 
-		// X is padded to MSB, so bit shift does the correct sign extension
-		public int X => 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 => ((short)(Bits >> 4)) >> 4;
-
-		public byte Layer => (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 CPos(int x, int y) { X = x; Y = y; }
+		public static readonly CPos Zero = new CPos(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, 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 CPos operator +(CVec a, CPos b) { return new CPos(a.X + b.X, a.Y + b.Y); }
+		public static CPos operator +(CPos a, CVec b) { return new CPos(a.X + b.X, a.Y + b.Y); }
+		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y); }
 		public static CVec operator -(CPos a, CPos b) { return new CVec(a.X - b.X, a.Y - b.Y); }
 
-		public static bool operator ==(CPos me, CPos other) { return me.Bits == other.Bits; }
+		public static bool operator ==(CPos me, CPos other) { return me.X == other.X && me.Y == other.Y; }
 		public static bool operator !=(CPos me, CPos other) { return !(me == other); }
 
-		public override int GetHashCode() { return Bits.GetHashCode(); }
+		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 bool Equals(CPos other) { return Bits == other.Bits; }
+		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+		public bool Equals(CPos other) { return X == other.X && Y == other.Y; }
 		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
 
-		public override string ToString()
-		{
-			if (Layer == 0)
-				return X + "," + Y;
-
-			return X + "," + Y + "," + Layer;
-		}
+		public override string ToString() { return X + "," + Y; }
 
 		public MPos ToMPos(Map map)
 		{
-			return ToMPos(map.Grid.Type);
+			return ToMPos(map.TileShape);
 		}
 
-		public MPos ToMPos(MapGridType gridType)
+		public MPos ToMPos(TileShape shape)
 		{
-			if (gridType == MapGridType.Rectangular)
+			if (shape == TileShape.Rectangle)
 				return new MPos(X, Y);
 
-			// Convert from RectangularIsometric cell (x, y) position to rectangular map position (u, v)
+			// Convert from diamond cell (x, y) position to rectangular map position (u, v)
 			//  - The staggered rows make this fiddly (hint: draw a diagram!)
 			// (a) Consider the relationships:
 			//  - +1x (even -> odd) adds (0, 1) to (u, v)
@@ -95,35 +71,28 @@ namespace OpenRA
 
 		public LuaValue Add(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			if (!left.TryGetClrValue(out CPos a) || !right.TryGetClrValue(out CVec b))
-				throw new LuaException($"Attempted to call CPos.Add(CPos, CVec) with invalid arguments ({left.WrappedClrType().Name}, {right.WrappedClrType().Name})");
+			CPos a;
+			CVec b;
+			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CVec>(out b))
+				throw new LuaException("Attempted to call CPos.Add(CPos, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a + b);
 		}
 
 		public LuaValue Subtract(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			var rightType = right.WrappedClrType();
-			if (!left.TryGetClrValue(out CPos a))
-				throw new LuaException($"Attempted to call CPos.Subtract(CPos, (CPos|CVec)) with invalid arguments ({left.WrappedClrType().Name}, {rightType.Name})");
+			CPos a;
+			CVec b;
+			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CVec>(out b))
+				throw new LuaException("Attempted to call CPos.Subtract(CPos, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
-			if (rightType == typeof(CPos))
-			{
-				right.TryGetClrValue(out CPos b);
-				return new LuaCustomClrObject(a - b);
-			}
-			else if (rightType == typeof(CVec))
-			{
-				right.TryGetClrValue(out CVec b);
-				return new LuaCustomClrObject(a - b);
-			}
-
-			throw new LuaException($"Attempted to call CPos.Subtract(CPos, (CPos|CVec)) with invalid arguments ({left.WrappedClrType().Name}, {rightType.Name})");
+			return new LuaCustomClrObject(a - b);
 		}
 
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			if (!left.TryGetClrValue(out CPos a) || !right.TryGetClrValue(out CPos b))
+			CPos a, b;
+			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CPos>(out b))
 				return false;
 
 			return a == b;
@@ -137,14 +106,16 @@ namespace OpenRA
 				{
 					case "X": return X;
 					case "Y": return Y;
-					case "Layer": return Layer;
-					default: throw new LuaException($"CPos does not define a member '{key}'");
+					default: throw new LuaException("CPos does not define a member '{0}'".F(key));
 				}
 			}
 
-			set => throw new LuaException("CPos is read-only. Use CPos.New to create a new value");
+			set
+			{
+				throw new LuaException("CPos is read-only. Use CPos.New to create a new value");
+			}
 		}
 
 		#endregion
 	}
-}
+}

OpenRA.Game/CVec.cs

@@ -1,23 +1,22 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
 using System;
+using System.Drawing;
 using Eluant;
 using Eluant.ObjectBinding;
-using OpenRA.Primitives;
 using OpenRA.Scripting;
 
 namespace OpenRA
 {
-	public readonly struct CVec : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaUnaryMinusBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CVec>
+	public struct CVec : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaUnaryMinusBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CVec>
 	{
 		public readonly int X, Y;
 
@@ -42,8 +41,8 @@ namespace OpenRA
 
 		public CVec Sign() { return new CVec(Math.Sign(X), Math.Sign(Y)); }
 		public CVec Abs() { return new CVec(Math.Abs(X), Math.Abs(Y)); }
-		public int LengthSquared => X * X + Y * Y;
-		public int Length => Exts.ISqrt(LengthSquared);
+		public int LengthSquared { get { return X * X + Y * Y; } }
+		public int Length { get { return Exts.ISqrt(LengthSquared); } }
 
 		public CVec Clamp(Rectangle r)
 		{
@@ -75,16 +74,18 @@ namespace OpenRA
 
 		public LuaValue Add(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			if (!left.TryGetClrValue(out CVec a) || !right.TryGetClrValue(out CVec b))
-				throw new LuaException($"Attempted to call CVec.Add(CVec, CVec) with invalid arguments ({left.WrappedClrType().Name}, {right.WrappedClrType().Name})");
+			CVec a, b;
+			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
+				throw new LuaException("Attempted to call CVec.Add(CVec, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a + b);
 		}
 
 		public LuaValue Subtract(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			if (!left.TryGetClrValue(out CVec a) || !right.TryGetClrValue(out CVec b))
-				throw new LuaException($"Attempted to call CVec.Subtract(CVec, CVec) with invalid arguments ({left.WrappedClrType().Name}, {right.WrappedClrType().Name})");
+			CVec a, b;
+			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
+				throw new LuaException("Attempted to call CVec.Subtract(CVec, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a - b);
 		}
@@ -96,7 +97,8 @@ namespace OpenRA
 
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			if (!left.TryGetClrValue(out CVec a) || !right.TryGetClrValue(out CVec b))
+			CVec a, b;
+			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
 				return false;
 
 			return a == b;
@@ -110,11 +112,14 @@ namespace OpenRA
 				{
 					case "X": return X;
 					case "Y": return Y;
-					default: throw new LuaException($"CVec does not define a member '{key}'");
+					default: throw new LuaException("CVec does not define a member '{0}'".F(key));
 				}
 			}
 
-			set => throw new LuaException("CVec is read-only. Use CVec.New to create a new value");
+			set
+			{
+				throw new LuaException("WVec is read-only. Use CVec.New to create a new value");
+			}
 		}
 
 		#endregion

OpenRA.Game/CacheStorage.cs

@@ -0,0 +1,19 @@
+#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
+
+namespace OpenRA
+{
+	public interface ICacheStorage<T>
+	{
+		void Remove(string key);
+		void Store(string key, T data);
+		T Retrieve(string key);
+	}
+}

OpenRA.Game/CryptoUtil.cs

@@ -1,261 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is 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/DefaultPlayer.cs

@@ -1,20 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is 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 OpenRA.Primitives;
-
-namespace OpenRA
-{
-	public class DefaultPlayer : IGlobalModData
-	{
-		public readonly Color Color = Color.FromArgb(0xEE, 0xEE, 0xEE);
-	}
-}

OpenRA.Game/Download.cs

@@ -0,0 +1,79 @@
+#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.ComponentModel;
+using System.Net;
+
+namespace OpenRA
+{
+	public class Download
+	{
+		WebClient wc;
+		bool cancelled;
+
+		public static string FormatErrorMessage(Exception e)
+		{
+			var ex = e as WebException;
+			if (ex == null)
+				return e.Message;
+
+			switch (ex.Status)
+			{
+				case WebExceptionStatus.NameResolutionFailure:
+					return "DNS lookup failed";
+				case WebExceptionStatus.Timeout:
+					return "Connection timeout";
+				case WebExceptionStatus.ConnectFailure:
+					return "Cannot connect to remote server";
+				case WebExceptionStatus.ProtocolError:
+					return "File not found on remote server";
+				default:
+					return ex.Message;
+			}
+		}
+
+		public Download(string url, string path, Action<DownloadProgressChangedEventArgs> onProgress, Action<AsyncCompletedEventArgs, bool> onComplete)
+		{
+			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);
+		}
+
+		public Download(string url, Action<DownloadProgressChangedEventArgs> onProgress, Action<DownloadDataCompletedEventArgs, bool> onComplete)
+		{
+			wc = new WebClient();
+			wc.Proxy = null;
+
+			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));
+		}
+
+		public void Cancel()
+		{
+			Game.OnQuit -= Cancel;
+			wc.CancelAsync();
+			wc.Dispose();
+			cancelled = true;
+		}
+	}
+}

OpenRA.Game/Effects/AsyncAction.cs

@@ -1,11 +1,10 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
@@ -17,8 +16,8 @@ namespace OpenRA.Effects
 {
 	public class AsyncAction : IEffect
 	{
-		readonly Action a;
-		readonly IAsyncResult ar;
+		Action a;
+		IAsyncResult ar;
 
 		public AsyncAction(IAsyncResult ar, Action a)
 		{

OpenRA.Game/Effects/DelayedAction.cs

@@ -1,11 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
@@ -17,7 +16,7 @@ namespace OpenRA.Effects
 {
 	public class DelayedAction : IEffect
 	{
-		readonly Action a;
+		Action a;
 		int delay;
 
 		public DelayedAction(int delay, Action a)

OpenRA.Game/Effects/DelayedImpact.cs

@@ -1,43 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is 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.GameRules;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Effects
-{
-	public class DelayedImpact : IEffect
-	{
-		readonly Target target;
-		readonly IWarhead wh;
-		readonly WarheadArgs args;
-
-		int delay;
-
-		public DelayedImpact(int delay, IWarhead wh, Target target, WarheadArgs args)
-		{
-			this.wh = wh;
-			this.delay = delay;
-			this.target = target;
-			this.args = args;
-		}
-
-		public void Tick(World world)
-		{
-			if (--delay <= 0)
-				world.AddFrameEndTask(w => { w.Remove(this); wh.DoImpact(target, args); });
-		}
-
-		public IEnumerable<IRenderable> Render(WorldRenderer wr) { yield break; }
-	}
-}

OpenRA.Game/Effects/FlashTarget.cs

@@ -0,0 +1,54 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
+
+namespace OpenRA.Effects
+{
+	public class FlashTarget : IEffect
+	{
+		Actor target;
+		Player player;
+		int remainingTicks;
+
+		public FlashTarget(Actor target, Player asPlayer = null, int ticks = 4)
+		{
+			this.target = target;
+			player = asPlayer;
+			remainingTicks = ticks;
+			target.World.RemoveAll(effect =>
+			{
+				var flashTarget = effect as FlashTarget;
+				return flashTarget != null && flashTarget.target == target;
+			});
+		}
+
+		public void Tick(World world)
+		{
+			if (--remainingTicks == 0 || !target.IsInWorld)
+				world.AddFrameEndTask(w => w.Remove(this));
+		}
+
+		public IEnumerable<IRenderable> Render(WorldRenderer wr)
+		{
+			if (target.IsInWorld && remainingTicks % 2 == 0)
+			{
+				var palette = wr.Palette(player == null ? "highlight" : "highlight" + player.InternalName);
+				return target.Render(wr)
+					.Where(r => !r.IsDecoration)
+					.Select(r => r.WithPalette(palette));
+			}
+
+			return SpriteRenderable.None;
+		}
+	}
+}

OpenRA.Game/Effects/IEffect.cs

@@ -1,11 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
@@ -19,10 +18,4 @@ 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); }
-	public interface IEffectAnnotation { IEnumerable<IRenderable> RenderAnnotation(WorldRenderer wr); }
 }

OpenRA.Game/Effects/SpriteEffect.cs

@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Graphics;
+
+namespace OpenRA.Effects
+{
+	public class SpriteEffect : IEffect
+	{
+		readonly string palette;
+		readonly Animation anim;
+		readonly WPos pos;
+
+		public SpriteEffect(WPos pos, World world, string image, string palette)
+		{
+			this.pos = pos;
+			this.palette = palette;
+			anim = new Animation(world, image);
+			anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
+		}
+
+		public void Tick(World world)
+		{
+			anim.Tick();
+		}
+
+		public IEnumerable<IRenderable> Render(WorldRenderer wr)
+		{
+			return anim.Render(pos, WVec.Zero, 0, wr.Palette(palette), 1f / wr.Viewport.Zoom);
+		}
+	}
+}

OpenRA.Game/ExternalMods.cs

@@ -1,290 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is 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.IO;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
-
-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 Sprite Icon2x { get; internal set; }
-		public Sprite Icon3x { 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;
-
-		Sheet CreateSheet()
-		{
-			var sheet = new Sheet(SheetType.BGRA, new Size(512, 512));
-
-			// We must manually force the buffer creation to avoid a crash
-			// that is indirectly triggered by rendering from a Sheet that
-			// has not yet been written to.
-			sheet.CreateBuffer();
-			sheet.GetTexture().ScaleFilter = TextureScaleFilter.Linear;
-
-			return sheet;
-		}
-
-		public ExternalMods()
-		{
-			// Don't try to load mod icons if we don't have a texture to put them in
-			if (Game.Renderer != null)
-				sheetBuilder = new SheetBuilder(SheetType.BGRA, CreateSheet);
-
-			// Several types of support directory types are available, depending on
-			// how the player has installed and launched the game.
-			// Read registration metadata from all of them
-			foreach (var source in GetSupportDirs(ModRegistration.User | ModRegistration.System))
-			{
-				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);
-
-			if (sheetBuilder != null)
-			{
-				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)))
-						mod.Icon = sheetBuilder.Add(new Png(stream));
-
-				var icon2xNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon2x");
-				if (icon2xNode != null && !string.IsNullOrEmpty(icon2xNode.Value.Value))
-					using (var stream = new MemoryStream(Convert.FromBase64String(icon2xNode.Value.Value)))
-						mod.Icon2x = sheetBuilder.Add(new Png(stream), 1f / 2);
-
-				var icon3xNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon3x");
-				if (icon3xNode != null && !string.IsNullOrEmpty(icon3xNode.Value.Value))
-					using (var stream = new MemoryStream(Convert.FromBase64String(icon3xNode.Value.Value)))
-						mod.Icon3x = sheetBuilder.Add(new Png(stream), 1f / 3);
-			}
-
-			// 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, IEnumerable<string> launchArgs, ModRegistration registration)
-		{
-			if (mod.Metadata.Hidden)
-				return;
-
-			var key = ExternalMod.MakeKey(mod);
-			var yaml = 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("LaunchPath", launchPath),
-				new MiniYamlNode("LaunchArgs", new[] { "Game.Mod=" + mod.Id }.Concat(launchArgs).JoinWith(", "))
-			}));
-
-			using (var stream = mod.Package.GetStream("icon.png"))
-				if (stream != null)
-					yaml.Value.Nodes.Add(new MiniYamlNode("Icon", Convert.ToBase64String(stream.ReadAllBytes())));
-
-			using (var stream = mod.Package.GetStream("icon-2x.png"))
-				if (stream != null)
-					yaml.Value.Nodes.Add(new MiniYamlNode("Icon2x", Convert.ToBase64String(stream.ReadAllBytes())));
-
-			using (var stream = mod.Package.GetStream("icon-3x.png"))
-				if (stream != null)
-					yaml.Value.Nodes.Add(new MiniYamlNode("Icon3x", Convert.ToBase64String(stream.ReadAllBytes())));
-
-			var sources = new HashSet<string>();
-			if (registration.HasFlag(ModRegistration.System))
-				sources.Add(Platform.GetSupportDir(SupportDirType.System));
-
-			if (registration.HasFlag(ModRegistration.User))
-			{
-				sources.Add(Platform.GetSupportDir(SupportDirType.User));
-
-				// If using the modern support dir we must also write the registration
-				// to the legacy support dir for older engine versions, but ONLY if it exists
-				var legacyPath = Platform.GetSupportDir(SupportDirType.LegacyUser);
-				if (Directory.Exists(legacyPath))
-					sources.Add(legacyPath);
-			}
-
-			// Make sure the mod is available for this session, even if saving it fails
-			LoadMod(yaml.Value, forceRegistration: true);
-
-			var lines = new List<MiniYamlNode> { yaml }.ToLines().ToArray();
-			foreach (var source in sources)
-			{
-				var metadataPath = Path.Combine(source, "ModMetadata");
-
-				try
-				{
-					Directory.CreateDirectory(metadataPath);
-					File.WriteAllLines(Path.Combine(metadataPath, key + ".yaml"), lines);
-				}
-				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(ModRegistration registration)
-		{
-			foreach (var source in GetSupportDirs(registration))
-			{
-				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 this one is valid
-						// HACK: Explicitly invalidate paths to OpenRA.dll to clean up bogus metadata files
-						// that were created after the initial migration from .NET Framework to Core/5.
-						if (File.Exists(m.LaunchPath) && Path.GetFileNameWithoutExtension(path) == modKey && Path.GetExtension(m.LaunchPath) != ".dll")
-							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 key = ExternalMod.MakeKey(mod);
-			mods.Remove(key);
-
-			foreach (var source in GetSupportDirs(registration))
-			{
-				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());
-				}
-			}
-		}
-
-		IEnumerable<string> GetSupportDirs(ModRegistration registration)
-		{
-			var sources = new HashSet<string>(4);
-			if (registration.HasFlag(ModRegistration.System))
-				sources.Add(Platform.GetSupportDir(SupportDirType.System));
-
-			if (registration.HasFlag(ModRegistration.User))
-			{
-				// User support dir may be using the modern or legacy value, or overridden by the user
-				// Add all the possibilities and let the HashSet ignore the duplicates
-				sources.Add(Platform.GetSupportDir(SupportDirType.User));
-				sources.Add(Platform.GetSupportDir(SupportDirType.ModernUser));
-				sources.Add(Platform.GetSupportDir(SupportDirType.LegacyUser));
-			}
-
-			return sources;
-		}
-
-		public ExternalMod this[string key] => mods[key];
-		public int Count => mods.Count;
-		public ICollection<string> Keys => mods.Keys;
-		public ICollection<ExternalMod> Values => mods.Values;
-
-		IEnumerable<string> IReadOnlyDictionary<string, ExternalMod>.Keys => ((IReadOnlyDictionary<string, ExternalMod>)mods).Keys;
-
-		IEnumerable<ExternalMod> IReadOnlyDictionary<string, ExternalMod>.Values => ((IReadOnlyDictionary<string, ExternalMod>)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,20 +1,20 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
 
@@ -38,6 +38,12 @@ namespace OpenRA
 			catch { return def; }
 		}
 
+		public static void Do<T>(this IEnumerable<T> e, Action<T> fn)
+		{
+			foreach (var ee in e)
+				fn(ee);
+		}
+
 		public static Lazy<T> Lazy<T>(Func<T> p) { return new Lazy<T>(p); }
 
 		public static IEnumerable<string> GetNamespaces(this Assembly a)
@@ -47,7 +53,7 @@ namespace OpenRA
 
 		public static bool HasAttribute<T>(this MemberInfo mi)
 		{
-			return Attribute.IsDefined(mi, typeof(T));
+			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
 		}
 
 		public static T[] GetCustomAttributes<T>(this MemberInfo mi, bool inherit)
@@ -72,9 +78,19 @@ namespace OpenRA
 				return val;
 		}
 
+		public static bool Contains(this Rectangle r, int2 p)
+		{
+			return r.Contains(p.ToPoint());
+		}
+
+		public static bool Contains(this RectangleF r, int2 p)
+		{
+			return r.Contains(p.ToPointF());
+		}
+
 		static int WindingDirectionTest(int2 v0, int2 v1, int2 p)
 		{
-			return Math.Sign((v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y));
+			return (v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y);
 		}
 
 		public static bool PolygonContains(this int2[] polygon, int2 p)
@@ -95,38 +111,21 @@ namespace OpenRA
 			return windingNumber != 0;
 		}
 
-		public static bool LinesIntersect(int2 a, int2 b, int2 c, int2 d)
-		{
-			// If line segments AB and CD intersect:
-			//  - the triangles ACD and BCD must have opposite sense (clockwise or anticlockwise)
-			//  - the triangles CAB and DAB must have opposite sense
-			// Segments intersect if the orientation (clockwise or anticlockwise) of the two points in each line segment are opposite with respect to the other
-			// Assumes that lines are not collinear
-			return WindingDirectionTest(c, d, a) != WindingDirectionTest(c, d, b) && WindingDirectionTest(a, b, c) != WindingDirectionTest(a, b, d);
-		}
-
 		public static bool HasModifier(this Modifiers k, Modifiers mod)
 		{
-			// PERF: Enum.HasFlag is slower and requires allocations.
 			return (k & mod) == mod;
 		}
 
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
 			where V : new()
 		{
-			return d.GetOrAdd(k, new V());
-		}
-
-		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, V v)
-		{
-			if (!d.TryGetValue(k, out var ret))
-				d.Add(k, ret = v);
-			return ret;
+			return d.GetOrAdd(k, _ => new V());
 		}
 
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
 		{
-			if (!d.TryGetValue(k, out var ret))
+			V ret;
+			if (!d.TryGetValue(k, out ret))
 				d.Add(k, ret = createFn(k));
 			return ret;
 		}
@@ -153,34 +152,14 @@ namespace OpenRA
 			if (xs.Count == 0)
 			{
 				if (throws)
-					throw new ArgumentException("Collection must not be empty.", nameof(ts));
+					throw new ArgumentException("Collection must not be empty.", "ts");
 				else
-					return default;
+					return default(T);
 			}
 			else
 				return xs.ElementAt(r.Next(xs.Count));
 		}
 
-		public static Rectangle Union(this IEnumerable<Rectangle> rects)
-		{
-			// PERF: Avoid LINQ.
-			var first = true;
-			var result = Rectangle.Empty;
-			foreach (var rect in rects)
-			{
-				if (first)
-				{
-					first = false;
-					result = rect;
-					continue;
-				}
-
-				result = Rectangle.Union(rect, result);
-			}
-
-			return result;
-		}
-
 		public static float Product(this IEnumerable<float> xs)
 		{
 			return xs.Aggregate(1f, (a, x) => a * x);
@@ -194,11 +173,7 @@ namespace OpenRA
 
 		public static IEnumerable<T> Iterate<T>(this T t, Func<T, T> f)
 		{
-			while (true)
-			{
-				yield return t;
-				t = f(t);
-			}
+			for (;;) { yield return t; t = f(t); }
 		}
 
 		public static T MinBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
@@ -230,9 +205,9 @@ namespace OpenRA
 			{
 				if (!e.MoveNext())
 					if (throws)
-						throw new ArgumentException("Collection must not be empty.", nameof(ts));
+						throw new ArgumentException("Collection must not be empty.", "ts");
 					else
-						return default;
+						return default(T);
 				t = e.Current;
 				u = selector(t);
 				while (e.MoveNext())
@@ -272,7 +247,7 @@ namespace OpenRA
 		public static int ISqrt(int number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
 		{
 			if (number < 0)
-				throw new InvalidOperationException($"Attempted to calculate the square root of a negative integer: {number}");
+				throw new InvalidOperationException("Attempted to calculate the square root of a negative integer: {0}".F(number));
 
 			return (int)ISqrt((uint)number, round);
 		}
@@ -313,7 +288,7 @@ namespace OpenRA
 		public static long ISqrt(long number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
 		{
 			if (number < 0)
-				throw new InvalidOperationException($"Attempted to calculate the square root of a negative integer: {number}");
+				throw new InvalidOperationException("Attempted to calculate the square root of a negative integer: {0}".F(number));
 
 			return (long)ISqrt((ulong)number, round);
 		}
@@ -351,19 +326,6 @@ namespace OpenRA
 			return root;
 		}
 
-		public static int MultiplyBySqrtTwo(short number)
-		{
-			return number * 46341 / 32768;
-		}
-
-		public static int IntegerDivisionRoundingAwayFromZero(int dividend, int divisor)
-		{
-			var quotient = Math.DivRem(dividend, divisor, out var remainder);
-			if (remainder == 0)
-				return quotient;
-			return quotient + (Math.Sign(dividend) == Math.Sign(divisor) ? 1 : -1);
-		}
-
 		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
 		{
 			return string.Join(j, ts);
@@ -374,11 +336,6 @@ namespace OpenRA
 			return ts.Concat(moreTs);
 		}
 
-		public static IEnumerable<T> Exclude<T>(this IEnumerable<T> ts, params T[] exclusions)
-		{
-			return ts.Except(exclusions);
-		}
-
 		public static HashSet<T> ToHashSet<T>(this IEnumerable<T> source)
 		{
 			return new HashSet<T>(source);
@@ -393,7 +350,7 @@ namespace OpenRA
 
 		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(
 			this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector,
-			string debugName, Func<TKey, string> logKey = null, Func<TElement, string> logValue = null)
+			string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
 		{
 			// Fall back on ToString() if null functions are provided:
 			logKey = logKey ?? (s => s.ToString());
@@ -401,40 +358,37 @@ namespace OpenRA
 
 			// Try to build a dictionary and log all duplicates found (if any):
 			var dupKeys = new Dictionary<TKey, List<string>>();
-			var capacity = source is ICollection<TSource> collection ? collection.Count : 0;
-			var d = new Dictionary<TKey, TElement>(capacity);
+			var d = new Dictionary<TKey, TElement>();
 			foreach (var item in source)
 			{
 				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.TryAdd(key, element))
+				if (d.ContainsKey(key))
 				{
-					if (!dupKeys.TryGetValue(key, out var dupKeyMessages))
+					List<string> dupKeyMessages;
+					if (!dupKeys.TryGetValue(key, out dupKeyMessages))
 					{
 						// Log the initial conflicting value already inserted:
-						dupKeyMessages = new List<string>
-						{
-							logValue(d[key])
-						};
+						dupKeyMessages = new List<string>();
+						dupKeyMessages.Add(logValue(d[key]));
 						dupKeys.Add(key, dupKeyMessages);
 					}
 
 					// Log this conflicting value:
 					dupKeyMessages.Add(logValue(element));
+					continue;
 				}
+
+				d.Add(key, element);
 			}
 
 			// If any duplicates were found, throw a descriptive error
 			if (dupKeys.Count > 0)
 			{
-				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => $"{logKey(p.Key)}: [{string.Join(",", p.Value)}]"));
-				var msg = $"{debugName}, duplicate values found for the following keys: {badKeysFormatted}";
+				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value))));
+				var msg = "{0}, duplicate values found for the following keys: {1}".F(debugName, badKeysFormatted);
 				throw new ArgumentException(msg);
 			}
 
@@ -479,6 +433,27 @@ namespace OpenRA
 			return result;
 		}
 
+		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
+
+		public static Bitmap CloneWith32bbpArgbPixelFormat(this Bitmap original)
+		{
+			// Note: We would use original.Clone(original.Bounds(), PixelFormat.Format32bppArgb)
+			// but this doesn't work on mono.
+			var clone = new Bitmap(original.Width, original.Height, PixelFormat.Format32bppArgb);
+			try
+			{
+				using (var g = System.Drawing.Graphics.FromImage(clone))
+					g.DrawImage(original, original.Bounds());
+			}
+			catch (Exception)
+			{
+				clone.Dispose();
+				throw;
+			}
+
+			return clone;
+		}
+
 		public static int ToBits(this IEnumerable<bool> bits)
 		{
 			var i = 0;
@@ -498,109 +473,20 @@ 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 TryParseInt64Invariant(string s, out long i)
+		public static bool IsTraitEnabled(this object trait)
 		{
-			return long.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
+			return trait as IDisabledTrait == null || !(trait as IDisabledTrait).IsTraitDisabled;
 		}
 
-		public static bool IsTraitEnabled<T>(this T trait)
+		public static bool IsTraitEnabled<T>(T t)
 		{
-			return !(trait is IDisabledTrait disabledTrait) || !disabledTrait.IsTraitDisabled;
+			return IsTraitEnabled(t as object);
 		}
-
-		public static T FirstEnabledTraitOrDefault<T>(this IEnumerable<T> ts)
-		{
-			// PERF: Avoid LINQ.
-			foreach (var t in ts)
-				if (t.IsTraitEnabled())
-					return t;
-
-			return default;
-		}
-
-		public static T FirstEnabledTraitOrDefault<T>(this T[] ts)
-		{
-			// PERF: Avoid LINQ.
-			foreach (var t in ts)
-				if (t.IsTraitEnabled())
-					return t;
-
-			return default;
-		}
-
-		public static T FirstEnabledConditionalTraitOrDefault<T>(this IEnumerable<T> ts) where T : IDisabledTrait
-		{
-			// PERF: Avoid LINQ.
-			foreach (var t in ts)
-				if (!t.IsTraitDisabled)
-					return t;
-
-			return default;
-		}
-
-		public static T FirstEnabledConditionalTraitOrDefault<T>(this T[] ts) where T : IDisabledTrait
-		{
-			// PERF: Avoid LINQ.
-			foreach (var t in ts)
-				if (!t.IsTraitDisabled)
-					return t;
-
-			return default;
-		}
-
-		public static LineSplitEnumerator SplitLines(this string str, char separator)
-		{
-			return new LineSplitEnumerator(str.AsSpan(), separator);
-		}
-	}
-
-	public ref struct LineSplitEnumerator
-	{
-		ReadOnlySpan<char> str;
-		readonly char separator;
-
-		public LineSplitEnumerator(ReadOnlySpan<char> str, char separator)
-		{
-			this.str = str;
-			this.separator = separator;
-			Current = default;
-		}
-
-		public LineSplitEnumerator GetEnumerator() => this;
-
-		public bool MoveNext()
-		{
-			var span = str;
-
-			// Reach the end of the string
-			if (span.Length == 0)
-				return false;
-
-			var index = span.IndexOf(separator);
-			if (index == -1)
-			{
-				// The remaining string is an empty string
-				str = ReadOnlySpan<char>.Empty;
-				Current = span;
-				return true;
-			}
-
-			Current = span.Slice(0, index);
-			str = span.Slice(index + 1);
-			return true;
-		}
-
-		public ReadOnlySpan<char> Current { get; private set; }
 	}
 
 	public static class Enum<T>
@@ -616,7 +502,7 @@ namespace OpenRA
 
 			if (values.Any(x => !names.Contains(x)))
 			{
-				value = default;
+				value = default(T);
 				return false;
 			}
 

OpenRA.Game/FieldSaver.cs

@@ -1,21 +1,20 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Drawing;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -28,18 +27,7 @@ namespace OpenRA
 
 			foreach (var info in FieldLoader.GetTypeLoadInfo(o.GetType(), includePrivateByDefault))
 			{
-				if (info.Attribute.DictionaryFromYamlKey)
-				{
-					var dict = (System.Collections.IDictionary)info.Field.GetValue(o);
-					foreach (var kvp in dict)
-					{
-						var key = ((System.Collections.DictionaryEntry)kvp).Key;
-						var value = ((System.Collections.DictionaryEntry)kvp).Value;
-
-						nodes.Add(new MiniYamlNode(FormatValue(key), FormatValue(value)));
-					}
-				}
-				else if (info.Attribute.FromYamlKey)
+				if (info.Attribute.FromYamlKey)
 					root = FormatValue(o, info.Field);
 				else
 					nodes.Add(new MiniYamlNode(info.YamlName, FormatValue(o, info.Field)));
@@ -66,42 +54,46 @@ namespace OpenRA
 			return new MiniYamlNode(field, FormatValue(o, o.GetType().GetField(field)));
 		}
 
-		public static string FormatValue(object v)
+		public static string FormatValue(object v, Type t)
 		{
 			if (v == null)
 				return "";
 
-			var t = v.GetType();
-			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(", ");
-
-			if (t.IsGenericType && (t.GetGenericTypeDefinition() == typeof(HashSet<>) || t.GetGenericTypeDefinition() == typeof(List<>)))
-				return ((System.Collections.IEnumerable)v).Cast<object>().Select(FormatValue).JoinWith(", ");
-
-			// This is only for documentation generation
-			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+			// Color.ToString() does the wrong thing; force it to format as an array
+			if (t == typeof(Color))
 			{
-				var result = "";
-				var dict = (System.Collections.IDictionary)v;
-				foreach (var kvp in dict)
-				{
-					var key = ((System.Collections.DictionaryEntry)kvp).Key;
-					var value = ((System.Collections.DictionaryEntry)kvp).Value;
-
-					var formattedKey = FormatValue(key);
-					var formattedValue = FormatValue(value);
-
-					result += $"{formattedKey}: {formattedValue}{Environment.NewLine}";
-				}
-
-				return result;
+				var c = (Color)v;
+				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
+					((int)c.R).Clamp(0, 255),
+					((int)c.G).Clamp(0, 255),
+					((int)c.B).Clamp(0, 255));
 			}
 
-			if (v is DateTime d)
-				return d.ToString("yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture);
+			// Don't save using country-specific decimal separators which can be misunderstood as group seperators.
+			if (t == typeof(float))
+				return ((float)v).ToString(CultureInfo.InvariantCulture);
+			if (t == typeof(decimal))
+				return ((decimal)v).ToString(CultureInfo.InvariantCulture);
+			if (t == typeof(double))
+				return ((double)v).ToString(CultureInfo.InvariantCulture);
+
+			if (t == typeof(Rectangle))
+			{
+				var r = (Rectangle)v;
+				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
+			}
+
+			if (t.IsArray)
+			{
+				var elems = ((Array)v).OfType<object>();
+				return elems.JoinWith(", ");
+			}
+
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))
+				return ""; // TODO
+
+			if (t == typeof(DateTime))
+				return ((DateTime)v).ToString("yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture);
 
 			// Try the TypeConverter
 			var conv = TypeDescriptor.GetConverter(t);
@@ -121,7 +113,7 @@ namespace OpenRA
 
 		public static string FormatValue(object o, FieldInfo f)
 		{
-			return FormatValue(f.GetValue(o));
+			return FormatValue(f.GetValue(o), f.FieldType);
 		}
 	}
 }

OpenRA.Game/FileFormats/AudLoader.cs

@@ -0,0 +1,159 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	[Flags]
+	enum SoundFlags
+	{
+		Stereo = 0x1,
+		_16Bit = 0x2,
+	}
+
+	enum SoundFormat
+	{
+		WestwoodCompressed = 1,
+		ImaAdpcm = 99,
+	}
+
+	struct Chunk
+	{
+		public int CompressedSize;
+		public int OutputSize;
+
+		public static Chunk Read(Stream s)
+		{
+			Chunk c;
+			c.CompressedSize = s.ReadUInt16();
+			c.OutputSize = s.ReadUInt16();
+			if (s.ReadUInt32() != 0xdeaf)
+				throw new InvalidDataException("Chunk header is bogus");
+			return c;
+		}
+	}
+
+	public static class AudLoader
+	{
+		static int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
+		static int[] stepTable =
+		{
+			7, 8, 9, 10, 11, 12, 13, 14, 16,
+			17, 19, 21, 23, 25, 28, 31, 34, 37,
+			41, 45, 50, 55, 60, 66, 73, 80, 88,
+			97, 107, 118, 130, 143, 157, 173, 190, 209,
+			230, 253, 279, 307, 337, 371, 408, 449, 494,
+			544, 598, 658, 724, 796, 876, 963, 1060, 1166,
+			1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749,
+			3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484,
+			7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289,
+			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
+		};
+
+		static short DecodeSample(byte b, ref int index, ref int current)
+		{
+			var sb = (b & 8) != 0;
+			b &= 7;
+
+			var delta = (stepTable[index] * b) / 4 + stepTable[index] / 8;
+			if (sb) delta = -delta;
+
+			current += delta;
+			if (current > short.MaxValue) current = short.MaxValue;
+			if (current < short.MinValue) current = short.MinValue;
+
+			index += indexAdjust[b];
+			if (index < 0) index = 0;
+			if (index > 88) index = 88;
+
+			return (short)current;
+		}
+
+		public static byte[] LoadSound(byte[] raw, ref int index)
+		{
+			var s = new MemoryStream(raw);
+			var dataSize = raw.Length;
+			var outputSize = raw.Length * 4;
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var currentSample = 0;
+
+			while (dataSize-- > 0)
+			{
+				var b = s.ReadUInt8();
+
+				var t = DecodeSample(b, ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+
+				t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+			}
+
+			return output;
+		}
+
+		public static float SoundLength(Stream s)
+		{
+			var sampleRate = s.ReadUInt16();
+			/*var dataSize = */ s.ReadInt32();
+			var outputSize = s.ReadInt32();
+			var flags = (SoundFlags)s.ReadByte();
+
+			var samples = outputSize;
+			if (0 != (flags & SoundFlags.Stereo)) samples /= 2;
+			if (0 != (flags & SoundFlags._16Bit)) samples /= 2;
+			return samples / sampleRate;
+		}
+
+		public static byte[] LoadSound(Stream s)
+		{
+			/*var sampleRate =*/ s.ReadUInt16();
+			var dataSize = s.ReadInt32();
+			var outputSize = s.ReadInt32();
+			/*var flags = (SoundFlags)*/ s.ReadByte();
+			/*var format = (SoundFormat)*/ s.ReadByte();
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var index = 0;
+			var currentSample = 0;
+
+			while (dataSize > 0)
+			{
+				var chunk = Chunk.Read(s);
+				for (var n = 0; n < chunk.CompressedSize; n++)
+				{
+					var b = s.ReadUInt8();
+
+					var t = DecodeSample(b, ref index, ref currentSample);
+					output[offset++] = (byte)t;
+					output[offset++] = (byte)(t >> 8);
+
+					if (offset < outputSize)
+					{
+						/* possible that only half of the final byte is used! */
+						t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+						output[offset++] = (byte)t;
+						output[offset++] = (byte)(t >> 8);
+					}
+				}
+
+				dataSize -= 8 + chunk.CompressedSize;
+			}
+
+			return output;
+		}
+	}
+}

OpenRA.Game/FileFormats/Blast.cs

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

OpenRA.Game/FileFormats/Blowfish.cs

@@ -1,15 +1,14 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
-namespace OpenRA.Mods.Cnc.FileFormats
+namespace OpenRA.FileFormats
 {
 	class Blowfish
 	{
@@ -130,8 +129,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 			return i;
 		}
 
-		readonly uint[] lookupMfromP =
-		{
+		uint[] lookupMfromP = new uint[] {
 			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
 			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
 			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
@@ -139,8 +137,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 			0x9216d5d9, 0x8979fb1b
 		};
 
-		readonly uint[,] lookupMfromS =
-		{
+		uint[,] lookupMfromS = new uint[,] {
 			{
 				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
 				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,

OpenRA.Game/FileFormats/BlowfishKeyProvider.cs

@@ -1,18 +1,17 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
 using System;
 using System.Linq;
 
-namespace OpenRA.Mods.Cnc.FileFormats
+namespace OpenRA.FileFormats
 {
 	/* TODO: Convert this direct C port into readable code. */
 
@@ -22,18 +21,18 @@ namespace OpenRA.Mods.Cnc.FileFormats
 
 		class PublicKey
 		{
-			public readonly uint[] KeyOne = new uint[64];
-			public readonly uint[] KeyTwo = new uint[64];
+			public uint[] KeyOne = new uint[64];
+			public uint[] KeyTwo = new uint[64];
 			public uint Len;
 		}
 
-		readonly PublicKey pubkey = new PublicKey();
+		PublicKey pubkey = new PublicKey();
 
-		readonly uint[] globOne = new uint[64];
+		uint[] globOne = new uint[64];
 		uint globOneBitLen, globOneLenXTwo;
-		readonly uint[] globTwo = new uint[130];
-		readonly uint[] globOneHigh = new uint[4];
-		readonly uint[] globOneHighInv = new uint[4];
+		uint[] globTwo = new uint[130];
+		uint[] globOneHigh = new uint[4];
+		uint[] globOneHighInv = new uint[4];
 		uint globOneHighBitLen;
 		uint globOneHighInvLow, globOneHighInvHigh;
 
@@ -56,7 +55,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 				{
 					var pn = (byte*)tempPn;
 					var i = blen * 4;
-					for (; i > klen; i--) pn[i - 1] = sign;
+					for (; i > klen; i--) pn[i - 1] = (byte)sign;
 					for (; i > 0; i--) pn[i - 1] = key[klen - i];
 				}
 			}
@@ -90,8 +89,9 @@ namespace OpenRA.Mods.Cnc.FileFormats
 
 		static uint LenBigNum(uint[] n, uint len)
 		{
-			var i = len - 1;
-			while (n[i] == 0) i--;
+			uint i;
+			i = len - 1;
+			while ((i >= 0) && (n[i] == 0)) i--;
 			return i + 1;
 		}
 
@@ -119,6 +119,12 @@ namespace OpenRA.Mods.Cnc.FileFormats
 			pubkey.Len = BitLenBigNum(pubkey.KeyOne, 64) - 1;
 		}
 
+		uint LenPreData()
+		{
+			var a = (pubkey.Len - 1) / 8;
+			return (55 / a + 1) * (a + 1);
+		}
+
 		static int CompareBigNum(uint[] n1, uint[] n2, uint len)
 		{
 			while (len > 0)
@@ -224,13 +230,15 @@ namespace OpenRA.Mods.Cnc.FileFormats
 			uint nTwoByteLen, bit;
 			int nTwoBitLen;
 
+			var j = 0;
+
 			InitBigNum(nTmp, 0, len);
 			InitBigNum(n1, 0, len);
 			nTwoBitLen = (int)BitLenBigNum(n2, len);
-			bit = 1U << (nTwoBitLen % 32);
-			var j = ((nTwoBitLen + 32) / 32) - 1;
+			bit = ((uint)1) << (nTwoBitLen % 32);
+			j = ((nTwoBitLen + 32) / 32) - 1;
 			nTwoByteLen = (uint)((nTwoBitLen - 1) / 32) * 4;
-			nTmp[nTwoByteLen / 4] |= 1U << ((nTwoBitLen - 1) & 0x1f);
+			nTmp[nTwoByteLen / 4] |= ((uint)1) << ((nTwoBitLen - 1) & 0x1f);
 
 			while (nTwoBitLen > 0)
 			{
@@ -299,7 +307,6 @@ namespace OpenRA.Mods.Cnc.FileFormats
 						pn2++;
 						tmp >>= 16;
 					}
-
 					*pn1 += (ushort)tmp;
 				}
 			}
@@ -383,7 +390,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 								MulBignumWord(esi, globOne, tmp, 2 * len);
 								if ((*edi & 0x8000) == 0)
 								{
-									if (SubBigNum((uint*)esi, (uint*)esi, g1, 0, (int)len) != 0)
+									if (0 != SubBigNum((uint*)esi, (uint*)esi, g1, 0, (int)len))
 										(*edi)--;
 								}
 							}
@@ -429,7 +436,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 					InitTwoDw(n4, n4_len);
 					n3_bitlen = (int)BitLenBigNum(n3, n4_len);
 					n3_len = (uint)((n3_bitlen + 31) / 32);
-					bit_mask = (1U << ((n3_bitlen - 1) % 32)) >> 1;
+					bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
 					pn3 += n3_len - 1;
 					n3_bitlen--;
 					MoveBigNum(n1, n2, n4_len);
@@ -455,37 +462,46 @@ namespace OpenRA.Mods.Cnc.FileFormats
 			}
 		}
 
-		byte[] ProcessPredata(byte[] src)
+		static unsafe void Memcopy(byte* dest, byte* src, int len)
+		{
+			while (len-- != 0) *dest++ = *src++;
+		}
+
+		unsafe void ProcessPredata(byte* pre, uint pre_len, byte* buf)
 		{
-			var dest = new byte[256];
 			var n2 = new uint[64];
 			var n3 = new uint[64];
 
-			var a = (int)((pubkey.Len - 1) / 8);
-			var pre_len = (55 / a + 1) * (a + 1);
-			var srcOffset = 0;
-			var destOffset = 0;
-
+			var a = (pubkey.Len - 1) / 8;
 			while (a + 1 <= pre_len)
 			{
 				InitBigNum(n2, 0, 64);
-
-				Buffer.BlockCopy(src, srcOffset, n2, 0, a + 1);
+				fixed (uint* pn2 = &n2[0])
+					Memcopy((byte*)pn2, pre, (int)a + 1);
 				CalcKey(n3, n2, pubkey.KeyTwo, pubkey.KeyOne, 64);
-				Buffer.BlockCopy(n3, 0, dest, destOffset, a);
+
+				fixed (uint* pn3 = &n3[0])
+					Memcopy(buf, (byte*)pn3, (int)a);
 
 				pre_len -= a + 1;
-				srcOffset += a + 1;
-				destOffset += a;
+				pre += a + 1;
+				buf += a;
 			}
-
-			return dest;
 		}
 
 		public byte[] DecryptKey(byte[] src)
 		{
 			InitPublicKey();
-			return ProcessPredata(src).Take(56).ToArray();
+			var dest = new byte[256];
+
+			unsafe
+			{
+				fixed (byte* pdest = &dest[0])
+				fixed (byte* psrc = &src[0])
+					ProcessPredata(psrc, LenPreData(), pdest);
+			}
+
+			return dest.Take(56).ToArray();
 		}
 	}
 }

OpenRA.Game/FileFormats/CRC32.cs

@@ -1,17 +1,14 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
-using System;
-
-namespace OpenRA.Mods.Cnc.FileFormats
+namespace OpenRA.FileFormats
 {
 	/// <summary>
 	/// Static class that uses a lookup table to calculates CRC32
@@ -22,7 +19,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 		/// <summary>
 		/// The CRC32 lookup table
 		/// </summary>
-		static readonly uint[] LookUp = new uint[256]
+		static uint[] lookUp = new uint[256]
 		{
 			0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
 			0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
@@ -91,32 +88,47 @@ namespace OpenRA.Mods.Cnc.FileFormats
 		};
 
 		/// <summary>
-		/// A CRC32 implementation that can be used on spans of bytes.
+		/// A fast (native) CRC32 implementation that can be used on a regular byte arrays.
 		/// </summary>
 		/// <param name="data">The data from which to calculate the checksum.</param>
-		/// <param name="polynomial">The polynomial to XOR with.</param>
+		/// <param name="polynomial">The polynomial.</param>
 		/// <returns>
 		/// The calculated checksum.
 		/// </returns>
-		public static uint Calculate(ReadOnlySpan<byte> data, uint polynomial)
+		public static uint Calculate(byte[] data, uint polynomial)
 		{
 			var crc = polynomial;
 			for (var i = 0; i < data.Length; i++)
-				crc = (crc >> 8) ^ LookUp[(crc & 0xFF) ^ data[i]];
+				crc = (crc >> 8) ^ lookUp[(crc & 0xFF) ^ data[i]];
 			crc ^= polynomial;
 			return crc;
 		}
 
-		/// <summary>
-		/// A CRC32 implementation that can be used on spans of bytes, with default polynomial.
-		/// </summary>
-		/// <param name="data">The data from which to calculate the checksum.</param>
-		/// <returns>
-		/// The calculated checksum.
-		/// </returns>
-		public static uint Calculate(ReadOnlySpan<byte> data)
+		public static uint Calculate(byte[] data)
 		{
 			return Calculate(data, 0xFFFFFFFF);
 		}
+
+		/// <summary>
+		/// A fast (native) CRC32 implementation that can be used on a pinned byte array using
+		/// default polynomal.
+		/// </summary>
+		/// <param name="data">		[in,out] If non-null, the.</param>
+		/// <param name="len">		The length of the data data.</param>
+		/// <param name="polynomial">The polynomal to xor with.</param>
+		/// <returns>The calculated checksum.</returns>
+		public static unsafe uint Calculate(byte* data, uint len, uint polynomial)
+		{
+			var crc = polynomial;
+			for (var i = 0; i < len; i++)
+				crc = (crc >> 8) ^ lookUp[(crc & 0xFF) ^ *data++];
+			crc ^= polynomial;
+			return crc;
+		}
+
+		public static unsafe uint Calculate(byte* data, uint len)
+		{
+			return Calculate(data, len, 0xFFFFFFFF);
+		}
 	}
-}
+}

OpenRA.Game/FileFormats/Format2.cs

@@ -0,0 +1,33 @@
+#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
+
+namespace OpenRA.FileFormats
+{
+	public static class Format2
+	{
+		public static void DecodeInto(byte[] src, byte[] dest, int destIndex)
+		{
+			var r = new FastByteReader(src);
+
+			while (!r.Done())
+			{
+				var cmd = r.ReadByte();
+				if (cmd == 0)
+				{
+					var count = r.ReadByte();
+					while (count-- > 0)
+						dest[destIndex++] = 0;
+				}
+				else
+					dest[destIndex++] = cmd;
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/Format40.cs

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

OpenRA.Game/FileFormats/Format80.cs

@@ -0,0 +1,203 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	class FastByteReader
+	{
+		readonly byte[] src;
+		int offset;
+
+		public FastByteReader(byte[] src, int offset = 0)
+		{
+			this.src = src;
+			this.offset = offset;
+		}
+
+		public bool Done() { return offset >= src.Length; }
+		public byte ReadByte() { return src[offset++]; }
+		public int ReadWord()
+		{
+			var x = ReadByte();
+			return x | (ReadByte() << 8);
+		}
+
+		public void CopyTo(byte[] dest, int offset, int count)
+		{
+			Array.Copy(src, this.offset, dest, offset, count);
+			this.offset += count;
+		}
+
+		public int Remaining() { return src.Length - offset; }
+	}
+
+	public static class Format80
+	{
+		static void ReplicatePrevious(byte[] dest, int destIndex, int srcIndex, int count)
+		{
+			if (srcIndex > destIndex)
+				throw new NotImplementedException("srcIndex > destIndex {0} {1}".F(srcIndex, destIndex));
+
+			if (destIndex - srcIndex == 1)
+			{
+				for (var i = 0; i < count; i++)
+					dest[destIndex + i] = dest[destIndex - 1];
+			}
+			else
+			{
+				for (var i = 0; i < count; i++)
+					dest[destIndex + i] = dest[srcIndex + i];
+			}
+		}
+
+		public static int DecodeInto(byte[] src, byte[] dest, int srcOffset = 0, bool reverse = false)
+		{
+			var ctx = new FastByteReader(src, srcOffset);
+			var destIndex = 0;
+			while (true)
+			{
+				var i = ctx.ReadByte();
+				if ((i & 0x80) == 0)
+				{
+					// case 2
+					var secondByte = ctx.ReadByte();
+					var count = ((i & 0x70) >> 4) + 3;
+					var rpos = ((i & 0xf) << 8) + secondByte;
+
+					ReplicatePrevious(dest, destIndex, destIndex - rpos, count);
+					destIndex += count;
+				}
+				else if ((i & 0x40) == 0)
+				{
+					// case 1
+					var count = i & 0x3F;
+					if (count == 0)
+						return destIndex;
+
+					ctx.CopyTo(dest, destIndex, count);
+					destIndex += count;
+				}
+				else
+				{
+					var count3 = i & 0x3F;
+					if (count3 == 0x3E)
+					{
+						// case 4
+						var count = ctx.ReadWord();
+						var color = ctx.ReadByte();
+
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] = color;
+					}
+					else if (count3 == 0x3F)
+					{
+						// case 5
+						var count = ctx.ReadWord();
+						var srcIndex = reverse ? destIndex - ctx.ReadWord() : ctx.ReadWord();
+						if (srcIndex >= destIndex)
+							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
+
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] = dest[srcIndex++];
+					}
+					else
+					{
+						// case 3
+						var count = count3 + 3;
+						var srcIndex = reverse ? destIndex - ctx.ReadWord() : ctx.ReadWord();
+						if (srcIndex >= destIndex)
+							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
+
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] = dest[srcIndex++];
+					}
+				}
+			}
+		}
+
+		static int CountSame(byte[] src, int offset, int maxCount)
+		{
+			maxCount = Math.Min(src.Length - offset, maxCount);
+			if (maxCount <= 0)
+				return 0;
+
+			var first = src[offset++];
+			var count = 1;
+
+			while (count < maxCount && src[offset++] == first)
+				count++;
+
+			return count;
+		}
+
+		static void WriteCopyBlocks(byte[] src, int offset, int count, MemoryStream output)
+		{
+			while (count > 0)
+			{
+				var writeNow = Math.Min(count, 0x3F);
+				output.WriteByte((byte)(0x80 | writeNow));
+				output.Write(src, offset, writeNow);
+
+				count -= writeNow;
+				offset += writeNow;
+			}
+		}
+
+		// Quick and dirty Format80 encoder version 2
+		// Uses raw copy and RLE compression
+		public static byte[] Encode(byte[] src)
+		{
+			using (var ms = new MemoryStream())
+			{
+				var offset = 0;
+				var left = src.Length;
+				var blockStart = 0;
+
+				while (offset < left)
+				{
+					var repeatCount = CountSame(src, offset, 0xFFFF);
+					if (repeatCount >= 4)
+					{
+						// Write what we haven't written up to now
+						WriteCopyBlocks(src, blockStart, offset - blockStart, ms);
+
+						// Command 4: Repeat byte n times
+						ms.WriteByte(0xFE);
+
+						// Low byte
+						ms.WriteByte((byte)(repeatCount & 0xFF));
+
+						// High byte
+						ms.WriteByte((byte)(repeatCount >> 8));
+
+						// Value to repeat
+						ms.WriteByte(src[offset]);
+
+						offset += repeatCount;
+						blockStart = offset;
+					}
+					else
+						offset++;
+				}
+
+				// Write what we haven't written up to now
+				WriteCopyBlocks(src, blockStart, offset - blockStart, ms);
+
+				// Write terminator
+				ms.WriteByte(0x80);
+
+				return ms.ToArray();
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/HvaReader.cs

@@ -0,0 +1,55 @@
+#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.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class HvaReader
+	{
+		public readonly uint FrameCount;
+		public readonly uint LimbCount;
+		public readonly float[] Transforms;
+
+		public HvaReader(Stream s)
+		{
+			// Index swaps for transposing a matrix
+			var ids = new byte[] { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14 };
+
+			s.Seek(16, SeekOrigin.Begin);
+			FrameCount = s.ReadUInt32();
+			LimbCount = s.ReadUInt32();
+
+			// Skip limb names
+			s.Seek(16 * LimbCount, SeekOrigin.Current);
+			Transforms = new float[16 * FrameCount * LimbCount];
+			for (var j = 0; j < FrameCount; j++)
+				for (var i = 0; i < LimbCount; i++)
+				{
+					// Convert to column-major matrices and add the final matrix row
+					var c = 16 * (LimbCount * j + i);
+					Transforms[c + 3] = 0;
+					Transforms[c + 7] = 0;
+					Transforms[c + 11] = 0;
+					Transforms[c + 15] = 1;
+
+					for (var k = 0; k < 12; k++)
+						Transforms[c + ids[k]] = s.ReadFloat();
+				}
+		}
+
+		public static HvaReader Load(string filename)
+		{
+			using (var s = File.OpenRead(filename))
+				return new HvaReader(s);
+		}
+	}
+}

OpenRA.Game/FileFormats/IdxReader.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using OpenRA.FileSystem;
+
+namespace OpenRA.FileFormats
+{
+	public class IdxReader
+	{
+		public readonly int SoundCount;
+		public List<IdxEntry> Entries;
+
+		public IdxReader(Stream s)
+		{
+			s.Seek(0, SeekOrigin.Begin);
+
+			var id = s.ReadASCII(4);
+
+			if (id != "GABA")
+				throw new InvalidDataException("Unable to load Idx file, did not find magic id, found {0} instead".F(id));
+
+			var two = s.ReadInt32();
+
+			if (two != 2)
+				throw new InvalidDataException("Unable to load Idx file, did not find magic number 2, found {0} instead".F(two));
+
+			SoundCount = s.ReadInt32();
+
+			Entries = new List<IdxEntry>();
+
+			for (var i = 0; i < SoundCount; i++)
+				Entries.Add(new IdxEntry(s));
+		}
+	}
+}

OpenRA.Game/FileFormats/ImaAdpcmLoader.cs

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

OpenRA.Game/FileFormats/IniFile.cs

@@ -0,0 +1,151 @@
+#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;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace OpenRA.FileFormats
+{
+	public class IniFile
+	{
+		Dictionary<string, IniSection> sections = new Dictionary<string, IniSection>();
+
+		public IniFile(Stream s)
+		{
+			Load(s);
+		}
+
+		public IniFile(params Stream[] streams)
+		{
+			foreach (var s in streams)
+				Load(s);
+		}
+
+		public void Load(Stream s)
+		{
+			var reader = new StreamReader(s);
+			IniSection currentSection = null;
+
+			while (!reader.EndOfStream)
+			{
+				var line = reader.ReadLine();
+
+				if (line.Length == 0) continue;
+
+				switch (line[0])
+				{
+					case ';': break;
+					case '[': currentSection = ProcessSection(line); break;
+					default: ProcessEntry(line, currentSection); break;
+				}
+			}
+		}
+
+		Regex sectionPattern = new Regex(@"^\[([^]]*)\]");
+
+		IniSection ProcessSection(string line)
+		{
+			var m = sectionPattern.Match(line);
+			if (!m.Success)
+				return null;
+			var sectionName = m.Groups[1].Value.ToLowerInvariant();
+
+			IniSection ret;
+			if (!sections.TryGetValue(sectionName, out ret))
+				sections.Add(sectionName, ret = new IniSection(sectionName));
+			return ret;
+		}
+
+		static bool ProcessEntry(string line, IniSection currentSection)
+		{
+			var comment = line.IndexOf(';');
+			if (comment >= 0)
+				line = line.Substring(0, comment);
+
+			line = line.Trim();
+			if (line.Length == 0)
+				return false;
+
+			var key = line;
+			var value = "";
+			var eq = line.IndexOf('=');
+			if (eq >= 0)
+			{
+				key = line.Substring(0, eq).Trim();
+				value = line.Substring(eq + 1, line.Length - eq - 1).Trim();
+			}
+
+			if (currentSection == null)
+				throw new InvalidOperationException("No current INI section");
+
+			if (!currentSection.Contains(key))
+				currentSection.Add(key, value);
+			return true;
+		}
+
+		public IniSection GetSection(string s)
+		{
+			return GetSection(s, false);
+		}
+
+		public IniSection GetSection(string s, bool allowFail)
+		{
+			IniSection section;
+			if (sections.TryGetValue(s.ToLowerInvariant(), out section))
+				return section;
+
+			if (allowFail)
+				return new IniSection(s);
+			throw new InvalidOperationException("Section does not exist in map or rules: " + s);
+		}
+
+		public IEnumerable<IniSection> Sections { get { return sections.Values; } }
+	}
+
+	public class IniSection : IEnumerable<KeyValuePair<string, string>>
+	{
+		public string Name { get; private set; }
+		Dictionary<string, string> values = new Dictionary<string, string>();
+
+		public IniSection(string name)
+		{
+			Name = name;
+		}
+
+		public void Add(string key, string value)
+		{
+			values[key] = value;
+		}
+
+		public bool Contains(string key)
+		{
+			return values.ContainsKey(key);
+		}
+
+		public string GetValue(string key, string defaultValue)
+		{
+			string s;
+			return values.TryGetValue(key, out s) ? s : defaultValue;
+		}
+
+		public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+		{
+			return values.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}

OpenRA.Game/FileFormats/Png.cs

@@ -1,379 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is 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.Net;
-using System.Text;
-using ICSharpCode.SharpZipLib.Checksum;
-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
-
-namespace OpenRA.FileFormats
-{
-	public class Png
-	{
-		static readonly byte[] Signature = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
-
-		public int Width { get; }
-		public int Height { get; }
-		public Color[] Palette { get; }
-		public byte[] Data { get; }
-		public SpriteFrameType Type { get; }
-		public Dictionary<string, string> EmbeddedData = new Dictionary<string, string>();
-
-		public int PixelStride => Type == SpriteFrameType.Indexed8 ? 1 : Type == SpriteFrameType.Rgb24 ? 3 : 4;
-
-		public Png(Stream s)
-		{
-			if (!Verify(s))
-				throw new InvalidDataException("PNG Signature is bogus");
-
-			s.Position += 8;
-			var headerParsed = false;
-			var data = new List<byte>();
-			Type = SpriteFrameType.Rgba32;
-
-			while (true)
-			{
-				var length = IPAddress.NetworkToHostOrder(s.ReadInt32());
-				var type = Encoding.UTF8.GetString(s.ReadBytes(4));
-				var content = s.ReadBytes(length);
-				/*var crc = */s.ReadInt32();
-
-				if (!headerParsed && type != "IHDR")
-					throw new InvalidDataException("Invalid PNG file - header does not appear first.");
-
-				using (var ms = new MemoryStream(content))
-				{
-					switch (type)
-					{
-						case "IHDR":
-						{
-							if (headerParsed)
-								throw new InvalidDataException("Invalid PNG file - duplicate header.");
-							Width = IPAddress.NetworkToHostOrder(ms.ReadInt32());
-							Height = IPAddress.NetworkToHostOrder(ms.ReadInt32());
-
-							var bitDepth = ms.ReadUInt8();
-							var colorType = (PngColorType)ms.ReadByte();
-							if (IsPaletted(bitDepth, colorType))
-								Type = SpriteFrameType.Indexed8;
-							else if (colorType == PngColorType.Color)
-								Type = SpriteFrameType.Rgb24;
-
-							Data = new byte[Width * Height * PixelStride];
-
-							var compression = ms.ReadByte();
-							/*var filter = */ms.ReadByte();
-							var interlace = ms.ReadByte();
-
-							if (compression != 0)
-								throw new InvalidDataException("Compression method not supported");
-
-							if (interlace != 0)
-								throw new InvalidDataException("Interlacing not supported");
-
-							headerParsed = true;
-
-							break;
-						}
-
-						case "PLTE":
-						{
-							Palette = new Color[256];
-							for (var i = 0; i < length / 3; i++)
-							{
-								var r = ms.ReadByte(); var g = ms.ReadByte(); var b = ms.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(ms.ReadByte(), Palette[i]);
-
-							break;
-						}
-
-						case "IDAT":
-						{
-							data.AddRange(content);
-
-							break;
-						}
-
-						case "tEXt":
-						{
-							var key = ms.ReadASCIIZ();
-							EmbeddedData.Add(key, ms.ReadASCII(length - key.Length - 1));
-
-							break;
-						}
-
-						case "IEND":
-						{
-							using (var ns = new MemoryStream(data.ToArray()))
-							{
-								using (var ds = new InflaterInputStream(ns))
-								{
-									var pxStride = PixelStride;
-									var rowStride = Width * pxStride;
-
-									var prevLine = new byte[rowStride];
-									for (var y = 0; y < Height; y++)
-									{
-										var filter = (PngFilter)ds.ReadByte();
-										var line = ds.ReadBytes(rowStride);
-
-										for (var i = 0; i < rowStride; i++)
-											line[i] = i < pxStride
-												? UnapplyFilter(filter, line[i], 0, prevLine[i], 0)
-												: UnapplyFilter(filter, line[i], line[i - pxStride], prevLine[i], prevLine[i - pxStride]);
-
-										Array.Copy(line, 0, Data, y * rowStride, rowStride);
-
-										prevLine = line;
-									}
-								}
-							}
-
-							if (Type == SpriteFrameType.Indexed8 && Palette == null)
-								throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-							return;
-						}
-					}
-				}
-			}
-		}
-
-		public Png(byte[] data, SpriteFrameType type, int width, int height, Color[] palette = null,
-			Dictionary<string, string> embeddedData = null)
-		{
-			var expectLength = width * height;
-			if (palette == null)
-				expectLength *= 4;
-
-			if (data.Length != expectLength)
-				throw new InvalidDataException("Input data does not match expected length");
-
-			Type = type;
-			Width = width;
-			Height = height;
-
-			switch (type)
-			{
-				case SpriteFrameType.Indexed8:
-				case SpriteFrameType.Rgba32:
-				case SpriteFrameType.Rgb24:
-				{
-					// Data is already in a compatible format
-					Data = data;
-					if (type == SpriteFrameType.Indexed8)
-						Palette = palette;
-
-					break;
-				}
-
-				case SpriteFrameType.Bgra32:
-				case SpriteFrameType.Bgr24:
-				{
-					// Convert to big endian
-					Data = new byte[data.Length];
-					var stride = PixelStride;
-					for (var i = 0; i < width * height; i++)
-					{
-						Data[stride * i] = data[stride * i + 2];
-						Data[stride * i + 1] = data[stride * i + 1];
-						Data[stride * i + 2] = data[stride * i + 0];
-
-						if (type == SpriteFrameType.Bgra32)
-							Data[stride * i + 3] = data[stride * i + 3];
-					}
-
-					break;
-				}
-
-				default:
-					throw new InvalidDataException($"Unhandled SpriteFrameType {type}");
-			}
-
-			if (embeddedData != null)
-				EmbeddedData = embeddedData;
-		}
-
-		public static bool Verify(Stream s)
-		{
-			var pos = s.Position;
-			var isPng = Signature.Aggregate(true, (current, t) => current && s.ReadUInt8() == t);
-			s.Position = pos;
-			return isPng;
-		}
-
-		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 bool IsPaletted(byte bitDepth, PngColorType colorType)
-		{
-			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
-				return true;
-
-			if (bitDepth == 8 && colorType == (PngColorType.Color | PngColorType.Alpha))
-				return false;
-
-			if (bitDepth == 8 && colorType == PngColorType.Color)
-				return false;
-
-			throw new InvalidDataException("Unknown pixel format");
-		}
-
-		void WritePngChunk(Stream output, string type, Stream input)
-		{
-			input.Position = 0;
-
-			var typeBytes = Encoding.ASCII.GetBytes(type);
-			output.Write(IPAddress.HostToNetworkOrder((int)input.Length));
-			output.WriteArray(typeBytes);
-
-			var data = input.ReadAllBytes();
-			output.WriteArray(data);
-
-			var crc32 = new Crc32();
-			crc32.Update(typeBytes);
-			crc32.Update(data);
-			output.Write(IPAddress.NetworkToHostOrder((int)crc32.Value));
-		}
-
-		public byte[] Save()
-		{
-			using (var output = new MemoryStream())
-			{
-				output.WriteArray(Signature);
-				using (var header = new MemoryStream())
-				{
-					header.Write(IPAddress.HostToNetworkOrder(Width));
-					header.Write(IPAddress.HostToNetworkOrder(Height));
-					header.WriteByte(8); // Bit depth
-
-					var colorType = Type == SpriteFrameType.Indexed8 ? PngColorType.Indexed | PngColorType.Color :
-						Type == SpriteFrameType.Rgb24 ? PngColorType.Color : PngColorType.Color | PngColorType.Alpha;
-					header.WriteByte((byte)colorType);
-
-					header.WriteByte(0); // Compression
-					header.WriteByte(0); // Filter
-					header.WriteByte(0); // Interlacing
-
-					WritePngChunk(output, "IHDR", header);
-				}
-
-				var alphaPalette = false;
-				if (Palette != null)
-				{
-					using (var palette = new MemoryStream())
-					{
-						foreach (var c in Palette)
-						{
-							palette.WriteByte(c.R);
-							palette.WriteByte(c.G);
-							palette.WriteByte(c.B);
-							alphaPalette |= c.A > 0;
-						}
-
-						WritePngChunk(output, "PLTE", palette);
-					}
-				}
-
-				if (alphaPalette)
-				{
-					using (var alpha = new MemoryStream())
-					{
-						foreach (var c in Palette)
-							alpha.WriteByte(c.A);
-
-						WritePngChunk(output, "tRNS", alpha);
-					}
-				}
-
-				using (var data = new MemoryStream())
-				{
-					using (var compressed = new DeflaterOutputStream(data))
-					{
-						var rowStride = Width * PixelStride;
-						for (var y = 0; y < Height; y++)
-						{
-							// Write uncompressed scanlines for simplicity
-							compressed.WriteByte(0);
-							compressed.Write(Data, y * rowStride, rowStride);
-						}
-
-						compressed.Flush();
-						compressed.Finish();
-
-						WritePngChunk(output, "IDAT", data);
-					}
-				}
-
-				foreach (var kv in EmbeddedData)
-				{
-					using (var text = new MemoryStream())
-					{
-						text.WriteArray(Encoding.ASCII.GetBytes(kv.Key + (char)0 + kv.Value));
-						WritePngChunk(output, "tEXt", text);
-					}
-				}
-
-				WritePngChunk(output, "IEND", new MemoryStream());
-				return output.ToArray();
-			}
-		}
-
-		public void Save(string path)
-		{
-			File.WriteAllBytes(path, Save());
-		}
-	}
-}

OpenRA.Game/FileFormats/PngLoader.cs

@@ -0,0 +1,184 @@
+#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.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>();
+
+				for (;;)
+				{
+					var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
+					var type = Encoding.UTF8.GetString(br.ReadBytes(4));
+					var content = br.ReadBytes(length);
+					/*var crc = */br.ReadInt32();
+
+					using (var ms = new MemoryStream(content))
+					using (var cr = new BinaryReader(ms))
+						switch (type)
+						{
+							case "IHDR":
+								{
+									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":
+								{
+									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);
+
+									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;
+									}
+								}
+						}
+				}
+			}
+		}
+
+		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 pixelformat");
+		}
+	}
+}

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -1,11 +1,10 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
 #endregion
 
@@ -28,7 +27,7 @@ namespace OpenRA.FileFormats
 		public ReplayMetadata(GameInformation info)
 		{
 			if (info == null)
-				throw new ArgumentNullException(nameof(info));
+				throw new ArgumentNullException("info");
 
 			GameInfo = info;
 		}
@@ -44,7 +43,7 @@ namespace OpenRA.FileFormats
 			// Read version
 			var version = fs.ReadInt32();
 			if (version != MetaVersion)
-				throw new NotSupportedException($"Metadata version {version} is not supported");
+				throw new NotSupportedException("Metadata version {0} is not supported".F(version));
 
 			// Read game info (max 100K limit as a safeguard against corrupted files)
 			var data = fs.ReadString(Encoding.UTF8, 1024 * 100);
@@ -79,27 +78,41 @@ 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
 			{
-				using (var fs = new FileStream(path, FileMode.Open))
+				fs.Seek(-(4 + 4), SeekOrigin.End);
+				var dataLength = fs.ReadInt32();
+				if (fs.ReadInt32() == MetaEndMarker)
 				{
-					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);
+					try
 					{
-						// 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 (InvalidOperationException ex)
+					{
+						Log.Write("debug", ex.ToString());
+					}
+					catch (NotSupportedException ex)
+					{
+						Log.Write("debug", ex.ToString());
+					}
 				}
 			}
-			catch (Exception ex)
+			catch (IOException ex)
 			{
 				Log.Write("debug", ex.ToString());
 			}

OpenRA.Game/FileFormats/VqaReader.cs

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

OpenRA.Game/FileFormats/VxlReader.cs

@@ -1,18 +1,18 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
  */
+
 #endregion
 
 using System.Collections.Generic;
 using System.IO;
 
-namespace OpenRA.Mods.Cnc.FileFormats
+namespace OpenRA.FileFormats
 {
 	public enum NormalType { TiberianSun = 2, RedAlert2 = 4 }
 	public class VxlElement
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 		public readonly uint LimbCount;
 		public VxlLimb[] Limbs;
 
-		readonly uint bodySize;
+		uint bodySize;
 
 		static void ReadVoxelData(Stream s, VxlLimb l)
 		{
@@ -66,8 +66,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 					z += count;
 					l.VoxelCount += count;
 					s.Seek(2 * count + 1, SeekOrigin.Current);
-				}
-				while (z < l.Size[2]);
+				} while (z < l.Size[2]);
 			}
 
 			// Read the data
@@ -90,11 +89,9 @@ namespace OpenRA.Mods.Cnc.FileFormats
 					var count = s.ReadUInt8();
 					for (var j = 0; j < count; j++)
 					{
-						var v = new VxlElement
-						{
-							Color = s.ReadUInt8(),
-							Normal = s.ReadUInt8()
-						};
+						var v = new VxlElement();
+						v.Color = s.ReadUInt8();
+						v.Normal = s.ReadUInt8();
 
 						l.VoxelMap[x, y].Add(z, v);
 						z++;
@@ -102,8 +99,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 
 					// Skip duplicate count
 					s.ReadUInt8();
-				}
-				while (z < l.Size[2]);
+				} while (z < l.Size[2]);
 			}
 		}
 
@@ -122,11 +118,8 @@ namespace OpenRA.Mods.Cnc.FileFormats
 			Limbs = new VxlLimb[LimbCount];
 			for (var i = 0; i < LimbCount; i++)
 			{
-				Limbs[i] = new VxlLimb
-				{
-					Name = s.ReadASCII(16)
-				};
-
+				Limbs[i] = new VxlLimb();
+				Limbs[i].Name = s.ReadASCII(16);
 				s.Seek(12, SeekOrigin.Current);
 			}
 

OpenRA.Game/FileFormats/WavLoader.cs

@@ -0,0 +1,180 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class WavLoader
+	{
+		public readonly int FileSize;
+		public readonly string Format;
+
+		public readonly int FmtChunkSize;
+		public readonly int AudioFormat;
+		public readonly int Channels;
+		public readonly int SampleRate;
+		public readonly int ByteRate;
+		public readonly int BlockAlign;
+		public readonly int BitsPerSample;
+
+		public readonly int UncompressedSize;
+		public readonly int DataSize;
+		public readonly byte[] RawOutput;
+
+		public enum WaveType { Pcm = 0x1, ImaAdpcm = 0x11 }
+		public static WaveType Type { get; private set; }
+
+		public WavLoader(Stream s)
+		{
+			while (s.Position < s.Length)
+			{
+				if ((s.Position & 1) == 1)
+					s.ReadByte(); // Alignment
+
+				var type = s.ReadASCII(4);
+				switch (type)
+				{
+					case "RIFF":
+						FileSize = s.ReadInt32();
+						Format = s.ReadASCII(4);
+						if (Format != "WAVE")
+							throw new NotSupportedException("Not a canonical WAVE file.");
+						break;
+					case "fmt ":
+						FmtChunkSize = s.ReadInt32();
+						AudioFormat = s.ReadInt16();
+						Type = (WaveType)AudioFormat;
+						if (Type != WaveType.Pcm && Type != WaveType.ImaAdpcm)
+							throw new NotSupportedException("Compression type is not supported.");
+						Channels = s.ReadInt16();
+						SampleRate = s.ReadInt32();
+						ByteRate = s.ReadInt32();
+						BlockAlign = s.ReadInt16();
+						BitsPerSample = s.ReadInt16();
+
+						s.ReadBytes(FmtChunkSize - 16);
+						break;
+					case "fact":
+						{
+							var chunkSize = s.ReadInt32();
+							UncompressedSize = s.ReadInt32();
+							s.ReadBytes(chunkSize - 4);
+						}
+
+						break;
+					case "data":
+						DataSize = s.ReadInt32();
+						RawOutput = s.ReadBytes(DataSize);
+						break;
+					default:
+						// Ignore unknown chunks
+						{
+							var chunkSize = s.ReadInt32();
+							s.ReadBytes(chunkSize);
+						}
+
+						break;
+				}
+			}
+
+			if (Type == WaveType.ImaAdpcm)
+			{
+				RawOutput = DecodeImaAdpcmData();
+				BitsPerSample = 16;
+			}
+		}
+
+		public static float WaveLength(Stream s)
+		{
+			s.Position = 12;
+			var fmt = s.ReadASCII(4);
+
+			if (fmt != "fmt ")
+				return 0;
+
+			s.Position = 22;
+			var channels = s.ReadInt16();
+			var sampleRate = s.ReadInt32();
+
+			s.Position = 34;
+			var bitsPerSample = s.ReadInt16();
+			var length = s.Length * 8;
+
+			return length / (channels * sampleRate * bitsPerSample);
+		}
+
+		public byte[] DecodeImaAdpcmData()
+		{
+			var s = new MemoryStream(RawOutput);
+
+			var numBlocks = DataSize / BlockAlign;
+			var blockDataSize = BlockAlign - (Channels * 4);
+			var outputSize = UncompressedSize * Channels * 2;
+
+			var outOffset = 0;
+			var output = new byte[outputSize];
+
+			var predictor = new int[Channels];
+			var index = new int[Channels];
+
+			// Decode each block of IMA ADPCM data in RawOutput
+			for (var block = 0; block < numBlocks; block++)
+			{
+				// Each block starts with a initial state per-channel
+				for (var c = 0; c < Channels; c++)
+				{
+					predictor[c] = s.ReadInt16();
+					index[c] = s.ReadUInt8();
+					/* unknown/reserved */ s.ReadUInt8();
+
+					// Output first sample from input
+					output[outOffset++] = (byte)predictor[c];
+					output[outOffset++] = (byte)(predictor[c] >> 8);
+
+					if (outOffset >= outputSize)
+						return output;
+				}
+
+				// Decode and output remaining data in this block
+				var blockOffset = 0;
+				while (blockOffset < blockDataSize)
+				{
+					for (var c = 0; c < Channels; c++)
+					{
+						// Decode 4 bytes (to 16 bytes of output) per channel
+						var chunk = s.ReadBytes(4);
+						var decoded = ImaAdpcmLoader.LoadImaAdpcmSound(chunk, ref index[c], ref predictor[c]);
+
+						// Interleave output, one sample per channel
+						var outOffsetChannel = outOffset + (2 * c);
+						for (var i = 0; i < decoded.Length; i += 2)
+						{
+							var outOffsetSample = outOffsetChannel + i;
+							if (outOffsetSample >= outputSize)
+								return output;
+
+							output[outOffsetSample] = decoded[i];
+							output[outOffsetSample + 1] = decoded[i + 1];
+							outOffsetChannel += 2 * (Channels - 1);
+						}
+
+						blockOffset += 4;
+					}
+
+					outOffset += 16 * Channels;
+				}
+			}
+
+			return output;
+		}
+	}
+}

OpenRA.Game/FileFormats/XccGlobalDatabase.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class XccGlobalDatabase
+	{
+		public readonly string[] Entries;
+		public XccGlobalDatabase(Stream s)
+		{
+			var entries = new List<string>();
+			var reader = new BinaryReader(s);
+			while (reader.PeekChar() > -1)
+			{
+				var count = reader.ReadInt32();
+				for (var i = 0; i < count; i++)
+				{
+					var chars = new List<char>();
+					char c;
+
+					// Read filename
+					while ((c = reader.ReadChar()) != 0)
+						chars.Add(c);
+					entries.Add(new string(chars.ToArray()));
+
+					// Skip comment
+					while ((c = reader.ReadChar()) != 0) { }
+				}
+			}
+
+			Entries = entries.ToArray();
+		}
+	}
+}

OpenRA.Game/FileFormats/XccLocalDatabase.cs

@@ -0,0 +1,67 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace OpenRA.FileFormats
+{
+	public class XccLocalDatabase
+	{
+		public readonly string[] Entries;
+		public XccLocalDatabase(Stream s)
+		{
+			// Skip unnecessary header data
+			s.Seek(48, SeekOrigin.Begin);
+			var reader = new BinaryReader(s);
+			var count = reader.ReadInt32();
+			Entries = new string[count];
+			for (var i = 0; i < count; i++)
+			{
+				var chars = new List<char>();
+				char c;
+				while ((c = reader.ReadChar()) != 0)
+					chars.Add(c);
+
+				Entries[i] = new string(chars.ToArray());
+			}
+		}
+
+		public XccLocalDatabase(IEnumerable<string> filenames)
+		{
+			Entries = filenames.ToArray();
+		}
+
+		public byte[] Data()
+		{
+			var data = new MemoryStream();
+			using (var writer = new BinaryWriter(data))
+			{
+				writer.Write(Encoding.ASCII.GetBytes("XCC by Olaf van der Spek"));
+				writer.Write(new byte[] { 0x1A, 0x04, 0x17, 0x27, 0x10, 0x19, 0x80, 0x00 });
+
+				writer.Write((int)(Entries.Aggregate(Entries.Length, (a, b) => a + b.Length) + 52)); // Size
+				writer.Write((int)0); // Type
+				writer.Write((int)0); // Version
+				writer.Write((int)0); // Game/Format (0 == TD)
+				writer.Write((int)Entries.Length); // Entries
+				foreach (var e in Entries)
+				{
+					writer.Write(Encoding.ASCII.GetBytes(e));
+					writer.Write((byte)0);
+				}
+			}
+
+			return data.ToArray();
+		}
+	}
+}

OpenRA.Game/FileSystem/BagFile.cs

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

OpenRA.Game/FileSystem/BigFile.cs

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