Updated Makefile to remove RA-NG target.

.editorconfig

@@ -1,213 +0,0 @@
-; 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
-[*.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

.gitattributes

@@ -1,10 +0,0 @@
-# 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

.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,52 @@
-# 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 crap
+Release
+bin
+obj
+*.ncb
+*.vcproj*
+*.suo
+*.user
+*.sln.cache
+mods/*/*.dll
+
+# Red Alert binary files
+*.[mM][iI][xX]
+*.[aA][uU][dD]
+
+# Crap generated by OpenRa
+sheet-*.png
+log.txt
+
+*.rep
+
+#binary stuff
+/*.dll
+*.mdb
+/*.exe
+OpenRA
+OpenRA.app
+
+# backup files by various editors
+*~
+# dependency DLLs (different for every platform!)
+cg.dll
+cgGL.dll
+glfw.dll
+
+/OpenRa.Gl.dll
+settings.ini
+
+#monodevelop
+*.pidb
+*.userprefs
+
+packaging/windows/*.exe
+
+# osx build crap
+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

.kateproject

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

.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

@@ -1,219 +0,0 @@
-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)
-    * Matthias Mailänder (Mailaender)
-
-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
-    * Andrew Riedi
-    * Andreas Beck (baxtor)
-    * Ang Soon Li (asl97)
-    * 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
-    * 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)
-    * 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)
-    * 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)
-    * 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)
-    * Riderr3
-    * riiga
-    * Rikhardur Bjarni Einarsson (WolfGaming)
-    * Sascha Biedermann (bidifx)
-    * Sean Hunt (coppro)
-    * 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)
-    * Tristan Keating (Kilkakon)
-    * Tristan Mühlbacher (MicroBit)
-    * UnknownProgrammer
-    * Vladimir Komarov (VrKomarov)
-    * Wojciech Walaszek (Voidwalker)
-    * Wuschel
-
-Using GNU FreeFont distributed under the GNU GPL
-terms.
-
-Using Simple DirectMedia Layer distributed under
-the terms of the zlib license.
-
-Using FreeType distributed under the terms of the
-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 Eluant created by Chris Howie and released
-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 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,29 +0,0 @@
-# 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
-
-* [Coding standard](https://github.com/OpenRA/OpenRA/wiki/Coding-Standard)
-* [Branches and Releases](https://github.com/OpenRA/OpenRA/wiki/Branches-and-Releases)
-* [Licensing](http://www.gnu.org/licenses/quick-guide-gplv3.html)
-
-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).
-
-Please propose a [CHANGELOG](https://github.com/OpenRA/OpenRA/wiki/CHANGELOG) entry in the pull-request comments.
-
-While your pull-request is in review it will be helpful if you join [IRC](irc://chat.freenode.net/openra) to discuss the changes.
-
-See also the in-depth guide on [contributing](https://github.com/OpenRA/OpenRA/wiki/Contributing) to the OpenRA project.

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>

HACKING

@@ -0,0 +1,55 @@
+HACKING
+
+There are n main sections to OpenRA: UI, Rendering, unit behaviour, ...
+
+All  units/structures/most things in the map are Actors. Actors contain a  collection of traits.
+Traits consist of an info class and a  class that does stuff
+
+Actor assembly is done via the mod's yaml files. A section  exists for each actor type, and within that section we list the traits  the actor should have. These get looked up in the loaded mod DLLs. Each trait can contain properties, which are automatically loaded into the corresponding fields on the trait's ITraitInfo.
+
+- Traits: look at TraitInterfaces.cs
+    We've tried to make individual traits implement as self-contained a unit of functionality as possible - all cross-trait references should be in terms of an interface from TraitInterfaces.cs.
+    
+- Things an actor can be *doing* are represented as IActivity implementations. Actor has a queue of these. There's a standard set of activities in OpenRa.Game/Traits/Activities, and mods tend to define more as they need them. (RA defines various special-infantry actions as activities).
+
+- Units offer orders they can perform (given context) through traits that implement IIssueOrder. Every trait with this interface is given a chance to generate orders for the current context.
+
+- For more complex things that require modal UI (like special abilities, RA-style sell/repair buttons, etc) we have IOrderGenerator implementations. This can completely replace the normal actors-provide-orders model temporarily. IOGs wiring is provided through OpenRa.Game/Controller.cs (ToggleInputMode<T>, CancelInputMode)
+
+- Things that don't affect gameplay, or (increasingly) are just transient are implemented as IEffect, rather than real Actors. This is similar to the temp ents mechanism in many other game engines.
+
+- Most player-level or global-level game behavior is implemented as traits on special Player and World actors. These are accessible via Player.PlayerActor and World.WorldActor. This includes production queue support, ore/tiberium growth, various palette manipulation magic.
+
+- Many traits can be modified by adding an appropriate IFooModifier implementation to the unit. This includes rendering, where IRenderModifier allows you to define an arbitrary transform on the Renderables emitted by the actor's IRender implementation(s). Examples are things like cloaking, invisibility to certain players, flying units with shadows, etc. Other modifiers can affect movement speed, damage taken, weapon firepower, etc.
+
+Game code is collected into "Mod" units. Mods can be added prior to starting the game. Currently there is no dependancy mechanism, but provided you are doing additions or overrides you can add multiple mods without problem.
+Everything is a mod  (including RA - which is loaded by default). 
+
+The contents of the mod is defined in a manifest file mod.yaml. This lists the packages containing art assets (typically .mix files), yaml files defining actor defintions, and ini files containing legacy information that have yet to be ported over to the (relatively new) yaml system.
+
+The unit artwork itself must be defined in a Sequences file (typically Sequences.xml; check mod.yaml for a list of what the mod uses); the format is self explanatory. There is also the SequenceEditor tool to make this easy.
+
+Chrome artwork is similarly defined in Chrome.xml. Chrome is already mod dependent. Sortof ;) mod-dependent *behavior* would be nice too, not just skinning. This is a property of the traits however; once we port UI into traits this will become a non-issue.
+
+Rendering
+OpenRa.Game/Chrome.cs is the user interface. 
+Three renderers (SpriteRenderer, LineRenderer, Rgba?Renderer) render most stuff. Don't forget to flush the renderer (if you want to see anything).
+
+UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be able to save values changed in game into settings.ini (not yet implemented)
+
+Bugs: There is a list of known bugs and features at http://openra.res0l.net/projects/openra/issues . There's also a few at http://github.com/chrisforbes/OpenRA/issues (which won't be ported over, but no more bugs should be added here).
+
+We also have a website at http://www.open-ra.org/ . 
+
+As far as using git, get your own repository on github. You probably want to set up the gitbot to spam irc when you make commits (its nice to know). Push your changes into your git repository, and it will/might :P be merged into chrisforbes/OpenRA . Alli: setup howto for this?
+
+Other things we probably want to put in here:
+    - A guide on how to add a generic unit via yaml using existing traits
+        - and then introduce some element that requires a simple trait change.
+    - how to set up a new mod (TC-style or mutator-style)
+    - VFS (OpenRa.FileFormats.FileSystem, Package, Folder classes)
+    - Trait inheritance (and the magicness of ^ActorType)
+    - Removing inherited traits (prepend `-` to the trait name)
+    - Multiple instances of a trait (`@` and all subsequent characters are ignored for the purposes 
+        of looking up the trait.
+

INSTALL

@@ -0,0 +1,57 @@
+Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, 
+	Paul Chote, Alli Witheford.
+	
+This file is part of OpenRA.
+
+OpenRA is free software: you can redistribute it and/or modify
+it 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.
+
+OpenRA is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+
+To compile OpenRA, open the OpenRA.sln solution in the main folder, 
+or build it from the command-line with MSBuild.
+
+To run OpenRA, several files from the original game’s install need 
+to be copied to the root of the project directory. The required files are:
+
+	redalert.mix
+	conquer.mix
+	temperat.mix
+	interior.mix
+	snow.mix
+	sounds.mix
+	allies.mix
+	russian.mix
+	general.mix
+	
+	hires1.mix
+	expand2.mix
+
+Red Alert has been released by EA Games as freeware so it shouldn’t 
+be too hard to find a legal copy of the CD images. Unfortunately the 
+installer is 16-bit and so won’t run on 64-bit operating systems. This 
+can be worked around by using the Red Alert Setup Manager 
+	(http://ra.afraid.org/html/downloads/utilities-3.html). 
+Make sure you apply the no-CD protection fix so all the files needed 
+are installed to the hard drive.
+
+Dependencies - Make sure you have these installed, or you'll 
+have very strange errors.
+
+* .NET Framework >= 3.5-SP1
+	(http://www.microsoft.com/downloads/details.aspx?FamilyID=AB99342F-5D1A-413D-8319-81DA479AB0D7&displaylang=en)
+* Tao Framework >= 2.1.0
+	(http://sourceforge.net/projects/taoframework/)
+	(required libs: Tao.OpenGL, Tao.Cg, Tao.Platform.Windows)
+* OpenAL >= 1.1
+	(http://connect.creativelabs.com/openal/Downloads/oalinst.zip)
+* Cg Toolkit >= 2.2
+	(http://developer.download.nvidia.com/cg/Cg_2.2/Cg-2.2_October2009_Setup.exe)

INSTALL.Ubuntu

@@ -0,0 +1,52 @@
+Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, 
+	Paul Chote, Alli Witheford.
+	
+This file is part of OpenRA.
+
+OpenRA is free software: you can redistribute it and/or modify
+it 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.
+
+OpenRA is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+
+To compile OpenRA, open the OpenRA.sln solution in the main folder, 
+or build it from the command-line with MSBuild.
+
+To run OpenRA, several files from the original game’s install need 
+to be copied to the root of the project directory. The required files are:
+
+	redalert.mix
+	conquer.mix
+	temperat.mix
+	interior.mix
+	snow.mix
+	sounds.mix
+	allies.mix
+	russian.mix
+	general.mix
+	
+	hires1.mix
+	expand2.mix
+
+Red Alert has been released by EA Games as freeware so it shouldn’t 
+be too hard to find a legal copy of the CD images. Unfortunately the 
+installer is 16-bit and so won’t run on 64-bit operating systems. This 
+can be worked around by using the Red Alert Setup Manager 
+	(http://ra.afraid.org/html/downloads/utilities-3.html). 
+Make sure you apply the no-CD protection fix so all the files needed 
+are installed to the hard drive.
+
+Dependencies - Make sure you have these installed, or you'll 
+have very strange errors.
+
+* mono-gmcs
+* libglfw2
+* nvidia-cg-toolkit
+* libmono-*

INSTALL.md

@@ -1,83 +0,0 @@
-To run OpenRA, several files are needed from the original game disks.
-A minimal asset pack can also be downloaded and installed by the game.
-
-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)
-
-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.
-
-Run the game with `launch-game.cmd`. It can be handed arguments that specify the exact mod one wishes to run, for example, run `launch-game.cmd Game.Mod=ra` to launch Red Alert, `launch-game.cmd Game.Mod=cnc` to start Tiberian dawn or `launch-game.cmd Game.Mod=d2k` to launch Dune 2000.
-
-Linux
-=====
-
-.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.
-
-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` 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.
-
-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`.
-
-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.
-
-These can be installed using your package manager on various distros:
-
-<details><summary>Arch Linux</summary>
-
-```
-sudo pacman -S openal libgl freetype2 sdl2 lua51
-```
-</details>
-<details><summary>Debian/Ubuntu</summary>
-
-```
-sudo apt install libfreetype6 libopenal1 liblua5.1-0 libsdl2-2.0-0
-```
-</details>
-<details><summary>Fedora</summary>
-
-```
-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`.

Makefile

@@ -1,211 +1,132 @@
-############################# INSTRUCTIONS #############################
-#
-# 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 check the official mods for erroneous yaml files, run:
-#   make [RUNTIME=net6] test
-#
-# to check the engine and official mod dlls for code style violations, run:
-#   make [RUNTIME=net6] check
-#
-# to compile and install Red Alert, Tiberian Dawn, and Dune 2000, run:
-#   make [RUNTIME=net6] [prefix=/foo] [bindir=/bar/bin] install
-#
-# 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 FreeDesktop startup scripts, desktop files, icons, and MIME metadata
-#   make install-linux-shortcuts
-#
-# to install FreeDesktop AppStream metadata
-#   make install-linux-appdata
-#
-# to install the Unix man page
-#   make install-man
-#
-# for help, run:
-#   make help
-#
+CSC     = gmcs
+CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
+DEFINE  = DEBUG;TRACE
+PROGRAMS	=fileformats gl game ra cnc aftermath seqed mapcvtr
+prefix = /usr/local
+datarootdir = $(prefix)/share
+datadir = $(datarootdir)
+bindir = $(prefix)/bin
+INSTALL_DIR = $(DESTDIR)$(datadir)/openra
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
 
-######################### UTILITIES/SETTINGS ###########################
-#
-# Install locations for local installs and downstream packaging
-prefix ?= /usr/local
-datarootdir ?= $(prefix)/share
-datadir ?= $(datarootdir)
-mandir ?= $(datarootdir)/man/
-bindir ?= $(prefix)/bin
-libdir ?= $(prefix)/lib
-gameinstalldir ?= $(libdir)/openra
+COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
 
-# Toolchain
-CWD = $(shell pwd)
-MSBUILD = msbuild -verbosity:m -nologo
-DOTNET = dotnet
-MONO = mono
-RM = rm
-RM_R = $(RM) -r
-RM_F = $(RM) -f
-RM_RF = $(RM) -rf
+CORE = fileformats gl game seqed mapcvtr
 
-RUNTIME ?= net6
-CONFIGURATION ?= Release
-DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3)
-ARCH_X64 = $(shell echo ${DOTNET_RID} | grep x64)
+fileformats_SRCS	=	$(shell find OpenRA.FileFormats/ -iname '*.cs')
+fileformats_TARGET	=	OpenRA.FileFormats.dll
+fileformats_KIND	=	library
+fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll
 
-# 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))
+gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
+gl_TARGET			= OpenRA.Gl.dll
+gl_KIND				= library
+gl_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+gl_LIBS				= $(COMMON_LIBS) System.Windows.Forms.dll \
+						thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+						$(gl_DEPS) $(game_TARGET)
 
-# Detect target platform for dependencies if not given by the user
-ifndef TARGETPLATFORM
-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
-endif
+game_SRCS			=	$(shell find OpenRA.Game/ -iname '*.cs')
+game_TARGET			= OpenRA.Game.exe
+game_KIND			= winexe
+game_DEPS			= $(fileformats_TARGET) 
+game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
+						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
+game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
 
-##################### DEVELOPMENT BUILDS AND TESTS #####################
-#
-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
+ra_SRCS				=	$(shell find OpenRA.Mods.RA/ -iname '*.cs')
+ra_TARGET			=	mods/ra/OpenRA.Mods.RA.dll
+ra_KIND				=	library
+ra_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+ra_LIBS				= $(COMMON_LIBS) $(ra_DEPS)
 
-# 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
+cnc_SRCS			=	$(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
+cnc_TARGET			=	mods/cnc/OpenRA.Mods.Cnc.dll
+cnc_KIND			=	library
+cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
+cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)
 
-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
+aftermath_SRCS		=	$(shell find OpenRA.Mods.Aftermath/ -iname '*.cs')
+aftermath_TARGET	=	mods/aftermath/OpenRA.Mods.Aftermath.dll
+aftermath_KIND		=	library
+aftermath_DEPS		= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
+aftermath_LIBS		= $(COMMON_LIBS) $(aftermath_DEPS)
 
-check-scripts:
-	@echo
-	@echo "Checking for Lua syntax errors..."
-	@find lua/ mods/*/{maps,scripts}/ -iname "*.lua" -print0 | xargs -0n1 luac -p
+seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
+seqed_TARGET		= SequenceEditor.exe
+seqed_KIND			= winexe
+seqed_DEPS			= $(fileformats_TARGET)
+seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
 
-test: all
-	@echo
-	@echo "Testing Tiberian Sun mod MiniYAML..."
-	@./utility.sh ts --check-yaml
-	@echo
-	@echo "Testing Dune 2000 mod MiniYAML..."
-	@./utility.sh d2k --check-yaml
-	@echo
-	@echo "Testing Tiberian Dawn mod MiniYAML..."
-	@./utility.sh cnc --check-yaml
-	@echo
-	@echo "Testing Red Alert mod MiniYAML..."
-	@./utility.sh ra --check-yaml
+mapcvtr_SRCS		= $(shell find MapConverter/ -iname '*.cs')
+mapcvtr_TARGET		= MapConverter.exe
+mapcvtr_KIND		= winexe
+mapcvtr_DEPS		= $(fileformats_TARGET)
+mapcvtr_LIBS		= $(COMMON_LIBS) $(mapcvtr_DEPS)
 
-############# LOCAL INSTALLATION AND DOWNSTREAM PACKAGING ##############
-#
-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))
-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-linux-shortcuts:
-	@sh -c '. ./packaging/functions.sh; install_linux_shortcuts $(CWD) "$(DESTDIR)" "$(gameinstalldir)" "$(bindir)" "$(datadir)" "$(shell head -n1 VERSION)" cnc d2k ra'
-
-install-linux-appdata:
-	@sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) "$(DESTDIR)" "$(datadir)" cnc d2k ra'
-
-install-man: all
-	@mkdir -p $(DESTDIR)$(mandir)/man6/
-	@./utility.sh all --man-page > $(DESTDIR)$(mandir)/man6/openra.6
-
-help:
-	@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
-	@echo 'to compile using system libraries for native dependencies, run:'
-	@echo '  make [RUNTIME=net6] TARGETPLATFORM=unix-generic'
-	@echo
-	@echo 'to check the official mods for erroneous yaml files, run:'
-	@echo '  make [RUNTIME=net6] test'
-	@echo
-	@echo 'to check the engine and official mod dlls for code style violations, run:'
-	@echo '  make [RUNTIME=net6] check'
-	@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
-	@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
-	@echo 'to install FreeDesktop startup scripts, desktop files, icons, and MIME metadata'
-	@echo '  make install-linux-shortcuts'
-	@echo
-	@echo 'to install FreeDesktop AppStream metadata'
-	@echo '  make install-linux-appdata'
-	@echo
-	@echo 'to install a Unix man page'
-	@echo '  make install-man'
-
-########################### MAKEFILE SETTINGS ##########################
-#
-.DEFAULT_GOAL := all
+# -platform:x86
 
 .SUFFIXES:
+.PHONY: clean all default mods seqed mapcvtr install uninstall
 
-.PHONY: all clean check check-scripts test version install install-linux-shortcuts install-linux-appdata install-man help
+all: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(seqed_TARGET) $(mapcvtr_TARGET)
+
+clean: 
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb
+
+distclean: clean
+
+install: all
+	@-echo "Installing OpenRA to $(INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
+	
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/aftermath
+	@$(INSTALL_PROGRAM) $(aftermath_TARGET) $(INSTALL_DIR)/mods/aftermath
+	@-cp $(foreach f,$(shell ls mods/aftermath --hide=*.dll),mods/aftermath/$(f)) $(INSTALL_DIR)/mods/aftermath
+	@cp -r mods/aftermath/packages $(INSTALL_DIR)/mods/aftermath
+	
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
+	@$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc
+	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
+	
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
+	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
+	
+	@cp -r shaders $(INSTALL_DIR)
+	@cp *.ttf $(INSTALL_DIR)
+	@-cp *.ini $(INSTALL_DIR)
+	@cp -r thirdparty $(INSTALL_DIR)
+	@echo "OpenRA is now installed. You will now want to download"
+	@echo "http://open-ra.org/packages/ra-packages.zip and"
+	@echo "http://open-ra.org/packages/cnc-packages.zip"
+	@echo "and extract their contents to"
+	@echo "$(INSTALL_DIR)/mods/ra/packages and "
+	@echo "$(INSTALL_DIR)/mods/cnc/packages respectively."
+	@echo "It is also advised to install the contents of $(INSTALL_DIR)/thirdparty to the Mono Global Assembly Cache \
+	with gacutil."
+
+uninstall:
+	@-rm -r $(INSTALL_DIR)
+	@-rm $(DESTDIR)$(bindir)/openra
+
+mods: $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET)
+seqed: $(seqed_TARGET)
+mapcvtr: $(mapcvtr_TARGET)
+
+define BUILD_ASSEMBLY
+
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
+	@echo CSC $$(@)
+	@$(CSC) $$($(1)_LIBS:%=-r:%) \
+		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
+		-define:"$(DEFINE)" \
+		-t:"$$($(1)_KIND)" \
+		$$($(1)_SRCS)
+endef
+
+$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))

MapConverter/AssemblyInfo.cs

@@ -0,0 +1,26 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("MapConverter")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]

MapConverter/Main.cs

@@ -0,0 +1,13 @@
+using System;
+using OpenRA.FileFormats;
+
+namespace MapConverter
+{
+	class MainClass
+	{
+		public static void Main (string[] args)
+		{
+			new MapConverter(args);
+		}
+	}
+}

MapConverter/MapConverter.cs

@@ -0,0 +1,405 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenRA;
+using OpenRA.FileFormats;
+
+namespace MapConverter
+{
+	public class MapConverter
+	{
+		// Mapping from ra overlay index to type string
+		static string[] raOverlayNames =
+		{
+			"sbag", "cycl", "brik", "fenc", "wood",
+			"gold01", "gold02", "gold03", "gold04",
+			"gem01", "gem02", "gem03", "gem04",
+			"v12", "v13", "v14", "v15", "v16", "v17", "v18",
+			"fpls", "wcrate", "scrate", "barb", "sbag",
+		};
+		
+		static Dictionary< string, Pair<byte,byte> > overlayResourceMapping = new Dictionary<string, Pair<byte, byte>>()
+		{
+			// RA Gems, Gold
+			{ "gold01", new Pair<byte,byte>(1,0) },
+			{ "gold02", new Pair<byte,byte>(1,1) },
+			{ "gold03", new Pair<byte,byte>(1,2) },
+			{ "gold04", new Pair<byte,byte>(1,3) },
+			
+			{ "gem01", new Pair<byte,byte>(2,0) },
+			{ "gem02", new Pair<byte,byte>(2,1) },
+			{ "gem03", new Pair<byte,byte>(2,2) },
+			{ "gem04", new Pair<byte,byte>(2,3) },
+			
+			// cnc tiberium
+			{ "ti1", new Pair<byte,byte>(1,0) },
+			{ "ti2", new Pair<byte,byte>(1,1) },
+			{ "ti3", new Pair<byte,byte>(1,2) },
+			{ "ti4", new Pair<byte,byte>(1,3) },
+			{ "ti5", new Pair<byte,byte>(1,4) },
+			{ "ti6", new Pair<byte,byte>(1,5) },
+			{ "ti7", new Pair<byte,byte>(1,6) },
+			{ "ti8", new Pair<byte,byte>(1,7) },
+			{ "ti9", new Pair<byte,byte>(1,8) },
+			{ "ti10", new Pair<byte,byte>(1,9) },
+			{ "ti11", new Pair<byte,byte>(1,10) },
+			{ "ti12", new Pair<byte,byte>(1,11) },
+		};
+		
+		static Dictionary<string, string> overlayActorMapping = new Dictionary<string,string>() {
+			// Fences
+			{"sbag","sbag"},
+			{"cycl","cycl"},
+			{"brik","brik"},
+			{"fenc","fenc"},
+			{"wood","wood"},
+			
+			// Fields
+			{"v12","v12"},
+			{"v13","v13"},
+			{"v14","v14"},
+			{"v15","v15"},
+			{"v16","v16"},
+			{"v17","v17"},
+			{"v18","v18"},
+			
+			// Crates
+			{"wcrate","crate"},
+			{"scrate","crate"},
+		};
+		
+		int MapSize;
+		int ActorCount = 0; 
+		Map Map = new Map();
+		Manifest manifest;
+
+		public MapConverter(string[] args)
+		{
+			if (args.Length != 3)
+			{
+				Console.WriteLine("usage: MapConverter mod[,mod]* input-map.ini output-map.yaml");
+				return;
+			}
+
+			var mods = args[0].Split(',');
+			manifest = new Manifest(mods);
+
+			foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
+			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
+			
+			ConvertIniMap(args[1]);
+			Map.DebugContents();
+			Save(args[2]);
+		}
+		
+		
+		static Dictionary<Pair<string,string>,Pair<string,string> > fileMapping = new Dictionary<Pair<string,string>,Pair<string,string> >()
+		{
+			{Pair.New("ra","TEMPERAT"),Pair.New("tem","temperat.col")},
+			{Pair.New("ra","SNOW"),Pair.New("sno","snow.col")},
+			{Pair.New("ra","INTERIOR"),Pair.New("int","temperat.col")},
+			{Pair.New("cnc","DESERT"),Pair.New("des","desert.col")},
+			{Pair.New("cnc","TEMPERAT"),Pair.New("tem","temperat.col")},
+			{Pair.New("cnc","WINTER"),Pair.New("win","winter.col")},
+		};
+		
+		TerrainColorSet terrainTypeColors;
+		TileSet tileset;
+		public void ConvertIniMap(string iniFile)
+		{
+			IniFile file = new IniFile(FileSystem.Open(iniFile));
+			IniSection basic = file.GetSection("Basic");
+			IniSection map = file.GetSection("Map");
+			var INIFormat = int.Parse(basic.GetValue("NewINIFormat", "0"));
+			var XOffset = int.Parse(map.GetValue("X", "0"));
+			var YOffset = int.Parse(map.GetValue("Y", "0"));
+			var Width = int.Parse(map.GetValue("Width", "0"));
+			var Height = int.Parse(map.GetValue("Height", "0"));
+			MapSize = (INIFormat == 3) ? 128 : 64;
+			
+			Map.Title = basic.GetValue("Name", "(null)");
+			Map.Author = "Westwood Studios";
+			Map.Tileset = Truncate(map.GetValue("Theater", "TEMPERAT"), 8);
+			Map.MapSize.X = MapSize;
+			Map.MapSize.Y = MapSize;
+			Map.TopLeft = new int2 (XOffset, YOffset);
+			Map.BottomRight = new int2(XOffset+Width,YOffset+Height);
+			Map.Selectable = true;
+			
+			if (INIFormat == 3) // RA map
+			{
+				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
+				UnpackRAOverlayData(ReadPackedSection(file.GetSection("OverlayPack")));
+				ReadRATrees(file);
+				terrainTypeColors = new TerrainColorSet(fileMapping[Pair.New("ra",Map.Tileset)].Second);
+				tileset = new TileSet("tileSet.til","templates.ini",fileMapping[Pair.New("ra",Map.Tileset)].First);
+			}
+			else // CNC
+			{
+				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0,iniFile.Length-4)+".bin"));
+				ReadCncOverlay(file);
+				ReadCncTrees(file);
+				terrainTypeColors = new TerrainColorSet(fileMapping[Pair.New("cnc",Map.Tileset)].Second);
+				tileset = new TileSet("tileSet.til","templates.ini",fileMapping[Pair.New("cnc",Map.Tileset)].First);
+			}
+			
+			LoadActors(file, "STRUCTURES");
+			LoadActors(file, "UNITS");
+			LoadActors(file, "INFANTRY");
+			LoadSmudges(file, "SMUDGE");
+		
+			var wp = file.GetSection("Waypoints")
+					.Where(kv => int.Parse(kv.Value) > 0)
+					.Select(kv => Pair.New(int.Parse(kv.Key), new int2(int.Parse(kv.Value) % MapSize, int.Parse(kv.Value) / MapSize)))
+					.Where(a => a.First < 8)
+					.ToArray();
+			
+			Map.PlayerCount = wp.Count();
+			
+			foreach (var kv in wp)
+				Map.Waypoints.Add("spawn"+kv.First, kv.Second);
+		}
+		
+		static MemoryStream ReadPackedSection(IniSection mapPackSection)
+		{
+			StringBuilder sb = new StringBuilder();
+			for (int i = 1; ; i++)
+			{
+				string line = mapPackSection.GetValue(i.ToString(), null);
+				if (line == null)
+					break;
+
+				sb.Append(line.Trim());
+			}
+
+			byte[] data = Convert.FromBase64String(sb.ToString());
+			List<byte[]> chunks = new List<byte[]>();
+			BinaryReader reader = new BinaryReader(new MemoryStream(data));
+
+			try
+			{
+				while (true)
+				{
+					uint length = reader.ReadUInt32() & 0xdfffffff;
+					byte[] dest = new byte[8192];
+					byte[] src = reader.ReadBytes((int)length);
+
+					/*int actualLength =*/ Format80.DecodeInto(src, dest);
+
+					chunks.Add(dest);
+				}
+			}
+			catch (EndOfStreamException) { }
+
+			MemoryStream ms = new MemoryStream();
+			foreach (byte[] chunk in chunks)
+				ms.Write(chunk, 0, chunk.Length);
+
+			ms.Position = 0;
+
+			return ms;
+		}
+
+		static byte ReadByte( Stream s )
+		{
+			int ret = s.ReadByte();
+			if( ret == -1 )
+				throw new NotImplementedException();
+			return (byte)ret;
+		}
+
+		static ushort ReadWord(Stream s)
+		{
+			ushort ret = ReadByte(s);
+			ret |= (ushort)(ReadByte(s) << 8);
+
+			return ret;
+		}
+
+		void UnpackRATileData( MemoryStream ms )
+		{
+			Map.MapTiles = new TileReference<ushort, byte>[ MapSize, MapSize ];
+			for( int i = 0 ; i < MapSize ; i++ )
+				for( int j = 0 ; j < MapSize ; j++ )
+					Map.MapTiles[i,j] = new TileReference<ushort,byte>();
+			
+			for( int j = 0 ; j < MapSize ; j++ )
+				for( int i = 0 ; i < MapSize ; i++ )
+					Map.MapTiles[i,j].type = ReadWord(ms);
+
+			for( int j = 0 ; j < MapSize ; j++ )
+				for( int i = 0 ; i < MapSize ; i++ )
+				{
+					Map.MapTiles[i,j].index = ReadByte(ms);
+					if( Map.MapTiles[i,j].type == 0xff || Map.MapTiles[i,j].type == 0xffff )
+						Map.MapTiles[i,j].index = byte.MaxValue;
+				}
+		}
+	
+		void UnpackRAOverlayData( MemoryStream ms )
+		{
+			Map.MapResources = new TileReference<byte, byte>[ MapSize, MapSize ];		
+			for( int j = 0 ; j < MapSize ; j++ )
+				for( int i = 0 ; i < MapSize ; i++ )
+				{
+					byte o = ReadByte( ms );
+					var res = Pair.New((byte)0,(byte)0);
+					
+					if (o != 255 && overlayResourceMapping.ContainsKey(raOverlayNames[o]))
+						res = overlayResourceMapping[raOverlayNames[o]];
+					
+					Map.MapResources[i,j] = new TileReference<byte,byte>(res.First, res.Second);
+				
+					if (o != 255 && overlayActorMapping.ContainsKey(raOverlayNames[o]))
+							Map.Actors.Add("Actor"+ActorCount++, new ActorReference( overlayActorMapping[raOverlayNames[o]], new int2(i,j), "Neutral"));
+				}
+		}
+
+		void ReadRATrees( IniFile file )
+		{
+			IniSection terrain = file.GetSection( "TERRAIN", true );
+			if( terrain == null )
+				return;
+			
+			foreach( KeyValuePair<string, string> kv in terrain )
+			{
+				var loc = int.Parse( kv.Key );
+				Map.Actors.Add("Actor"+ActorCount++, new ActorReference(kv.Value.ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), "Neutral" ) );
+			}
+		}
+		
+		void UnpackCncTileData( Stream ms )
+		{		
+			Map.MapTiles = new TileReference<ushort, byte>[ MapSize, MapSize ];
+			for( int i = 0 ; i < MapSize ; i++ )
+				for( int j = 0 ; j < MapSize ; j++ )
+					Map.MapTiles[i,j] = new TileReference<ushort,byte>();
+			
+			for( int j = 0 ; j < MapSize ; j++ )
+				for( int i = 0 ; i < MapSize ; i++ )
+				{
+					Map.MapTiles[i,j].type = ReadByte(ms);
+					Map.MapTiles[i,j].index = ReadByte(ms);
+					
+					if( Map.MapTiles[i,j].type == 0xff )
+						Map.MapTiles[i,j].index = byte.MaxValue;
+				}			
+		}
+				
+		void ReadCncOverlay( IniFile file )
+		{
+			IniSection overlay = file.GetSection( "OVERLAY", true );
+			if( overlay == null )
+				return;
+		
+			Map.MapResources = new TileReference<byte, byte>[ MapSize, MapSize ];		
+			foreach( KeyValuePair<string, string> kv in overlay )
+			{
+				var loc = int.Parse( kv.Key );
+				int2 cell = new int2(loc % MapSize, loc / MapSize);
+				
+				var res = Pair.New((byte)0,(byte)0);
+				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
+						res = overlayResourceMapping[kv.Value.ToLower()];
+				
+				Map.MapResources[ cell.X, cell.Y ] = new TileReference<byte,byte>(res.First, res.Second);
+				
+				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
+					Map.Actors.Add("Actor"+ActorCount++, new ActorReference( overlayActorMapping[kv.Value.ToLower()], new int2(cell.X,cell.Y), "Neutral"));
+			}
+		}
+		
+		
+		void ReadCncTrees( IniFile file )
+		{
+			IniSection terrain = file.GetSection( "TERRAIN", true );
+			if( terrain == null )
+				return;
+
+			foreach( KeyValuePair<string, string> kv in terrain )
+			{
+				var loc = int.Parse( kv.Key );
+				Map.Actors.Add("Actor"+ActorCount++, new ActorReference( kv.Value.Split(',')[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize),"Neutral"));
+			}
+		}
+		
+		void LoadActors(IniFile file, string section)
+		{
+			foreach (var s in file.GetSection(section, true))
+			{
+				//num=owner,type,health,location,facing,...
+				var parts = s.Value.Split( ',' );
+				var loc = int.Parse(parts[3]);
+				if (parts[0] == "")
+					parts[0] = "Neutral";
+				Map.Actors.Add("Actor"+ActorCount++, new ActorReference( parts[1].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), parts[0]));
+			}
+		}
+		
+		void LoadSmudges(IniFile file, string section)
+		{
+			foreach (var s in file.GetSection(section, true))
+			{
+				//loc=type,loc,depth
+				var parts = s.Value.Split( ',' );
+				var loc = int.Parse(parts[1]);
+				Map.Smudges.Add(new SmudgeReference(parts[0].ToLowerInvariant(),new int2(loc % MapSize, loc / MapSize),int.Parse(parts[2])));
+			}
+		}
+		static string Truncate( string s, int maxLength )
+		{
+			return s.Length <= maxLength ? s : s.Substring(0,maxLength );
+		}
+		
+		public void SavePreviewImage(string filepath)
+		{
+			var xs = Map.TopLeft.X;
+			var ys = Map.TopLeft.Y;
+			
+			var bitmap = new Bitmap(Map.Width, Map.Height);
+			for (var x = 0; x < Map.Width; x++)
+				for (var y = 0; y < Map.Height; y++)
+					bitmap.SetPixel(x, y, terrainTypeColors.ColorForTerrainType(tileset.GetTerrainType(Map.MapTiles[x+xs, y+ys])));
+		
+			for (var x = 0; x < Map.Width; x++)
+				for (var y = 0; y < Map.Height; y++)
+					if (Map.MapResources[x+xs, y+ys].type > 0)
+						bitmap.SetPixel(x, y, terrainTypeColors.ColorForTerrainType(TerrainType.Ore));
+				
+			bitmap.Save(filepath,ImageFormat.Png);
+		}
+		
+		public void Save(string filepath)
+		{
+			Directory.CreateDirectory(filepath);
+			
+			Map.Package = new Folder(filepath);
+			SavePreviewImage(Path.Combine(filepath,"preview.png"));
+			Map.Save(filepath);
+		}
+	}
+}

MapConverter/MapConverter.csproj

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

OpenRA.FileFormats/ConnectedComponents.cs

@@ -0,0 +1,97 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+
+namespace OpenRA.FileFormats
+{
+	public static class ConnectedComponents
+	{
+		static readonly int2[] Neighbors 
+			= { new int2(-1, -1), new int2(0, -1), new int2(1, -1), new int2(-1, 0) };
+
+		public static int[,] Extract(Map m, Func<int, int, int> f)
+		{
+			var result = new int[m.MapSize.X, m.MapSize.Y];
+			var types = new int[m.MapSize.X, m.MapSize.Y];
+			var d = new Dictionary<int, Node>();
+			var n = 1;
+
+			for( var j = m.YOffset; j < m.YOffset + m.Height; j++ )
+				for (var i = m.XOffset; i < m.XOffset + m.Width; i++)
+				{
+					types[i, j] = f(i, j);
+
+					var k = n;
+
+					foreach (var a in Neighbors)
+						if (types[i + a.X, j + a.Y] == types[i, j])
+							k = (k == n) 
+								? result[i + a.X, j + a.Y]
+								: Union( d, k, result[i+a.X, j+a.Y] );
+
+					result[i,j] = k;
+					if (k == n) MakeSet(d, n++);
+				}
+
+			for (var j = m.YOffset; j < m.YOffset + m.Height; j++)
+				for (var i = m.XOffset; i < m.XOffset + m.Width; i++)
+					result[i, j] = Find(d, result[i, j]);
+
+			return result;
+		}
+
+		// disjoint-set forest stuff
+
+		class Node { public int a, b; public Node(int a, int b) { this.a = a; this.b = b; } }
+
+		static int MakeSet(Dictionary<int, Node> d, int x)
+		{
+			d[x] = new Node(x, 0);
+			return x;
+		}
+
+		static int Union(Dictionary<int, Node> d, int x, int y)
+		{
+			var xr = Find(d, x);
+			var yr = Find(d, y);
+			var xa = d[xr].b;
+			var ya = d[yr].b;
+
+			if (xa > ya) d[yr].a = xr;
+			else if (xa < ya) d[xr].a = yr;
+			else if (xr != yr)
+			{
+				d[yr].a = xr;
+				++d[xr].b;
+			}
+
+			return xr;
+		}
+
+		static int Find(Dictionary<int, Node> d, int x)
+		{
+			if (d[x].a == x) return x;
+			return d[x].a = Find(d, d[x].a);
+		}
+
+	}
+}

OpenRA.FileFormats/DisposableAction.cs

@@ -0,0 +1,45 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA
+{
+	public class DisposableAction : IDisposable
+	{
+		public DisposableAction(Action a) { this.a = a; }
+
+		Action a;
+		bool disposed;
+
+		public void Dispose()
+		{
+			if (disposed) return;
+			disposed = true;
+			a();
+			GC.SuppressFinalize(this);
+		}
+
+		~DisposableAction()
+		{
+			Dispose();
+		}
+	}
+}

OpenRA.FileFormats/Evaluator.cs

@@ -0,0 +1,117 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public static class Evaluator
+	{
+		public static int Evaluate(string expr)
+		{
+			return Evaluate(expr, new Dictionary<string, int>());
+		}
+
+		public static int Evaluate(string expr, Dictionary<string, int> syms)
+		{
+			var toks = Tokens(expr, "+-*/()");
+			var postfix = ToPostfix(toks, syms);
+
+			var s = new Stack<int>();
+
+			foreach (var t in postfix)
+			{
+				switch (t[0])
+				{
+					case '+': ApplyBinop(s, (x, y) => y + x); break;
+					case '-': ApplyBinop(s, (x, y) => y - x); break;
+					case '*': ApplyBinop(s, (x, y) => y * x); break;
+					case '/': ApplyBinop(s, (x, y) => y / x); break;
+					default: s.Push(int.Parse(t)); break;
+				}
+			}
+			return s.Pop();
+		}
+
+		static void ApplyBinop( Stack<int> s, Func<int,int,int> f )
+		{
+			var x = s.Pop();
+			var y = s.Pop();
+			s.Push( f(x,y) );
+		}
+
+		static IEnumerable<string> ToPostfix(IEnumerable<string> toks, Dictionary<string, int> syms)
+		{
+			var s = new Stack<string>();
+			foreach (var t in toks)
+			{
+				if (t[0] == '(') s.Push(t);
+				else if (t[0] == ')')
+				{
+					var temp = "";
+					while ((temp = s.Pop()) != "(") yield return temp;
+				}
+				else if (char.IsNumber(t[0])) yield return t;
+				else if (char.IsLetter(t[0])) 
+				{
+					if (!syms.ContainsKey(t))
+						throw new InvalidOperationException("Substitution `{0}` undefined".F(t));
+					    
+					yield return syms[t].ToString();;
+				}
+				else
+				{
+					while (s.Count > 0 && Prec[t] <= Prec[s.Peek()]) yield return s.Pop();
+					s.Push(t);
+				}
+			}
+			
+			while (s.Count > 0) yield return s.Pop();
+		}
+
+		static readonly Dictionary<string, int> Prec
+			= new Dictionary<string, int> { { "+", 0 }, { "-", 0 }, { "*", 1 }, { "/", 1 }, { "(", -1 } };
+
+		static IEnumerable<string> Tokens(string expr, string ops)
+		{
+			var s = "";
+			foreach (var c in expr)
+			{
+				if (char.IsWhiteSpace(c))
+				{
+					if (s != "") yield return s;
+					s = "";
+				}
+				else if (ops.Contains(c))
+				{
+					if (s != "") yield return s;
+					s = "";
+					yield return "" + c;
+				}
+				else
+					s += c;
+			}
+
+			if (s != "") yield return s;
+		}
+	}
+}

OpenRA.FileFormats/Exts.cs

@@ -0,0 +1,64 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Linq;
+using System.IO;
+
+namespace OpenRA
+{
+	public static class Exts
+	{
+		public static string F(this string fmt, params object[] args)
+		{
+			return string.Format(fmt, args);
+		}
+
+		public static void Do<T>( this IEnumerable<T> e, Action<T> fn )
+		{
+			foreach( var ee in e )
+				fn( ee );
+		}
+
+		public static IEnumerable<string> GetNamespaces(this Assembly a)
+		{
+			return a.GetTypes().Select(t => t.Namespace).Distinct().Where(n => n != null);
+		}
+
+		public static string ReadAllText(this Stream s)
+		{
+			using (s)
+			using (var sr = new StreamReader(s))
+				return sr.ReadToEnd();
+		}
+
+		public static byte[] ReadAllBytes(this Stream s)
+		{
+			using (s)
+			{
+				var data = new byte[s.Length - s.Position];
+				s.Read(data, 0, data.Length);
+				return data;
+			}
+		}
+	}
+}

OpenRA.FileFormats/FieldLoader.cs

@@ -0,0 +1,136 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace OpenRA.FileFormats
+{
+	public static class FieldLoader
+	{
+		public static void Load(object self, IniSection ini)
+		{
+			foreach (var x in ini)
+				LoadField(self, x.Key, x.Value);
+		}
+
+		public static void Load(object self, MiniYaml my)
+		{
+			foreach (var x in my.Nodes)
+				if (!x.Key.StartsWith("-"))
+					LoadField( self, x.Key, x.Value.Value );
+		}
+
+		public static T Load<T>(MiniYaml y) where T : new()
+		{
+			var t = new T();
+			Load(t, y);
+			return t;
+		}
+		
+		public static void LoadFields( object self, Dictionary<string,MiniYaml> my, IEnumerable<string> fields )
+		{
+			foreach (var field in fields)
+			{
+				if (!my.ContainsKey(field)) continue;
+				FieldLoader.LoadField(self,field,my[field].Value);
+			}
+		}
+		
+
+		public static void LoadField( object self, string key, string value )
+		{
+			var field = self.GetType().GetField( key.Trim() );
+			if( field == null )
+				throw new NotImplementedException( "Missing field `{0}` on `{1}`".F( key.Trim(), self.GetType().Name ) );
+			field.SetValue( self, GetValue( field.FieldType, value ) );
+		}
+
+		public static object GetValue( Type fieldType, string x )
+		{
+			if (x != null) x = x.Trim();
+			if( fieldType == typeof( int ) )
+				return int.Parse( x );
+
+			else if (fieldType == typeof(float))
+				return float.Parse(x.Replace("%","")) * (x.Contains( '%' ) ? 0.01f : 1f);
+
+			else if (fieldType == typeof(string))
+				return x;
+
+			else if (fieldType.IsEnum)
+				return Enum.Parse(fieldType, x, true);
+
+			else if (fieldType == typeof(bool))
+				return ParseYesNo(x);
+
+			else if (fieldType.IsArray)
+			{
+				if (x == null)
+					return Array.CreateInstance(fieldType.GetElementType(), 0);
+
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
+				for (int i = 0; i < parts.Length; i++)
+					ret.SetValue(GetValue(fieldType.GetElementType(), parts[i].Trim()), i);
+				return ret;
+			}
+			else if (fieldType == typeof(int2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
+			}
+			else
+				throw new InvalidOperationException("FieldLoader: don't know how to load field of type " + fieldType.ToString());
+		}
+
+		static bool ParseYesNo( string p )
+		{
+			p = p.ToLowerInvariant();
+			if( p == "yes" ) return true;
+			if( p == "true" ) return true;
+			if( p == "no" ) return false;
+			if( p == "false" ) return false;
+			throw new InvalidOperationException();
+		}
+	}
+
+	public static class FieldSaver
+	{
+		public static MiniYaml Save(object o)
+		{
+			return new MiniYaml(null, o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
+				.ToDictionary(
+					f => f.Name,
+					f => new MiniYaml(FormatValue(o, f))));
+		}
+
+		public static string FormatValue(object o, FieldInfo f)
+		{
+			var v = f.GetValue(o);
+			return f.FieldType.IsArray
+				? string.Join(",", ((Array)v).OfType<object>().Select(a => a.ToString()).ToArray())
+				: v.ToString();
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/AudLoader.cs

@@ -0,0 +1,125 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#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(BinaryReader r)
+		{
+			Chunk c;
+			c.CompressedSize = r.ReadUInt16();
+			c.OutputSize = r.ReadUInt16();
+			if (0xdeaf != r.ReadUInt32())
+				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(Stream s)
+		{
+			var br = new BinaryReader(s);
+			/*var sampleRate =*/ br.ReadUInt16();
+			var dataSize = br.ReadInt32();
+			var outputSize = br.ReadInt32();
+			/*var flags = (SoundFlags)*/ br.ReadByte();
+			/*var format = (SoundFormat)*/ br.ReadByte();
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var index = 0;
+			var currentSample = 0;
+
+			while (dataSize > 0)
+			{
+				var chunk = Chunk.Read(br);
+				for (int n = 0; n < chunk.CompressedSize; n++)
+				{
+					var b = br.ReadByte();
+
+					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);
+				}
+
+				dataSize -= 8 + chunk.CompressedSize;
+			}
+
+			return output;
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Blowfish.cs

@@ -1,410 +1,416 @@
-#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
-
-namespace OpenRA.Mods.Cnc.FileFormats
-{
-	class Blowfish
-	{
-		public Blowfish(byte[] key)
-		{
-			for (int i = 0, j = 0; i < 18; ++i)
-			{
-				uint a = key[j++ % key.Length];
-				uint b = key[j++ % key.Length];
-				uint c = key[j++ % key.Length];
-				uint d = key[j++ % key.Length];
-
-				lookupMfromP[i] ^= a << 24 | b << 16 | c << 8 | d;
-			}
-
-			uint l = 0, r = 0;
-
-			for (var i = 0; i < 18;)
-			{
-				Encrypt(ref l, ref r);
-				lookupMfromP[i++] = l;
-				lookupMfromP[i++] = r;
-			}
-
-			for (var i = 0; i < 4; ++i)
-				for (var j = 0; j < 256;)
-				{
-					Encrypt(ref l, ref r);
-					lookupMfromS[i, j++] = l;
-					lookupMfromS[i, j++] = r;
-				}
-		}
-
-		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
-		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
-
-		delegate void CipherFunc(ref uint a, ref uint b);
-
-		static uint[] RunCipher(uint[] data, CipherFunc f)
-		{
-			var result = new uint[data.Length];
-
-			var size = data.Length / 2;
-			var i = 0;
-			while (size-- > 0)
-			{
-				var a = SwapBytes(data[i]);
-				var b = SwapBytes(data[i + 1]);
-
-				f(ref a, ref b);
-
-				result[i++] = SwapBytes(a);
-				result[i++] = SwapBytes(b);
-			}
-
-			return result;
-		}
-
-		void Encrypt(ref uint a, ref uint b)
-		{
-			uint tempA = a, tempB = b;
-			tempA ^= lookupMfromP[0];
-
-			var x = false;
-			for (var i = 1; i <= 16; i++, x ^= true)
-			{
-				if (x)
-					Round(ref tempA, tempB, i);
-				else
-					Round(ref tempB, tempA, i);
-			}
-
-			tempB ^= lookupMfromP[17];
-
-			a = tempB;
-			b = tempA;
-		}
-
-		void Decrypt(ref uint a, ref uint b)
-		{
-			uint tempA = a, tempB = b;
-			tempA ^= lookupMfromP[17];
-
-			var x = false;
-			for (var i = 16; i >= 1; i--, x ^= true)
-			{
-				if (x)
-					Round(ref tempA, tempB, i);
-				else
-					Round(ref tempB, tempA, i);
-			}
-
-			tempB ^= lookupMfromP[0];
-
-			a = tempB;
-			b = tempA;
-		}
-
-		uint S(uint x, int i)
-		{
-			return lookupMfromS[i, (x >> ((3 - i) << 3)) & 0xff];
-		}
-
-		uint ConvertBFtoF(uint x)
-		{
-			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
-		}
-
-		void Round(ref uint a, uint b, int n)
-		{
-			a ^= ConvertBFtoF(b) ^ lookupMfromP[n];
-		}
-
-		static uint SwapBytes(uint i)
-		{
-			i = (i << 16) | (i >> 16);
-			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);
-			return i;
-		}
-
-		readonly uint[] lookupMfromP =
-		{
-			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-			0x9216d5d9, 0x8979fb1b
-		};
-
-		readonly uint[,] lookupMfromS =
-		{
-			{
-				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-				0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-			},
-			{
-				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-				0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-			},
-			{
-				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-				0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-			},
-			{
-				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-			}
-		};
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	class Blowfish
+	{
+		public Blowfish(byte[] key)
+		{
+			for (int i = 0, j = 0; i < 18; ++i)
+			{
+				uint a = key[j++ % key.Length];
+				uint b = key[j++ % key.Length];
+				uint c = key[j++ % key.Length];
+				uint d = key[j++ % key.Length];
+
+				m_p[i] ^= a << 24 | b << 16 | c << 8 | d;
+			}
+
+			uint l = 0, r = 0;
+
+			for (int i = 0; i < 18; )
+			{
+				Encrypt(ref l, ref r);
+				m_p[i++] = l;
+				m_p[i++] = r;
+			}
+
+			for (int i = 0; i < 4; ++i)
+				for (int j = 0; j < 256; )
+				{
+					Encrypt(ref l, ref r);
+					m_s[i, j++] = l;
+					m_s[i, j++] = r;
+				}
+		}
+
+		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
+		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
+
+		delegate void CipherFunc( ref uint a, ref uint b );
+
+		uint[] RunCipher(uint[] data, CipherFunc f)
+		{
+			uint[] result = new uint[data.Length];
+
+			int size = data.Length / 2;
+			int i = 0;
+			while (size-- > 0)
+			{
+				uint a = SwapBytes(data[i]);
+				uint b = SwapBytes(data[i+1]);
+
+				f(ref a, ref b);
+
+				result[i++] = SwapBytes(a);
+				result[i++] = SwapBytes(b);
+			}
+
+			return result;
+		}
+
+		void Encrypt(ref uint a, ref uint b)
+		{
+			uint _a = a, _b = b;
+			_a ^= m_p[0];
+
+			bool x = false;
+			for( int i = 1; i <= 16; i++, x ^= true)
+			{
+				if (x)
+					Round(ref _a, _b, i);
+				else
+					Round(ref _b, _a, i);
+			}
+			_b ^= m_p[17];
+
+			a = _b;
+			b = _a;
+		}
+
+		void Decrypt(ref uint a, ref uint b)
+		{
+			uint _a = a, _b = b;
+			_a ^= m_p[17];
+
+			bool x = false;
+			for (int i = 16; i >= 1; i--, x ^= true)
+			{
+				if (x)
+					Round(ref _a, _b, i);
+				else
+					Round(ref _b, _a, i);
+			}
+			_b ^= m_p[0];
+
+			a = _b;
+			b = _a;
+		}
+
+		uint S(uint x, int i)
+		{
+			return m_s[i, (x >> ((3 - i) << 3)) & 0xff];
+		}
+
+		uint bf_f(uint x)
+		{
+			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
+		}
+
+		void Round(ref uint a, uint b, int n)
+		{
+			a ^= bf_f(b) ^ m_p[n];
+		}
+
+		uint SwapBytes(uint i)
+		{
+			i = (i << 16) | (i >> 16);
+			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);
+			return i;
+		}
+
+		uint[] m_p = new uint[] {
+			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+			0x9216d5d9, 0x8979fb1b
+		};
+
+		uint[,] m_s = new uint[,] {
+			{
+				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+				0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+			},
+			{
+				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+				0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+			},
+			{
+				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+				0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+			},
+			{
+				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+			}
+
+		};
+	}
+}

OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs

@@ -0,0 +1,538 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+    /* possibly the fugliest C# i've ever seen. */
+
+    class BlowfishKeyProvider
+    {
+        const string pubkeyStr = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
+
+        static sbyte[] char2num = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
+    -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+    -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+
+        class PublicKey
+        {
+            public uint[] key1 = new uint[64];
+            public uint[] key2 = new uint[64];
+            public uint len;
+        }
+        PublicKey pubkey = new PublicKey();
+
+        uint[] glob1 = new uint[64];
+        uint glob1_bitlen, glob1_len_x2;
+        uint[] glob2 = new uint[130];
+        uint[] glob1_hi = new uint[4];
+        uint[] glob1_hi_inv = new uint[4];
+        uint glob1_hi_bitlen;
+        uint glob1_hi_inv_lo, glob1_hi_inv_hi;
+
+        void init_bignum(uint[] n, uint val, uint len)
+        {
+            for (int i = 0; i < len; i++) n[i] = 0;
+            n[0] = val;
+        }
+
+        void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
+        {
+            byte sign;
+
+            if ((key[0] & 0x80) != 0) sign = 0xff;
+            else sign = 0;
+
+            unsafe
+            {
+                fixed (uint* _pn = &n[0])
+                {
+                    byte* pn = (byte*)_pn;
+                    uint i = blen * 4;
+                    for (; i > klen; i--) pn[i - 1] = (byte)sign;
+                    for (; i > 0; i--) pn[i - 1] = key[klen - i];
+                }
+            }
+        }
+
+        void key_to_bignum(uint[] n, byte[] key, uint len)
+        {
+            uint keylen;
+            int i;
+
+            int j = 0;
+
+            if (key[j] != 2) return;
+            j++;
+
+            if ((key[j] & 0x80) != 0)
+            {
+                keylen = 0;
+                for (i = 0; i < (key[j] & 0x7f); i++) keylen = (keylen << 8) | key[j + i + 1];
+                j += (key[j] & 0x7f) + 1;
+            }
+            else
+            {
+                keylen = key[j];
+                j++;
+            }
+            if (keylen <= len * 4)
+                move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
+        }
+
+        uint len_bignum(uint[] n, uint len)
+        {
+            uint i;
+            i = len - 1;
+            while ((i >= 0) && (n[i] == 0)) i--;
+            return i + 1;
+        }
+
+        uint bitlen_bignum(uint[] n, uint len)
+        {
+            uint ddlen, bitlen, mask;
+            ddlen = len_bignum(n, len);
+            if (ddlen == 0) return 0;
+            bitlen = ddlen * 32;
+            mask = 0x80000000;
+            while ((mask & n[ddlen - 1]) == 0)
+            {
+                mask >>= 1;
+                bitlen--;
+            }
+            return bitlen;
+        }
+
+        void init_pubkey()
+        {
+            int i = 0;
+            uint i2, tmp;
+            byte[] keytmp = new byte[256];
+
+            init_bignum(pubkey.key2, 0x10001, 64);
+
+            i2 = 0;
+            while (i < pubkeyStr.Length)
+            {
+                tmp = (uint)char2num[pubkeyStr[i++]];
+                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+                keytmp[i2++] = (byte)((tmp >> 16) & 0xff);
+                keytmp[i2++] = (byte)((tmp >> 8) & 0xff);
+                keytmp[i2++] = (byte)(tmp & 0xff);
+            }
+
+            key_to_bignum(pubkey.key1, keytmp, 64);
+            pubkey.len = bitlen_bignum(pubkey.key1, 64) - 1;
+        }
+
+        uint len_predata()
+        {
+            uint a = (pubkey.len - 1) / 8;
+            return (55 / a + 1) * (a + 1);
+        }
+
+        int cmp_bignum(uint[] n1, uint[] n2, uint len)
+        {
+
+            while (len > 0)
+            {
+                --len;
+                if (n1[len] < n2[len]) return -1;
+                if (n1[len] > n2[len]) return 1;
+            }
+            return 0;
+        }
+
+        void mov_bignum(uint[] dest, uint[] src, uint len)
+        {
+            Array.Copy(src, dest, len);
+        }
+
+        void shr_bignum(uint[] n, int bits, int len)
+        {
+            int i; int i2 = bits / 32;
+
+            if (i2 > 0)
+            {
+                for (i = 0; i < len - i2; i++) n[i] = n[i + i2];
+                for (; i < len; i++) n[i] = 0;
+                bits = bits % 32;
+            }
+            if (bits == 0) return;
+            for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 -
+          bits));
+            n[i] = n[i] >> bits;
+        }
+
+        void shl_bignum(uint[] n, int bits, int len)
+        {
+            int i, i2;
+
+            i2 = bits / 32;
+            if (i2 > 0)
+            {
+                for (i = len - 1; i > i2; i--) n[i] = n[i - i2];
+                for (; i > 0; i--) n[i] = 0;
+                bits = bits % 32;
+            }
+            if (bits == 0) return;
+            for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 -
+          bits));
+            n[0] <<= bits;
+        }
+
+        uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
+        {
+            uint i1, i2;
+
+            len += len;
+            unsafe
+            {
+                fixed (uint* _ps1 = &src1[0])
+                fixed (uint* _ps2 = &src2[0])
+                fixed (uint* _pd = &dest[0])
+                {
+                    ushort* ps1 = (ushort*)_ps1;
+                    ushort* ps2 = (ushort*)_ps2;
+                    ushort* pd = (ushort*)_pd;
+
+                    while (--len != -1)
+                    {
+                        i1 = *ps1++;
+                        i2 = *ps2++;
+                        *pd++ = (ushort)(i1 - i2 - carry);
+                        if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
+                    }
+                }
+            }
+            return carry;
+        }
+
+        unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
+        {
+            uint i1, i2;
+
+            len += len;
+
+            ushort* ps1 = (ushort*)src1;
+            ushort* ps2 = (ushort*)src2;
+            ushort* pd = (ushort*)dest;
+
+            while (--len != -1)
+            {
+                i1 = *ps1++;
+                i2 = *ps2++;
+                *pd++ = (ushort)(i1 - i2 - carry);
+                if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
+
+            }
+            return carry;
+        }
+
+        void inv_bignum(uint[] n1, uint[] n2, uint len)
+        {
+            uint[] n_tmp = new uint[64];
+            uint n2_bytelen, bit;
+            int n2_bitlen;
+
+            int j = 0;
+
+            init_bignum(n_tmp, 0, len);
+            init_bignum(n1, 0, len);
+            n2_bitlen = (int)bitlen_bignum(n2, len);
+            bit = ((uint)1) << (n2_bitlen % 32);
+            j = ((n2_bitlen + 32) / 32) - 1;
+            n2_bytelen = (uint)((n2_bitlen - 1) / 32) * 4;
+            n_tmp[n2_bytelen / 4] |= ((uint)1) << ((n2_bitlen - 1) & 0x1f);
+
+            while (n2_bitlen > 0)
+            {
+                n2_bitlen--;
+                shl_bignum(n_tmp, 1, (int)len);
+                if (cmp_bignum(n_tmp, n2, len) != -1)
+                {
+                    sub_bignum(n_tmp, n_tmp, n2, 0, (int)len);
+                    n1[j] |= bit;
+                }
+                bit >>= 1;
+                if (bit == 0)
+                {
+                    j--;
+                    bit = 0x80000000;
+                }
+            }
+            init_bignum(n_tmp, 0, len);
+        }
+
+        void inc_bignum(uint[] n, uint len)
+        {
+            int i = 0;
+            while ((++n[i] == 0) && (--len > 0)) i++;
+        }
+
+        void init_two_dw(uint[] n, uint len)
+        {
+            mov_bignum(glob1, n, len);
+            glob1_bitlen = bitlen_bignum(glob1, len);
+            glob1_len_x2 = (glob1_bitlen + 15) / 16;
+            mov_bignum(glob1_hi, glob1.Skip((int)len_bignum(glob1, len) - 2).ToArray(), 2);
+            glob1_hi_bitlen = bitlen_bignum(glob1_hi, 2) - 32;
+            shr_bignum(glob1_hi, (int)glob1_hi_bitlen, 2);
+            inv_bignum(glob1_hi_inv, glob1_hi, 2);
+            shr_bignum(glob1_hi_inv, 1, 2);
+            glob1_hi_bitlen = (glob1_hi_bitlen + 15) % 16 + 1;
+            inc_bignum(glob1_hi_inv, 2);
+            if (bitlen_bignum(glob1_hi_inv, 2) > 32)
+            {
+                shr_bignum(glob1_hi_inv, 1, 2);
+                glob1_hi_bitlen--;
+            }
+            glob1_hi_inv_lo = (ushort)glob1_hi_inv[0];
+            glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
+        }
+
+        unsafe void mul_bignum_word(ushort *pn1, uint[] n2, uint mul, uint len)
+        {
+            uint i, tmp;
+            unsafe
+            {
+                fixed (uint* _pn2 = &n2[0])
+                {
+                    ushort* pn2 = (ushort*)_pn2;
+
+                    tmp = 0;
+                    for (i = 0; i < len; i++)
+                    {
+                        tmp = mul * (*pn2) + (*pn1) + tmp;
+                        *pn1 = (ushort)tmp;
+                        pn1++;
+                        pn2++;
+                        tmp >>= 16;
+                    }
+                    *pn1 += (ushort)tmp;
+                }
+            }
+        }
+
+        void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
+        {
+          uint i;
+
+          unsafe
+          {
+              fixed( uint * _psrc2 = &src2[0] )
+              fixed(uint* _pdest = &dest[0])
+              {
+                  ushort* psrc2 = (ushort*)_psrc2;
+                  ushort* pdest = (ushort*)_pdest;
+
+                  init_bignum(dest, 0, len * 2);
+                  for (i = 0; i < len * 2; i++)
+                      mul_bignum_word(pdest++, src1, *psrc2++, len * 2);
+              }
+          }
+        }
+
+        void not_bignum(uint[] n, uint len)
+        {
+          uint i;
+          for (i = 0; i < len; i++) n[i] = ~n[i];
+        }
+
+        void neg_bignum(uint[] n, uint len)
+        {
+          not_bignum(n, len);
+          inc_bignum(n, len);
+        }
+
+        unsafe uint get_mulword(uint* n)
+        {
+            ushort* wn = (ushort*)n;
+            uint i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
+                 + (((*(wn - 2) ^ 0xffff) * glob1_hi_inv_hi + glob1_hi_inv_hi) >> 1) + 1)
+                 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_hi) >> 1) +
+                 (((*wn ^ 0xffff) * glob1_hi_inv_lo) >> 1) + 1) >> 14) + glob1_hi_inv_hi
+                 * (*wn ^ 0xffff) * 2) >> (int)glob1_hi_bitlen);
+            if (i > 0xffff) i = 0xffff;
+            return i & 0xffff;
+        }
+
+        void dec_bignum(uint[] n, uint len)
+        {
+            int i = 0;
+            while ((--n[i] == 0xffffffff) && (--len > 0)) 
+                i++;
+        }
+
+        void calc_a_bignum(uint[] n1, uint[] n2, uint[] n3, uint len)
+        {
+            uint g2_len_x2, len_diff;
+            unsafe
+            {
+                fixed( uint* g1 = &glob1[0])
+                fixed (uint* g2 = &glob2[0])
+                {
+                    mul_bignum(glob2, n2, n3, len);
+                    glob2[len * 2] = 0;
+                    g2_len_x2 = len_bignum(glob2, len * 2 + 1) * 2;
+                    if (g2_len_x2 >= glob1_len_x2)
+                    {
+                        inc_bignum(glob2, len * 2 + 1);
+                        neg_bignum(glob2, len * 2 + 1);
+                        len_diff = g2_len_x2 + 1 - glob1_len_x2;
+                        ushort* esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
+                        ushort* edi = ((ushort*)g2) + (g2_len_x2 + 1);
+                        for (; len_diff != 0; len_diff--)
+                        {
+                            edi--;
+                            uint tmp = get_mulword((uint*)edi);
+                            esi--;
+                            if (tmp > 0)
+                            {
+                                mul_bignum_word(esi, glob1, tmp, 2 * len);
+                                if ((*edi & 0x8000) == 0)
+                                {
+                                    if (0 != sub_bignum((uint*)esi, (uint*)esi, g1, 0, (int)len)) (*edi)--;
+                                }
+                            }
+                        }
+                        neg_bignum(glob2, len);
+                        dec_bignum(glob2, len);
+                    }
+                    mov_bignum(n1, glob2, len);
+                }
+            }
+        }
+
+        void clear_tmp_vars(uint len)
+        {
+            init_bignum(glob1, 0, len);
+            init_bignum(glob2, 0, len);
+            init_bignum(glob1_hi_inv, 0, 4);
+            init_bignum(glob1_hi, 0, 4);
+            glob1_bitlen = 0;
+            glob1_hi_bitlen = 0;
+            glob1_len_x2 = 0;
+            glob1_hi_inv_lo = 0;
+            glob1_hi_inv_hi = 0;
+        }
+
+        void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
+        {
+            uint[] n_tmp = new uint[64];
+            uint n3_len, n4_len;
+            int n3_bitlen;
+            uint bit_mask;
+
+            unsafe
+            {
+                fixed (uint* _pn3 = &n3[0])
+                {
+                    uint* pn3 = _pn3;
+
+                    init_bignum(n1, 1, len);
+                    n4_len = len_bignum(n4, len);
+                    init_two_dw(n4, n4_len);
+                    n3_bitlen = (int)bitlen_bignum(n3, n4_len);
+                    n3_len = (uint)((n3_bitlen + 31) / 32);
+                    bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
+                    pn3 += n3_len - 1;
+                    n3_bitlen--;
+                    mov_bignum(n1, n2, n4_len);
+                    while (--n3_bitlen != -1)
+                    {
+                        if (bit_mask == 0)
+                        {
+                            bit_mask = 0x80000000;
+                            pn3--;
+                        }
+                        calc_a_bignum(n_tmp, n1, n1, n4_len);
+                        if ((*pn3 & bit_mask) != 0)
+                            calc_a_bignum(n1, n_tmp, n2, n4_len);
+                        else
+                            mov_bignum(n1, n_tmp, n4_len);
+                        bit_mask >>= 1;
+                    }
+                    init_bignum(n_tmp, 0, n4_len);
+                    clear_tmp_vars(len);
+                }
+            }
+        }
+
+        unsafe void memcpy(byte* dest, byte* src, int len)
+        {
+            while (len-- != 0) *dest++ = *src++;
+        }
+
+        unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
+        {
+            uint[] n2 = new uint[64];
+            uint[] n3 = new uint[64];
+
+            uint a = (pubkey.len - 1) / 8;
+            while (a + 1 <= pre_len) 
+            {
+                init_bignum(n2, 0, 64);
+                fixed( uint * pn2 = &n2[0] )
+                    memcpy((byte *)pn2, pre, (int)a + 1);
+                calc_a_key(n3, n2, pubkey.key2, pubkey.key1, 64);
+
+                fixed( uint * pn3 = &n3[0] )
+                    memcpy(buf, (byte *)pn3, (int)a);
+
+                pre_len -= a + 1;
+                pre += a + 1;
+                buf += a;
+            }
+        }
+
+        public byte[] DecryptKey(byte[] src)
+        {
+            init_pubkey();
+            byte[] dest = new byte[256];
+
+            unsafe
+            {
+                fixed (byte* pdest = &dest[0])
+                fixed (byte* psrc = &src[0])
+                    process_predata(psrc, len_predata(), pdest);
+            }
+            return dest.Take(56).ToArray();
+        }
+    }
+}

OpenRA.FileFormats/FileFormats/Format2.cs

@@ -0,0 +1,46 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public static class Format2
+	{
+		public static int DecodeInto(byte[] src, byte[] dest)
+		{
+			FastByteReader r = new FastByteReader(src);
+
+			int i = 0;
+			while (!r.Done())
+			{
+				byte cmd = r.ReadByte();
+				if (cmd == 0)
+				{
+					byte count = r.ReadByte();
+					while (count-- > 0)
+						dest[i++] = 0;
+				}
+				else
+					dest[i++] = cmd;
+			}
+
+			return i;
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Format40.cs

@@ -0,0 +1,88 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public static class Format40
+	{
+		public static int DecodeInto( byte[] src, byte[] dest )
+		{
+            var ctx = new FastByteReader(src);
+			int destIndex = 0;
+
+			while( true )
+			{
+                byte i = ctx.ReadByte();
+				if( ( i & 0x80 ) == 0 )
+				{
+					int count = i & 0x7F;
+					if( count == 0 )
+					{
+						// case 6
+                        count = ctx.ReadByte();
+                        byte value = ctx.ReadByte();
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] ^= value;
+					}
+					else
+					{
+						// case 5
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+                            dest[destIndex] ^= ctx.ReadByte();
+					}
+				}
+				else
+				{
+					int 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( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
+                                dest[destIndex] ^= ctx.ReadByte();
+						}
+						else
+						{
+							// case 4
+                            byte value = ctx.ReadByte();
+							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
+								dest[ destIndex ] ^= value;
+						}
+					}
+					else
+					{
+						// case 1
+						destIndex += count;
+					}
+				}
+			}
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Format80.cs

@@ -0,0 +1,135 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA.FileFormats
+{
+    class FastByteReader
+    {
+        readonly byte[] src;
+        int offset = 0;
+
+        public FastByteReader(byte[] src)
+        {
+            this.src = src;
+        }
+
+        public bool Done() { return offset >= src.Length; }
+        public byte ReadByte() { return src[offset++]; }
+        public int ReadWord()
+        {
+            int 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 static class Format80
+	{
+		static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count )
+		{
+			if( srcIndex > destIndex )
+				throw new NotImplementedException( string.Format( "srcIndex > destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+			if( destIndex - srcIndex == 1 )
+			{
+				for( int i = 0 ; i < count ; i++ )
+					dest[ destIndex + i ] = dest[ destIndex - 1 ];
+			}
+			else
+			{
+				for( int i = 0 ; i < count ; i++ )
+					dest[ destIndex + i ] = dest[ srcIndex + i ];
+			}
+		}
+
+		public static int DecodeInto( byte[] src, byte[] dest )
+		{
+            var ctx = new FastByteReader(src);
+			int destIndex = 0;
+
+			while( true )
+			{
+                byte i = ctx.ReadByte();
+				if( ( i & 0x80 ) == 0 )
+				{
+					// case 2
+                    byte secondByte = ctx.ReadByte();
+					int count = ( ( i & 0x70 ) >> 4 ) + 3;
+					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
+
+					ReplicatePrevious( dest, destIndex, destIndex - rpos, count );
+					destIndex += count;
+				}
+				else if( ( i & 0x40 ) == 0 )
+				{
+					// case 1
+					int count = i & 0x3F;
+					if( count == 0 )
+						return destIndex;
+
+					ctx.CopyTo( dest, destIndex, count );
+					destIndex += count;
+				}
+				else
+				{
+					int count3 = i & 0x3F;
+					if( count3 == 0x3E )
+					{
+						// case 4
+                        int count = ctx.ReadWord();
+                        byte color = ctx.ReadByte();
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = color;
+					}
+					else if( count3 == 0x3F )
+					{
+						// case 5
+                        int count = ctx.ReadWord();
+                        int srcIndex = ctx.ReadWord();
+						if( srcIndex >= destIndex )
+							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = dest[ srcIndex++ ];
+					}
+					else
+					{
+						// case 3
+						int count = count3 + 3;
+                        int srcIndex = ctx.ReadWord();
+						if( srcIndex >= destIndex )
+							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = dest[ srcIndex++ ];
+					}
+				}
+			}
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/IniFile.cs

@@ -0,0 +1,161 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#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 )
+		{
+			StreamReader reader = new StreamReader( s );
+			IniSection currentSection = null;
+
+			while( !reader.EndOfStream )
+			{
+				string 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 )
+		{
+			Match m = sectionPattern.Match( line );
+			if( m == null || !m.Success )
+				return null;
+			string sectionName = m.Groups[ 1 ].Value.ToLowerInvariant();
+
+			IniSection ret;
+			if( !sections.TryGetValue( sectionName, out ret ) )
+				sections.Add( sectionName, ret = new IniSection( sectionName ) );
+			return ret;
+		}
+
+		bool ProcessEntry( string line, IniSection currentSection )
+		{
+			int 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 = "";
+			int eq = line.IndexOf( '=' );
+			if( eq >= 0 )
+			{
+				key = line.Substring( 0, eq );
+				value = line.Substring( eq + 1, line.Length - eq - 1 );
+			}
+
+			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.FileFormats/FileSystem.cs

@@ -0,0 +1,168 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+namespace OpenRA.FileFormats
+{
+	public static class FileSystem
+	{
+		static List<IFolder> mountedFolders = new List<IFolder>();
+
+		static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
+
+		static void MountInner(IFolder folder)
+		{
+			mountedFolders.Add(folder);
+
+			foreach( var hash in folder.AllFileHashes() )
+			{
+				var l = allFiles[hash];
+				if( !l.Contains( folder ) )
+					l.Add( folder );
+			}
+		}
+
+		public static void Mount(string name)
+		{
+			name = name.ToLowerInvariant();
+			var optional = name.StartsWith("~");
+			if (optional) name = name.Substring(1);
+
+			var a = name.EndsWith(".mix")
+				? (Action)(() => FileSystem.MountInner(new Package(name)))
+				: () => FileSystem.MountInner(new Folder(name));
+
+			if (optional)
+				try { a(); }
+				catch { }
+			else
+				a();
+		}
+
+		public static void UnmountAll()
+		{
+			mountedFolders.Clear();
+			allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
+		}
+
+		static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
+		{
+			foreach( var folder in index[ PackageEntry.HashFilename( filename ) ] )
+			{
+				Stream s = folder.GetContent(filename);
+				if( s != null )
+					return s;
+			}
+			return null;
+		}
+
+		public static Stream Open(string filename)
+		{
+			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
+			{
+				var ret = GetFromCache( allFiles, filename );
+				if( ret != null )
+					return ret;
+			}
+
+			foreach( IFolder folder in mountedFolders )
+			{
+				Stream s = folder.GetContent(filename);
+				if( s != null )
+					return s;
+			}
+
+			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+		}
+
+		public static Stream OpenWithExts( string filename, params string[] exts )
+		{
+			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
+			{
+				foreach( var ext in exts )
+				{
+					var s = GetFromCache( allFiles, filename + ext );
+					if( s != null )
+						return s;
+				}
+			}
+
+			foreach( var ext in exts )
+			{
+				foreach( IFolder folder in mountedFolders )
+				{
+					Stream s = folder.GetContent( filename + ext );
+					if( s != null )
+						return s;
+				}
+			}
+
+			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+		}
+
+		public static bool Exists(string filename)
+		{
+			foreach (var folder in mountedFolders)
+			{
+				var s = folder.GetContent(filename);
+				if (s != null)
+				{
+					s.Dispose();
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
+
+		public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
+		{
+			foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+			{
+				if (assembly.FullName == e.Name)
+					return assembly;
+			}
+
+			string[] frags = e.Name.Split(',');
+			var filename = frags[0] + ".dll";
+			Assembly a;
+			if (assemblyCache.TryGetValue(filename, out a))
+				return a;
+
+			if (FileSystem.Exists(filename))
+				using (Stream s = FileSystem.Open(filename))
+				{
+					byte[] buf = new byte[s.Length];
+					s.Read(buf, 0, buf.Length);
+					a = Assembly.Load(buf);
+					assemblyCache.Add(filename, a);
+					return a;
+				}
+			
+			return null;
+		}
+	}
+}

OpenRA.FileFormats/Folder.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class Folder : IFolder
+	{
+		readonly string path;
+
+		public Folder(string path) { this.path = path; }
+
+		public Stream GetContent(string filename)
+		{
+			try { return File.OpenRead( Path.Combine( path, filename ) ); }
+			catch { return null; }
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
+				yield return PackageEntry.HashFilename( filename );
+		}
+	}
+}

OpenRA.FileFormats/Graphics/Dune2ShpReader.cs

@@ -0,0 +1,156 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public enum Dune2ImageFlags : int
+	{
+		F80_F2 = 0,
+		F2 = 2,
+		L16_F80_F2_1 = 1,
+		L16_F80_F2_2 = 3,
+		Ln_F80_F2 = 5
+	}
+
+	public class Dune2ImageHeader
+	{
+		public readonly Dune2ImageFlags Flags;
+		public readonly int Width;
+		public readonly int Height;
+		public readonly int Slices;
+		public readonly int FileSize;
+		public readonly int DataSize;
+
+		public readonly byte[] LookupTable;
+		public byte[] Image;
+
+		public Dune2ImageHeader(BinaryReader reader)
+		{
+			Flags = (Dune2ImageFlags)reader.ReadUInt16();
+			Slices = reader.ReadByte();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadByte();
+			FileSize = reader.ReadUInt16();
+			DataSize = reader.ReadUInt16();
+
+			if (Flags == Dune2ImageFlags.L16_F80_F2_1 ||
+				Flags == Dune2ImageFlags.L16_F80_F2_2 ||
+				Flags == Dune2ImageFlags.Ln_F80_F2)
+			{
+				int n = Flags == Dune2ImageFlags.Ln_F80_F2 ? reader.ReadByte() : (byte)16;
+				LookupTable = new byte[n];
+				for (int i = 0; i < n; i++)
+					LookupTable[i] = reader.ReadByte();
+			}
+			else
+			{
+				LookupTable = new byte[256];
+				for (int i = 0; i < 256; i++)
+					LookupTable[i] = (byte)i;
+				LookupTable[1] = 0x7f;
+				LookupTable[2] = 0x7e;
+				LookupTable[3] = 0x7d;
+				LookupTable[4] = 0x7c;
+			}
+		}
+
+		public Size Size
+		{
+			get { return new Size(Width, Height); }
+		}
+	}
+
+	public class Dune2ShpReader : IEnumerable<Dune2ImageHeader>
+	{
+		public readonly int ImageCount;
+
+		List<Dune2ImageHeader> headers = new List<Dune2ImageHeader>();
+
+		public Dune2ShpReader(Stream stream)
+		{
+			BinaryReader reader = new BinaryReader(stream);
+
+			ImageCount = reader.ReadUInt16();
+			
+			//Last offset is pointer to end of file.
+			uint[] offsets = new uint[ImageCount + 1];
+
+			uint temp = reader.ReadUInt32();
+
+			//If fourth byte in file is non-zero, the offsets are two bytes each.
+			bool twoByteOffsets = (temp & 0xFF0000) > 0; 
+			if (twoByteOffsets)
+			{
+				offsets[0] = ((temp & 0xFFFF0000) >> 16) + 2; //Offset does not account for image count bytes
+				offsets[1] = (temp & 0xFFFF) + 2;
+			}
+			else
+				offsets[0] = temp + 2;
+
+			for (int i = twoByteOffsets ? 2 : 1; i < ImageCount + 1; i++)
+				offsets[i] = (twoByteOffsets ? reader.ReadUInt16() : reader.ReadUInt32()) + 2;
+
+			for (int i = 0; i < ImageCount; i++)
+			{
+				reader.BaseStream.Seek(offsets[i], SeekOrigin.Begin);
+				Dune2ImageHeader header = new Dune2ImageHeader(reader);
+				byte[] imgData = reader.ReadBytes(header.FileSize);
+				header.Image = new byte[header.Height * header.Width];
+
+				//Decode image data
+				if (header.Flags != Dune2ImageFlags.F2)
+				{
+					byte[] tempData = new byte[header.DataSize];
+					Format80.DecodeInto(imgData, tempData);
+					Format2.DecodeInto(tempData, header.Image);
+				}
+				else
+					Format2.DecodeInto(imgData, header.Image);
+
+				//Lookup values in lookup table
+				if (header.LookupTable != null)
+					for (int j = 0; j < header.Image.Length; j++)
+						header.Image[j] = header.LookupTable[header.Image[j]];
+
+				headers.Add(header);
+			}
+		}
+
+		public Dune2ImageHeader this[int index]
+		{
+			get { return headers[index]; }
+		}
+	
+		public IEnumerator<Dune2ImageHeader> GetEnumerator()
+		{
+			return headers.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -0,0 +1,105 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	[AttributeUsage( AttributeTargets.Assembly )]
+	public class RendererAttribute : Attribute
+	{
+		public readonly Type Type;
+
+		public RendererAttribute( Type graphicsDeviceType )
+		{
+			if( !typeof( IGraphicsDevice ).IsAssignableFrom( graphicsDeviceType ) )
+				throw new InvalidOperationException( "Incorrect type in RendererAttribute" );
+			Type = graphicsDeviceType;
+		}
+	}
+
+	public interface IGraphicsDevice
+	{
+		IVertexBuffer<Vertex> CreateVertexBuffer( int length );
+		IIndexBuffer CreateIndexBuffer( int length );
+		ITexture CreateTexture( Bitmap bitmap );
+		IShader CreateShader( Stream stream );
+
+		Size WindowSize { get; }
+
+		void Begin();
+		void End();
+		void Clear( Color color );
+		void Present();
+
+		void DrawIndexedPrimitives( PrimitiveType type, Range<int> vertexRange, Range<int> indexRange );
+		void DrawIndexedPrimitives( PrimitiveType type, int vertexPool, int numPrimitives );
+
+		void EnableScissor( int left, int top, int width, int height );
+		void DisableScissor();
+	}
+
+	public interface IVertexBuffer<T>
+	{
+		void Bind();
+		void SetData( T[] vertices );
+	}
+
+	public interface IIndexBuffer
+	{
+		void Bind();
+		void SetData( ushort[] indices );
+	}
+
+	public interface IShader
+	{
+		void SetValue( string name, float x, float y );
+		void SetValue( string param, ITexture texture );
+		void Commit();
+		void Render( Action a );
+	}
+
+	public interface ITexture
+	{
+		void SetData( Bitmap bitmap );
+	}
+
+	public interface IFont
+	{
+		void DrawText( string text, int2 pos, Color c );
+
+		int2 Measure( string text );
+	}
+
+    public enum PrimitiveType
+    {
+        PointList, 
+        LineList, 
+        TriangleList,
+    }
+
+	public struct Range<T>
+	{
+		public readonly T Start, End;
+		public Range( T start, T end ) { Start = start; End = end; }
+	}
+}

OpenRA.FileFormats/Graphics/ShpReader.cs

@@ -0,0 +1,177 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class ImageHeader
+	{
+		public uint Offset;
+		public Format Format;
+
+		public uint RefOffset;
+		public Format RefFormat;
+		public ImageHeader RefImage;
+
+		public byte[] Image;
+
+		public ImageHeader( BinaryReader reader )
+		{
+			Offset = reader.ReadUInt32();
+			Format = (Format)( Offset >> 24 );
+			Offset &= 0xFFFFFF;
+
+			RefOffset = reader.ReadUInt16();
+			RefFormat = (Format)reader.ReadUInt16();
+		}
+	}
+
+	public enum Format
+	{
+		Format20 = 0x20,
+		Format40 = 0x40,
+		Format80 = 0x80,
+	}
+
+	public class ShpReader : IEnumerable<ImageHeader>
+	{
+		public readonly int ImageCount;
+		public readonly ushort Width;
+		public readonly ushort Height;
+
+		public Size Size { get { return new Size(Width, Height); } }
+
+		private readonly List<ImageHeader> headers = new List<ImageHeader>();
+
+		int recurseDepth = 0;
+
+		public ShpReader( Stream stream )
+		{
+			BinaryReader reader = new BinaryReader( stream );
+
+			ImageCount = reader.ReadUInt16();
+			reader.ReadUInt16();
+			reader.ReadUInt16();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadUInt16();
+			reader.ReadUInt32();
+
+			for( int i = 0 ; i < ImageCount ; i++ )
+				headers.Add( new ImageHeader( reader ) );
+
+			new ImageHeader( reader ); // end-of-file header
+			new ImageHeader( reader ); // all-zeroes header
+
+			Dictionary<uint, ImageHeader> offsets = new Dictionary<uint, ImageHeader>();
+			foreach( ImageHeader h in headers )
+				offsets.Add( h.Offset, h );
+
+			for( int i = 0 ; i < ImageCount ; i++ )
+			{
+				ImageHeader h = headers[ i ];
+				if( h.Format == Format.Format20 )
+					h.RefImage = headers[ i - 1 ];
+
+				else if( h.Format == Format.Format40 )
+				{
+					if( !offsets.TryGetValue( h.RefOffset, out h.RefImage ) )
+						throw new InvalidDataException( string.Format( "Reference doesnt point to image data {0}->{1}", h.Offset, h.RefOffset ) );
+				}
+			}
+
+			foreach( ImageHeader h in headers )
+				Decompress( stream, h );
+		}
+
+		public ImageHeader this[ int index ]
+		{
+			get { return headers[ index ]; }
+		}
+
+		void Decompress( Stream stream, ImageHeader h )
+		{
+			if( recurseDepth > ImageCount )
+				throw new InvalidDataException( "Format20/40 headers contain infinite loop" );
+
+			switch( h.Format )
+			{
+				case Format.Format20:
+				case Format.Format40:
+					{
+						if( h.RefImage.Image == null )
+						{
+							++recurseDepth;
+							Decompress( stream, h.RefImage );
+							--recurseDepth;
+						}
+
+						h.Image = CopyImageData( h.RefImage.Image );
+						Format40.DecodeInto(ReadCompressedData(stream, h), h.Image);
+						break;
+					}
+				case Format.Format80:
+					{
+						byte[] imageBytes = new byte[ Width * Height ];
+						Format80.DecodeInto( ReadCompressedData( stream, h ), imageBytes );
+						h.Image = imageBytes;
+						break;
+					}
+				default:
+					throw new InvalidDataException();
+			}
+		}
+
+		static byte[] ReadCompressedData( Stream stream, ImageHeader h )
+		{
+			stream.Position = h.Offset;
+			// Actually, far too big. There's no length field with the correct length though :(
+			int compressedLength = (int)( stream.Length - stream.Position );
+
+			byte[] compressedBytes = new byte[ compressedLength ];
+			stream.Read( compressedBytes, 0, compressedLength );
+
+			//MemoryStream ms = new MemoryStream( compressedBytes );
+			return compressedBytes;
+		}
+
+		private byte[] CopyImageData( byte[] baseImage )
+		{
+			byte[] imageData = new byte[ Width * Height ];
+			for( int i = 0 ; i < Width * Height ; i++ )
+				imageData[ i ] = baseImage[ i ];
+
+			return imageData;
+		}
+
+		public IEnumerator<ImageHeader> GetEnumerator()
+		{
+			return headers.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}

OpenRA.FileFormats/Graphics/Vertex.cs

@@ -0,0 +1,38 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Runtime.InteropServices;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	[StructLayout(LayoutKind.Sequential)]
+	public struct Vertex
+	{
+		public float x, y, z, u, v;
+		public float p, c;
+
+		public Vertex(float2 xy, float2 uv, float2 pc)
+		{
+			this.x = xy.X; this.y = xy.Y; this.z = 0;
+			this.u = uv.X; this.v = uv.Y;
+			this.p = pc.X; this.c = pc.Y;
+		}
+	}
+}

OpenRA.FileFormats/IPaletteRemap.cs

@@ -0,0 +1,29 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Drawing;
+
+namespace OpenRA.FileFormats
+{
+	public interface IPaletteRemap
+	{
+		Color GetRemappedColor(Color original, int index);
+	}
+}

OpenRA.FileFormats/Map/ActorReference.cs

@@ -0,0 +1,41 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public struct ActorReference
+	{
+		public readonly int2 Location;
+		public readonly string Name;
+		public readonly string Owner;
+		public ActorReference( string name, int2 location, string owner )
+		{
+			Name = name;
+			Location = location;
+			Owner = owner;
+		}
+		
+		public override string ToString ()
+		{
+			return string.Format("{0} {1} {2},{3}", Name, Owner, Location.X,Location.Y);
+		}
+
+	}
+}

OpenRA.FileFormats/Map/Map.cs

@@ -0,0 +1,265 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Security.Cryptography;
+
+namespace OpenRA.FileFormats
+{
+	public class Map
+	{
+		public IFolder Package;
+		public string Uid;
+
+		// Yaml map data
+		public bool Selectable;
+		public int MapFormat = 1;
+		public string Title;
+		public string Description;
+		public string Author;
+		public int PlayerCount;
+		public string Tileset;
+
+		public Dictionary<string, ActorReference> Actors = new Dictionary<string, ActorReference>();
+		public List<SmudgeReference> Smudges = new List<SmudgeReference>();
+		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
+		
+		// Rules overrides
+		public Dictionary<string, MiniYaml> Rules = new Dictionary<string, MiniYaml>();
+		public Dictionary<string, MiniYaml> Weapons = new Dictionary<string, MiniYaml>();
+		public Dictionary<string, MiniYaml> Voices = new Dictionary<string, MiniYaml>();
+		public Dictionary<string, MiniYaml> Music = new Dictionary<string, MiniYaml>();
+		public Dictionary<string, MiniYaml> Terrain = new Dictionary<string, MiniYaml>();
+		// Binary map data
+		public byte TileFormat = 1;
+		public int2 MapSize;
+
+		public int2 TopLeft;
+		public int2 BottomRight;
+
+		public Rectangle Bounds { get { return Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y); } }
+
+		public TileReference<ushort, byte>[,] MapTiles;
+		public TileReference<byte, byte>[,] MapResources;
+
+
+		// Temporary compat hacks
+		public int XOffset { get { return TopLeft.X; } }
+		public int YOffset { get { return TopLeft.Y; } }
+		public int Width { get { return BottomRight.X - TopLeft.X; } }
+		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
+		public string Theater { get { return Tileset; } }
+		public IEnumerable<int2> SpawnPoints { get { return Waypoints.Select(kv => kv.Value); } }
+
+		static List<string> SimpleFields = new List<string>() {
+			"Selectable", "MapFormat", "Title", "Description", "Author", "PlayerCount", "Tileset", "MapSize", "TopLeft", "BottomRight"
+		};
+
+		public Map() { }
+
+		public Map(IFolder package)
+		{
+			Package = package;
+			var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
+
+			// 'Simple' metadata
+			FieldLoader.LoadFields(this, yaml, SimpleFields);
+
+			// Waypoints
+			foreach (var wp in yaml["Waypoints"].Nodes)
+			{
+				string[] loc = wp.Value.Value.Split(',');
+				Waypoints.Add(wp.Key, new int2(int.Parse(loc[0]), int.Parse(loc[1])));
+			}
+
+			// Actors
+			foreach (var kv in yaml["Actors"].Nodes)
+			{
+				string[] vals = kv.Value.Value.Split(' ');
+				string[] loc = vals[2].Split(',');
+				var a = new ActorReference(vals[0], new int2(int.Parse(loc[0]), int.Parse(loc[1])), vals[2]);
+				Actors.Add(kv.Key, a);
+			}
+
+			// Smudges
+			foreach (var kv in yaml["Smudges"].Nodes)
+			{
+				string[] vals = kv.Key.Split(' ');
+				string[] loc = vals[1].Split(',');
+				Smudges.Add(new SmudgeReference(vals[0], new int2(int.Parse(loc[0]), int.Parse(loc[1])), int.Parse(vals[2])));
+			}
+
+			// Rules
+			Rules = yaml["Rules"].Nodes;
+
+			LoadUid();
+			LoadBinaryData();
+		}
+
+		public void Save(string filepath)
+		{
+			Dictionary<string, MiniYaml> root = new Dictionary<string, MiniYaml>();
+			foreach (var field in SimpleFields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				root.Add(field, new MiniYaml(FieldSaver.FormatValue(this, f), null));
+			}
+
+			root.Add("Actors", MiniYaml.FromDictionary<string, ActorReference>(Actors));
+			root.Add("Waypoints", MiniYaml.FromDictionary<string, int2>(Waypoints));
+			root.Add("Smudges", MiniYaml.FromList<SmudgeReference>(Smudges));
+			root.Add("Rules", new MiniYaml(null, Rules));
+			SaveBinaryData(Path.Combine(filepath, "map.bin"));
+			root.WriteToFile(Path.Combine(filepath, "map.yaml"));
+			SaveUid(Path.Combine(filepath, "map.uid"));
+		}
+
+		static byte ReadByte(Stream s)
+		{
+			int ret = s.ReadByte();
+			if (ret == -1)
+				throw new NotImplementedException();
+			return (byte)ret;
+		}
+
+		static ushort ReadWord(Stream s)
+		{
+			ushort ret = ReadByte(s);
+			ret |= (ushort)(ReadByte(s) << 8);
+
+			return ret;
+		}
+
+		public void LoadBinaryData()
+		{
+			using (var dataStream = Package.GetContent("map.bin"))
+			{
+				// Load header info
+				byte version = ReadByte(dataStream);
+				var width = ReadWord(dataStream);
+				var height = ReadWord(dataStream);
+
+				if (width != MapSize.X || height != MapSize.Y)
+					throw new InvalidDataException("Invalid tile data");
+
+				MapTiles = new TileReference<ushort, byte>[MapSize.X, MapSize.Y];
+				MapResources = new TileReference<byte, byte>[MapSize.X, MapSize.Y];
+
+				// Load tile data
+				for (int i = 0; i < MapSize.X; i++)
+					for (int j = 0; j < MapSize.Y; j++)
+					{
+						ushort tile = ReadWord(dataStream);
+						byte index = ReadByte(dataStream);
+						byte image = (index == byte.MaxValue) ? (byte)(i % 4 + (j % 4) * 4) : index;
+						MapTiles[i, j] = new TileReference<ushort, byte>(tile, index, image);
+					}
+
+				// Load resource data
+				for (int i = 0; i < MapSize.X; i++)
+					for (int j = 0; j < MapSize.Y; j++)
+						MapResources[i, j] = new TileReference<byte, byte>(ReadByte(dataStream), ReadByte(dataStream));
+			}
+		}
+
+		public void SaveBinaryData(string filepath)
+		{
+			using (var dataStream = File.Create(filepath + ".tmp"))
+			using (var writer = new BinaryWriter(dataStream))
+			{
+				// File header consists of a version byte, followed by 2 ushorts for width and height
+				writer.Write(TileFormat);
+				writer.Write((ushort)MapSize.X);
+				writer.Write((ushort)MapSize.Y);
+
+				// Tile data
+				for (int i = 0; i < MapSize.X; i++)
+					for (int j = 0; j < MapSize.Y; j++)
+					{
+						writer.Write(MapTiles[i, j].type);
+						writer.Write(MapTiles[i, j].index);
+					}
+
+				// Resource data	
+				for (int i = 0; i < MapSize.X; i++)
+					for (int j = 0; j < MapSize.Y; j++)
+					{
+						writer.Write(MapResources[i, j].type);
+						writer.Write(MapResources[i, j].index);
+					}
+			}
+			File.Delete(filepath);
+			File.Move(filepath + ".tmp", filepath);
+		}
+
+		public void LoadUid()
+		{
+			Uid = Package.GetContent("map.uid").ReadAllText();
+		}
+
+		public void SaveUid(string filename)
+		{
+			// UID is calculated by taking an SHA1 of the yaml and binary data
+			// Read the relevant data into a buffer
+			var data = Exts.ReadAllBytes(Package.GetContent("map.yaml"))
+				.Concat(Exts.ReadAllBytes(Package.GetContent("map.bin"))).ToArray();
+
+			// Take the SHA1
+			using (var csp = SHA1.Create())
+				Uid = new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
+
+			File.WriteAllText(filename, Uid);
+		}
+
+		public bool IsInMap(int2 xy)
+		{
+			return IsInMap(xy.X, xy.Y);
+		}
+
+		public bool IsInMap(int x, int y)
+		{
+			return (x >= TopLeft.X && y >= TopLeft.Y && x < BottomRight.X && y < BottomRight.Y);
+		}
+
+		public void DebugContents()
+		{
+			foreach (var field in SimpleFields)
+				Console.WriteLine("Loaded {0}: {1}", field, this.GetType().GetField(field).GetValue(this));
+
+			Console.WriteLine("Loaded Waypoints:");
+			foreach (var wp in Waypoints)
+				Console.WriteLine("\t{0} => {1}", wp.Key, wp.Value);
+
+			Console.WriteLine("Loaded Actors:");
+			foreach (var wp in Actors)
+				Console.WriteLine("\t{0} => {1} {2} {3}", wp.Key, wp.Value.Name, wp.Value.Owner, wp.Value.Location);
+
+			Console.WriteLine("Loaded Smudges:");
+			foreach (var s in Smudges)
+				Console.WriteLine("\t{0} {1} {2}", s.Type, s.Location, s.Depth);
+		}
+	}
+}

OpenRA.FileFormats/Map/MapStub.cs

@@ -0,0 +1,97 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Drawing;
+
+namespace OpenRA.FileFormats
+{
+	public class MapStub
+	{
+		public IFolder Package;
+		
+		// Yaml map data
+		public string Uid;
+		public bool Selectable;
+
+		public string Title;
+		public string Description;
+		public string Author;
+		public int PlayerCount;
+		public string Tileset;
+		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
+
+		public int2 TopLeft;
+		public int2 BottomRight;
+		public int Width { get { return BottomRight.X - TopLeft.X; } }
+		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
+		public Lazy<Bitmap> Preview;
+
+		static List<string> Fields = new List<string>() {
+			"Selectable", "Title", "Description", "Author", "PlayerCount", "Tileset", "TopLeft", "BottomRight"
+		};
+
+		public MapStub() { }
+
+		public MapStub(IFolder package)
+		{
+			Package = package;
+			var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
+			FieldLoader.LoadFields(this, yaml, Fields);
+			
+			// Waypoints
+			foreach (var wp in yaml["Waypoints"].Nodes)
+			{
+				string[] loc = wp.Value.Value.Split(',');
+				Waypoints.Add(wp.Key, new int2(int.Parse(loc[0]), int.Parse(loc[1])));
+			}
+			
+			Preview = Lazy.New(
+				() => { return new Bitmap(Package.GetContent("preview.png")); }
+			);
+
+			Uid = Package.GetContent("map.uid").ReadAllText();
+		}
+		
+		public int2 ConvertToPreview(int2 point, Rectangle container)
+		{
+			float scale = Math.Min(container.Width * 1.0f / Width, container.Height * 1.0f / Height);
+
+			var size = Math.Max(Width, Height);
+			var dw = (int)(scale * (size - Width)) / 2;
+			var dh = (int)(scale * (size - Height)) / 2;
+
+			return new int2(container.X + dw + (int)(scale*(point.X - TopLeft.X)) , container.Y + dh + (int)(scale*(point.Y - TopLeft.Y)));
+		}
+		
+		public Rectangle PreviewBounds(Rectangle container)
+		{
+			float scale = Math.Min(container.Width * 1.0f / Width, container.Height * 1.0f / Height);
+
+			var size = Math.Max(Width, Height);
+			var dw = (int)(scale * (size - Width)) / 2;
+			var dh = (int)(scale * (size - Height)) / 2;
+
+			return new Rectangle(container.X + dw, container.Y + dh, (int)(Width * scale), (int)(Height * scale));
+		}
+	}
+}

OpenRA.FileFormats/Map/SmudgeReference.cs

@@ -0,0 +1,41 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public struct SmudgeReference
+	{
+		public readonly string Type;
+		public readonly int2 Location;
+		public readonly int Depth;
+		public SmudgeReference( string type, int2 location, int depth )
+		{
+			Type = type;
+			Location = location;
+			Depth = depth;
+		}
+		
+		public override string ToString ()
+		{
+			return string.Format("{0} {1},{2} {3}", Type, Location.X,Location.Y, Depth);
+		}
+
+	}
+}

OpenRA.FileFormats/Map/Terrain.cs

@@ -0,0 +1,88 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class Terrain
+	{
+		public readonly List<byte[]> TileBitmapBytes = new List<byte[]>();
+
+		public Terrain( Stream stream )
+		{		
+			// Try loading as a cnc .tem
+			BinaryReader reader = new BinaryReader( stream );
+			int Width = reader.ReadUInt16();
+			int Height = reader.ReadUInt16();
+
+			if( Width != 24 || Height != 24 )
+				throw new InvalidDataException( string.Format( "{0}x{1}", Width, Height ) );
+			
+			/*NumTiles = */reader.ReadUInt16();
+			/*Zero1 = */reader.ReadUInt16();			
+			/*uint Size = */reader.ReadUInt32();
+			uint ImgStart = reader.ReadUInt32();
+			/*Zero2 = */reader.ReadUInt32();
+			
+			int IndexEnd, IndexStart;
+			if (reader.ReadUInt16() == 65535) // ID1 = FFFFh for cnc
+			{
+				/*ID2 = */reader.ReadUInt16();	
+				IndexEnd = reader.ReadInt32();
+				IndexStart = reader.ReadInt32();
+			}
+			else // Load as a ra .tem
+			{
+				stream.Position = 0;	
+				reader = new BinaryReader( stream );
+				Width = reader.ReadUInt16();
+				Height = reader.ReadUInt16();
+				if( Width != 24 || Height != 24 )
+					throw new InvalidDataException( string.Format( "{0}x{1}", Width, Height ) );
+	
+				/*NumTiles = */reader.ReadUInt16();
+				reader.ReadUInt16();
+				/*XDim = */reader.ReadUInt16();
+				/*YDim = */reader.ReadUInt16();
+				/*uint FileSize = */reader.ReadUInt32();
+				ImgStart = reader.ReadUInt32();
+				reader.ReadUInt32();
+				reader.ReadUInt32();
+				IndexEnd = reader.ReadInt32();
+				reader.ReadUInt32();
+				IndexStart = reader.ReadInt32();		
+			}
+			stream.Position = IndexStart;
+
+			foreach( byte b in new BinaryReader(stream).ReadBytes(IndexEnd - IndexStart) )
+			{
+				if (b != 255)
+				{
+					stream.Position = ImgStart + b * 24 * 24;
+					TileBitmapBytes.Add(new BinaryReader(stream).ReadBytes(24 * 24));
+				}
+				else
+					TileBitmapBytes.Add(null);
+			}
+		}
+	}
+}

OpenRA.FileFormats/Map/TerrainColorSet.cs

@@ -0,0 +1,69 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using System.Drawing;
+using System;
+namespace OpenRA.FileFormats
+{
+	public class TerrainColorSet
+	{
+		public readonly Dictionary<TerrainType, Color> colors = new Dictionary<TerrainType, Color>();
+
+		string NextLine( StreamReader reader )
+		{
+			string ret;
+			do
+			{
+				ret = reader.ReadLine();
+				if( ret == null )
+					return null;
+				ret = ret.Trim();
+			}
+			while( ret.Length == 0 || ret[ 0 ] == ';' );
+			return ret;
+		}
+
+		public TerrainColorSet( string colorFile )
+		{
+			StreamReader file = new StreamReader( FileSystem.Open(colorFile) );
+
+			while( true )
+			{
+				string line = NextLine( file );
+				if( line == null )
+					break;
+				string[] kv = line.Split('=');
+				TerrainType key = (TerrainType)Enum.Parse(typeof(TerrainType),kv[0]);
+				string[] entries = kv[1].Split(',');
+				Color val = Color.FromArgb(int.Parse(entries[0]),int.Parse(entries[1]),int.Parse(entries[2]));
+				colors.Add(key,val);
+			}
+
+			file.Close();
+		}
+		
+		public Color ColorForTerrainType(TerrainType type)
+		{
+			return colors[type];	
+		}
+	}
+}

OpenRA.FileFormats/Map/TileReference.cs

@@ -0,0 +1,45 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public struct TileReference<T, U>
+	{
+		public T type;
+		public U index;
+		public U image;
+		
+		public TileReference(T t, U i)
+		{
+			type = t;
+			index = i;
+			image = i;
+		}
+		
+		public TileReference(T t, U i, U im)
+		{
+			type = t;
+			index = i;
+			image = im;
+		}
+
+		public override int GetHashCode() { return type.GetHashCode() ^ index.GetHashCode(); }
+	}
+}

OpenRA.FileFormats/Map/TileSet.cs

@@ -0,0 +1,110 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class TileSet
+	{
+		public readonly Dictionary<ushort, Terrain> tiles = new Dictionary<ushort, Terrain>();
+
+		public readonly Walkability Walkability;
+		public readonly Dictionary<ushort, TileTemplate> walk 
+			= new Dictionary<ushort, TileTemplate>();
+
+		string NextLine( StreamReader reader )
+		{
+			string ret;
+			do
+			{
+				ret = reader.ReadLine();
+				if( ret == null )
+					return null;
+				ret = ret.Trim();
+			}
+			while( ret.Length == 0 || ret[ 0 ] == ';' );
+			return ret;
+		}
+
+		public TileSet( string tilesetFile, string templatesFile, string suffix )
+		{
+			Walkability = new Walkability(templatesFile);
+
+			char tileSetChar = char.ToUpperInvariant( suffix[ 0 ] );
+			StreamReader tileIdFile = new StreamReader( FileSystem.Open(tilesetFile) );
+
+			while( true )
+			{
+				string tileSetStr = NextLine( tileIdFile );
+				string countStr = NextLine( tileIdFile );
+				string startStr = NextLine( tileIdFile );
+				string pattern = NextLine( tileIdFile );
+				if( tileSetStr == null || countStr == null || startStr == null || pattern == null )
+					break;
+
+				if( tileSetStr.IndexOf( tileSetChar.ToString() ) == -1 )
+					continue;
+
+				int count = int.Parse( countStr );
+				int start = int.Parse( startStr, NumberStyles.HexNumber );
+				for( int i = 0 ; i < count ; i++ )
+				{
+					string tilename = string.Format(pattern, i + 1);
+
+					if (!walk.ContainsKey((ushort)(start + i)))
+						walk.Add((ushort)(start + i), Walkability.GetTileTemplate(tilename));
+
+					using( Stream s = FileSystem.Open( tilename + "." + suffix ) )
+					{
+						if( !tiles.ContainsKey( (ushort)( start + i ) ) )
+							tiles.Add( (ushort)( start + i ), new Terrain( s ) );
+					}
+				}
+			}
+
+			tileIdFile.Close();
+		}
+
+		public byte[] GetBytes(TileReference<ushort,byte> r)
+		{
+			Terrain tile;
+			if( tiles.TryGetValue( r.type, out tile ) )
+				return tile.TileBitmapBytes[ r.image ];
+			
+			byte[] missingTile = new byte[ 24 * 24 ];
+			for( int i = 0 ; i < missingTile.Length ; i++ )
+				missingTile[ i ] = 0x36;
+
+			return missingTile;
+		}
+
+		public TerrainType GetTerrainType( TileReference<ushort, byte> r )
+		{
+			var tt = walk[ r.type ].TerrainType;
+			TerrainType ret;
+				if( !tt.TryGetValue( r.image, out ret ) )
+				return 0;// Default zero (walkable)
+			return ret;
+		}
+	}
+}

OpenRA.FileFormats/Map/Walkability.cs

@@ -0,0 +1,89 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using System;
+namespace OpenRA.FileFormats
+{
+	public enum TerrainType : byte
+	{
+		Clear = 0,
+		Water = 1,
+		Road = 2,
+		Rock = 3,
+		Tree = 4,
+		River = 5,
+		Rough = 6,
+		Wall = 7,
+		Beach = 8,
+		Ore = 9,
+		Special = 10,
+	}
+	
+	public class TileTemplate
+	{
+		public int Index; // not valid for `interior` stuff. only used for bridges.
+		public string Name;
+		public int2 Size;
+		public string Bridge;
+		public float HP;
+		public Dictionary<int, TerrainType> TerrainType = new Dictionary<int, TerrainType>();
+	}
+	
+	public class Walkability
+	{
+		Dictionary<string, TileTemplate> templates 
+			= new Dictionary<string,TileTemplate>();
+
+		public Walkability(string templatesFile)
+		{
+			var file = new IniFile( FileSystem.Open( templatesFile ) );
+
+			foreach (var section in file.Sections)
+			{
+				var tile = new TileTemplate
+				{
+					Size = new int2(
+						int.Parse(section.GetValue("width", "0")),
+						int.Parse(section.GetValue("height", "0"))),
+					TerrainType = section
+						.Where(p => p.Key.StartsWith("tiletype"))
+						.ToDictionary(
+							p => int.Parse(p.Key.Substring(8)),
+							p => (TerrainType)Enum.Parse(typeof(TerrainType),p.Value)),
+					Name = section.GetValue("Name", null).ToLowerInvariant(),
+					Bridge = section.GetValue("bridge", null),
+					HP = float.Parse(section.GetValue("hp", "0"))
+				};
+								
+				tile.Index = -1;
+				int.TryParse(section.Name.Substring(3), out tile.Index);
+
+				templates[tile.Name] = tile;
+			}
+		}
+
+		public TileTemplate GetTileTemplate(string terrainName)
+		{
+			return templates[terrainName];
+		}
+	}
+}

OpenRA.FileFormats/MiniYaml.cs

@@ -0,0 +1,195 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	using MiniYamlNodes = Dictionary<string, MiniYaml>;
+
+	public class MiniYaml
+	{
+		public string Value;
+		public Dictionary<string, MiniYaml> Nodes = new Dictionary<string,MiniYaml>();
+
+		public MiniYaml( string value ) : this( value, new Dictionary<string, MiniYaml>() ) { }
+
+		public MiniYaml( string value, Dictionary<string, MiniYaml> nodes )
+		{
+			Value = value;
+			Nodes = nodes;
+		}
+		
+		public static MiniYaml FromDictionary<K,V>(Dictionary<K,V>dict)
+		{
+			return new MiniYaml( null, dict.ToDictionary( x=>x.Key.ToString(), x=>new MiniYaml(x.Value.ToString())));
+		}
+		
+		public static MiniYaml FromList<T>(List<T>list)
+		{
+			return new MiniYaml( null, list.ToDictionary( x=>x.ToString(), x=>new MiniYaml(null)));
+		}
+		
+		static Dictionary<string, MiniYaml> FromLines(string[] lines)
+		{
+			var levels = new List<Dictionary<string, MiniYaml>>();
+			levels.Add(new Dictionary<string, MiniYaml>());
+
+			foreach (var line in lines)
+			{
+				var t = line.TrimStart(' ', '\t');
+				if (t.Length == 0 || t[0] == '#')
+					continue;
+				var level = line.Length - t.Length;
+
+				if (levels.Count <= level)
+					throw new InvalidOperationException("Bad indent in miniyaml");
+				while (levels.Count > level + 1)
+					levels.RemoveAt(levels.Count - 1);
+
+				var colon = t.IndexOf(':');
+				var d = new Dictionary<string, MiniYaml>();
+				try
+				{
+					if (colon == -1)
+						levels[level].Add(t.Trim(), new MiniYaml(null, d));
+					else
+					{
+						var value = t.Substring(colon + 1).Trim();
+						if (value.Length == 0)
+							value = null;
+						levels[level].Add(t.Substring(0, colon).Trim(), new MiniYaml(value, d));
+					}
+				}
+				catch (ArgumentException) { throw new InvalidDataException("Duplicate Identifier:`{0}`".F(t)); }
+				
+				levels.Add(d);
+			}
+			return levels[0];
+		}
+
+		public static Dictionary<string, MiniYaml> FromFileInPackage( string path )
+		{
+			StreamReader reader = new StreamReader( FileSystem.Open(path) );
+			List<string> lines = new List<string>();
+			
+			while( !reader.EndOfStream )
+				lines.Add(reader.ReadLine());
+			reader.Close();
+			
+			return FromLines(lines.ToArray());
+		}
+		
+		public static Dictionary<string, MiniYaml> FromFile( string path )
+		{			
+			return FromLines(File.ReadAllLines( path ));
+		}
+
+		public static Dictionary<string, MiniYaml> FromStream(Stream s)
+		{
+			using (var reader = new StreamReader(s))
+				return FromString(reader.ReadToEnd());
+		}
+
+		public static Dictionary<string, MiniYaml> FromString(string text)
+		{
+			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries));
+		}
+
+		public static Dictionary<string, MiniYaml> Merge( Dictionary<string, MiniYaml> a, Dictionary<string, MiniYaml> b )
+		{
+			if( a.Count == 0 )
+				return b;
+			if( b.Count == 0 )
+				return a;
+
+			var ret = new Dictionary<string, MiniYaml>();
+
+			var keys = a.Keys.Union( b.Keys ).ToList();
+
+			var noInherit = keys.Where( x => x.Length > 0 && x[ 0 ] == '-' ).Select( x => x.Substring( 1 ) ).ToList();
+
+			foreach( var key in keys )
+			{
+				MiniYaml aa, bb;
+				a.TryGetValue( key, out aa );
+				b.TryGetValue( key, out bb );
+
+//				if( key.Length > 0 && key[ 0 ] == '-' )
+//					continue;
+			//	else 
+				if( noInherit.Contains( key ) )
+				{
+					if( aa != null )
+						ret.Add( key, aa );
+				}
+				else
+					ret.Add( key, Merge( aa, bb ) );
+			}
+
+			return ret;
+		}
+
+		public static MiniYaml Merge( MiniYaml a, MiniYaml b )
+		{
+			if( a == null )
+				return b;
+			if( b == null )
+				return a;
+
+			return new MiniYaml( a.Value ?? b.Value, Merge( a.Nodes, b.Nodes ) );
+		}
+
+		public IEnumerable<string> ToLines(string name)
+		{
+			yield return name + ": " + Value;
+			if (Nodes != null)
+				foreach (var line in Nodes.ToLines(false))
+					yield return "\t" + line;
+		}
+	}
+
+	public static class MiniYamlExts
+	{
+		public static void WriteToFile(this MiniYamlNodes y, string filename)
+		{
+			File.WriteAllLines(filename, y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
+		}
+
+		public static string WriteToString(this MiniYamlNodes y)
+		{
+			return string.Join("\n", y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
+		}
+
+		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
+		{
+			foreach (var kv in y)
+			{
+				foreach (var line in kv.Value.ToLines(kv.Key))
+					yield return line;
+				if (lowest)
+					yield return "";
+			}
+		}
+	}
+}

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA.FileFormats</RootNamespace>
+    <AssemblyName>OpenRA.FileFormats</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ConnectedComponents.cs" />
+    <Compile Include="DisposableAction.cs" />
+    <Compile Include="Evaluator.cs" />
+    <Compile Include="Exts.cs" />
+    <Compile Include="FieldLoader.cs" />
+    <Compile Include="FileSystem.cs" />
+    <Compile Include="Folder.cs" />
+    <Compile Include="Graphics\IGraphicsDevice.cs" />
+    <Compile Include="Graphics\Vertex.cs" />
+    <Compile Include="IPaletteRemap.cs" />
+    <Compile Include="MiniYaml.cs" />
+    <Compile Include="PackageEntry.cs" />
+    <Compile Include="Package.cs" />
+    <Compile Include="Palette.cs" />
+    <Compile Include="PlayerColorRemap.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ProtocolVersion.cs" />
+    <Compile Include="Thirdparty\Random.cs" />
+    <Compile Include="Session.cs" />
+    <Compile Include="ShroudPaletteRemap.cs" />
+    <Compile Include="SingleColorRemap.cs" />
+    <Compile Include="Support\Log.cs" />
+    <Compile Include="Support\Stopwatch.cs" />
+    <Compile Include="Support\Timer.cs" />
+    <Compile Include="TypeDictionary.cs" />
+    <Compile Include="Map\ActorReference.cs" />
+    <Compile Include="Map\Map.cs" />
+    <Compile Include="Map\TileReference.cs" />
+    <Compile Include="Map\Walkability.cs" />
+    <Compile Include="Map\Terrain.cs" />
+    <Compile Include="Primitives\Cache.cs" />
+    <Compile Include="Primitives\float2.cs" />
+    <Compile Include="Primitives\Pair.cs" />
+    <Compile Include="Map\TerrainColorSet.cs" />
+    <Compile Include="Primitives\Tuple.cs" />
+    <Compile Include="Map\TileSet.cs" />
+    <Compile Include="Primitives\PriorityQueue.cs" />
+    <Compile Include="Primitives\Lazy.cs" />
+    <Compile Include="FileFormats\AudLoader.cs" />
+    <Compile Include="FileFormats\Blowfish.cs" />
+    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
+    <Compile Include="Primitives\Set.cs" />
+    <Compile Include="Graphics\Dune2ShpReader.cs" />
+    <Compile Include="FileFormats\Format2.cs" />
+    <Compile Include="FileFormats\Format40.cs" />
+    <Compile Include="FileFormats\Format80.cs" />
+    <Compile Include="FileFormats\IniFile.cs" />
+    <Compile Include="Graphics\ShpReader.cs" />
+    <Compile Include="Primitives\int2.cs" />
+    <Compile Include="Map\MapStub.cs" />
+    <Compile Include="Map\SmudgeReference.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

OpenRA.FileFormats/Package.cs

@@ -0,0 +1,166 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public interface IFolder
+	{
+		Stream GetContent(string filename);
+		IEnumerable<uint> AllFileHashes();
+	}
+
+	public class Package : IFolder
+	{
+		readonly Dictionary<uint, PackageEntry> index;
+		readonly bool isRmix, isEncrypted;
+		readonly long dataStart;
+		readonly Stream s;
+
+		public Package(string filename)
+		{
+			s = FileSystem.Open(filename);
+
+			BinaryReader reader = new BinaryReader(s);
+			uint signature = reader.ReadUInt32();
+
+			isRmix = 0 == (signature & ~(uint)(MixFileFlags.Checksum | MixFileFlags.Encrypted));
+
+			if (isRmix)
+			{
+				isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted);
+				if( isEncrypted )
+				{
+					index = ParseRaHeader( s, out dataStart ).ToDictionary(x => x.Hash);
+					return;
+				}
+			}
+			else
+				s.Seek( 0, SeekOrigin.Begin );
+
+			isEncrypted = false;
+			index = ParseTdHeader(s, out dataStart).ToDictionary(x => x.Hash);
+		}
+
+		const long headerStart = 84;
+
+		List<PackageEntry> ParseRaHeader(Stream s, out long dataStart)
+		{
+			BinaryReader reader = new BinaryReader(s);
+			byte[] keyblock = reader.ReadBytes(80);
+			byte[] blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
+
+			uint[] h = ReadUints(reader, 2);
+
+			Blowfish fish = new Blowfish(blowfishKey);
+			MemoryStream ms = Decrypt( h, fish );
+			BinaryReader reader2 = new BinaryReader(ms);
+
+			ushort numFiles = reader2.ReadUInt16();
+			uint datasize = reader2.ReadUInt32();
+
+			Console.WriteLine("{0} files, {1} kb", numFiles, datasize >> 10);
+
+			s.Position = headerStart;
+			reader = new BinaryReader(s);
+
+			int byteCount = 6 + numFiles * PackageEntry.Size;
+			h = ReadUints( reader, ( byteCount + 3 ) / 4 );
+
+			ms = Decrypt( h, fish );
+
+			dataStart = headerStart + byteCount + ( ( ~byteCount + 1 ) & 7 );
+
+			long ds;
+			return ParseTdHeader( ms, out ds );
+		}
+
+		static MemoryStream Decrypt( uint[] h, Blowfish fish )
+		{
+			uint[] decrypted = fish.Decrypt( h );
+
+			MemoryStream ms = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter( ms );
+			foreach( uint t in decrypted )
+				writer.Write( t );
+			writer.Flush();
+
+			ms.Position = 0;
+			return ms;
+		}
+
+		uint[] ReadUints(BinaryReader r, int count)
+		{
+			uint[] ret = new uint[count];
+			for (int i = 0; i < ret.Length; i++)
+				ret[i] = r.ReadUInt32();
+
+			return ret;
+		}
+
+		List<PackageEntry> ParseTdHeader(Stream s, out long dataStart)
+		{
+			List<PackageEntry> items = new List<PackageEntry>();
+
+			BinaryReader reader = new BinaryReader(s);
+			ushort numFiles = reader.ReadUInt16();
+			/*uint dataSize = */reader.ReadUInt32();
+
+			for (int i = 0; i < numFiles; i++)
+				items.Add(new PackageEntry(reader));
+
+			dataStart = s.Position;
+			return items;
+		}
+
+		public Stream GetContent(uint hash)
+		{
+			PackageEntry e;
+			if (!index.TryGetValue(hash, out e))
+				return null;
+
+			s.Seek( dataStart + e.Offset, SeekOrigin.Begin );
+			byte[] data = new byte[ e.Length ];
+			s.Read( data, 0, (int)e.Length );
+			return new MemoryStream(data);
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return GetContent(PackageEntry.HashFilename(filename));
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			return index.Keys;
+		}
+	}
+
+	[Flags]
+	enum MixFileFlags : uint
+	{
+		Checksum = 0x10000,
+		Encrypted = 0x20000,
+	}
+}

OpenRA.FileFormats/PackageEntry.cs

@@ -0,0 +1,80 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace OpenRA.FileFormats
+{
+	public class PackageEntry
+	{
+		public readonly uint Hash;
+		public readonly uint Offset;
+		public readonly uint Length;
+
+		public PackageEntry(BinaryReader r)
+		{
+			Hash = r.ReadUInt32();
+			Offset = r.ReadUInt32();
+			Length = r.ReadUInt32();
+		}
+
+		public override string ToString()
+		{
+			string filename;
+			if (Names.TryGetValue(Hash, out filename))
+				return string.Format("{0} - offset 0x{1:x8} - length 0x{2:x8}", filename, Offset, Length);
+			else
+				return string.Format("0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}", Hash, Offset, Length);
+		}
+
+		public static uint HashFilename(string name)
+		{
+			if (name.Length > 12)
+				name = name.Substring(0, 12);
+
+			name = name.ToUpperInvariant();
+			if (name.Length % 4 != 0)
+				name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');
+
+			MemoryStream ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
+			BinaryReader reader = new BinaryReader(ms);
+
+			int len = name.Length >> 2; 
+			uint result = 0;
+
+			while (len-- != 0)
+				result = ((result << 1) | (result >> 31)) + reader.ReadUInt32();
+
+			return result;
+		}
+
+		static Dictionary<uint, string> Names = new Dictionary<uint,string>();
+		
+		public static void AddStandardName(string s)
+		{
+			uint hash = HashFilename(s);
+			Names.Add(hash, s);
+		}
+
+		public const int Size = 12;
+	}
+}

OpenRA.FileFormats/Palette.cs

@@ -0,0 +1,65 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class Palette
+	{
+		List<Color> colors = new List<Color>();
+
+		public Color GetColor(int index)
+		{
+			return colors[index];
+		}
+
+		public Palette(Stream s, bool remapTransparent)
+		{
+			using (BinaryReader reader = new BinaryReader(s))
+			{
+				for (int i = 0; i < 256; i++)
+				{
+					byte r = (byte)(reader.ReadByte() << 2);
+					byte g = (byte)(reader.ReadByte() << 2);
+					byte b = (byte)(reader.ReadByte() << 2);
+
+					colors.Add(Color.FromArgb(r, g, b));
+				}
+			}
+
+			colors[0] = Color.FromArgb(0, 0, 0, 0);
+
+			if (remapTransparent)
+			{
+				colors[3] = Color.FromArgb(178, 0, 0, 0);
+				colors[4] = Color.FromArgb(140, 0, 0, 0);
+			}
+		}
+
+		public Palette(Palette p, IPaletteRemap r)
+		{
+			for (int i = 0; i < 256; i++)
+				colors.Add(r.GetRemappedColor(p.GetColor(i), i));
+		}
+	}
+}

OpenRA.FileFormats/PlayerColorRemap.cs

@@ -0,0 +1,58 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class PlayerColorRemap : IPaletteRemap
+	{
+		Dictionary<int, Color> remapColors;
+
+		public PlayerColorRemap(Color c1, Color c2, bool useSplitRamp)
+		{
+			var baseIndex = useSplitRamp ? 0xb0 : 80;
+			var ramp = useSplitRamp
+				? new[] { 0, 2, 4, 6, 8, 10, 13, 15, 1, 3, 5, 7, 9, 11, 12, 14 }
+				: new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+
+			remapColors = ramp.Select((x, i) => Pair.New(baseIndex + i, ColorLerp(x / 16f, c1, c2)))
+				.ToDictionary(u => u.First, u => u.Second);
+		}
+
+		static Color ColorLerp(float t, Color c1, Color c2)
+		{
+			return Color.FromArgb(255,
+				(int)(t * c2.R + (1 - t) * c1.R),
+				(int)(t * c2.G + (1 - t) * c1.G),
+				(int)(t * c2.B + (1 - t) * c1.B));
+		}
+		
+		public Color GetRemappedColor(Color original, int index)
+		{
+			Color c;
+			return remapColors.TryGetValue(index, out c) 
+				? c : original;
+		}
+	}
+}

OpenRA.FileFormats/Primitives/Cache.cs

@@ -0,0 +1,59 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace OpenRA.FileFormats
+{
+	public class Cache<T, U> : IEnumerable<KeyValuePair<T, U>>
+	{
+		Dictionary<T, U> hax = new Dictionary<T, U>();
+		Func<T,U> loader;
+
+		public Cache(Func<T,U> loader)
+		{
+			if (loader == null)
+				throw new ArgumentNullException();
+
+			this.loader = loader;
+		}
+
+		public U this[T key]
+		{
+			get
+			{
+				U result;
+				if (!hax.TryGetValue(key, out result))
+					hax.Add(key, result = loader(key));
+
+				return result;
+			}
+		}
+
+		public IEnumerator<KeyValuePair<T, U>> GetEnumerator() { return hax.GetEnumerator(); }
+
+		IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
+
+		public IEnumerable<T> Keys { get { return hax.Keys; } }
+		public IEnumerable<U> Values { get { return hax.Values; } }
+	}
+}

OpenRA.FileFormats/Primitives/Lazy.cs

@@ -0,0 +1,56 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA.FileFormats
+{
+	public class Lazy<T>
+	{
+		Func<T> p;
+		T value;
+
+		public Lazy(Func<T> p)
+		{
+			if (p == null)
+				throw new ArgumentNullException();
+
+			this.p = p;
+		}
+
+		public T Value
+		{
+			get
+			{
+				if (p == null)
+					return value;
+
+				value = p();
+				p = null;
+				return value;
+			}
+		}
+	}
+
+	public static class Lazy
+	{
+		public static Lazy<T> New<T>(Func<T> p) { return new Lazy<T>(p); }
+	}
+}

OpenRA.FileFormats/Primitives/Pair.cs

@@ -0,0 +1,75 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+
+namespace OpenRA.FileFormats
+{
+	public struct Pair<T, U>
+	{
+		public T First;
+		public U Second;
+
+		public Pair(T first, U second)
+		{
+			First = first;
+			Second = second;
+		}
+
+		static IEqualityComparer<T> tc = EqualityComparer<T>.Default;
+		static IEqualityComparer<U> uc = EqualityComparer<U>.Default;
+
+		public static bool operator ==(Pair<T, U> a, Pair<T, U> b)
+		{
+			return tc.Equals(a.First, b.First) && uc.Equals(a.Second, b.Second);
+		}
+
+		public static bool operator !=(Pair<T, U> a, Pair<T, U> b)
+		{
+			return !(a == b);
+		}
+
+		public override bool Equals(object obj)
+		{
+			if (!(obj is Pair<T, U>))
+				return false;
+
+			return (Pair<T, U>)obj == this;
+		}
+
+		public override int GetHashCode()
+		{
+			return First.GetHashCode() ^ Second.GetHashCode();
+		}
+
+		public Pair<T, U> WithFirst(T t) { return new Pair<T, U>(t, Second); }
+		public Pair<T, U> WithSecond(U u) { return new Pair<T, U>(First, u); }
+
+		public static T AsFirst(Pair<T, U> p) { return p.First; }
+		public static U AsSecond(Pair<T, U> p) { return p.Second; }
+
+        public Pair<U, T> Swap() { return Pair.New(Second, First); }
+	}
+
+    public static class Pair
+    {
+        public static Pair<T, U> New<T, U>(T t, U u) { return new Pair<T, U>(t, u); }
+    }
+}

OpenRA.FileFormats/Primitives/PriorityQueue.cs

@@ -0,0 +1,113 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+
+namespace OpenRA.FileFormats
+{
+	public class PriorityQueue<T>
+			where T : IComparable<T>
+	{
+		List<T[]> items = new List<T[]>();
+		int level, index;
+
+		public PriorityQueue()
+		{
+			items.Add(new T[1]);
+		}
+
+		public void Add(T item)
+		{
+			int addLevel = level;
+			int addIndex = index;
+
+			while (addLevel >= 1 && Above(addLevel, addIndex).CompareTo(item) > 0)
+			{
+				items[addLevel][addIndex] = Above(addLevel, addIndex);
+				--addLevel;
+				addIndex >>= 1;
+			}
+
+			items[addLevel][addIndex] = item;
+
+			if (++index >= (1 << level))
+			{
+				index = 0;
+				if (items.Count <= ++level)
+					items.Add(new T[1 << level]);
+			}
+		}
+
+		public bool Empty { get { return (level == 0); } }
+
+		T At(int level, int index) { return items[level][index]; }
+		T Above(int level, int index) { return items[level - 1][index >> 1]; }
+
+		T Last()
+		{
+			int lastLevel = level;
+			int lastIndex = index;
+
+			if (--lastIndex < 0)
+				lastIndex = (1 << --lastLevel) - 1;
+
+			return At(lastLevel, lastIndex);
+		}
+
+		public T Pop()
+		{
+			if (level == 0 && index == 0)
+				throw new InvalidOperationException("Attempting to pop empty PriorityQueue");
+
+			T ret = At(0, 0);
+			BubbleInto(0, 0, Last());
+			if (--index < 0)
+				index = (1 << --level) - 1;
+
+			return ret;
+		}
+
+		void BubbleInto(int intoLevel, int intoIndex, T val)
+		{
+			int downLevel = intoLevel + 1;
+			int downIndex = intoIndex << 1;
+
+			if (downLevel > level || (downLevel == level && downIndex >= index))
+			{
+				items[intoLevel][intoIndex] = val;
+				return;
+			}
+
+			if (downLevel <= level && downIndex < index - 1 &&
+				At(downLevel, downIndex).CompareTo(At(downLevel, downIndex + 1)) >= 0)
+				++downIndex;
+
+			if (val.CompareTo(At(downLevel, downIndex)) <= 0)
+			{
+				items[intoLevel][intoIndex] = val;
+				return;
+			}
+
+			items[intoLevel][intoIndex] = At(downLevel, downIndex);
+			BubbleInto(downLevel, downIndex, val);
+		}
+	}
+}

OpenRA.FileFormats/Primitives/Set.cs

@@ -0,0 +1,76 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace OpenRA.Collections
+{
+	public class Set<T> : IEnumerable<T>
+	{
+		Dictionary<T, bool> data = new Dictionary<T, bool>();
+
+		public void Add( T obj )
+		{
+			data.Add( obj, false );
+			if( OnAdd != null )
+				OnAdd( obj );
+		}
+
+		public void Remove( T obj )
+		{
+			data.Remove( obj );
+			if( OnRemove != null )
+				OnRemove( obj );
+		}
+
+		public event Action<T> OnAdd;
+		public event Action<T> OnRemove;
+
+		public IEnumerator<T> GetEnumerator()
+		{
+			return data.Keys.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+
+	public class CachedView<T,U> : Set<U>
+	{
+		public CachedView( Set<T> set, Func<T, bool> include, Func<T, U> store )
+			: this( set, include, x => new[] { store( x ) } )
+		{
+		}
+
+		public CachedView( Set<T> set, Func<T,bool> include, Func<T,IEnumerable<U>> store )
+		{
+			foreach( var t in set )
+				if( include( t ) )
+					store( t ).Do( x => Add( x ) );
+
+			set.OnAdd += obj => { if( include( obj ) ) store( obj ).Do( x => Add( x ) ); };
+			set.OnRemove += obj => { if( include( obj ) ) store( obj ).Do( x => Remove( x ) ); };
+		}
+	}
+}

OpenRA.FileFormats/Primitives/Tuple.cs

@@ -0,0 +1,39 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public class Tuple<A, B, C>
+	{
+		public A a;
+		public B b;
+		public C c;
+
+		public Tuple(A a, B b, C c) { this.a = a; this.b = b; this.c = c; }
+	}
+
+	public static class Tuple
+	{
+		public static Tuple<A, B, C> New<A, B, C>(A a, B b, C c)
+		{
+			return new Tuple<A, B, C>(a, b, c);
+		}
+	}
+}

OpenRA.FileFormats/Primitives/float2.cs

@@ -0,0 +1,113 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace OpenRA
+{
+	[StructLayout(LayoutKind.Sequential)]
+	public struct float2
+	{
+		public float X, Y;
+
+		public float2(float x, float y) { X = x; Y = y; }
+		public float2(PointF p) { X = p.X; Y = p.Y; }
+		public float2(Point p) { X = p.X; Y = p.Y; }
+		public float2(Size p) { X = p.Width; Y = p.Height; }
+		public float2(SizeF p) { X = p.Width; Y = p.Height; }
+
+		public PointF ToPointF() { return new PointF(X, Y); }
+		public SizeF ToSizeF() { return new SizeF(X, Y); }
+
+		public static implicit operator float2(int2 src) { return new float2(src.X, src.Y); }
+
+		public static float2 operator +(float2 a, float2 b) { return new float2(a.X + b.X, a.Y + b.Y); }
+		public static float2 operator -(float2 a, float2 b) { return new float2(a.X - b.X, a.Y - b.Y); }
+
+		public static float2 operator -(float2 a) { return new float2(-a.X, -a.Y); }
+
+		public static float Lerp(float a, float b, float t) { return a + t * (b - a); }
+
+		public static float2 Lerp(float2 a, float2 b, float t)
+		{
+			return new float2(
+				Lerp(a.X, b.X, t),
+				Lerp(a.Y, b.Y, t));
+		}
+
+		public static float2 Lerp(float2 a, float2 b, float2 t)
+		{
+			return new float2(
+				Lerp(a.X, b.X, t.X),
+				Lerp(a.Y, b.Y, t.Y));
+		}
+
+		public static float2 FromAngle(float a) { return new float2((float)Math.Sin(a), (float)Math.Cos(a)); }
+
+		static float Constrain(float x, float a, float b) { return x < a ? a : x > b ? b : x; }
+
+		public float2 Constrain(float2 min, float2 max)
+		{
+			return new float2(
+				Constrain(X, min.X, max.X),
+				Constrain(Y, min.Y, max.Y));
+		}
+
+		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
+		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
+
+        public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
+        public static bool operator !=(float2 me, float2 other) { return !(me == other); }
+        public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+                return false;
+
+            float2 o = (float2)obj;
+            return o == this;
+        }
+
+		public static readonly float2 Zero = new float2(0, 0);
+
+		public static bool WithinEpsilon(float2 a, float2 b, float e)
+		{
+			float2 d = a - b;
+			return Math.Abs(d.X) < e && Math.Abs(d.Y) < e;
+		}
+
+		public float2 Sign() { return new float2(Math.Sign(X), Math.Sign(Y)); }
+		public static float Dot(float2 a, float2 b) { return a.X * b.X + a.Y * b.Y; }
+		public float2 Round() { return new float2((float)Math.Round(X), (float)Math.Round(Y)); }
+
+		public override string ToString() { return string.Format("({0},{1})", X, Y); }
+		public int2 ToInt2() { return new int2((int)X, (int)Y); }
+
+		public static float2 Max(float2 a, float2 b) { return new float2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static float2 Min(float2 a, float2 b) { return new float2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public float LengthSquared { get { return X * X + Y * Y; } }
+		public float Length { get { return (float)Math.Sqrt(LengthSquared); } }
+	}
+}

OpenRA.FileFormats/Primitives/int2.cs

@@ -0,0 +1,67 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+
+namespace OpenRA
+{
+	public struct int2
+	{
+		public int X,Y;
+
+		public int2( int x, int y ) { this.X = x; this.Y = y; }
+		public int2( Point p ) { X = p.X; Y = p.Y; }
+		public int2( Size p ) { X = p.Width; Y = p.Height; }
+
+		public static int2 operator +(int2 a, int2 b) { return new int2(a.X + b.X, a.Y + b.Y); }
+		public static int2 operator -(int2 a, int2 b) { return new int2(a.X - b.X, a.Y - b.Y); }
+		public static int2 operator *(int a, int2 b) { return new int2(a * b.X, a * b.Y); }
+		public static int2 operator *(int2 b, int a) { return new int2(a * b.X, a * b.Y); }
+
+		public static bool operator ==(int2 me, int2 other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator !=(int2 me, int2 other) { return !(me == other); }
+
+		public int2 Sign() { return new int2(Math.Sign(X), Math.Sign(Y)); }
+		public int2 Abs() { return new int2( Math.Abs( X ), Math.Abs( Y ) ); }
+		public int LengthSquared { get { return X * X + Y * Y; } }
+		public int Length { get { return (int)Math.Sqrt(LengthSquared); } }
+		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+		public static int2 Max(int2 a, int2 b) { return new int2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static int2 Min(int2 a, int2 b) { return new int2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
+
+			int2 o = (int2)obj;
+			return o == this;
+		}
+
+		public static readonly int2 Zero = new int2(0, 0);
+		public Point ToPoint() { return new Point(X, Y); }
+        public PointF ToPointF() { return new PointF(X, Y); }
+		public float2 ToFloat2() { return new float2(X, Y); }
+
+		public override string ToString() { return string.Format("{0},{1}", X, Y); }
+	}
+}

OpenRA.FileFormats/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("OpenRA.FileFormats")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenRA.FileFormats")]
+[assembly: AssemblyCopyright("Copyright ©  2007,2009,2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

OpenRA.FileFormats/ProtocolVersion.cs

@@ -0,0 +1,28 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public static class ProtocolVersion
+	{
+		// you *must* increment this whenever you make an incompatible protocol change
+		public static readonly int Version = 4;
+	}
+}

OpenRA.FileFormats/Session.cs

@@ -0,0 +1,91 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class Session
+	{
+		public List<Client> Clients = new List<Client>();
+		public Global GlobalSettings = new Global();
+
+		public enum ClientState
+		{
+			NotReady,
+			Downloading,
+			Ready
+		}
+
+		public class Client
+		{
+			public int Index;
+			public int PaletteIndex;
+			public string Country;
+			public int SpawnPoint;
+			public string Name;
+			public ClientState State;
+			public int Team;
+		}
+
+		public class Global
+		{
+			public string Map;
+			public string[] Packages = {};	// filename:sha1 pairs.
+			public string[] Mods = { "ra" };	// mod names
+			public int OrderLatency = 3;
+			public int RandomSeed = 0;
+		}
+	}
+
+	public class Manifest
+	{
+		public readonly string[] 
+			Folders, Packages, Rules, 
+			Sequences, Chrome, Assemblies, ChromeLayout, 
+			Weapons, Voices, Music, Terrain;
+		
+		public readonly string ShellmapUid;
+
+		public Manifest(string[] mods)
+		{
+			var yaml = mods
+				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
+				.Aggregate(MiniYaml.Merge);
+				
+			Folders = YamlList(yaml, "Folders");
+			Packages = YamlList(yaml, "Packages");
+			Rules = YamlList(yaml, "Rules");
+			Sequences = YamlList(yaml, "Sequences");
+			Chrome = YamlList(yaml, "Chrome");
+			Assemblies = YamlList(yaml, "Assemblies");
+			ChromeLayout = YamlList(yaml, "ChromeLayout");
+			Weapons = YamlList(yaml, "Weapons");
+			Voices = YamlList(yaml, "Voices");
+			Music = YamlList(yaml, "Music");
+			Terrain = YamlList(yaml, "Terrain");
+			
+			ShellmapUid = yaml["ShellmapUid"].Value;
+		}
+
+		static string[] YamlList(Dictionary<string, MiniYaml> ys, string key) { return ys[key].Nodes.Keys.ToArray(); }
+	}
+}

OpenRA.FileFormats/ShroudPaletteRemap.cs

@@ -0,0 +1,60 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Drawing;
+
+namespace OpenRA.FileFormats
+{
+	public class ShroudPaletteRemap : IPaletteRemap
+	{
+		bool isFog;
+
+		public ShroudPaletteRemap(bool isFog) { this.isFog = isFog; }
+		public Color GetRemappedColor(Color original, int index)
+		{
+			// false-color version for debug
+
+			//return new[] { 
+			//    Color.FromArgb(64,0,0,0), Color.Green, 
+			//    Color.Blue, Color.Yellow, 
+			//    Color.Green, 
+			//    Color.Red, 
+			//    Color.Purple, 
+			//    Color.Cyan}[index % 8];
+
+			if (isFog)
+				return new[] { 
+					Color.Transparent, Color.Green, 
+					Color.Blue, Color.Yellow, 
+					Color.FromArgb(128,0,0,0), 
+					Color.FromArgb(128,0,0,0), 
+					Color.FromArgb(128,0,0,0), 
+					Color.FromArgb(64,0,0,0)}[index % 8];
+			else
+				return new[] { 
+					Color.Transparent, Color.Green, 
+					Color.Blue, Color.Yellow, 
+					Color.Black, 
+					Color.FromArgb(128,0,0,0), 
+					Color.Transparent, 
+					Color.Transparent}[index % 8];
+		}
+	}
+}

OpenRA.FileFormats/SingleColorRemap.cs

@@ -0,0 +1,38 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Drawing;
+
+namespace OpenRA.FileFormats
+{
+	public class SingleColorRemap : IPaletteRemap
+	{
+		Color c;
+		public SingleColorRemap(Color c)
+		{
+			this.c = c;
+		}
+
+		public Color GetRemappedColor(Color original, int index)
+		{
+			return original.A > 0 ? c : original;
+		}
+	}
+}

OpenRA.FileFormats/Support/Log.cs

@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.IO;
+using System;
+
+namespace OpenRA
+{
+	public static class Log
+	{
+		static StreamWriter writer = File.CreateText(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + Path.DirectorySeparatorChar + "openra.log.txt");
+
+		static Log()
+		{
+			writer.AutoFlush = true;
+		}
+
+		public static void Write(string format, params object[] args)
+		{
+			writer.WriteLine(format, args);
+		}
+	}
+}

OpenRA.FileFormats/Support/Stopwatch.cs

@@ -0,0 +1,41 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.Support
+{
+	public class Stopwatch
+	{
+		System.Diagnostics.Stopwatch sw;
+		public Stopwatch ()
+		{
+			Reset();
+		}
+
+		public double ElapsedTime()
+		{
+			return sw.Elapsed.TotalMilliseconds / 1000.0;
+		}
+
+		public void Reset()
+		{
+			sw = System.Diagnostics.Stopwatch.StartNew();
+		}
+	}
+}

OpenRA.FileFormats/Support/Timer.cs

@@ -0,0 +1,35 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.Support
+{
+	public static class Timer
+	{
+		static Stopwatch sw = new Stopwatch();
+		static double lastTime = 0;
+
+		public static void Time( string message )
+		{
+			var time = sw.ElapsedTime();
+			Log.Write( message, time - lastTime );
+			lastTime = time;
+		}
+	}
+}

OpenRA.FileFormats/Thirdparty/Random.cs

@@ -0,0 +1,53 @@
+using System;
+
+namespace OpenRA.Thirdparty
+{
+	// quick & dirty Mersenne Twister [MT19937] implementation
+
+	public class Random
+	{
+		uint[] mt = new uint[624];
+		int index = 0;
+
+		public Random() : this(Environment.TickCount) { }
+		
+		public Random(int seed)
+		{
+			mt[0] = (uint)seed;
+			for (var i = 1u; i < mt.Length; i++)
+				mt[i] = 1812433253u * (mt[i - 1] ^ (mt[i - 1] >> 30)) + i;
+		}
+
+		public int Next()
+		{
+			if (index == 0) Generate();
+
+			var y = mt[index];
+			y ^= (y >> 11);
+			y ^= ((y << 7) & 2636928640);
+			y ^= ((y << 15) & 4022730752);
+			y ^= y >> 18;
+
+			index = (index + 1) % 624;
+			return (int)(y % int.MaxValue);
+		}
+
+		public int Next(int low, int high) { return low + Next() % (high - low); }
+		public int Next(int high) { return Next() % high; }
+		public double NextDouble() { return Math.Abs(Next() / (double)0x7fffffff); }
+
+		void Generate()
+		{
+			unchecked
+			{
+				for (var i = 0u; i < mt.Length; i++)
+				{
+					var y = (mt[i] & 0x80000000) | (mt[(i + 1) % 624] & 0x7fffffff);
+					mt[i] = mt[(i + 397u) % 624u] ^ (y >> 1);
+					if ((y & 1) == 1)
+						mt[i] = (mt[i] ^ 2567483615);
+				}
+			}
+		}
+	}
+}

OpenRA.FileFormats/TypeDictionary.cs

@@ -0,0 +1,115 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class TypeDictionary
+	{
+		Dictionary<Type, object> dataSingular = new Dictionary<Type, object>();
+		Dictionary<Type, List<object>> dataMultiple = new Dictionary<Type, List<object>>();
+
+		public void Add( object val )
+		{
+			var t = val.GetType();
+
+			foreach( var i in t.GetInterfaces() )
+				InnerAdd( i, val );
+			foreach( var tt in t.BaseTypes() )
+				InnerAdd( tt, val );
+		}
+
+		void InnerAdd( Type t, object val )
+		{
+			List<object> objs;
+			object obj;
+
+			if( dataMultiple.TryGetValue( t, out objs ) )
+				objs.Add( val );
+			else if( dataSingular.TryGetValue( t, out obj ) )
+			{
+				dataSingular.Remove( t );
+				dataMultiple.Add( t, new List<object> { obj, val } );
+			}
+			else
+				dataSingular.Add( t, val );
+		}
+
+		public bool Contains<T>()
+		{
+			return dataSingular.ContainsKey( typeof( T ) ) || dataMultiple.ContainsKey( typeof( T ) );
+		}
+
+		public T Get<T>()
+		{
+			if( dataMultiple.ContainsKey( typeof( T ) ) )
+				throw new InvalidOperationException( string.Format( "TypeDictionary contains multiple instance of type `{0}`", typeof( T ) ) );
+
+			object ret;
+			if( !dataSingular.TryGetValue( typeof( T ), out ret ) )
+				throw new InvalidOperationException(string.Format("TypeDictionary does not contain instance of type `{0}`", typeof(T)));
+			return (T)ret;
+		}
+
+		public T GetOrDefault<T>()
+		{
+			if( dataMultiple.ContainsKey( typeof( T ) ) )
+				throw new InvalidOperationException( string.Format( "TypeDictionary contains multiple instance of type `{0}`", typeof( T ) ) );
+
+			object ret;
+			if( !dataSingular.TryGetValue( typeof( T ), out ret ) )
+				return default( T );
+			return (T)ret;
+		}
+
+		public IEnumerable<T> WithInterface<T>()
+		{
+			List<object> objs;
+			object obj;
+
+			if( dataMultiple.TryGetValue( typeof( T ), out objs ) )
+				return objs.Cast<T>();
+			else if( dataSingular.TryGetValue( typeof( T ), out obj ) )
+				return new T[] { (T)obj };
+			else
+				return new T[ 0 ];
+		}
+
+		public IEnumerator<object> GetEnumerator()
+		{
+			return WithInterface<object>().GetEnumerator();
+		}
+	}
+
+	static class TypeExts
+	{
+		public static IEnumerable<Type> BaseTypes( this Type t )
+		{
+			while( t != null )
+			{
+				yield return t;
+				t = t.BaseType;
+			}
+		}
+	}
+}

OpenRA.Game/Activities/Activity.cs

@@ -1,291 +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.Linq;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
-using OpenRA.Traits;
-
-namespace OpenRA.Activities
-{
-	public enum ActivityState { Queued, Active, Canceling, Done }
-
-	public class TargetLineNode
-	{
-		public readonly Target Target;
-		public readonly Color Color;
-		public readonly Sprite Tile;
-
-		public TargetLineNode(in Target target, Color color, Sprite tile = null)
-		{
-			// 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;
-		}
-
-		Activity nextActivity;
-		public Activity NextActivity
-		{
-			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.
-			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);
-			}
-		}
-
-		public virtual IEnumerable<Target> GetTargets(Actor self)
-		{
-			yield break;
-		}
-
-		public virtual IEnumerable<TargetLineNode> TargetLineNodes(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;
-		}
-	}
-}

OpenRA.Game/Activities/CallFunc.cs

@@ -1,33 +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;
-
-namespace OpenRA.Activities
-{
-	public class CallFunc : Activity
-	{
-		public CallFunc(Action a) { this.a = a; }
-		public CallFunc(Action a, bool interruptible)
-		{
-			this.a = a;
-			IsInterruptible = interruptible;
-		}
-
-		readonly Action a;
-
-		public override bool Tick(Actor self)
-		{
-			a.Invoke();
-			return true;
-		}
-	}
-}

OpenRA.Game/Actor.cs

@@ -1,633 +1,254 @@
-#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.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using Eluant;
-using Eluant.ObjectBinding;
-using OpenRA.Activities;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
-using OpenRA.Scripting;
-using OpenRA.Traits;
-
-namespace OpenRA
-{
-	[Flags]
-	public enum SystemActors
-	{
-		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; }
-
-		public bool IsInWorld { get; internal set; }
-		public bool WillDispose { get; private set; }
-		public bool Disposed { get; private set; }
-
-		Activity currentActivity;
-		public Activity CurrentActivity
-		{
-			get => Activity.SkipDoneActivities(currentActivity);
-			private set => currentActivity = value;
-		}
-
-		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; }
-
-		public bool IsIdle => CurrentActivity == null;
-		public bool IsDead => Disposed || (health != null && health.IsDead);
-
-		public CPos Location => OccupiesSpace.TopLeft;
-		public WPos CenterPosition => OccupiesSpace.CenterPosition;
-
-		public WRot Orientation => facing?.Orientation ?? WRot.None;
-
-		/// <summary>Value used to represent an invalid token.</summary>
-		public static readonly int InvalidConditionToken = -1;
-
-		class ConditionState
-		{
-			/// <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>();
-		}
-
-		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;
-
-		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 (name != null)
-			{
-				name = name.ToLowerInvariant();
-
-				if (!world.Map.Rules.Actors.ContainsKey(name))
-					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();
-			}
-		}
-
-		internal void Initialize(bool addToWorld = true)
-		{
-			created = true;
-
-			// 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>())
-			{
-				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);
-
-						// 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;
-					}
-				}
-			}
-
-			// Update all traits with their initial condition state
-			foreach (var notify in allObserverNotifiers)
-				notify(this, readOnlyConditionCache);
-
-			// 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);
-		}
-
-		public void Tick()
-		{
-			var wasIdle = IsIdle;
-			CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
-
-			if (!wasIdle && IsIdle)
-			{
-				foreach (var n in becomingIdles)
-					n.OnBecomingIdle(this);
-
-				// If IsIdle is true, it means the last CurrentActivity.Tick returned null.
-				// If a next activity has been queued via OnBecomingIdle, we need to start running it now,
-				// to avoid an 'empty' null tick where the actor will (visibly, if moving) do nothing.
-				CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
-			}
-			else if (wasIdle)
-				foreach (var tickIdle in tickIdles)
-					tickIdle.TickIdle(this);
-		}
-
-		public IEnumerable<IRenderable> Render(WorldRenderer wr)
-		{
-			// PERF: Avoid LINQ.
-			var renderables = Renderables(wr);
-			foreach (var modifier in renderModifiers)
-				renderables = modifier.ModifyRender(this, wr, renderables);
-			return renderables;
-		}
-
-		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;
-			else
-				CurrentActivity.Queue(nextActivity);
-		}
-
-		public void CancelActivity()
-		{
-			CurrentActivity?.Cancel(this);
-		}
-
-		public override int GetHashCode()
-		{
-			return (int)ActorID;
-		}
-
-		public override bool Equals(object obj)
-		{
-			return obj is Actor o && Equals(o);
-		}
-
-		public bool Equals(Actor other)
-		{
-			return ActorID == other.ActorID;
-		}
-
-		public override string ToString()
-		{
-			// PERF: Avoid format strings.
-			var name = Info.Name + " " + ActorID;
-			if (!IsInWorld)
-				name += " (not in world)";
-			return name;
-		}
-
-		public T Trait<T>()
-		{
-			return World.TraitDict.Get<T>(this);
-		}
-
-		public T TraitOrDefault<T>()
-		{
-			return World.TraitDict.GetOrDefault<T>(this);
-		}
-
-		public IEnumerable<T> TraitsImplementing<T>()
-		{
-			return World.TraitDict.WithInterface<T>(this);
-		}
-
-		public void AddTrait(object trait)
-		{
-			World.TraitDict.AddTrait(this, trait);
-		}
-
-		public void Dispose()
-		{
-			// If CurrentActivity isn't null, run OnActorDisposeOuter in case some cleanups are needed.
-			// This should be done before the FrameEndTask to avoid dependency issues.
-			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)
-					return;
-
-				if (IsInWorld)
-					World.Remove(this);
-
-				foreach (var t in TraitsImplementing<INotifyActorDisposing>())
-					t.Disposing(this);
-
-				World.TraitDict.RemoveActor(this);
-				Disposed = true;
-
-				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));
-		}
-
-		/// <summary>
-		/// Change the actors owner without queuing a FrameEndTask.
-		/// This must only be called from inside an existing FrameEndTask.
-		/// </summary>
-		public void ChangeOwnerSync(Player newOwner)
-		{
-			if (Disposed)
-				return;
-
-			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);
-		}
-
-		public DamageState GetDamageState()
-		{
-			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))
-					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;
-		public void OnScriptBind(ScriptContext context)
-		{
-			if (luaInterface == null)
-				luaInterface = Exts.Lazy(() => new ScriptActorInterface(context, this));
-		}
-
-		public LuaValue this[LuaRuntime runtime, LuaValue keyValue]
-		{
-			get => 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))
-				return false;
-
-			return a == b;
-		}
-
-		public LuaValue ToString(LuaRuntime runtime)
-		{
-			return $"Actor ({this})";
-		}
-
-		public bool HasScriptProperty(string name)
-		{
-			return luaInterface.Value.ContainsKey(name);
-		}
-
-		#endregion
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
+
+namespace OpenRA
+{
+	public class Actor
+	{
+		[Sync]
+		public readonly TypeDictionary traits = new TypeDictionary();
+		public readonly ActorInfo Info;
+
+		public readonly World World;
+		public readonly uint ActorID;
+
+		[Sync]
+		public int2 Location;
+		[Sync]
+		public Player Owner;
+		[Sync]
+		public int Health;
+		IActivity currentActivity;
+
+		public Actor(World world, string name, int2 location, Player owner)
+		{
+			World = world;
+			ActorID = world.NextAID();
+			Location = location;
+			CenterLocation = Traits.Util.CenterOfCell(Location);
+			Owner = owner;
+
+			if (name != null)
+			{
+				if (!Rules.Info.ContainsKey(name.ToLowerInvariant()))
+					throw new NotImplementedException("No rules definition for unit {0}".F(name.ToLowerInvariant()));
+
+				Info = Rules.Info[name.ToLowerInvariant()];
+				Health = this.GetMaxHP();
+
+				foreach (var trait in Info.TraitsInConstructOrder())
+					traits.Add(trait.Create(this));
+			}
+
+			Size = Lazy.New(() =>
+			{
+				var si = Info.Traits.GetOrDefault<SelectableInfo>();
+				if (si != null && si.Bounds != null)
+					return new float2(si.Bounds[0], si.Bounds[1]);
+
+				// auto size from render
+				var firstSprite = traits.WithInterface<IRender>().SelectMany(x => x.Render(this)).FirstOrDefault();
+				if (firstSprite.Sprite == null) return float2.Zero;
+				return firstSprite.Sprite.size;
+			});
+		}
+
+		public void Tick()
+		{
+			var wasIdle = currentActivity is Idle;
+			while (currentActivity != null)
+			{
+				var a = currentActivity;
+				currentActivity = a.Tick(this) ?? new Idle();
+
+				if (a == currentActivity) break;
+
+				if (currentActivity is Idle)
+				{
+					if (!wasIdle)
+						foreach (var ni in traits.WithInterface<INotifyIdle>())
+							ni.Idle(this);
+
+					break;
+				}
+			}
+		}
+
+		public bool IsIdle
+		{
+			get { return currentActivity == null || currentActivity is Idle; }
+		}
+
+		public float2 CenterLocation;
+
+		Lazy<float2> Size;
+
+		public IEnumerable<Renderable> Render()
+		{
+			var mods = traits.WithInterface<IRenderModifier>();
+			var sprites = traits.WithInterface<IRender>().SelectMany(x => x.Render(this));
+			return mods.Aggregate(sprites, (m, p) => p.ModifyRender(this, m));
+		}
+
+		public Order Order( int2 xy, MouseInput mi )
+		{
+			if (Owner != World.LocalPlayer)
+				return null;
+
+			if (!World.Map.IsInMap(xy.X, xy.Y))
+				return null;
+
+			var underCursor = World.FindUnitsAtMouse(mi.Location)
+				.Where(a => a.Info.Traits.Contains<SelectableInfo>())
+				.OrderByDescending(a => a.Info.Traits.Get<SelectableInfo>().Priority)
+				.FirstOrDefault();
+			
+			return traits.WithInterface<IIssueOrder>()
+				.Select( x => x.IssueOrder( this, xy, mi, underCursor ) )
+				.FirstOrDefault( x => x != null );
+		}
+
+		public RectangleF GetBounds(bool useAltitude)
+		{
+			var si = Info.Traits.GetOrDefault<SelectableInfo>();
+
+			var size = Size.Value;
+			var loc = CenterLocation - 0.5f * size;
+			
+			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
+				loc += new float2(si.Bounds[2], si.Bounds[3]);
+
+			if (useAltitude)
+			{
+				var unit = traits.GetOrDefault<Unit>();
+				if (unit != null) loc -= new float2(0, unit.Altitude);
+			}
+
+			return new RectangleF(loc.X, loc.Y, size.X, size.Y);
+		}
+
+		public bool IsDead { get { return Health <= 0; } }
+		public bool IsInWorld { get; set; }
+		public bool RemoveOnDeath = true;
+
+		public DamageState GetDamageState()
+		{
+			if (Health <= 0)
+				return DamageState.Dead;
+			
+			if (Health < this.GetMaxHP() * World.Defaults.ConditionYellow)
+				return DamageState.Half;
+
+			return DamageState.Normal;
+		}
+
+		public void InflictDamage(Actor attacker, int damage, WarheadInfo warhead)
+		{
+			if (IsDead) return;		/* overkill! don't count extra hits as more kills! */
+
+			var rawDamage = damage;
+			var oldState = GetDamageState();
+
+			/* apply the damage modifiers, if we have any. */
+			var modifier = (float)traits.WithInterface<IDamageModifier>()
+				.Select(t => t.GetDamageModifier()).Product();
+
+			damage = (int)(damage * modifier);
+
+			Health -= damage;
+			if (Health <= 0)
+			{
+				Health = 0;
+
+				attacker.Owner.Kills++;
+				Owner.Deaths++;
+
+				if (RemoveOnDeath)
+					World.AddFrameEndTask(w => w.Remove(this));
+			}
+
+			var maxHP = this.GetMaxHP();
+
+			if (Health > maxHP)	Health = maxHP;
+
+			Log.Write("InflictDamage: {0} #{1} -> {2} #{3} raw={4} adj={5} hp={6} mod={7}",
+				attacker.Info.Name, attacker.ActorID, Info.Name, ActorID, rawDamage, damage, Health, modifier);
+
+			var newState = GetDamageState();
+
+			foreach (var nd in traits.WithInterface<INotifyDamage>())
+				nd.Damaged(this, new AttackInfo
+				{
+					Attacker = attacker,
+					Damage = damage,
+					DamageState = newState,
+					DamageStateChanged = newState != oldState,
+					Warhead = warhead
+				});
+		}
+
+		public void QueueActivity( IActivity nextActivity )
+		{
+			if( currentActivity == null )
+			{
+				currentActivity = nextActivity;
+				return;
+			}
+			var act = currentActivity;
+			while( act.NextActivity != null )
+			{
+				act = act.NextActivity;
+			}
+			act.NextActivity = nextActivity;
+		}
+
+		public void CancelActivity()
+		{
+			if( currentActivity != null )
+				currentActivity.Cancel( this );
+		}
+
+		// For pathdebug, et al
+		public IActivity GetCurrentActivity()
+		{
+			return currentActivity;
+		}
+
+		public override int GetHashCode()
+		{
+			return (int)ActorID;
+		}
+
+		public override bool Equals( object obj )
+		{
+			var o = obj as Actor;
+			return ( o != null && o.ActorID == ActorID );
+		}
+	}
+}

OpenRA.Game/CPos.cs

@@ -1,150 +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 Eluant;
-using Eluant.ObjectBinding;
-using OpenRA.Scripting;
-
-namespace OpenRA
-{
-	public readonly 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;
-
-		// 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 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 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 == other); }
-
-		public override int GetHashCode() { return Bits.GetHashCode(); }
-
-		public bool Equals(CPos other) { return Bits == other.Bits; }
-		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
-
-		public override string ToString()
-		{
-			if (Layer == 0)
-				return X + "," + Y;
-
-			return X + "," + Y + "," + Layer;
-		}
-
-		public MPos ToMPos(Map map)
-		{
-			return ToMPos(map.Grid.Type);
-		}
-
-		public MPos ToMPos(MapGridType gridType)
-		{
-			if (gridType == MapGridType.Rectangular)
-				return new MPos(X, Y);
-
-			// Convert from RectangularIsometric cell (x, y) position to rectangular map position (u, v)
-			//  - The staggered rows make this fiddly (hint: draw a diagram!)
-			// (a) Consider the relationships:
-			//  - +1x (even -> odd) adds (0, 1) to (u, v)
-			//  - +1x (odd -> even) adds (1, 1) to (u, v)
-			//  - +1y (even -> odd) adds (-1, 1) to (u, v)
-			//  - +1y (odd -> even) adds (0, 1) to (u, v)
-			// (b) Therefore:
-			//  - ax + by adds (a - b)/2 to u (only even increments count)
-			//  - ax + by adds a + b to v
-			var u = (X - Y) / 2;
-			var v = X + Y;
-			return new MPos(u, v);
-		}
-
-		#region Scripting interface
-
-		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})");
-
-			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})");
-
-			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})");
-		}
-
-		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
-		{
-			if (!left.TryGetClrValue(out CPos a) || !right.TryGetClrValue(out CPos b))
-				return false;
-
-			return a == b;
-		}
-
-		public LuaValue this[LuaRuntime runtime, LuaValue key]
-		{
-			get
-			{
-				switch (key.ToString())
-				{
-					case "X": return X;
-					case "Y": return Y;
-					case "Layer": return Layer;
-					default: throw new LuaException($"CPos does not define a member '{key}'");
-				}
-			}
-
-			set => throw new LuaException("CPos is read-only. Use CPos.New to create a new value");
-		}
-
-		#endregion
-	}
-}

OpenRA.Game/CVec.cs

@@ -1,122 +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 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 readonly int X, Y;
-
-		public CVec(int x, int y) { X = x; Y = y; }
-		public static readonly CVec Zero = new CVec(0, 0);
-
-		public static CVec operator +(CVec a, CVec b) { return new CVec(a.X + b.X, a.Y + b.Y); }
-		public static CVec operator -(CVec a, CVec b) { return new CVec(a.X - b.X, a.Y - b.Y); }
-		public static CVec operator *(int a, CVec b) { return new CVec(a * b.X, a * b.Y); }
-		public static CVec operator *(CVec b, int a) { return new CVec(a * b.X, a * b.Y); }
-		public static CVec operator /(CVec a, int b) { return new CVec(a.X / b, a.Y / b); }
-
-		public static CVec operator -(CVec a) { return new CVec(-a.X, -a.Y); }
-
-		public static bool operator ==(CVec me, CVec other) { return me.X == other.X && me.Y == other.Y; }
-		public static bool operator !=(CVec me, CVec other) { return !(me == other); }
-
-		public static CVec Max(CVec a, CVec b) { return new CVec(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
-		public static CVec Min(CVec a, CVec b) { return new CVec(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
-
-		public static int Dot(CVec a, CVec b) { return a.X * b.X + a.Y * b.Y; }
-
-		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 CVec Clamp(Rectangle r)
-		{
-			return new CVec(
-				Math.Min(r.Right, Math.Max(X, r.Left)),
-				Math.Min(r.Bottom, Math.Max(Y, r.Top)));
-		}
-
-		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
-
-		public bool Equals(CVec other) { return other == this; }
-		public override bool Equals(object obj) { return obj is CVec && Equals((CVec)obj); }
-
-		public override string ToString() { return X + "," + Y; }
-
-		public static readonly CVec[] Directions =
-		{
-			new CVec(-1, -1),
-			new CVec(-1,  0),
-			new CVec(-1,  1),
-			new CVec(0, -1),
-			new CVec(0,  1),
-			new CVec(1, -1),
-			new CVec(1,  0),
-			new CVec(1,  1),
-		};
-
-		#region Scripting interface
-
-		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})");
-
-			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})");
-
-			return new LuaCustomClrObject(a - b);
-		}
-
-		public LuaValue Minus(LuaRuntime runtime)
-		{
-			return new LuaCustomClrObject(-this);
-		}
-
-		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
-		{
-			if (!left.TryGetClrValue(out CVec a) || !right.TryGetClrValue(out CVec b))
-				return false;
-
-			return a == b;
-		}
-
-		public LuaValue this[LuaRuntime runtime, LuaValue key]
-		{
-			get
-			{
-				switch (key.ToString())
-				{
-					case "X": return X;
-					case "Y": return Y;
-					default: throw new LuaException($"CVec does not define a member '{key}'");
-				}
-			}
-
-			set => throw new LuaException("CVec is read-only. Use CVec.New to create a new value");
-		}
-
-		#endregion
-	}
-}

OpenRA.Game/Chat.cs

@@ -0,0 +1,77 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
+
+namespace OpenRA
+{
+	class Chat
+	{
+		const int logLength = 10;
+
+		public List<Tuple<Color, string, string>> recentLines = new List<Tuple<Color, string, string>>();
+		public string typing = "";
+		public bool isChatting = true;
+
+		public void Toggle()
+		{
+			if( isChatting && typing.Length > 0 )
+				Game.IssueOrder( Order.Chat( typing ) );
+
+			typing = "";
+			if( Game.orderManager.GameStarted )
+				isChatting ^= true;
+		}
+		
+		public void Reset()
+		{
+			typing = "";
+			isChatting = false;
+			recentLines.Clear();
+		}
+
+		public void TypeChar(char c)
+		{
+			if (c == '\b' || c == 0x7f)
+			{
+				if (typing.Length > 0)
+					typing = typing.Remove(typing.Length - 1);
+			}
+			else if (!char.IsControl(c))
+				typing += c;
+		}
+
+		public void AddLine(Session.Client p, string text)
+		{
+			AddLine(Player.PlayerColors( Game.world )[p.PaletteIndex].c, p.Name, text);
+		}
+
+		public void AddLine(Color c, string from, string text)
+		{
+			recentLines.Add(Tuple.New(c, from, text));
+			var eva = Rules.Info["world"].Traits.Get<EvaAlertsInfo>();
+			Sound.Play(eva.ChatBeep);
+			while (recentLines.Count > logLength) recentLines.RemoveAt(0);
+		}
+	}
+}

OpenRA.Game/Chrome.cs

@@ -0,0 +1,261 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+using OpenRA.Widgets;
+
+namespace OpenRA
+{
+	class Chrome : IHandleInput
+	{
+		public readonly Renderer renderer;
+		public readonly LineRenderer lineRenderer;
+
+		SpriteRenderer rgbaRenderer { get { return renderer.RgbaSpriteRenderer; } }
+		SpriteRenderer shpRenderer { get { return renderer.WorldSpriteRenderer; } }
+	
+		readonly List<Pair<RectangleF, Action<bool>>> buttons = new List<Pair<RectangleF, Action<bool>>>();
+
+		internal MapStub currentMap;
+
+		public Chrome(Renderer r, Manifest m)
+		{
+			this.renderer = r;
+			lineRenderer = new LineRenderer(renderer);
+					
+			var widgetYaml = m.ChromeLayout.Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge);
+			
+			if (rootWidget == null)
+			{
+				rootWidget = WidgetLoader.LoadWidget( widgetYaml.FirstOrDefault() );
+				rootWidget.Initialize();
+				rootWidget.InitDelegates();
+				Widget.WindowList.Push("MAINMENU_BG");
+			}
+		}
+
+		public static Widget rootWidget = null;
+		public static Widget selectedWidget;
+				
+		public void Tick(World world)
+		{
+			if (!world.GameHasStarted) return;
+			if (world.LocalPlayer == null) return;
+
+			++ticksSinceLastMove;
+			
+			rootWidget.Tick(world);
+		}
+				
+		public void Draw( World world )
+		{
+			buttons.Clear();
+			renderer.Device.DisableScissor();
+			
+			var typingArea = new Rectangle(240, Game.viewport.Height - 30, Game.viewport.Width - 420, 30);
+			var chatLogArea = new Rectangle(240, Game.viewport.Height - 500, Game.viewport.Width - 420, 500 - 40);
+			DrawChat(typingArea, chatLogArea);
+		}
+		
+		void AddUiButton(int2 pos, string text, Action<bool> a)
+		{
+			var rect = new Rectangle(pos.X - 160 / 2, pos.Y - 4, 160, 24);
+			DrawDialogBackground( rect, "dialog2");
+			DrawCentered(text, new int2(pos.X, pos.Y), Color.White);
+			rgbaRenderer.Flush();
+			AddButton(rect, a);
+		}
+
+		public void DrawMapChooser()
+		{
+			buttons.Clear();
+
+			var w = 800;
+			var h = 600;
+			var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h );
+
+			AddUiButton(new int2(r.Left + 200, r.Bottom - 40), "OK",
+				_ =>
+				{
+					Game.IssueOrder(Order.Chat("/map " + currentMap.Uid));
+					Chrome.rootWidget.CloseWindow();
+				});
+
+			AddUiButton(new int2(r.Right - 200, r.Bottom - 40), "Cancel",
+				_ =>
+				{
+					Chrome.rootWidget.CloseWindow();
+				});
+
+			var mapContainer = new Rectangle(r.Right - 280, r.Top + 30, 256, 256);
+
+			var y = r.Top + 50;
+					
+			// Don't bother showing a subset of the data
+			// This will be fixed properly when we move the map list to widgets
+			foreach (var kv in Game.AvailableMaps)
+			{
+				var map = kv.Value;
+				if (!map.Selectable)
+					continue;
+
+				var itemRect = new Rectangle(r.Left + 50, y - 2, r.Width - 340, 20);
+				if (map == currentMap)
+				{
+					rgbaRenderer.Flush();
+					DrawDialogBackground(itemRect, "dialog2");
+				}
+
+				renderer.RegularFont.DrawText(map.Title, new int2(r.Left + 60, y), Color.White);
+				rgbaRenderer.Flush();
+				var closureMap = map;
+				AddButton(itemRect, _ => { currentMap = closureMap; });
+				y += 20;
+			}
+
+			y = mapContainer.Bottom + 20;
+			DrawCentered("Title: {0}".F(currentMap.Title),
+				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
+			y += 20;
+			DrawCentered("Size: {0}x{1}".F(currentMap.Width, currentMap.Height),
+				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
+			y += 20;
+
+			var theaterInfo = Rules.Info["world"].Traits.WithInterface<TheaterInfo>().FirstOrDefault(t => t.Theater == currentMap.Tileset);
+			DrawCentered("Theater: {0}".F(theaterInfo.Name),
+				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
+			y += 20;
+			DrawCentered("Spawnpoints: {0}".F(currentMap.PlayerCount),
+				new int2(mapContainer.Left + mapContainer.Width / 2, y), Color.White);
+
+			AddButton(r, _ => { });
+		}
+		
+
+		public void DrawWidgets(World world) { rootWidget.Draw(world); shpRenderer.Flush(); rgbaRenderer.Flush(); lineRenderer.Flush(); }
+		
+		public void DrawLobby()
+		{
+			buttons.Clear();
+
+			if( Game.LobbyInfo.GlobalSettings.Map == null )
+				currentMap = null;
+			else
+				currentMap = Game.AvailableMaps[ Game.LobbyInfo.GlobalSettings.Map ];
+			
+			var w = 800;
+			var h = 600;
+			var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h );
+
+			var typingBox = new Rectangle(r.Left + 20, r.Bottom - 47, r.Width - 40, 27);
+			var chatBox = new Rectangle(r.Left + 20, r.Bottom - 269, r.Width - 40, 220);
+
+			DrawDialogBackground(typingBox, "dialog2");
+			DrawDialogBackground(chatBox, "dialog3");
+
+			DrawChat(typingBox, chatBox);
+		}
+		
+		void AddButton(RectangleF r, Action<bool> b) { buttons.Add(Pair.New(r, b)); }
+
+		void DrawDialogBackground(Rectangle r, string collection)
+		{
+			WidgetUtils.DrawPanel(collection, r);
+		}
+
+		void DrawChat(Rectangle typingArea, Rectangle chatLogArea)
+		{
+			var chatpos = new int2(chatLogArea.X + 10, chatLogArea.Bottom - 6);
+
+			renderer.Device.EnableScissor(typingArea.Left, typingArea.Top, typingArea.Width, typingArea.Height);
+			if (Game.chat.isChatting)
+				RenderChatLine(Tuple.New(Color.White, "Chat:", Game.chat.typing), 
+					new int2(typingArea.X + 10, typingArea.Y + 6));
+
+			rgbaRenderer.Flush();
+			renderer.Device.DisableScissor();
+
+			renderer.Device.EnableScissor(chatLogArea.Left, chatLogArea.Top, chatLogArea.Width, chatLogArea.Height);
+			foreach (var line in Game.chat.recentLines.AsEnumerable().Reverse())
+			{
+				chatpos.Y -= 20;
+				RenderChatLine(line, chatpos);
+			}
+
+			rgbaRenderer.Flush();
+			renderer.Device.DisableScissor();
+		}
+
+		void RenderChatLine(Tuple<Color, string, string> line, int2 p)
+		{
+			var size = renderer.RegularFont.Measure(line.b);
+			renderer.RegularFont.DrawText(line.b, p, line.a);
+			renderer.RegularFont.DrawText(line.c, p + new int2(size.X + 10, 0), Color.White);
+		}
+
+		public int ticksSinceLastMove = 0;
+		public int2 lastMousePos;
+		public bool HandleInput(World world, MouseInput mi)
+		{
+			if (selectedWidget != null)
+				return selectedWidget.HandleInput(mi);
+				
+			if (rootWidget.HandleInput(mi))
+				return true;
+
+			if (mi.Event == MouseInputEvent.Move)
+			{
+				lastMousePos = mi.Location;
+				ticksSinceLastMove = 0;
+			}
+
+			var action = buttons.Where(a => a.First.Contains(mi.Location.ToPoint()))
+				.Select(a => a.Second).FirstOrDefault();
+
+			if (action == null)
+				return false;
+
+			if (mi.Event == MouseInputEvent.Down)
+				action(mi.Button == MouseButton.Left);
+
+			return true;
+		}
+
+		public bool HitTest(int2 mousePos)
+		{
+			if (selectedWidget != null)
+				return true;
+			
+			return rootWidget.HitTest(mousePos)
+				|| buttons.Any(a => a.First.Contains(mousePos.ToPoint()));
+		}
+
+		void DrawCentered(string text, int2 pos, Color c)
+		{
+			renderer.BoldFont.DrawText(text, pos - new int2(renderer.BoldFont.Measure(text).X / 2, 0), c);
+		}
+	}
+}

OpenRA.Game/Combat.cs

@@ -0,0 +1,199 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Linq;
+using OpenRA.Effects;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+using OpenRA.FileFormats;
+
+namespace OpenRA
+{
+	public static class Combat			/* some utility bits that are shared between various things */
+	{
+		static string GetImpactSound(WarheadInfo warhead, bool isWater)
+		{
+			if (isWater && warhead.WaterImpactSound != null)
+				return warhead.WaterImpactSound + ".aud";
+
+			if (warhead.ImpactSound != null)
+				return warhead.ImpactSound + ".aud";
+
+			return null;
+		}
+
+		public static void DoImpact(WarheadInfo warhead, ProjectileArgs args)
+		{
+			var world = args.firedBy.World;
+			var targetTile = ((1f / Game.CellSize) * args.dest.ToFloat2()).ToInt2();
+			var isWater = world.GetTerrainType(targetTile) == TerrainType.Water;
+
+			if (warhead.Explosion != 0)
+				world.AddFrameEndTask(
+					w => w.Add(new Explosion(w, args.dest, warhead.Explosion, isWater)));
+
+			Sound.Play(GetImpactSound(warhead, isWater));
+			
+			if (warhead.SmudgeType != null)
+			{
+				var smudgeLayer = world.WorldActor.traits.WithInterface<SmudgeLayer>()
+					.FirstOrDefault(x => x.Info.Type == warhead.SmudgeType);
+				if (smudgeLayer == null)
+					throw new NotImplementedException("Unknown smudge type `{0}`".F(warhead.SmudgeType));
+
+				if (warhead.Size[0] > 0)
+				{
+					var smudgeCells = world.FindTilesInCircle(targetTile, warhead.Size[0])
+						.Except(world.FindTilesInCircle(targetTile, warhead.Size[1]));
+
+					foreach (var sc in smudgeCells)
+						smudgeLayer.AddSmudge(sc);
+				}
+				else
+					smudgeLayer.AddSmudge(targetTile);
+			}
+			
+			if (warhead.Ore)
+				world.WorldActor.traits.Get<ResourceLayer>().Destroy(targetTile);
+
+			var firepowerModifier = args.firedBy.traits
+				.WithInterface<IFirepowerModifier>()
+				.Select(a => a.GetFirepowerModifier())
+				.Product();
+
+			switch (warhead.DamageModel)
+			{
+				case DamageModel.Normal:
+					{
+						var maxSpread = warhead.Spread * (float)Math.Log(Math.Abs(warhead.Damage), 2);
+						var hitActors = world.FindUnitsInCircle(args.dest, maxSpread);
+
+						Log.Write("DoImpact: {0} damage={1} modifier={2} spread={3}",
+							args.dest, warhead.Damage, firepowerModifier, maxSpread);
+
+						foreach (var victim in hitActors)
+						{
+							var damage = (int)GetDamageToInflict(victim, args, warhead, firepowerModifier);
+							victim.InflictDamage(args.firedBy, damage, warhead);
+						}
+					} break;
+
+				case DamageModel.PerCell:
+					{
+						foreach (var t in world.FindTilesInCircle(targetTile, warhead.Size[0]))
+							foreach (var unit in world.FindUnits(Game.CellSize * t, Game.CellSize * (t + new float2(1,1))))
+								unit.InflictDamage(args.firedBy,
+									(int)(warhead.Damage * warhead.EffectivenessAgainst(
+									unit.Info.Traits.Get<OwnedActorInfo>().Armor)), warhead);
+					} break;
+			}
+		}
+
+		public static void DoImpacts(ProjectileArgs args)
+		{
+			foreach (var warhead in args.weapon.Warheads)
+			{
+				Action a = () => DoImpact(warhead, args);
+				if (warhead.Delay > 0)
+					args.firedBy.World.AddFrameEndTask(
+						w => w.Add(new DelayedAction(warhead.Delay, a)));
+				else
+					a();
+			}
+		}
+
+		public static void DoExplosion(Actor attacker, string weapontype, int2 location, int altitude)
+		{
+			var args = new ProjectileArgs
+			{
+				src = location,
+				dest = location,
+				srcAltitude = altitude,
+				destAltitude = altitude,
+				firedBy = attacker,
+				target = null,
+				weapon = Rules.Weapons[ weapontype.ToLowerInvariant() ],
+				facing = 0
+			};
+
+			DoImpacts(args);
+		}
+
+		static readonly float[] falloff = 
+		{
+			1f, 0.3678795f, 0.1353353f, 0.04978707f, 
+			0.01831564f, 0.006737947f, 0.002478752f, 0.000911882f
+		};
+
+		static float GetDamageFalloff(float x)
+		{
+			var u = (int)x;
+			if (u >= falloff.Length - 1) return 0;
+			var t = x - u;
+			return (falloff[u] * (1 - t)) + (falloff[u + 1] * t);
+		}
+
+		static float GetDamageToInflict(Actor target, ProjectileArgs args, WarheadInfo warhead, float modifier)
+		{
+			// don't hit air units with splash from ground explosions, etc
+			if (!WeaponValidForTarget(args.weapon, target)) return 0f;
+
+			var selectable = target.Info.Traits.GetOrDefault<SelectableInfo>();
+			var radius = selectable != null ? selectable.Radius : 0;
+			var distance = (int)Math.Max(0, (target.CenterLocation - args.dest).Length - radius);
+			var falloff = (float)GetDamageFalloff(distance / warhead.Spread);
+			var rawDamage = (float)(warhead.Damage * modifier * falloff);
+			var multiplier = (float)warhead.EffectivenessAgainst(target.Info.Traits.Get<OwnedActorInfo>().Armor);
+
+			Log.Write("GetDamageToInflict {0} #{1} r={2} dist={3} falloff={4} raw={5} mul={6}",
+				target.Info.Name, target.ActorID, radius, distance, falloff, rawDamage, multiplier);
+
+			return (float)(rawDamage * multiplier);
+		}
+
+		public static bool WeaponValidForTarget(WeaponInfo weapon, Actor target)
+		{
+			var ownedInfo = target.Info.Traits.GetOrDefault<OwnedActorInfo>();
+
+			if (!weapon.ValidTargets.Contains(ownedInfo.TargetType))
+				return false;
+
+			if (weapon.Warheads.All( w => w.EffectivenessAgainst(ownedInfo.Armor) <= 0))
+				return false;
+
+			if (weapon.Underwater && !ownedInfo.WaterBound)
+				return false;
+
+			return true;
+		}
+
+		public static bool HasAnyValidWeapons(Actor self, Actor target)
+		{
+			var info = self.Info.Traits.Get<AttackBaseInfo>();
+			if (info.PrimaryWeapon != null &&
+				WeaponValidForTarget(self.GetPrimaryWeapon(), target)) return true;
+			if (info.SecondaryWeapon != null &&
+				WeaponValidForTarget(self.GetSecondaryWeapon(), target)) return true;
+
+			return false;
+		}
+	}
+}

OpenRA.Game/Controller.cs

@@ -0,0 +1,168 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Orders;
+using OpenRA.Traits;
+
+namespace OpenRA
+{
+	public class Controller : IHandleInput
+	{
+		public IOrderGenerator orderGenerator = new UnitOrderGenerator();
+		public Selection selection = new Selection();
+
+		public void CancelInputMode() { orderGenerator = new UnitOrderGenerator(); }
+
+		public bool ToggleInputMode<T>() where T : IOrderGenerator, new()
+		{
+			if (orderGenerator is T)
+			{
+				CancelInputMode();
+				return false;
+			}
+			else
+			{
+				orderGenerator = new T();
+				return true;
+			}
+		}
+
+		void ApplyOrders(World world, float2 xy, MouseInput mi)
+		{
+			if (orderGenerator == null) return;
+
+			var orders = orderGenerator.Order(world, xy.ToInt2(), mi).ToArray();
+			Game.orderManager.IssueOrders( orders );
+
+			var voicedActor = orders.Select(o => o.Subject)
+				.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.traits.Contains<Unit>());
+
+			var isMove = orders.Any(o => o.OrderString == "Move");
+			var isAttack = orders.Any( o => o.OrderString == "Attack" );
+
+			if (voicedActor != null)
+			{
+				
+				if(voicedActor.traits.GetOrDefault<IMovement>().CanEnterCell(xy.ToInt2()))
+					Sound.PlayVoice(isAttack ? "Attack" : "Move", voicedActor);
+
+				if (isMove)
+					world.Add(new Effects.MoveFlash(world, Game.CellSize * xy));
+			}
+		}
+
+		float2 dragStart, dragEnd;
+		public bool HandleInput(World world, MouseInput mi)
+		{
+			var xy = Game.viewport.ViewToWorld(mi);
+
+			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down)
+			{
+				if (!(orderGenerator is PlaceBuildingOrderGenerator))
+					dragStart = dragEnd = xy;
+				ApplyOrders(world, xy, mi);
+			}
+
+			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Move)
+				dragEnd = xy;
+
+			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Up)
+			{
+				if (orderGenerator is UnitOrderGenerator)
+				{
+					var newSelection = world.SelectActorsInBox(Game.CellSize * dragStart, Game.CellSize * xy);
+					selection.Combine(world, newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
+				}
+
+				dragStart = dragEnd = xy;
+			}
+
+			if (mi.Button == MouseButton.None && mi.Event == MouseInputEvent.Move)
+				dragStart = dragEnd = xy;
+
+			if (mi.Button == MouseButton.Right && mi.Event == MouseInputEvent.Down)
+				ApplyOrders(world, xy, mi);
+
+			return true;
+		}
+
+		public Pair<float2, float2>? SelectionBox
+		{
+			get
+			{
+				if (dragStart == dragEnd) return null;
+				return Pair.New(Game.CellSize * dragStart, Game.CellSize * dragEnd);
+			}
+		}
+
+		public float2 MousePosition { get { return dragEnd; } }
+		Modifiers modifiers;
+
+		public string ChooseCursor( World world )
+		{
+			int sync = world.SyncHash();
+
+			try
+			{
+				if (!world.GameHasStarted)
+					return "default";
+
+				var mi = new MouseInput
+				{
+					Location = ( Game.CellSize * MousePosition - Game.viewport.Location ).ToInt2(),
+					Button = MouseButton.Right,
+					Modifiers = modifiers
+				};
+
+				return orderGenerator.GetCursor( world, MousePosition.ToInt2(), mi );
+			}
+			finally
+			{
+				if( sync != world.SyncHash() )
+					throw new InvalidOperationException( "Desync in Controller.ChooseCursor" );
+			}
+		}
+
+		public void SetModifiers(Modifiers mods) { modifiers = mods; }
+		public Modifiers GetModifiers() { return modifiers; }
+
+		public void GotoNextBase()
+		{
+			var bases = Game.world.Queries.OwnedBy[Game.world.LocalPlayer].WithTrait<BaseBuilding>().ToArray();
+			if (!bases.Any()) return;
+
+			var next = bases
+				.Select( b => b.Actor )
+				.SkipWhile(b => Game.controller.selection.Actors.Contains(b))
+				.Skip(1)
+				.FirstOrDefault();
+
+			if (next == null)
+				next = bases.Select(b => b.Actor).First();
+
+			Game.controller.selection.Combine(Game.world, new Actor[] { next }, false, true);
+			Game.viewport.Center(Game.controller.selection.Actors);
+		}
+	}
+}

OpenRA.Game/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/Cursor.cs

@@ -0,0 +1,36 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using OpenRA.Graphics;
+
+namespace OpenRA
+{
+	public class Cursor
+	{
+		CursorSequence sequence;
+		public Cursor(string cursor)
+		{
+			sequence = SequenceProvider.GetCursorSequence(cursor);
+		}
+
+		public Sprite GetSprite(int frame) { return sequence.GetSprite(frame); }
+		public int2 GetHotspot() { return sequence.Hotspot; }
+	}
+}

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/Effects/AsyncAction.cs

@@ -1,39 +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 OpenRA.Graphics;
-
-namespace OpenRA.Effects
-{
-	public class AsyncAction : IEffect
-	{
-		readonly Action a;
-		readonly IAsyncResult ar;
-
-		public AsyncAction(IAsyncResult ar, Action a)
-		{
-			this.a = a;
-			this.ar = ar;
-		}
-
-		public void Tick(World world)
-		{
-			if (ar.IsCompleted)
-			{
-				world.AddFrameEndTask(w => { w.Remove(this); a(); });
-			}
-		}
-
-		public IEnumerable<IRenderable> Render(WorldRenderer r) { yield break; }
-	}
-}

OpenRA.Game/Effects/Bullet.cs

@@ -0,0 +1,131 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Effects
+{
+	public class BulletInfo : IProjectileInfo
+	{
+		public readonly int Speed = 1;
+		public readonly string Trail = null;
+		public readonly float Inaccuracy = 0;			// pixels at maximum range
+		public readonly string Image = null;
+		public readonly bool High = false;
+		public readonly bool Arcing = false;
+		public readonly int RangeLimit = 0;
+		public readonly int Arm = 0;
+		public readonly bool Shadow = false;
+		public readonly bool Proximity = false;
+
+		public IEffect Create(ProjectileArgs args) { return new Bullet( this, args ); }
+	}
+
+	public class Bullet : IEffect
+	{
+		readonly BulletInfo Info;
+		readonly ProjectileArgs Args;
+		
+		int t = 0;
+		Animation anim;
+
+		const int BaseBulletSpeed = 100;		/* pixels / 40ms frame */
+
+		public Bullet(BulletInfo info, ProjectileArgs args)
+		{
+			Info = info;
+			Args = args;
+
+			if (info.Inaccuracy > 0)
+			{
+				var factor = ((Args.dest - Args.src).Length / Game.CellSize) / args.weapon.Range;
+				Args.dest += (info.Inaccuracy * factor * args.firedBy.World.SharedRandom.Gauss2D(2)).ToInt2();
+			}
+
+			if (Info.Image != null)
+			{
+				anim = new Animation(Info.Image, () => Traits.Util.GetFacing(Args.dest - Args.src, 0));
+				anim.PlayRepeating("idle");
+			}
+		}
+
+		int TotalTime() { return (Args.dest - Args.src).Length * BaseBulletSpeed / Info.Speed; }
+
+		public void Tick( World world )
+		{
+			t += 40;
+
+			if (anim != null) anim.Tick();
+
+			if (t > TotalTime()) Explode( world );
+
+			if (Info.Trail != null)
+			{
+				var at = (float)t / TotalTime();
+				var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at);
+				var pos = float2.Lerp(Args.src, Args.dest, at)
+					- 0.5f * anim.Image.size - new float2(0, altitude);
+
+				var highPos = (Info.High || Info.Arcing)
+					? (pos - new float2(0, (Args.dest - Args.src).Length * height * 4 * at * (1 - at)))
+					: pos;
+
+				world.AddFrameEndTask(w => w.Add(
+					new Smoke(w, highPos.ToInt2(), Info.Trail)));
+			}
+		}
+
+		const float height = .1f;
+
+		public IEnumerable<Renderable> Render()
+		{
+			if (anim != null)
+			{
+				var at = (float)t / TotalTime();
+
+				var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at);
+				var pos = float2.Lerp( Args.src, Args.dest, at)
+					- 0.5f * anim.Image.size - new float2( 0, altitude );
+
+				if (Info.High || Info.Arcing)
+				{
+					if (Info.Shadow)
+						yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "shadow");
+
+					var highPos = pos - new float2(0, (Args.dest - Args.src).Length * height * 4 * at * (1 - at));
+
+					yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, Args.firedBy.Owner.Palette);
+				}
+				else
+					yield return new Renderable(anim.Image, pos - .5f * anim.Image.size,
+						Args.weapon.Underwater ? "shadow" : Args.firedBy.Owner.Palette);
+			}
+		}
+
+		void Explode( World world )
+		{
+			world.AddFrameEndTask(w => w.Remove(this));
+			Combat.DoImpacts(Args);
+		}
+	}
+}

OpenRA.Game/Effects/Corpse.cs

@@ -0,0 +1,50 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Effects
+{
+	class Corpse : IEffect
+	{
+		readonly Animation anim;
+		readonly float2 pos;
+		readonly Player owner;
+
+		public Corpse(Actor fromActor, int death)
+		{
+			anim = new Animation(fromActor.traits.GetOrDefault<RenderSimple>().GetImage(fromActor));
+			anim.PlayThen("die{0}".F(death + 1),
+				() => fromActor.World.AddFrameEndTask(w => w.Remove(this)));
+
+			pos = fromActor.CenterLocation;
+			owner = fromActor.Owner;
+		}
+
+		public void Tick( World world ) { anim.Tick(); }
+
+		public IEnumerable<Renderable> Render()
+		{
+			yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, owner.Palette);
+		}
+	}
+}

OpenRA.Game/Effects/CrateEffect.cs

@@ -0,0 +1,51 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Effects
+{
+	class CrateEffect : IEffect
+	{
+		Actor a;
+		Animation anim = new Animation("crate-effects");
+		float2 doorOffset = new float2(-4,0);
+
+		public CrateEffect(Actor a, string seq)
+		{
+			this.a = a;
+			anim.PlayThen(seq,
+				() => a.World.AddFrameEndTask(w => w.Remove(this)));
+		}
+
+		public void Tick( World world )
+		{
+			anim.Tick();
+		}
+		
+		public IEnumerable<Renderable> Render()
+		{
+			yield return new Renderable(anim.Image,
+				a.CenterLocation - .5f * anim.Image.size + doorOffset, "effect");
+		}
+	}
+}

OpenRA.Game/Effects/DelayedAction.cs

@@ -1,37 +1,46 @@
-#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 OpenRA.Graphics;
-
-namespace OpenRA.Effects
-{
-	public class DelayedAction : IEffect
-	{
-		readonly Action a;
-		int delay;
-
-		public DelayedAction(int delay, Action a)
-		{
-			this.a = a;
-			this.delay = delay;
-		}
-
-		public void Tick(World world)
-		{
-			if (--delay <= 0)
-				world.AddFrameEndTask(w => { w.Remove(this); a(); });
-		}
-
-		public IEnumerable<IRenderable> Render(WorldRenderer wr) { yield break; }
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using OpenRA.Traits;
+
+namespace OpenRA.Effects
+{
+	public class DelayedAction : IEffect
+	{
+		Action a;
+		int delay;
+
+		public DelayedAction(int delay, Action a)
+		{
+			this.a = a;
+			this.delay = delay;
+		}
+
+		public void Tick( World world )
+		{
+			if (--delay <= 0)
+				world.AddFrameEndTask(w => { w.Remove(this); a(); });
+		}
+
+		public IEnumerable<Renderable> Render() { yield break; }
+	}
+}