Remove dependency on VCRUNTIME140.dll.

(cherry picked from commit bb6400f6f8585523c31dfeb7ab95073263aadd3c)

.editorconfig

@@ -8,444 +8,24 @@ end_of_line = LF
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-; 4-column tab indentation
-[*.yaml]
-indent_style = tab
-indent_size = 4
-
 ; 4-column tab indentation and .NET coding conventions
 [*.cs]
 indent_style = tab
 indent_size = 4
 
-#### Code Style Rules
-#### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = true
 
-# Severity Levels: https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/configuration-options#severity-level
-# Below we enable specific rules by setting severity to warning.
-# Rules are disabled by setting severity to silent (to still allow use in IDE) or none (to prevent all use).
-# Rules are listed below with any options available.
-# Options are commented out if they match the defaults.
+csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
 
-### Language Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/language-rules
+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
 
-## this and Me preferences
-
-# IDE0003/IDE0009 Remove 'this' or 'Me' qualification/Add 'this' or 'Me' qualification
-#dotnet_style_qualification_for_field = false
-#dotnet_style_qualification_for_property = false
-#dotnet_style_qualification_for_method = false
-#dotnet_style_qualification_for_event = false
-dotnet_diagnostic.IDE0003.severity = warning
-dotnet_diagnostic.IDE0009.severity = warning
-
-## Use languages keywords for types
-
-# IDE0049 Use language keywords instead of framework type names for type references
-#dotnet_style_predefined_type_for_locals_parameters_members = true
-#dotnet_style_predefined_type_for_member_access = true
-dotnet_diagnostic.IDE0049.severity = warning
-
-## Modifier preferences
-
-# IDE0036 Order modifiers
-#csharp_preferred_modifier_order = public, private, protected, internal, file, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, required, volatile, async
-dotnet_diagnostic.IDE0036.severity = warning
-
-# IDE0040 Add accessibility modifiers
-dotnet_style_require_accessibility_modifiers = omit_if_default
-dotnet_diagnostic.IDE0040.severity = warning
-
-# IDE0044 Add readonly modifier
-#dotnet_style_readonly_field = true
-dotnet_diagnostic.IDE0044.severity = warning
-
-# IDE0062 Make local function static
-#csharp_prefer_static_local_function = true
-dotnet_diagnostic.IDE0062.severity = warning
-
-# IDE0064 Make struct fields writable
-# No options
-dotnet_diagnostic.IDE0064.severity = warning
-
-## Parentheses preferences
-
-# IDE0047/IDE0048 Remove unnecessary parentheses/Add parentheses for clarity
-dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary
-dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary
-#dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
-#dotnet_style_parentheses_in_other_operators = never_if_unnecessary
-dotnet_diagnostic.IDE0047.severity = warning
-dotnet_diagnostic.IDE0048.severity = warning
-
-## Expression-level preferences
-
-# IDE0010 Add missing cases to switch statement
-# No options
-dotnet_diagnostic.IDE0010.severity = silent
-
-# IDE0017 Use object initializers
-#dotnet_style_object_initializer = true
-dotnet_diagnostic.IDE0017.severity = warning
-
-# IDE0018 Inline variable declaration
-#csharp_style_inlined_variable_declaration = true
-dotnet_diagnostic.IDE0018.severity = warning
-
-# IDE0028 Use collection initializers
-#dotnet_style_collection_initializer = true
-dotnet_diagnostic.IDE0028.severity = warning
-
-# IDE0032 Use auto-implemented property
-#dotnet_style_prefer_auto_properties = true
-dotnet_diagnostic.IDE0032.severity = warning
-
-# IDE0033 Use explicitly provided tuple name
-#dotnet_style_explicit_tuple_names = true
-dotnet_diagnostic.IDE0033.severity = warning
-
-# IDE0034 Simplify 'default' expression
-#csharp_prefer_simple_default_expression = true
-dotnet_diagnostic.IDE0034.severity = warning
-
-# IDE0037 Use inferred member name
-#dotnet_style_prefer_inferred_tuple_names = true
-#dotnet_style_prefer_inferred_anonymous_type_member_names = true
-dotnet_diagnostic.IDE0037.severity = silent
-
-# IDE0039 Use local function instead of lambda
-#csharp_style_prefer_local_over_anonymous_function = true
-dotnet_diagnostic.IDE0039.severity = warning
-
-# IDE0042 Deconstruct variable declaration
-#csharp_style_deconstructed_variable_declaration = true
-dotnet_diagnostic.IDE0042.severity = warning
-
-# IDE0045 Use conditional expression for assignment
-#dotnet_style_prefer_conditional_expression_over_assignment = true
-dotnet_diagnostic.IDE0045.severity = silent
-
-# IDE0046 Use conditional expression for return
-#dotnet_style_prefer_conditional_expression_over_return = true
-dotnet_diagnostic.IDE0046.severity = silent
-
-# IDE0050 Convert anonymous type to tuple
-# No options
-dotnet_diagnostic.IDE0050.severity = silent
-
-# IDE0054/IDE0074 Use compound assignment/Use coalesce compound assignment
-#dotnet_style_prefer_compound_assignment = true
-dotnet_diagnostic.IDE0054.severity = warning
-dotnet_diagnostic.IDE0074.severity = warning
-
-# IDE0056 Use index operator
-#csharp_style_prefer_index_operator = true
-dotnet_diagnostic.IDE0056.severity = warning
-
-# IDE0057 Use range operator
-#csharp_style_prefer_range_operator = true
-dotnet_diagnostic.IDE0057.severity = warning
-
-# IDE0070 Use 'System.HashCode.Combine'
-# No options
-dotnet_diagnostic.IDE0070.severity = warning
-
-# IDE0071 Simplify interpolation
-#dotnet_style_prefer_simplified_interpolation = true
-dotnet_diagnostic.IDE0071.severity = warning
-
-# IDE0072 Add missing cases to switch expression
-# No options
-dotnet_diagnostic.IDE0072.severity = silent
-
-# IDE0075 Simplify conditional expression
-#dotnet_style_prefer_simplified_boolean_expressions = true
-dotnet_diagnostic.IDE0075.severity = warning
-
-# IDE0082 Convert 'typeof' to 'nameof'
-# No options
-dotnet_diagnostic.IDE0082.severity = warning
-
-# IDE0090 Simplify 'new' expression
-#csharp_style_implicit_object_creation_when_type_is_apparent = true
-dotnet_diagnostic.IDE0090.severity = warning
-
-# IDE0180 Use tuple to swap values
-#csharp_style_prefer_tuple_swap = true
-dotnet_diagnostic.IDE0180.severity = warning
-
-## Namespace declaration preferences
-
-# IDE0160/IDE0161 Use block-scoped namespace/Use file-scoped namespace
-#csharp_style_namespace_declarations = block_scoped
-dotnet_diagnostic.IDE0160.severity = warning
-dotnet_diagnostic.IDE0161.severity = warning
-
-## Null-checking preferences
-
-# IDE0016 Use throw expression
-#csharp_style_throw_expression = true
-dotnet_diagnostic.IDE0016.severity = silent
-
-# IDE0029/IDE0030/IDE0270 Use coalesce expression (non-nullable types)/Use coalesce expression (nullable types)/Use coalesce expression (if null)
-#dotnet_style_coalesce_expression = true
-dotnet_diagnostic.IDE0029.severity = warning
-dotnet_diagnostic.IDE0030.severity = warning
-dotnet_diagnostic.IDE0270.severity = silent
-
-# IDE0031 Use null propagation
-#dotnet_style_null_propagation = true
-dotnet_diagnostic.IDE0031.severity = warning
-
-# IDE0041 Use 'is null' check
-#dotnet_style_prefer_is_null_check_over_reference_equality_method = true
-dotnet_diagnostic.IDE0041.severity = warning
-
-# IDE0150 Prefer 'null' check over type check
-#csharp_style_prefer_null_check_over_type_check = true
-dotnet_diagnostic.IDE0150.severity = warning
-
-# IDE1005 Use conditional delegate call
-csharp_style_conditional_delegate_call = true # true is the default, but the rule is not triggered if this is not specified.
-dotnet_diagnostic.IDE1005.severity = warning
-
-## var preferences
-
-# IDE0007/IDE0008 Use 'var' instead of explicit type/Use explicit type instead of 'var'
-csharp_style_var_for_built_in_types = true
-csharp_style_var_when_type_is_apparent = true
-csharp_style_var_elsewhere = true
-dotnet_diagnostic.IDE0007.severity = warning
-dotnet_diagnostic.IDE0008.severity = warning
-
-## Expression-bodied-members
-
-# IDE0021 Use expression body for constructors
-#csharp_style_expression_bodied_constructors = false
-dotnet_diagnostic.IDE0021.severity = silent
-
-# IDE0022 Use expression body for methods
-#csharp_style_expression_bodied_methods = false
-dotnet_diagnostic.IDE0022.severity = silent
-
-# IDE0023/IDE0024 Use expression body for conversion operators/Use expression body for operators
-#csharp_style_expression_bodied_operators = false
-dotnet_diagnostic.IDE0023.severity = silent
-dotnet_diagnostic.IDE0024.severity = silent
-
-# IDE0025 Use expression body for properties
-#csharp_style_expression_bodied_properties = true
-dotnet_diagnostic.IDE0025.severity = silent
-
-# IDE0026 Use expression body for indexers
-#csharp_style_expression_bodied_indexers = true
-dotnet_diagnostic.IDE0026.severity = silent
-
-# IDE0027 Use expression body for accessors
-#csharp_style_expression_bodied_accessors = true
-dotnet_diagnostic.IDE0027.severity = warning
-
-# IDE0053 Use expression body for lambdas
-# This rule is buggy and not enforced for builds. ':warning' will at least enforce it in the IDE.
-csharp_style_expression_bodied_lambdas = when_on_single_line:warning
-dotnet_diagnostic.IDE0053.severity = warning
-
-# IDE0061 Use expression body for local functions
-csharp_style_expression_bodied_local_functions = when_on_single_line
-dotnet_diagnostic.IDE0061.severity = warning
-
-## Pattern matching preferences
-
-# IDE0019 Use pattern matching to avoid 'as' followed by a 'null' check
-#csharp_style_pattern_matching_over_as_with_null_check = true
-dotnet_diagnostic.IDE0019.severity = warning
-
-# IDE0020/IDE0038 Use pattern matching to avoid 'is' check followed by a cast (with variable)/Use pattern matching to avoid 'is' check followed by a cast (without variable)
-#csharp_style_pattern_matching_over_is_with_cast_check = true
-dotnet_diagnostic.IDE0020.severity = warning
-dotnet_diagnostic.IDE0038.severity = warning
-
-# IDE0066 Use switch expression
-#csharp_style_prefer_switch_expression = true
-dotnet_diagnostic.IDE0066.severity = silent
-
-# IDE0078 Use pattern matching
-#csharp_style_prefer_pattern_matching = true
-dotnet_diagnostic.IDE0078.severity = silent
-
-# IDE0083 Use pattern matching ('not' operator)
-#csharp_style_prefer_not_pattern = true
-dotnet_diagnostic.IDE0083.severity = warning
-
-# IDE0170 Simplify property pattern
-#csharp_style_prefer_extended_property_pattern = true
-dotnet_diagnostic.IDE0170.severity = silent # Requires C# 10
-
-## Code block preferences
-
-# IDE0011 Add braces
-#csharp_prefer_braces = true
-# No options match the style used in OpenRA.
-dotnet_diagnostic.IDE0011.severity = none
-
-# IDE0063 Use simple 'using' statement
-#csharp_prefer_simple_using_statement = true
-dotnet_diagnostic.IDE0063.severity = silent
-
-## 'using' directive preferences
-
-# IDE0065 'using' directive placement
-#csharp_using_directive_placement = outside_namespace
-dotnet_diagnostic.IDE0065.severity = silent
-
-## File header preferences
-
-# IDE0073 Require file header
-#file_header_template = unset
-# This rule does not allow us to enforce our desired header, as it prefixes the header lines with // comments, meaning we can't apply a region.
-dotnet_diagnostic.IDE0073.severity = none
-
-## Namespace naming preferences
-
-# IDE0130 Namespace does not match folder structure
-#dotnet_style_namespace_match_folder = true
-# This rule doesn't appear to work (never reports violations)
-dotnet_diagnostic.IDE0130.severity = none
-
-### Unnecessary Code Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/unnecessary-code-rules
-
-# IDE0001 Simplify name
-# No options
-dotnet_diagnostic.IDE0001.severity = warning
-
-# IDE0002 Simplify member access
-# No options
-dotnet_diagnostic.IDE0002.severity = warning
-
-# IDE0004 Remove unnecessary cast
-# No options
-dotnet_diagnostic.IDE0004.severity = warning
-
-# IDE0005 Remove unnecessary import
-# No options
-# IDE0005 is only enabled in the IDE by default. https://github.com/dotnet/roslyn/issues/41640
-# To enable it for builds outside the IDE the 'GenerateDocumentationFile' property must be enabled on the build.
-# GenerateDocumentationFile generates additional warnings about XML docs, so disable any we don't care about.
-dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member
-dotnet_diagnostic.IDE0005.severity = warning
-
-# IDE0035 Remove unreachable code
-# No options
-# Duplicates compiler warning CS0162
-dotnet_diagnostic.IDE0035.severity = none
-
-# IDE0051 Remove unused private member
-# No options
-dotnet_diagnostic.IDE0051.severity = warning
-
-# IDE0052 Remove unread private member
-# No options
-dotnet_diagnostic.IDE0052.severity = warning
-
-# IDE0058 Remove unnecessary expression value
-#csharp_style_unused_value_expression_statement_preference = discard_variable
-dotnet_diagnostic.IDE0058.severity = silent
-
-# IDE0059 Remove unnecessary value assignment
-#csharp_style_unused_value_assignment_preference = discard_variable
-dotnet_diagnostic.IDE0059.severity = warning
-
-# IDE0060 Remove unused parameter
-dotnet_code_quality_unused_parameters = non_public
-dotnet_diagnostic.IDE0060.severity = warning
-
-# IDE0079 Remove unnecessary suppression
-#dotnet_remove_unnecessary_suppression_exclusions = none
-dotnet_diagnostic.IDE0079.severity = warning
-
-# IDE0080 Remove unnecessary suppression operator
-# No options
-dotnet_diagnostic.IDE0080.severity = warning
-
-# IDE0100 Remove unnecessary equality operator
-# No options
-dotnet_diagnostic.IDE0100.severity = warning
-
-# IDE0110 Remove unnecessary discard
-# No options
-dotnet_diagnostic.IDE0110.severity = warning
-
-### Miscellaneous Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/miscellaneous-rules
-
-# IDE0076 Remove invalid global 'SuppressMessageAttribute'
-# No options
-dotnet_diagnostic.IDE0076.severity = warning
-
-# IDE0077 Avoid legacy format target in global 'SuppressMessageAttribute'
-# No options
-dotnet_diagnostic.IDE0077.severity = warning
-
-### Formatting Rules (IDE0055)
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0055
-
-# We may eventually wish to enforce this rule, however some existing formatting conflicts with the rule despite being reasonable.
-# Additionally, the rule is buggy and likes to report spuriously after invoking Format Document in the IDE.
-dotnet_diagnostic.IDE0055.severity = none
-
-#dotnet_sort_system_directives_first = true
-#dotnet_separate_import_directive_groups = false
-#dotnet_style_namespace_match_folder = true
-
-#csharp_new_line_before_open_brace = all
-#csharp_new_line_before_else = true
-#csharp_new_line_before_catch = true
-#csharp_new_line_before_finally = true
-#csharp_new_line_before_members_in_object_initializers = true
-#csharp_new_line_before_members_in_anonymous_types = true
-#csharp_new_line_between_query_expression_clauses = true
-
-#csharp_indent_case_contents = true
-#csharp_indent_switch_labels = true
-#csharp_indent_labels = one_less_than_current
-#csharp_indent_block_contents = true
-#csharp_indent_braces = false
-#csharp_indent_case_contents_when_block = true
-
-#csharp_space_after_cast = false
-#csharp_space_after_keywords_in_control_flow_statements = true
-#csharp_space_between_parentheses =
-#csharp_space_before_colon_in_inheritance_clause = true
-#csharp_space_after_colon_in_inheritance_clause = true
-#csharp_space_around_binary_operators = before_and_after
-#csharp_space_between_method_declaration_parameter_list_parentheses = false
-#csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-#csharp_space_between_method_declaration_name_and_open_parenthesis = false
-#csharp_space_between_method_call_parameter_list_parentheses = false
-#csharp_space_between_method_call_empty_parameter_list_parentheses = false
-#csharp_space_between_method_call_name_and_opening_parenthesis = false
-#csharp_space_after_comma = true
-#csharp_space_before_comma = false
-#csharp_space_after_dot = false
-#csharp_space_before_dot = false
-#csharp_space_after_semicolon_in_for_statement = true
-#csharp_space_before_semicolon_in_for_statement = false
-#csharp_space_around_declaration_statements = false
-#csharp_space_before_open_square_brackets = false
-#csharp_space_between_empty_square_brackets = false
-#csharp_space_between_square_brackets = false
-
-#csharp_preserve_single_line_statements = true
-#csharp_preserve_single_line_blocks = true
-
-
-### Naming Rules (IDE1006)
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/naming-rules
-dotnet_diagnostic.IDE1006.severity = warning
-
-## Naming styles
+## Naming styles:
 
 dotnet_naming_style.camel_case.capitalization = camel_case
 
@@ -454,7 +34,7 @@ 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
 
-## Naming Symbols
+## Symbol specifications:
 
 dotnet_naming_symbols.const_locals.applicable_kinds = local
 dotnet_naming_symbols.const_locals.applicable_accessibilities = *
@@ -484,7 +64,7 @@ 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
+## 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
@@ -518,378 +98,89 @@ 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:
 
-### StyleCop.Analyzers
-### https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/DOCUMENTATION.md
+# Also handled by StyleCopAnalyzers - SA1024: ColonsMustBeSpacedCorrectly.
+csharp_space_after_colon_in_inheritance_clause = true
 
-# Below we enable rule categories by setting severity to warning.
-# We'll only list rules to disable.
-# Individual rules we wish to disable are typically set to none severity.
+# Also handled by StyleCopAnalyzers - SA1024: ColonsMustBeSpacedCorrectly.
+csharp_space_before_colon_in_inheritance_clause = true
 
-# Covers SAxxxx and SXxxxx rules
-dotnet_analyzer_diagnostic.category-StyleCop.CSharp.DocumentationRules.severity = warning
-dotnet_analyzer_diagnostic.category-StyleCop.CSharp.LayoutRules.severity = warning
-dotnet_analyzer_diagnostic.category-StyleCop.CSharp.MaintainabilityRules.severity = warning
-dotnet_analyzer_diagnostic.category-StyleCop.CSharp.NamingRules.severity = warning
-dotnet_analyzer_diagnostic.category-StyleCop.CSharp.OrderingRules.severity = warning
-dotnet_analyzer_diagnostic.category-StyleCop.CSharp.ReadabilityRules.severity = warning
-dotnet_analyzer_diagnostic.category-StyleCop.CSharp.SpacingRules.severity = warning
-dotnet_analyzer_diagnostic.category-StyleCop.CSharp.SpecialRules.severity = warning
+# Also handled by StyleCopAnalyzers - SA1000: KeywordsMustBeSpacedCorrectly.
+csharp_space_after_keywords_in_control_flow_statements = true
 
-# Rules that are covered by IDE0001 Simplify name
-dotnet_diagnostic.SA1125.severity = none # UseShorthandForNullableTypes
+# Leave code block on single line.
+csharp_preserve_single_line_blocks = true
 
-# Rules that are covered by IDE0047 Remove unnecessary parentheses
-dotnet_diagnostic.SA1119.severity = none # StatementMustNotUseUnnecessaryParenthesis
+# Leave statements and member declarations on the same line.
+csharp_preserve_single_line_statements = true
 
-# Rules that are covered by IDE0055 Formatting Rules
-dotnet_diagnostic.SA1027.severity = none # UseTabsCorrectly
+# IDE0049, IDE-only counterpart of StyleCopAnalyzers - SA1121: UseBuiltInTypeAlias.
+dotnet_style_predefined_type_for_member_access = true
 
-# Rules that are covered by IDE1006 Naming Rules
-dotnet_diagnostic.SA1300.severity = none # ElementMustBeginWithUpperCaseLetter
-dotnet_diagnostic.SA1302.severity = none # InterfaceNamesMustBeginWithI
-dotnet_diagnostic.SA1303.severity = none # ConstFieldNamesMustBeginWithUpperCaseLetter
-dotnet_diagnostic.SA1304.severity = none # NonPrivateReadonlyFieldsMustBeginWithUpperCaseLetter
-dotnet_diagnostic.SA1306.severity = none # FieldNamesMustBeginWithLowerCaseLetter
-dotnet_diagnostic.SA1307.severity = none # AccessibleFieldsMustBeginWithUpperCaseLetter
-dotnet_diagnostic.SA1311.severity = none # StaticReadonlyFieldsMustBeginWithUpperCaseLetter
-dotnet_diagnostic.SA1312.severity = none # VariableNamesMustBeginWithLowerCaseLetter
-dotnet_diagnostic.SA1313.severity = none # ParameterNamesMustBeginWithLowerCaseLetter
+# IDE0049, IDE-only counterpart of StyleCopAnalyzers - SA1121: UseBuiltInTypeAlias.
+dotnet_style_predefined_type_for_locals_parameters_members = true
 
-# Rules that conflict with OpenRA project style conventions
-dotnet_diagnostic.SA1101.severity = none # PrefixLocalCallsWithThis
-dotnet_diagnostic.SA1107.severity = none # CodeMustNotContainMultipleStatementsOnOneLine
-dotnet_diagnostic.SA1116.severity = none # SplitParametersMustStartOnLineAfterDeclaration
-dotnet_diagnostic.SA1117.severity = none # ParametersMustBeOnSameLineOrSeparateLines
-dotnet_diagnostic.SA1118.severity = none # ParameterMustNotSpanMultipleLines
-dotnet_diagnostic.SA1122.severity = none # UseStringEmptyForEmptyStrings
-dotnet_diagnostic.SA1124.severity = none # DoNotUseRegions
-dotnet_diagnostic.SA1127.severity = none # GenericTypeConstraintsMustBeOnOwnLine
-dotnet_diagnostic.SA1132.severity = none # DoNotCombineFields
-dotnet_diagnostic.SA1135.severity = none # UsingDirectivesMustBeQualified
-dotnet_diagnostic.SA1136.severity = none # EnumValuesShouldBeOnSeparateLines
-dotnet_diagnostic.SA1200.severity = none # UsingDirectivesMustBePlacedCorrectly
-dotnet_diagnostic.SA1201.severity = none # ElementsMustAppearInTheCorrectOrder
-dotnet_diagnostic.SA1202.severity = none # ElementsMustBeOrderedByAccess
-dotnet_diagnostic.SA1204.severity = none # StaticElementsMustAppearBeforeInstanceElements
-dotnet_diagnostic.SA1214.severity = none # ReadonlyElementsMustAppearBeforeNonReadonlyElements
-dotnet_diagnostic.SX1309.severity = none # FieldNamesMustBeginWithUnderscore
-dotnet_diagnostic.SX1309S.severity = none # StaticFieldNamesMustBeginWithUnderscore
-dotnet_diagnostic.SA1314.severity = none # TypeParameterNamesMustBeginWithT
-dotnet_diagnostic.SA1400.severity = none # AccessModifierMustBeDeclared
-dotnet_diagnostic.SA1401.severity = none # FieldsMustBePrivate
-dotnet_diagnostic.SA1402.severity = none # FileMayOnlyContainASingleType
-dotnet_diagnostic.SA1407.severity = none # ArithmeticExpressionsMustDeclarePrecedence
-dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers
-dotnet_diagnostic.SA1501.severity = none # StatementMustNotBeOnSingleLine
-dotnet_diagnostic.SA1502.severity = none # ElementMustNotBeOnSingleLine
-dotnet_diagnostic.SA1503.severity = none # BracesMustNotBeOmitted
-dotnet_diagnostic.SA1516.severity = none # ElementsMustBeSeparatedByBlankLine
-dotnet_diagnostic.SA1519.severity = none # BracesMustNotBeOmittedFromMultiLineChildStatement
-dotnet_diagnostic.SA1520.severity = none # UseBracesConsistently
-dotnet_diagnostic.SA1600.severity = none # ElementsMustBeDocumented
-dotnet_diagnostic.SA1601.severity = none # PartialElementsMustBeDocumented
-dotnet_diagnostic.SA1602.severity = none # EnumerationItemsMustBeDocumented
-dotnet_diagnostic.SA1611.severity = none # ElementParametersShouldBeDocumented
-dotnet_diagnostic.SA1615.severity = none # ElementReturnValueShouldBeDocumented
-dotnet_diagnostic.SA1618.severity = none # GenericTypeParametersShouldBeDocumented
-dotnet_diagnostic.SA1623.severity = none # PropertySummaryDocumentationShouldMatchAccessors
-dotnet_diagnostic.SA1633.severity = none # FileMustHaveHeader
-dotnet_diagnostic.SA1642.severity = none # ConstructorSummaryDocumentationShouldBeginWithStandardText
-dotnet_diagnostic.SA1649.severity = none # FileNameMustMatchTypeName
+## Others:
 
-#### Code Quality Rules
-#### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/
+# Show an IDE warning when default access modifiers are explicitly specified.
+dotnet_style_require_accessibility_modifiers = omit_if_default:warning
 
-# Below we enable specific rules by setting severity to warning.
-# Rules are listed below with any options available.
-# Options are commented out if they match the defaults.
+# use 'var' instead of explicit type
+dotnet_diagnostic.IDE0007.severity = warning
 
-# Rule options that apply over multiple rules are set here.
-# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-quality-rule-options
-dotnet_code_quality.api_surface = all
+# Don't prefer braces (for one liners).
+dotnet_diagnostic.IDE0011.severity = silent
 
-### Design Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/design-warnings
+# Object initialization can be simplified / Use object initializer.
+dotnet_diagnostic.IDE0017.severity = warning
 
-# Collections should implement generic interface.
-#dotnet_code_quality.CA1010.additional_required_generic_interfaces =
-dotnet_diagnostic.CA1010.severity = warning
+# Collection initialization can be simplified
+dotnet_diagnostic.IDE0028.severity = warning
 
-# Abstract types should not have public constructors.
-dotnet_diagnostic.CA1012.severity = warning
+# Simplify 'default' expression
+dotnet_diagnostic.IDE0034.severity = warning
 
-# Mark attributes with 'AttributeUsageAttribute'.
-dotnet_diagnostic.CA1018.severity = warning
+# Modifiers are not ordered.
+dotnet_diagnostic.IDE0036.severity = warning
 
-# Override methods on comparable types.
-dotnet_diagnostic.CA1036.severity = warning
+# Raise a warning on build when default access modifiers are explicitly specified.
+dotnet_diagnostic.IDE0040.severity = warning
 
-# Provide ObsoleteAttribute message.
-dotnet_diagnostic.CA1041.severity = warning
+# Make field readonly.
+dotnet_diagnostic.IDE0044.severity = warning
 
-# Do not declare protected members in sealed types.
-dotnet_diagnostic.CA1047.severity = warning
+# Unused private member.
+dotnet_diagnostic.IDE0052.severity = warning
 
-# Declare types in namespaces.
-dotnet_diagnostic.CA1050.severity = warning
+# Unnecessary value assignment.
+dotnet_diagnostic.IDE0059.severity = warning
 
-# Static holder types should be 'Static' or 'NotInheritable'.
-dotnet_diagnostic.CA1052.severity = warning
+# Unused parameter.
+dotnet_diagnostic.IDE0060.severity = warning
 
-# Do not hide base class methods.
-dotnet_diagnostic.CA1061.severity = warning
+# Naming rule violation.
+dotnet_diagnostic.IDE1006.severity = warning
 
-# Exceptions should be public.
-dotnet_diagnostic.CA1064.severity = warning
-
-# Implement 'IEquatable' when overriding 'Equals'.
-dotnet_diagnostic.CA1066.severity = warning
-
-# Override 'Equals' when implementing 'IEquatable'.
-dotnet_diagnostic.CA1067.severity = warning
-
-# 'CancellationToken' parameters must come last.
-dotnet_diagnostic.CA1068.severity = warning
-
-# Do not declare event fields as virtual.
-dotnet_diagnostic.CA1070.severity = warning
-
-### Documentation Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/documentation-warnings
-
-# Avoid using 'cref' tags with a prefix.
-dotnet_diagnostic.CA1200.severity = warning
-
-### Globalization Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/globalization-warnings
-
-### Portability and Interoperability Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/interoperability-warnings
-
-# Do not use 'OutAttribute' on string parameters for P/Invokes.
-dotnet_diagnostic.CA1417.severity = warning
-
-### Maintainability Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/maintainability-warnings
-
-# Use 'nameof' in place of string.
-dotnet_diagnostic.CA1507.severity = warning
-
-### Naming Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/naming-warnings
-
-# Do not prefix enum values with type name.
-dotnet_code_quality.CA1712.enum_values_prefix_trigger = AnyEnumValue
-dotnet_diagnostic.CA1712.severity = warning
-
-# Flags enums should have plural names.
-dotnet_diagnostic.CA1714.severity = warning
-
-# Only 'FlagsAttribute' enums should have plural names.
-dotnet_diagnostic.CA1717.severity = warning
-
-### Performance Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/performance-warnings
-
-# Use Literals Where Appropriate.
-#dotnet_code_quality.CA1802.required_modifiers = static
-dotnet_diagnostic.CA1802.severity = warning
-
-# Remove empty finalizers.
-dotnet_diagnostic.CA1821.severity = warning
-
-# Mark members as static.
-dotnet_code_quality.CA1822.api_surface = private,internal
-dotnet_diagnostic.CA1822.severity = warning
-
-# Avoid unused private fields.
-dotnet_diagnostic.CA1823.severity = warning
-
-# Avoid zero-length array allocations.
+# Avoid unnecessary zero-length array allocations.
 dotnet_diagnostic.CA1825.severity = warning
 
-# Use property instead of Linq Enumerable method.
-#dotnet_code_quality.CA1826.exclude_ordefault_methods = false
+# Do not use Enumerable methods on indexable collections. Instead use the collection directly.
 dotnet_diagnostic.CA1826.severity = warning
 
-# Do not use Count/LongCount when Any can be used.
+# Count() is used where Any() could be used instead to improve performance.
 dotnet_diagnostic.CA1827.severity = warning
 
-# Do not use CountAsync/LongCountAsync when AnyAsync can be used.
-dotnet_diagnostic.CA1828.severity = warning
-
 # Use Length/Count property instead of Enumerable.Count method.
 dotnet_diagnostic.CA1829.severity = warning
 
-# Prefer strongly-typed Append and Insert method overloads on StringBuilder.
-dotnet_diagnostic.CA1830.severity = warning
-
-# Use AsSpan instead of Range-based indexers for string when appropriate.
-dotnet_diagnostic.CA1831.severity = warning
-
-# Use AsSpan or AsMemory instead of Range-based indexers for getting ReadOnlySpan or ReadOnlyMemory portion of an array.
-dotnet_diagnostic.CA1832.severity = warning
-
-# Use AsSpan or AsMemory instead of Range-based indexers for getting Span or Memory portion of an array.
-dotnet_diagnostic.CA1833.severity = warning
-
-# Use StringBuilder.Append(char) for single character strings.
-dotnet_diagnostic.CA1834.severity = warning
-
-# Prefer the memory-based overloads of ReadAsync/WriteAsync methods in stream-based classes.
-dotnet_diagnostic.CA1835.severity = warning
-
-# Prefer IsEmpty over Count when available.
-dotnet_diagnostic.CA1836.severity = warning
-
-# Use Environment.ProcessId instead of Process.GetCurrentProcess().Id.
-dotnet_diagnostic.CA1837.severity = warning
-
-# Avoid StringBuilder parameters for P/Invokes.
-dotnet_diagnostic.CA1838.severity = warning
-
-# Use Environment.ProcessPath instead of Process.GetCurrentProcess().MainModule.FileName.
-dotnet_diagnostic.CA1839.severity = warning
-
-# Use Environment.CurrentManagedThreadId instead of Thread.CurrentThread.ManagedThreadId.
-dotnet_diagnostic.CA1840.severity = warning
-
-# Prefer Dictionary Contains methods.
-dotnet_diagnostic.CA1841.severity = warning
-
-# Do not use 'WhenAll' with a single task.
-dotnet_diagnostic.CA1842.severity = warning
-
-# Do not use 'WaitAll' with a single task.
-dotnet_diagnostic.CA1843.severity = warning
-
-# Provide memory-based overrides of async methods when subclassing 'Stream'.
-dotnet_diagnostic.CA1844.severity = warning
-
-# Use span-based 'string.Concat'. (Not available on mono)
-dotnet_diagnostic.CA1845.severity = none
-
-# Prefer AsSpan over Substring.
-dotnet_diagnostic.CA1846.severity = warning
-
 # Use string.Contains(char) instead of string.Contains(string) with single characters.
 dotnet_diagnostic.CA1847.severity = warning
 
-# Call async methods when in an async method.
-dotnet_diagnostic.CA1849.severity = warning
-
-# Prefer static HashData method over ComputeHash. (Not available on mono)
-dotnet_diagnostic.CA1850.severity = none
-
-# Seal internal types.
-dotnet_diagnostic.CA1852.severity = warning
-
-# Unnecessary call to 'Dictionary.ContainsKey(key)'.
-dotnet_diagnostic.CA1853.severity = warning
-
-# Prefer the IDictionary.TryGetValue(TKey, out TValue) method.
-dotnet_diagnostic.CA1854.severity = warning
-
-# Use Span<T>.Clear() instead of Span<T>.Fill().
-dotnet_diagnostic.CA1855.severity = warning
-
-# Use StartsWith instead of IndexOf.
-dotnet_diagnostic.CA1858.severity = warning
-
-# Avoid using 'Enumerable.Any()' extension method.
-dotnet_diagnostic.CA1860.severity = warning
-
-### Reliability Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/reliability-warnings
-
-# Do not assign property within its setter.
-dotnet_diagnostic.CA2011.severity = warning
-
-# Use ValueTasks correctly.
-dotnet_diagnostic.CA2012.severity = warning
-
-# Do not use ReferenceEquals with value types.
-dotnet_diagnostic.CA2013.severity = warning
-
-# Do not use stackalloc in loops.
-dotnet_diagnostic.CA2014.severity = warning
-
-# Forward the CancellationToken parameter to methods that take one.
-dotnet_diagnostic.CA2016.severity = warning
-
-# The 'count' argument to Buffer.BlockCopy should specify the number of bytes to copy.
-dotnet_diagnostic.CA2018.severity = warning
-
-# ThreadStatic fields should not use inline initialization.
-dotnet_diagnostic.CA2019.severity = warning
-
-### Security Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/security-warnings
-
-# Do Not Use Broken Cryptographic Algorithms.
-dotnet_diagnostic.CA5351.severity = warning
-
-### Usage Rules
-### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/usage-warnings
-
-# Call GC.SuppressFinalize correctly.
-dotnet_diagnostic.CA1816.severity = warning
-
-# Rethrow to preserve stack details.
-dotnet_diagnostic.CA2200.severity = warning
-
-# Initialize value type static fields inline.
-dotnet_diagnostic.CA2207.severity = warning
-
-# Instantiate argument exceptions correctly.
-dotnet_diagnostic.CA2208.severity = warning
-
-# Dispose methods should call base class dispose.
-dotnet_diagnostic.CA2215.severity = warning
-
-# Disposable types should declare finalizer.
-dotnet_diagnostic.CA2216.severity = warning
-
-# Override GetHashCode on overriding Equals.
-dotnet_diagnostic.CA2218.severity = warning
-
-# Overload operator equals on overriding ValueType.Equals.
-dotnet_diagnostic.CA2231.severity = warning
-
-# Provide correct arguments to formatting methods.
-#dotnet_code_quality.CA2241.additional_string_formatting_methods =
-dotnet_code_quality.CA2241.try_determine_additional_string_formatting_methods_automatically = true
-dotnet_diagnostic.CA2241.severity = warning
-
-# Test for NaN correctly.
-dotnet_diagnostic.CA2242.severity = warning
-
-# Attribute string literals should parse correctly.
-dotnet_diagnostic.CA2243.severity = warning
-
-# Do not duplicate indexed element initializations.
-dotnet_diagnostic.CA2244.severity = warning
-
-# Do not assign a property to itself.
-dotnet_diagnostic.CA2245.severity = warning
-
-# Argument passed to TaskCompletionSource constructor should be TaskCreationOptions enum instead of TaskContinuationOptions enum.
-dotnet_diagnostic.CA2247.severity = warning
-
-# Provide correct enum argument to Enum.HasFlag.
-dotnet_diagnostic.CA2248.severity = warning
-
-# Use ThrowIfCancellationRequested.
-dotnet_diagnostic.CA2250.severity = warning
-
-# Ensure ThreadStatic is only used with static fields.
-dotnet_diagnostic.CA2259.severity = warning
-
-### Roslynator
-### https://github.com/JosefPihrt/Roslynator/tree/main/docs/analyzers
-
-# Below we enable specific rules by setting severity to warning.
+; 4-column tab indentation
+[*.yaml]
+indent_style = tab
+indent_size = 4
 
 # Use 'Count' property instead of 'Any' method.
 dotnet_diagnostic.RCS1080.severity = warning

.github/workflows/ci.yml

@@ -5,41 +5,37 @@ on:
   pull_request:
     branches: [ bleed, 'prep-*' ]
 
-permissions:
-  contents: read  #  to fetch code (actions/checkout)
-
 jobs:
   linux:
     name: Linux (.NET 6.0)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.x'
 
       - name: Check Code
         run: |
           make check
-          make tests
 
       - name: Check Mods
         run: |
           sudo apt-get install lua5.1
           make check-scripts
-          make TREAT_WARNINGS_AS_ERRORS=true test
+          make test
 
   linux-mono:
     name: Linux (mono)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Check Code
         run: |
@@ -49,7 +45,7 @@ jobs:
       - name: Check Mods
         run: |
           # check-scripts does not depend on .net/mono, so is not needed here
-          make RUNTIME=mono TREAT_WARNINGS_AS_ERRORS=true test
+          make RUNTIME=mono test
 
   windows:
     name: Windows (.NET 6.0)
@@ -57,10 +53,10 @@ jobs:
 
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.x'
 
@@ -70,12 +66,12 @@ jobs:
           # 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
-          .\make.ps1 tests
+          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: |
-          choco install lua --version 5.1.5.52
+          chocolatey install lua --version 5.1.5.52
           $ENV:Path = $ENV:Path + ";C:\Program Files (x86)\Lua\5.1\"
-          $ENV:TREAT_WARNINGS_AS_ERRORS = "true"
           .\make.ps1 check-scripts
           .\make.ps1 test

.github/workflows/documentation.yml

@@ -8,22 +8,19 @@ on:
         required: true
         default: 'release-xxxxxxxx'
 
-permissions:
-  contents: read  #  to fetch code (actions/checkout)
-
 jobs:
   wiki:
     name: Update Wiki
     if: github.repository == 'openra/openra'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           ref: ${{ github.event.inputs.tag }}
 
       - name: Install .NET 6
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.x'
 
@@ -32,7 +29,7 @@ jobs:
           make all
 
       - name: Clone Wiki
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           repository: openra/openra.wiki
           token: ${{ secrets.DOCS_TOKEN }}
@@ -66,15 +63,15 @@ jobs:
   docs:
     name: Update docs.openra.net
     if: github.repository == 'openra/openra'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           ref: ${{ github.event.inputs.tag }}
 
       - name: Install .NET 6
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.x'
 
@@ -84,7 +81,7 @@ jobs:
 
       - name: Clone docs.openra.net (Playtest)
         if: startsWith(github.event.inputs.tag, 'playtest-')
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           repository: openra/docs
           token: ${{ secrets.DOCS_TOKEN }}
@@ -93,7 +90,7 @@ jobs:
 
       - name: Clone docs.openra.net (Release)
         if: startsWith(github.event.inputs.tag, 'release-')
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           repository: openra/docs
           token: ${{ secrets.DOCS_TOKEN }}

.github/workflows/itch.yml

@@ -8,11 +8,10 @@ on:
         required: true
         default: 'release-xxxxxxxx'
 
-permissions: {}
 jobs:
   itch:
     name: Deploy to itch.io
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'openra/openra'
     steps:
       - name: Download Packages

.github/workflows/packaging.yml

@@ -7,16 +7,13 @@ on:
     - 'playtest-*'
     - 'devtest-*'
 
-permissions:
-  contents: write  #  for release creation (svenstaro/upload-release-action)
-
 jobs:
   source:
     name: Source Tarball
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Prepare Environment
         run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
@@ -37,13 +34,13 @@ jobs:
 
   linux:
     name: Linux AppImages
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.x'
 
@@ -53,7 +50,6 @@ jobs:
       - name: Package AppImages
         run: |
           mkdir -p build/linux
-          sudo apt install libfuse2
           ./packaging/linux/buildpackage.sh "${GIT_TAG}" "${PWD}/build/linux"
 
       - name: Upload Packages
@@ -70,10 +66,10 @@ jobs:
     runs-on: macos-11
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.x'
 
@@ -102,13 +98,13 @@ jobs:
 
   windows:
     name: Windows Installers
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.x'
 

AUTHORS

@@ -74,7 +74,6 @@ Also thanks to:
     * Glenn Martin Jensen (Baxxster)
     * Gordon Martin (Happy0)
     * Guido Lipke (LipkeGu)
-    * Guillermo Cuenca (Wylli)
     * Hervé Matysiak (Herve-M)
     * Huw Pascoe
     * Ian T. Jacobsen (Smilex)
@@ -120,7 +119,6 @@ Also thanks to:
     * Mike Gagné (AngryBirdz)
     * Muh
     * Mustafa Alperen Seki (MustaphaTR)
-    * Nathan Nichols (cracksmoka420)
     * Neil Shivkar (havok13888)
     * Nikolay Fomin (netnazgul)
     * Nooze

Directory.Build.props

@@ -5,16 +5,15 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
-    <LangVersion>9</LangVersion>
+    <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>
-    <Product>OpenRA</Product>
-    <Copyright>Copyright (c) The OpenRA Developers and Contributors</Copyright>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -31,12 +30,6 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
-    <!-- Enable only for Debug builds to improve compile-time performance for Release builds -->
-    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <!-- Enabling GenerateDocumentationFile is required for IDE0005 (Remove unnecessary import) 
-      rule to run in command line builds. https://github.com/dotnet/roslyn/issues/41640
-      Enable only for Debug builds to improve compile-time performance for Release builds -->
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -53,6 +46,7 @@
 
   <!-- StyleCop -->
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
   </ItemGroup>
 </Project>

INSTALL.md

@@ -17,7 +17,7 @@ Run the game with `launch-game.cmd`. It can be handed arguments that specify the
 Linux
 =====
 
-.NET 6 or Mono (version 6.12 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.
+.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.
 
@@ -78,6 +78,6 @@ Type `sudo make install` for system-wide installation. Run `sudo make install-li
 macOS
 =====
 
-[.NET 6](https://dotnet.microsoft.com/download/dotnet/6.0) or [Mono](https://www.mono-project.com/download/stable/#download-mac) (version 6.12 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).
+[.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

@@ -3,7 +3,7 @@
 # to compile, run:
 #   make
 #
-# to compile using Mono (version 6.12 or greater) instead of .NET 6, run:
+# 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:
@@ -92,7 +92,7 @@ endif
 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.12."; exit 1)
+	@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)
@@ -112,10 +112,11 @@ check:
 	@echo
 	@echo "Compiling in Debug mode..."
 ifeq ($(RUNTIME), mono)
-	@$(MSBUILD) -t:clean\;build -restore -p:Configuration=Debug -warnaserror -p:TargetPlatform=$(TARGETPLATFORM)
+# 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
-	@$(DOTNET) clean -c Debug --nologo --verbosity minimal
-	@$(DOTNET) build -c Debug -nologo -warnaserror -p:TargetPlatform=$(TARGETPLATFORM)
+# 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
@@ -130,7 +131,7 @@ endif
 check-scripts:
 	@echo
 	@echo "Checking for Lua syntax errors..."
-	@find mods/*/maps/ mods/*/scripts/ -iname "*.lua" -print0 | xargs -0n1 luac -p
+	@find lua/ mods/*/{maps,scripts}/ -iname "*.lua" -print0 | xargs -0n1 luac -p
 
 test: all
 	@echo
@@ -146,11 +147,6 @@ test: all
 	@echo "Testing Red Alert mod MiniYAML..."
 	@./utility.sh ra --check-yaml
 
-tests:
-	@dotnet build OpenRA.Test/OpenRA.Test.csproj -c Debug --nologo -p:TargetPlatform=$(TARGETPLATFORM)
-	@echo
-	@dotnet test bin/OpenRA.Test.dll --test-adapter-path:.
-
 ############# 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
@@ -178,14 +174,14 @@ help:
 	@echo 'to compile, run:'
 	@echo '  make'
 	@echo
-	@echo 'to compile using Mono (version 6.12 or greater) instead of .NET 6, run:'
+	@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] [TREAT_WARNINGS_AS_ERRORS=false] test'
+	@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'

OpenRA.Game/Activities/Activity.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -86,7 +86,7 @@ namespace OpenRA.Activities
 		bool firstRunCompleted;
 		bool lastRun;
 
-		protected Activity()
+		public Activity()
 		{
 			IsInterruptible = true;
 			ChildHasPriority = true;

OpenRA.Game/Activities/CallFunc.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Actor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -35,9 +35,6 @@ namespace OpenRA
 
 	public sealed class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IDisposable
 	{
-		/// <summary>Value used to represent an invalid token.</summary>
-		public const int InvalidConditionToken = -1;
-
 		internal readonly struct SyncHash
 		{
 			public readonly ISync Trait;
@@ -81,24 +78,27 @@ namespace OpenRA
 
 		public WRot Orientation => facing?.Orientation ?? WRot.None;
 
-		sealed class ConditionState
+		/// <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();
+			public readonly List<VariableObserverNotifier> Notifiers = new List<VariableObserverNotifier>();
 
 			/// <summary>Unique integers identifying granted instances of the condition.</summary>
-			public readonly HashSet<int> Tokens = new();
+			public readonly HashSet<int> Tokens = new HashSet<int>();
 		}
 
-		readonly Dictionary<string, ConditionState> conditionStates = new();
+		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();
+		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();
+		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;
@@ -587,7 +587,7 @@ namespace OpenRA
 			return InvalidConditionToken;
 		}
 
-		/// <summary>Returns whether the specified token is valid for RevokeCondition.</summary>
+		/// <summary>Returns whether the specified token is valid for RevokeCondition</summary>
 		public bool TokenValid(int token)
 		{
 			return conditionTokens.ContainsKey(token);
@@ -600,7 +600,8 @@ namespace OpenRA
 		Lazy<ScriptActorInterface> luaInterface;
 		public void OnScriptBind(ScriptContext context)
 		{
-			luaInterface ??= Exts.Lazy(() => new ScriptActorInterface(context, this));
+			if (luaInterface == null)
+				luaInterface = Exts.Lazy(() => new ScriptActorInterface(context, this));
 		}
 
 		public LuaValue this[LuaRuntime runtime, LuaValue keyValue]

OpenRA.Game/CPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -41,7 +41,7 @@ namespace OpenRA
 			Bits = (x & 0xFFF) << 20 | (y & 0xFFF) << 8 | layer;
 		}
 
-		public static readonly CPos Zero = new(0, 0, 0);
+		public static readonly CPos Zero = new CPos(0, 0, 0);
 
 		public static explicit operator CPos(int2 a) { return new CPos(a.X, a.Y); }
 
@@ -56,7 +56,7 @@ namespace OpenRA
 		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 cell && Equals(cell); }
+		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
 
 		public override string ToString()
 		{

OpenRA.Game/CVec.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -22,7 +22,7 @@ namespace OpenRA
 		public readonly int X, Y;
 
 		public CVec(int x, int y) { X = x; Y = y; }
-		public static readonly CVec Zero = new(0, 0);
+		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); }
@@ -55,7 +55,7 @@ namespace OpenRA
 		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 vec && Equals(vec); }
+		public override bool Equals(object obj) { return obj is CVec && Equals((CVec)obj); }
 
 		public override string ToString() { return X + "," + Y; }
 

OpenRA.Game/CryptoUtil.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -187,10 +187,8 @@ namespace OpenRA
 			}
 			catch (Exception e)
 			{
-				Log.Write("debug", "Failed to decrypt string with exception:");
-				Log.Write("debug", e);
-				Console.WriteLine("String decryption failed:");
-				Console.WriteLine(e);
+				Log.Write("debug", "Failed to decrypt string with exception: {0}", e);
+				Console.WriteLine("String decryption failed: {0}", e);
 				return null;
 			}
 		}
@@ -213,10 +211,8 @@ namespace OpenRA
 			}
 			catch (Exception e)
 			{
-				Log.Write("debug", "Failed to sign string with exception");
-				Log.Write("debug", e);
-				Console.WriteLine("String signing failed:");
-				Console.WriteLine(e);
+				Log.Write("debug", "Failed to sign string with exception: {0}", e);
+				Console.WriteLine("String signing failed: {0}", e);
 				return null;
 			}
 		}
@@ -239,10 +235,8 @@ namespace OpenRA
 			}
 			catch (Exception e)
 			{
-				Log.Write("debug", "Failed to verify signature with exception:");
-				Log.Write("debug", e);
-				Console.WriteLine("Signature validation failed:");
-				Console.WriteLine(e);
+				Log.Write("debug", "Failed to verify signature with exception: {0}", e);
+				Console.WriteLine("Signature validation failed: {0}", e);
 				return false;
 			}
 		}

OpenRA.Game/DefaultPlayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Effects/AsyncAction.cs

@@ -0,0 +1,39 @@
+#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/DelayedAction.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Effects/DelayedImpact.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Effects/IEffect.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/ExternalMods.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -41,7 +41,7 @@ namespace OpenRA
 
 	public class ExternalMods : IReadOnlyDictionary<string, ExternalMod>
 	{
-		readonly Dictionary<string, ExternalMod> mods = new();
+		readonly Dictionary<string, ExternalMod> mods = new Dictionary<string, ExternalMod>();
 		readonly SheetBuilder sheetBuilder;
 
 		Sheet CreateSheet()
@@ -81,8 +81,8 @@ namespace OpenRA
 					}
 					catch (Exception e)
 					{
-						Log.Write("debug", $"Failed to parse mod metadata file '{path}'");
-						Log.Write("debug", e);
+						Log.Write("debug", "Failed to parse mod metadata file '{0}'", path);
+						Log.Write("debug", e.ToString());
 					}
 				}
 			}
@@ -174,19 +174,17 @@ namespace OpenRA
 				catch (Exception e)
 				{
 					Log.Write("debug", "Failed to register current mod metadata");
-					Log.Write("debug", e);
+					Log.Write("debug", e.ToString());
 				}
 			}
 		}
 
 		/// <summary>
 		/// Removes invalid mod registrations:
-		/// <list type="bullet">
-		/// <item>LaunchPath no longer exists.</item>
-		/// <item>LaunchPath and mod id matches the active mod, but the version is different.</item>
-		/// <item>Filename doesn't match internal key.</item>
-		/// <item>Fails to parse as a mod registration.</item>
-		/// </list>
+		/// * LaunchPath no longer exists
+		/// * LaunchPath and mod id matches the active mod, but the version is different
+		/// * Filename doesn't match internal key
+		/// * Fails to parse as a mod registration
 		/// </summary>
 		internal void ClearInvalidRegistrations(ModRegistration registration)
 		{
@@ -213,8 +211,8 @@ namespace OpenRA
 					}
 					catch (Exception e)
 					{
-						Log.Write("debug", $"Failed to parse mod metadata file '{path}'");
-						Log.Write("debug", e);
+						Log.Write("debug", "Failed to parse mod metadata file '{0}'", path);
+						Log.Write("debug", e.ToString());
 					}
 
 					// Remove from the ingame mod switcher
@@ -225,12 +223,12 @@ namespace OpenRA
 					try
 					{
 						File.Delete(path);
-						Log.Write("debug", $"Removed invalid mod metadata file '{path}'");
+						Log.Write("debug", "Removed invalid mod metadata file '{0}'", path);
 					}
 					catch (Exception e)
 					{
-						Log.Write("debug", $"Failed to remove mod metadata file '{path}'");
-						Log.Write("debug", e);
+						Log.Write("debug", "Failed to remove mod metadata file '{0}'", path);
+						Log.Write("debug", e.ToString());
 					}
 				}
 			}
@@ -251,13 +249,13 @@ namespace OpenRA
 				}
 				catch (Exception e)
 				{
-					Log.Write("debug", $"Failed to remove mod metadata file '{path}'");
-					Log.Write("debug", e);
+					Log.Write("debug", "Failed to remove mod metadata file '{0}'", path);
+					Log.Write("debug", e.ToString());
 				}
 			}
 		}
 
-		static IEnumerable<string> GetSupportDirs(ModRegistration registration)
+		IEnumerable<string> GetSupportDirs(ModRegistration registration)
 		{
 			var sources = new HashSet<string>(4);
 			if (registration.HasFlag(ModRegistration.System))

OpenRA.Game/Exts.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -27,6 +27,11 @@ namespace OpenRA
 			return string.Compare(str.ToUpperInvariant(), str, false) == 0;
 		}
 
+		public static string F(this string fmt, params object[] args)
+		{
+			return string.Format(fmt, args);
+		}
+
 		public static T WithDefault<T>(T def, Func<T> f)
 		{
 			try { return f(); }
@@ -40,16 +45,21 @@ namespace OpenRA
 			return a.GetTypes().Select(t => t.Namespace).Distinct().Where(n => n != null);
 		}
 
-		public static bool HasAttribute<TAttribute>(this MemberInfo mi)
-			where TAttribute : Attribute
+		public static bool HasAttribute<T>(this MemberInfo mi)
 		{
-			return Attribute.IsDefined(mi, typeof(TAttribute));
+			return Attribute.IsDefined(mi, typeof(T));
 		}
 
-		public static TAttribute[] GetCustomAttributes<TAttribute>(this MemberInfo mi, bool inherit)
-			where TAttribute : Attribute
+		public static T[] GetCustomAttributes<T>(this MemberInfo mi, bool inherit)
+			where T : class
 		{
-			return (TAttribute[])mi.GetCustomAttributes(typeof(TAttribute), inherit);
+			return (T[])mi.GetCustomAttributes(typeof(T), inherit);
+		}
+
+		public static T[] GetCustomAttributes<T>(this ParameterInfo mi)
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes(typeof(T), true);
 		}
 
 		public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
@@ -109,23 +119,13 @@ namespace OpenRA
 
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, V v)
 		{
-#if NET5_0_OR_GREATER
-			// SAFETY: Dictionary cannot be modified whilst the ref is alive.
-			ref var value = ref System.Runtime.InteropServices.CollectionsMarshal.GetValueRefOrAddDefault(d, k, out var exists);
-			if (!exists)
-				value = v;
-			return value;
-#else
 			if (!d.TryGetValue(k, out var ret))
 				d.Add(k, ret = v);
 			return ret;
-#endif
 		}
 
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
 		{
-			// Cannot use CollectionsMarshal.GetValueRefOrAddDefault here,
-			// the creation function could mutate the dictionary which would invalidate the ref.
 			if (!d.TryGetValue(k, out var ret))
 				d.Add(k, ret = createFn(k));
 			return ret;
@@ -149,7 +149,7 @@ namespace OpenRA
 		static T Random<T>(IEnumerable<T> ts, MersenneTwister r, bool throws)
 		{
 			var xs = ts as ICollection<T>;
-			xs ??= ts.ToList();
+			xs = xs ?? ts.ToList();
 			if (xs.Count == 0)
 			{
 				if (throws)
@@ -396,8 +396,8 @@ namespace OpenRA
 			string debugName, Func<TKey, string> logKey = null, Func<TElement, string> logValue = null)
 		{
 			// Fall back on ToString() if null functions are provided:
-			logKey ??= s => s.ToString();
-			logValue ??= s => s.ToString();
+			logKey = logKey ?? (s => s.ToString());
+			logValue = logValue ?? (s => s.ToString());
 
 			// Try to build a dictionary and log all duplicates found (if any):
 			var dupKeys = new Dictionary<TKey, List<string>>();
@@ -515,7 +515,7 @@ namespace OpenRA
 
 		public static bool IsTraitEnabled<T>(this T trait)
 		{
-			return trait is not IDisabledTrait disabledTrait || !disabledTrait.IsTraitDisabled;
+			return !(trait is IDisabledTrait disabledTrait) || !disabledTrait.IsTraitDisabled;
 		}
 
 		public static T FirstEnabledTraitOrDefault<T>(this IEnumerable<T> ts)
@@ -595,8 +595,8 @@ namespace OpenRA
 				return true;
 			}
 
-			Current = span[..index];
-			str = span[(index + 1)..];
+			Current = span.Slice(0, index);
+			str = span.Slice(index + 1);
 			return true;
 		}
 

OpenRA.Game/FieldLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -56,20 +56,24 @@ namespace OpenRA
 		}
 
 		public static Func<string, Type, string, object> InvalidValueAction = (s, t, f) =>
+		{
 			throw new YamlException($"FieldLoader: Cannot parse `{s}` into `{f}.{t}` ");
+		};
 
 		public static Action<string, Type> UnknownFieldAction = (s, f) =>
+		{
 			throw new NotImplementedException($"FieldLoader: Missing field `{s}` on `{f.Name}`");
+		};
 
 		static readonly ConcurrentCache<Type, FieldLoadInfo[]> TypeLoadInfo =
-			new(BuildTypeLoadInfo);
+			new ConcurrentCache<Type, FieldLoadInfo[]>(BuildTypeLoadInfo);
 		static readonly ConcurrentCache<string, BooleanExpression> BooleanExpressionCache =
-			new(expression => new BooleanExpression(expression));
+			new ConcurrentCache<string, BooleanExpression>(expression => new BooleanExpression(expression));
 		static readonly ConcurrentCache<string, IntegerExpression> IntegerExpressionCache =
-			new(expression => new IntegerExpression(expression));
+			new ConcurrentCache<string, IntegerExpression>(expression => new IntegerExpression(expression));
 
 		static readonly Dictionary<Type, Func<string, Type, string, MemberInfo, object>> TypeParsers =
-			new()
+			new Dictionary<Type, Func<string, Type, string, MemberInfo, object>>()
 			{
 				{ typeof(int), ParseInt },
 				{ typeof(ushort), ParseUShort },
@@ -103,7 +107,7 @@ namespace OpenRA
 			};
 
 		static readonly Dictionary<Type, Func<string, Type, string, MiniYaml, MemberInfo, object>> GenericTypeParsers =
-			new()
+			new Dictionary<Type, Func<string, Type, string, MiniYaml, MemberInfo, object>>()
 			{
 				{ typeof(HashSet<>), ParseHashSetOrList },
 				{ typeof(List<>), ParseHashSetOrList },
@@ -112,19 +116,10 @@ namespace OpenRA
 				{ typeof(Nullable<>), ParseNullable },
 			};
 
-		static readonly object BoxedTrue = true;
-		static readonly object BoxedFalse = false;
-		static readonly object[] BoxedInts = Exts.MakeArray(33, i => (object)i);
-
 		static object ParseInt(string fieldName, Type fieldType, string value, MemberInfo field)
 		{
 			if (Exts.TryParseIntegerInvariant(value, out var res))
-			{
-				if (res >= 0 && res < BoxedInts.Length)
-					return BoxedInts[res];
 				return res;
-			}
-
 			return InvalidValueAction(value, fieldType, fieldName);
 		}
 
@@ -164,7 +159,7 @@ namespace OpenRA
 		static object ParseColor(string fieldName, Type fieldType, string value, MemberInfo field)
 		{
 			if (value != null && Color.TryParse(value, out var color))
-				return color;
+					return color;
 
 			return InvalidValueAction(value, fieldType, fieldName);
 		}
@@ -370,7 +365,7 @@ namespace OpenRA
 		static object ParseBool(string fieldName, Type fieldType, string value, MemberInfo field)
 		{
 			if (bool.TryParse(value.ToLowerInvariant(), out var result))
-				return result ? BoxedTrue : BoxedFalse;
+				return result;
 
 			return InvalidValueAction(value, fieldType, fieldName);
 		}
@@ -478,11 +473,11 @@ namespace OpenRA
 
 		static object ParseHashSetOrList(string fieldName, Type fieldType, string value, MiniYaml yaml, MemberInfo field)
 		{
+			var set = Activator.CreateInstance(fieldType);
 			if (value == null)
-				return Activator.CreateInstance(fieldType);
+				return set;
 
 			var parts = value.Split(SplitComma, StringSplitOptions.RemoveEmptyEntries);
-			var set = Activator.CreateInstance(fieldType, parts.Length);
 			var arguments = fieldType.GetGenericArguments();
 			var addMethod = fieldType.GetMethod(nameof(List<object>.Add), arguments);
 			var addArgs = new object[1];
@@ -497,10 +492,7 @@ namespace OpenRA
 
 		static object ParseDictionary(string fieldName, Type fieldType, string value, MiniYaml yaml, MemberInfo field)
 		{
-			if (yaml == null)
-				return Activator.CreateInstance(fieldType);
-
-			var dict = Activator.CreateInstance(fieldType, yaml.Nodes.Count);
+			var dict = Activator.CreateInstance(fieldType);
 			var arguments = fieldType.GetGenericArguments();
 			var addMethod = fieldType.GetMethod(nameof(Dictionary<object, object>.Add), arguments);
 			var addArgs = new object[2];
@@ -539,7 +531,7 @@ namespace OpenRA
 		public static void Load(object self, MiniYaml my)
 		{
 			var loadInfo = TypeLoadInfo[self.GetType()];
-			List<string> missing = null;
+			var missing = new List<string>();
 
 			Dictionary<string, MiniYaml> md = null;
 
@@ -547,14 +539,14 @@ namespace OpenRA
 			{
 				object val;
 
-				md ??= my.ToDictionary();
+				if (md == null)
+					md = my.ToDictionary();
 				if (fli.Loader != null)
 				{
 					if (!fli.Attribute.Required || md.ContainsKey(fli.YamlName))
 						val = fli.Loader(my);
 					else
 					{
-						missing ??= new List<string>();
 						missing.Add(fli.YamlName);
 						continue;
 					}
@@ -564,11 +556,7 @@ namespace OpenRA
 					if (!TryGetValueFromYaml(fli.YamlName, fli.Field, md, out val))
 					{
 						if (fli.Attribute.Required)
-						{
-							missing ??= new List<string>();
 							missing.Add(fli.YamlName);
-						}
-
 						continue;
 					}
 				}
@@ -576,7 +564,7 @@ namespace OpenRA
 				fli.Field.SetValue(self, val);
 			}
 
-			if (missing != null)
+			if (missing.Count > 0)
 				throw new MissingFieldsException(missing.ToArray());
 		}
 
@@ -637,17 +625,12 @@ namespace OpenRA
 
 		public static object GetValue(string fieldName, Type fieldType, string value, MemberInfo field)
 		{
-			return GetValue(fieldName, fieldType, value, null, field);
+			return GetValue(fieldName, fieldType, new MiniYaml(value), field);
 		}
 
 		public static object GetValue(string fieldName, Type fieldType, MiniYaml yaml, MemberInfo field)
 		{
-			return GetValue(fieldName, fieldType, yaml.Value, yaml, field);
-		}
-
-		static object GetValue(string fieldName, Type fieldType, string value, MiniYaml yaml, MemberInfo field)
-		{
-			value = value?.Trim();
+			var value = yaml.Value?.Trim();
 			if (fieldType.IsGenericType)
 			{
 				if (GenericTypeParsers.TryGetValue(fieldType.GetGenericTypeDefinition(), out var parseFuncGeneric))
@@ -771,7 +754,7 @@ namespace OpenRA
 		[AttributeUsage(AttributeTargets.Field)]
 		public class SerializeAttribute : Attribute
 		{
-			public static readonly SerializeAttribute Default = new(true);
+			public static readonly SerializeAttribute Default = new SerializeAttribute(true);
 
 			public bool IsDefault => this == Default;
 

OpenRA.Game/FieldSaver.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/FileFormats/Png.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -31,7 +31,7 @@ namespace OpenRA.FileFormats
 		public Color[] Palette { get; }
 		public byte[] Data { get; }
 		public SpriteFrameType Type { get; }
-		public Dictionary<string, string> EmbeddedData = new();
+		public Dictionary<string, string> EmbeddedData = new Dictionary<string, string>();
 
 		public int PixelStride => Type == SpriteFrameType.Indexed8 ? 1 : Type == SpriteFrameType.Rgb24 ? 3 : 4;
 
@@ -67,7 +67,7 @@ namespace OpenRA.FileFormats
 							Height = IPAddress.NetworkToHostOrder(ms.ReadInt32());
 
 							var bitDepth = ms.ReadUInt8();
-							var colorType = (PngColorType)ms.ReadUInt8();
+							var colorType = (PngColorType)ms.ReadByte();
 							if (IsPaletted(bitDepth, colorType))
 								Type = SpriteFrameType.Indexed8;
 							else if (colorType == PngColorType.Color)
@@ -75,9 +75,9 @@ namespace OpenRA.FileFormats
 
 							Data = new byte[Width * Height * PixelStride];
 
-							var compression = ms.ReadUInt8();
-							/*var filter = */ms.ReadUInt8();
-							var interlace = ms.ReadUInt8();
+							var compression = ms.ReadByte();
+							/*var filter = */ms.ReadByte();
+							var interlace = ms.ReadByte();
 
 							if (compression != 0)
 								throw new InvalidDataException("Compression method not supported");
@@ -95,7 +95,7 @@ namespace OpenRA.FileFormats
 							Palette = new Color[256];
 							for (var i = 0; i < length / 3; i++)
 							{
-								var r = ms.ReadUInt8(); var g = ms.ReadUInt8(); var b = ms.ReadUInt8();
+								var r = ms.ReadByte(); var g = ms.ReadByte(); var b = ms.ReadByte();
 								Palette[i] = Color.FromArgb(r, g, b);
 							}
 
@@ -108,7 +108,7 @@ namespace OpenRA.FileFormats
 								throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
 
 							for (var i = 0; i < length; i++)
-								Palette[i] = Color.FromArgb(ms.ReadUInt8(), Palette[i]);
+								Palette[i] = Color.FromArgb(ms.ReadByte(), Palette[i]);
 
 							break;
 						}
@@ -137,56 +137,21 @@ namespace OpenRA.FileFormats
 									var pxStride = PixelStride;
 									var rowStride = Width * pxStride;
 
-									Span<byte> prevLine = new byte[rowStride];
+									var prevLine = new byte[rowStride];
 									for (var y = 0; y < Height; y++)
 									{
-										var filter = (PngFilter)ds.ReadUInt8();
-										ds.ReadBytes(Data, y * rowStride, rowStride);
-										var line = Data.AsSpan(y * rowStride, rowStride);
+										var filter = (PngFilter)ds.ReadByte();
+										var line = ds.ReadBytes(rowStride);
 
-										switch (filter)
-										{
-											case PngFilter.None:
-												break;
-											case PngFilter.Sub:
-												for (var i = pxStride; i < rowStride; i++)
-													line[i] += line[i - pxStride];
-												break;
-											case PngFilter.Up:
-												for (var i = 0; i < rowStride; i++)
-													line[i] += prevLine[i];
-												break;
-											case PngFilter.Average:
-												for (var i = 0; i < pxStride; i++)
-													line[i] += Average(0, prevLine[i]);
-												for (var i = pxStride; i < rowStride; i++)
-													line[i] += Average(line[i - pxStride], prevLine[i]);
-												break;
-											case PngFilter.Paeth:
-												for (var i = 0; i < pxStride; i++)
-													line[i] += Paeth(0, prevLine[i], 0);
-												for (var i = pxStride; i < rowStride; i++)
-													line[i] += Paeth(line[i - pxStride], prevLine[i], prevLine[i - pxStride]);
-												break;
-											default:
-												throw new InvalidOperationException("Unsupported Filter");
-										}
+										for (var i = 0; i < rowStride; i++)
+											line[i] = i < pxStride
+												? UnapplyFilter(filter, line[i], 0, prevLine[i], 0)
+												: UnapplyFilter(filter, line[i], line[i - pxStride], prevLine[i], prevLine[i - pxStride]);
+
+										Array.Copy(line, 0, Data, y * rowStride, rowStride);
 
 										prevLine = line;
 									}
-
-									static byte Average(byte a, byte b) => (byte)((a + b) / 2);
-
-									static byte Paeth(byte a, byte b, byte c)
-									{
-										var p = a + b - c;
-										var pa = Math.Abs(p - a);
-										var pb = Math.Abs(p - b);
-										var pc = Math.Abs(p - c);
-
-										return (pa <= pb && pa <= pc) ? a :
-											(pb <= pc) ? b : c;
-									}
 								}
 							}
 
@@ -263,9 +228,34 @@ namespace OpenRA.FileFormats
 			return isPng;
 		}
 
+		static byte UnapplyFilter(PngFilter f, byte x, byte a, byte b, byte c)
+		{
+			switch (f)
+			{
+				case PngFilter.None: return x;
+				case PngFilter.Sub: return (byte)(x + a);
+				case PngFilter.Up: return (byte)(x + b);
+				case PngFilter.Average: return (byte)(x + (a + b) / 2);
+				case PngFilter.Paeth: return (byte)(x + Paeth(a, b, c));
+				default:
+					throw new InvalidOperationException("Unsupported Filter");
+			}
+		}
+
+		static byte Paeth(byte a, byte b, byte c)
+		{
+			var p = a + b - c;
+			var pa = Math.Abs(p - a);
+			var pb = Math.Abs(p - b);
+			var pc = Math.Abs(p - c);
+
+			return (pa <= pb && pa <= pc) ? a :
+				(pb <= pc) ? b : c;
+		}
+
 		[Flags]
-		enum PngColorType : byte { Indexed = 1, Color = 2, Alpha = 4 }
-		enum PngFilter : byte { None, Sub, Up, Average, Paeth }
+		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 }
+		enum PngFilter { None, Sub, Up, Average, Paeth }
 
 		static bool IsPaletted(byte bitDepth, PngColorType colorType)
 		{
@@ -281,7 +271,7 @@ namespace OpenRA.FileFormats
 			throw new InvalidDataException("Unknown pixel format");
 		}
 
-		static void WritePngChunk(Stream output, string type, Stream input)
+		void WritePngChunk(Stream output, string type, Stream input)
 		{
 			input.Position = 0;
 

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/FileSystem/FileSystem.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -29,16 +29,16 @@ namespace OpenRA.FileSystem
 	public class FileSystem : IReadOnlyFileSystem
 	{
 		public IEnumerable<IReadOnlyPackage> MountedPackages => mountedPackages.Keys;
-		readonly Dictionary<IReadOnlyPackage, int> mountedPackages = new();
-		readonly Dictionary<string, IReadOnlyPackage> explicitMounts = new();
+		readonly Dictionary<IReadOnlyPackage, int> mountedPackages = new Dictionary<IReadOnlyPackage, int>();
+		readonly Dictionary<string, IReadOnlyPackage> explicitMounts = new Dictionary<string, IReadOnlyPackage>();
 		readonly string modID;
 
 		// Mod packages that should not be disposed
-		readonly List<IReadOnlyPackage> modPackages = new();
+		readonly List<IReadOnlyPackage> modPackages = new List<IReadOnlyPackage>();
 		readonly IReadOnlyDictionary<string, Manifest> installedMods;
 		readonly IPackageLoader[] packageLoaders;
 
-		Cache<string, List<IReadOnlyPackage>> fileIndex = new(_ => new List<IReadOnlyPackage>());
+		Cache<string, List<IReadOnlyPackage>> fileIndex = new Cache<string, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
 
 		public FileSystem(string modID, IReadOnlyDictionary<string, Manifest> installedMods, IPackageLoader[] packageLoaders)
 		{
@@ -85,14 +85,14 @@ namespace OpenRA.FileSystem
 		{
 			var optional = name.StartsWith("~", StringComparison.Ordinal);
 			if (optional)
-				name = name[1..];
+				name = name.Substring(1);
 
 			try
 			{
 				IReadOnlyPackage package;
 				if (name.StartsWith("$", StringComparison.Ordinal))
 				{
-					name = name[1..];
+					name = name.Substring(1);
 
 					if (!installedMods.TryGetValue(name, out var mod))
 						throw new InvalidOperationException($"Could not load mod '{name}'. Available mods: {installedMods.Keys.JoinWith(", ")}");
@@ -211,9 +211,9 @@ namespace OpenRA.FileSystem
 		public bool TryGetPackageContaining(string path, out IReadOnlyPackage package, out string filename)
 		{
 			var explicitSplit = path.IndexOf('|');
-			if (explicitSplit > 0 && explicitMounts.TryGetValue(path[..explicitSplit], out package))
+			if (explicitSplit > 0 && explicitMounts.TryGetValue(path.Substring(0, explicitSplit), out package))
 			{
-				filename = path[(explicitSplit + 1)..];
+				filename = path.Substring(explicitSplit + 1);
 				return true;
 			}
 
@@ -228,9 +228,9 @@ namespace OpenRA.FileSystem
 			var explicitSplit = filename.IndexOf('|');
 			if (explicitSplit > 0)
 			{
-				if (explicitMounts.TryGetValue(filename[..explicitSplit], out var explicitPackage))
+				if (explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out var explicitPackage))
 				{
-					s = explicitPackage.GetStream(filename[(explicitSplit + 1)..]);
+					s = explicitPackage.GetStream(filename.Substring(explicitSplit + 1));
 					if (s != null)
 						return true;
 				}
@@ -263,15 +263,15 @@ namespace OpenRA.FileSystem
 		{
 			var explicitSplit = filename.IndexOf('|');
 			if (explicitSplit > 0)
-				if (explicitMounts.TryGetValue(filename[..explicitSplit], out var explicitPackage))
-					if (explicitPackage.Contains(filename[(explicitSplit + 1)..]))
+				if (explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out var explicitPackage))
+					if (explicitPackage.Contains(filename.Substring(explicitSplit + 1)))
 						return true;
 
 			return fileIndex.ContainsKey(filename);
 		}
 
 		/// <summary>
-		/// Returns true if the given filename references an external mod via an explicit mount.
+		/// Returns true if the given filename references an external mod via an explicit mount
 		/// </summary>
 		public bool IsExternalModFile(string filename)
 		{
@@ -279,7 +279,7 @@ namespace OpenRA.FileSystem
 			if (explicitSplit < 0)
 				return false;
 
-			if (!explicitMounts.TryGetValue(filename[..explicitSplit], out var explicitPackage))
+			if (!explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out var explicitPackage))
 				return false;
 
 			if (installedMods[modID].Package == explicitPackage)
@@ -297,8 +297,8 @@ namespace OpenRA.FileSystem
 			var explicitSplit = path.IndexOf('|');
 			if (explicitSplit > 0 && !path.StartsWith("^"))
 			{
-				var parent = path[..explicitSplit];
-				var filename = path[(explicitSplit + 1)..];
+				var parent = path.Substring(0, explicitSplit);
+				var filename = path.Substring(explicitSplit + 1);
 
 				var parentPath = manifest.Packages.FirstOrDefault(kv => kv.Value == parent).Key;
 				if (parentPath == null)
@@ -306,10 +306,10 @@ namespace OpenRA.FileSystem
 
 				if (parentPath.StartsWith("$", StringComparison.Ordinal))
 				{
-					if (!installedMods.TryGetValue(parentPath[1..], out var mod))
+					if (!installedMods.TryGetValue(parentPath.Substring(1), out var mod))
 						return null;
 
-					if (mod.Package is not Folder)
+					if (!(mod.Package is Folder))
 						return null;
 
 					path = Path.Combine(mod.Package.Name, filename);
@@ -322,28 +322,6 @@ namespace OpenRA.FileSystem
 			return File.Exists(resolvedPath) ? resolvedPath : null;
 		}
 
-		public static string ResolveCaseInsensitivePath(string path)
-		{
-			var resolved = Path.GetPathRoot(path);
-
-			if (resolved == null)
-				return null;
-
-			foreach (var name in path[resolved.Length..].Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar))
-			{
-				// Filter out paths of the form /foo/bar/./baz
-				if (name == ".")
-					continue;
-
-				resolved = Directory.GetFileSystemEntries(resolved).FirstOrDefault(e => e.Equals(Path.Combine(resolved, name), StringComparison.InvariantCultureIgnoreCase));
-
-				if (resolved == null)
-					return null;
-			}
-
-			return resolved;
-		}
-
 		public string GetPrefix(IReadOnlyPackage package)
 		{
 			return explicitMounts.ContainsValue(package) ? explicitMounts.First(f => f.Value == package).Key : null;

OpenRA.Game/FileSystem/Folder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -18,22 +18,24 @@ namespace OpenRA.FileSystem
 {
 	public sealed class Folder : IReadWritePackage
 	{
-		public string Name { get; }
+		readonly string path;
 
 		public Folder(string path)
 		{
-			Name = path;
+			this.path = path;
 			if (!Directory.Exists(path))
 				Directory.CreateDirectory(path);
 		}
 
+		public string Name => path;
+
 		public IEnumerable<string> Contents
 		{
 			get
 			{
 				// Order may vary on different file systems and it matters for hashing.
-				return Directory.GetFiles(Name, "*", SearchOption.TopDirectoryOnly)
-					.Concat(Directory.GetDirectories(Name))
+				return Directory.GetFiles(path, "*", SearchOption.TopDirectoryOnly)
+					.Concat(Directory.GetDirectories(path))
 					.Select(Path.GetFileName)
 					.OrderBy(f => f);
 			}
@@ -41,14 +43,14 @@ namespace OpenRA.FileSystem
 
 		public Stream GetStream(string filename)
 		{
-			try { return File.OpenRead(Path.Combine(Name, filename)); }
+			try { return File.OpenRead(Path.Combine(path, filename)); }
 			catch { return null; }
 		}
 
 		public bool Contains(string filename)
 		{
-			var combined = Path.Combine(Name, filename);
-			return combined.StartsWith(Name, StringComparison.Ordinal) && File.Exists(combined);
+			var combined = Path.Combine(path, filename);
+			return combined.StartsWith(path, StringComparison.Ordinal) && File.Exists(combined);
 		}
 
 		public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
@@ -80,7 +82,7 @@ namespace OpenRA.FileSystem
 			// in FileSystem.OpenPackage.  Their internal name therefore contains the
 			// full parent path too.  We need to be careful to not add a second path
 			// prefix to these hacked packages.
-			var filePath = filename.StartsWith(Name) ? filename : Path.Combine(Name, filename);
+			var filePath = filename.StartsWith(path) ? filename : Path.Combine(path, filename);
 
 			Directory.CreateDirectory(Path.GetDirectoryName(filePath));
 			using (var s = File.Create(filePath))
@@ -94,7 +96,7 @@ namespace OpenRA.FileSystem
 			// in FileSystem.OpenPackage.  Their internal name therefore contains the
 			// full parent path too.  We need to be careful to not add a second path
 			// prefix to these hacked packages.
-			var filePath = filename.StartsWith(Name) ? filename : Path.Combine(Name, filename);
+			var filePath = filename.StartsWith(path) ? filename : Path.Combine(path, filename);
 			if (Directory.Exists(filePath))
 				Directory.Delete(filePath, true);
 			else if (File.Exists(filePath))

OpenRA.Game/FileSystem/IPackage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/FileSystem/ZipFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -19,7 +19,7 @@ namespace OpenRA.FileSystem
 {
 	public class ZipFileLoader : IPackageLoader
 	{
-		const uint ZipSignature = 0x04034b50;
+		static readonly string[] Extensions = { ".zip", ".oramap" };
 
 		class ReadOnlyZipFile : IReadOnlyPackage
 		{
@@ -95,7 +95,7 @@ namespace OpenRA.FileSystem
 
 		sealed class ReadWriteZipFile : ReadOnlyZipFile, IReadWritePackage
 		{
-			readonly MemoryStream pkgStream = new();
+			readonly MemoryStream pkgStream = new MemoryStream();
 
 			public ReadWriteZipFile(string filename, bool create = false)
 			{
@@ -142,22 +142,23 @@ namespace OpenRA.FileSystem
 
 		sealed class ZipFolder : IReadOnlyPackage
 		{
-			public string Name { get; }
+			public string Name => path;
 			public ReadOnlyZipFile Parent { get; }
+			readonly string path;
 
 			public ZipFolder(ReadOnlyZipFile parent, string path)
 			{
 				if (path.EndsWith("/", StringComparison.Ordinal))
-					path = path[..^1];
+					path = path.Substring(0, path.Length - 1);
 
-				Name = path;
 				Parent = parent;
+				this.path = path;
 			}
 
 			public Stream GetStream(string filename)
 			{
 				// Zip files use '/' as a path separator
-				return Parent.GetStream(Name + '/' + filename);
+				return Parent.GetStream(path + '/' + filename);
 			}
 
 			public IEnumerable<string> Contents
@@ -166,9 +167,9 @@ namespace OpenRA.FileSystem
 				{
 					foreach (var entry in Parent.Contents)
 					{
-						if (entry.StartsWith(Name, StringComparison.Ordinal) && entry != Name)
+						if (entry.StartsWith(path, StringComparison.Ordinal) && entry != path)
 						{
-							var filename = entry[(Name.Length + 1)..];
+							var filename = entry.Substring(path.Length + 1);
 							var dirLevels = filename.Split('/').Count(c => !string.IsNullOrEmpty(c));
 							if (dirLevels == 1)
 								yield return filename;
@@ -179,18 +180,18 @@ namespace OpenRA.FileSystem
 
 			public bool Contains(string filename)
 			{
-				return Parent.Contains(Name + '/' + filename);
+				return Parent.Contains(path + '/' + filename);
 			}
 
 			public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
 			{
-				return Parent.OpenPackage(Name + '/' + filename, context);
+				return Parent.OpenPackage(path + '/' + filename, context);
 			}
 
 			public void Dispose() { /* nothing to do */ }
 		}
 
-		sealed class StaticStreamDataSource : IStaticDataSource
+		class StaticStreamDataSource : IStaticDataSource
 		{
 			readonly Stream s;
 			public StaticStreamDataSource(Stream s)
@@ -206,10 +207,7 @@ namespace OpenRA.FileSystem
 
 		public bool TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package)
 		{
-			var readSignature = s.ReadUInt32();
-			s.Position -= 4;
-
-			if (readSignature != ZipSignature)
+			if (!Extensions.Any(e => filename.EndsWith(e, StringComparison.InvariantCultureIgnoreCase)))
 			{
 				package = null;
 				return false;
@@ -221,13 +219,10 @@ namespace OpenRA.FileSystem
 
 		public static bool TryParseReadWritePackage(string filename, out IReadWritePackage package)
 		{
-			using (var s = File.OpenRead(filename))
+			if (!Extensions.Any(e => filename.EndsWith(e, StringComparison.InvariantCultureIgnoreCase)))
 			{
-				if (s.ReadUInt32() != ZipSignature)
-				{
-					package = null;
-					return false;
-				}
+				package = null;
+				return false;
 			}
 
 			package = new ReadWriteZipFile(filename);

OpenRA.Game/Fonts.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Game.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -29,9 +29,6 @@ namespace OpenRA
 {
 	public static class Game
 	{
-		[TranslationReference("filename")]
-		const string SavedScreenshot = "notification-saved-screenshot";
-
 		public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
 
 		public static InstalledMods Mods { get; private set; }
@@ -48,7 +45,7 @@ namespace OpenRA
 		internal static OrderManager OrderManager;
 		static Server.Server server;
 
-		public static MersenneTwister CosmeticRandom = new(); // not synced
+		public static MersenneTwister CosmeticRandom = new MersenneTwister(); // not synced
 
 		public static Renderer Renderer;
 		public static Sound Sound;
@@ -65,7 +62,7 @@ namespace OpenRA
 		{
 			var newConnection = new NetworkConnection(endpoint);
 			if (recordReplay)
-				newConnection.StartRecording(() => TimestampedFilename());
+				newConnection.StartRecording(() => { return TimestampedFilename(); });
 
 			var om = new OrderManager(newConnection);
 			JoinInner(om);
@@ -187,8 +184,13 @@ namespace OpenRA
 			Cursor.SetCursor(null);
 			BeforeGameStart();
 
+			Map map;
+
+			using (new PerfTimer("PrepareMap"))
+				map = ModData.PrepareMap(mapUID);
+
 			using (new PerfTimer("NewWorld"))
-				OrderManager.World = new World(mapUID, ModData, OrderManager, type);
+				OrderManager.World = new World(ModData, map, OrderManager, type);
 
 			OrderManager.World.GameOver += FinishBenchmark;
 
@@ -265,14 +267,15 @@ namespace OpenRA
 		{
 			OrderManager om = null;
 
-			void LobbyReady()
+			Action lobbyReady = null;
+			lobbyReady = () =>
 			{
-				LobbyInfoChanged -= LobbyReady;
+				LobbyInfoChanged -= lobbyReady;
 				foreach (var o in setupOrders)
 					om.IssueOrder(o);
-			}
+			};
 
-			LobbyInfoChanged += LobbyReady;
+			LobbyInfoChanged += lobbyReady;
 
 			om = JoinServer(CreateLocalServer(mapUID), "");
 		}
@@ -416,7 +419,7 @@ namespace OpenRA
 				// Sanitize input from platform-specific launchers
 				// Process.Start requires paths to not be quoted, even if they contain spaces
 				if (launchPath != null && launchPath.First() == '"' && launchPath.Last() == '"')
-					launchPath = launchPath[1..^1];
+					launchPath = launchPath.Substring(1, launchPath.Length - 2);
 
 				// Metadata registration requires an explicit launch path
 				if (launchPath != null)
@@ -563,11 +566,14 @@ namespace OpenRA
 
 		// Note: These delayed actions should only be used by widgets or disposing objects
 		// - things that depend on a particular world should be queuing them on the world actor.
-		static volatile ActionQueue delayedActions = new();
+		static volatile ActionQueue delayedActions = new ActionQueue();
 
 		public static void RunAfterTick(Action a) { delayedActions.Add(a, RunTime); }
 		public static void RunAfterDelay(int delayMilliseconds, Action a) { delayedActions.Add(a, RunTime + delayMilliseconds); }
 
+		[TranslationReference("filename")]
+		static readonly string SavedScreenshot = "saved-screenshot";
+
 		static void TakeScreenshotInner()
 		{
 			using (new PerfTimer("Renderer.SaveScreenshot"))
@@ -581,7 +587,7 @@ namespace OpenRA
 				Log.Write("debug", "Taking screenshot " + path);
 
 				Renderer.SaveScreenshot(path);
-				TextNotificationsManager.Debug(TranslationProvider.GetString(SavedScreenshot, Translation.Arguments("filename", filename)));
+				TextNotificationsManager.Debug(ModData.Translation.GetString(SavedScreenshot, Translation.Arguments("filename", filename)));
 			}
 		}
 
@@ -613,7 +619,10 @@ namespace OpenRA
 
 					if (orderManager.TryTick())
 					{
-						Sync.RunUnsynced(world, () => world.OrderGenerator.Tick(world));
+						Sync.RunUnsynced(world, () =>
+						{
+							world.OrderGenerator.Tick(world);
+						});
 
 						world.Tick();
 

OpenRA.Game/GameInformation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -36,7 +36,7 @@ namespace OpenRA
 		public TimeSpan Duration => EndTimeUtc > StartTimeUtc ? EndTimeUtc - StartTimeUtc : TimeSpan.Zero;
 
 		public IList<Player> Players { get; }
-		public HashSet<int> DisabledSpawnPoints = new();
+		public HashSet<int> DisabledSpawnPoints = new HashSet<int>();
 		public MapPreview MapPreview => Game.ModData.MapCache[MapUid];
 		public IEnumerable<Player> HumanPlayers { get { return Players.Where(p => p.IsHuman); } }
 		public bool IsSinglePlayer => HumanPlayers.Count() == 1;

OpenRA.Game/GameRules/ActorInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -32,7 +32,7 @@ namespace OpenRA
 		/// You can remove inherited traits by adding a - in front of them as in -TraitName: to inherit everything, but this trait.
 		/// </summary>
 		public readonly string Name;
-		readonly TypeDictionary traits = new();
+		readonly TypeDictionary traits = new TypeDictionary();
 		List<TraitInfo> constructOrderCache = null;
 
 		public ActorInfo(ObjectCreator creator, string name, MiniYaml node)
@@ -115,46 +115,39 @@ namespace OpenRA
 			}).ToList();
 
 			var resolved = source.Where(s => s.Dependencies.Count == 0 && s.OptionalDependencies.Count == 0).ToList();
-			var unresolved = source.ToHashSet();
-			unresolved.ExceptWith(resolved);
+			var unresolved = source.Except(resolved);
 
-			static bool AreResolvable(Type a, Type b) => a.IsAssignableFrom(b);
+			var testResolve = new Func<Type, Type, bool>((a, b) => a == b || a.IsAssignableFrom(b));
 
 			// This query detects which unresolved traits can be immediately resolved as all their direct dependencies are met.
 			var more = unresolved.Where(u =>
 				u.Dependencies.All(d => // To be resolvable, all dependencies must be satisfied according to the following conditions:
-					resolved.Exists(r => AreResolvable(d, r.Type)) && // There must exist a resolved trait that meets the dependency.
-					!unresolved.Any(u1 => AreResolvable(d, u1.Type))) && // All matching traits that meet this dependency must be resolved first.
+					resolved.Exists(r => testResolve(d, r.Type)) && // There must exist a resolved trait that meets the dependency.
+					!unresolved.Any(u1 => testResolve(d, u1.Type))) && // All matching traits that meet this dependency must be resolved first.
 				u.OptionalDependencies.All(d => // To be resolvable, all optional dependencies must be satisfied according to the following condition:
-					!unresolved.Any(u1 => AreResolvable(d, u1.Type)))); // All matching traits that meet this optional dependencies must be resolved first.
+					!unresolved.Any(u1 => testResolve(d, u1.Type)))); // All matching traits that meet this optional dependencies must be resolved first.
 
 			// Continue resolving traits as long as possible.
 			// Each time we resolve some traits, this means dependencies for other traits may then be possible to satisfy in the next pass.
-			var readyToResolve = more.ToList();
-			while (readyToResolve.Count != 0)
-			{
-				resolved.AddRange(readyToResolve);
-				unresolved.ExceptWith(readyToResolve);
-				readyToResolve.Clear();
-				readyToResolve.AddRange(more);
-			}
+			while (more.Any())
+				resolved.AddRange(more);
 
-			if (unresolved.Count != 0)
+			if (unresolved.Any())
 			{
-				var exceptionString = "ActorInfo(\"" + Name + "\") failed to initialize because of the following:\n";
-				var missing = unresolved.SelectMany(u => u.Dependencies.Where(d => !source.Any(s => AreResolvable(d, s.Type)))).Distinct();
+				var exceptionString = "ActorInfo(\"" + Name + "\") failed to initialize because of the following:\r\n";
+				var missing = unresolved.SelectMany(u => u.Dependencies.Where(d => !source.Any(s => testResolve(d, s.Type)))).Distinct();
 
-				exceptionString += "Missing:\n";
+				exceptionString += "Missing:\r\n";
 				foreach (var m in missing)
-					exceptionString += m + " \n";
+					exceptionString += m + " \r\n";
 
-				exceptionString += "Unresolved:\n";
+				exceptionString += "Unresolved:\r\n";
 				foreach (var u in unresolved)
 				{
 					var deps = u.Dependencies.Where(d => !resolved.Exists(r => r.Type == d));
 					var optDeps = u.OptionalDependencies.Where(d => !resolved.Exists(r => r.Type == d));
 					var allDeps = string.Join(", ", deps.Select(o => o.ToString()).Concat(optDeps.Select(o => $"[{o}]")));
-					exceptionString += $"{u.Type}: {{ {allDeps} }}\n";
+					exceptionString += $"{u.Type}: {{ {allDeps} }}\r\n";
 				}
 
 				throw new YamlException(exceptionString);

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -28,14 +28,14 @@ namespace OpenRA.GameRules
 			Title = value.Value;
 
 			var nd = value.ToDictionary();
-			if (nd.TryGetValue("Hidden", out var yaml))
-				bool.TryParse(yaml.Value, out Hidden);
+			if (nd.ContainsKey("Hidden"))
+				bool.TryParse(nd["Hidden"].Value, out Hidden);
 
-			if (nd.TryGetValue("VolumeModifier", out yaml))
-				VolumeModifier = FieldLoader.GetValue<float>("VolumeModifier", yaml.Value);
+			if (nd.ContainsKey("VolumeModifier"))
+				VolumeModifier = FieldLoader.GetValue<float>("VolumeModifier", nd["VolumeModifier"].Value);
 
-			var ext = nd.TryGetValue("Extension", out yaml) ? yaml.Value : "aud";
-			Filename = (nd.TryGetValue("Filename", out yaml) ? yaml.Value : key) + "." + ext;
+			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
+			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
 		}
 
 		public void Load(IReadOnlyFileSystem fileSystem)

OpenRA.Game/GameRules/Ruleset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -15,6 +15,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using OpenRA.FileSystem;
 using OpenRA.GameRules;
+using OpenRA.Graphics;
 using OpenRA.Traits;
 
 namespace OpenRA
@@ -27,6 +28,7 @@ namespace OpenRA
 		public readonly IReadOnlyDictionary<string, SoundInfo> Notifications;
 		public readonly IReadOnlyDictionary<string, MusicInfo> Music;
 		public readonly ITerrainInfo TerrainInfo;
+		public readonly SequenceProvider Sequences;
 		public readonly IReadOnlyDictionary<string, MiniYamlNode> ModelSequences;
 
 		public Ruleset(
@@ -36,6 +38,7 @@ namespace OpenRA
 			IReadOnlyDictionary<string, SoundInfo> notifications,
 			IReadOnlyDictionary<string, MusicInfo> music,
 			ITerrainInfo terrainInfo,
+			SequenceProvider sequences,
 			IReadOnlyDictionary<string, MiniYamlNode> modelSequences)
 		{
 			Actors = new ActorInfoDictionary(actors);
@@ -44,6 +47,7 @@ namespace OpenRA
 			Notifications = notifications;
 			Music = music;
 			TerrainInfo = terrainInfo;
+			Sequences = sequences;
 			ModelSequences = modelSequences;
 
 			foreach (var a in Actors.Values)
@@ -120,7 +124,7 @@ namespace OpenRA
 			var fs = modData.DefaultFileSystem;
 
 			Ruleset ruleset = null;
-			void LoadRuleset()
+			Action f = () =>
 			{
 				var actors = MergeOrDefault("Manifest,Rules", fs, m.Rules, null, null,
 					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value),
@@ -141,15 +145,15 @@ namespace OpenRA
 				var modelSequences = MergeOrDefault("Manifest,ModelSequences", fs, m.ModelSequences, null, null,
 					k => k);
 
-				// The default ruleset does not include a preferred tileset
-				ruleset = new Ruleset(actors, weapons, voices, notifications, music, null, modelSequences);
-			}
+				// The default ruleset does not include a preferred tileset or sequence set
+				ruleset = new Ruleset(actors, weapons, voices, notifications, music, null, null, modelSequences);
+			};
 
 			if (modData.IsOnMainThread)
 			{
 				modData.HandleLoadingProgress();
 
-				var loader = new Task(LoadRuleset);
+				var loader = new Task(f);
 				loader.Start();
 
 				// Animate the loadscreen while we wait
@@ -157,7 +161,7 @@ namespace OpenRA
 					modData.HandleLoadingProgress();
 			}
 			else
-				LoadRuleset();
+				f();
 
 			return ruleset;
 		}
@@ -166,19 +170,20 @@ namespace OpenRA
 		{
 			var dr = modData.DefaultRules;
 			var terrainInfo = modData.DefaultTerrainInfo[tileSet];
+			var sequences = modData.DefaultSequences[tileSet];
 
-			return new Ruleset(dr.Actors, dr.Weapons, dr.Voices, dr.Notifications, dr.Music, terrainInfo, dr.ModelSequences);
+			return new Ruleset(dr.Actors, dr.Weapons, dr.Voices, dr.Notifications, dr.Music, terrainInfo, sequences, dr.ModelSequences);
 		}
 
 		public static Ruleset Load(ModData modData, IReadOnlyFileSystem fileSystem, string tileSet,
 			MiniYaml mapRules, MiniYaml mapWeapons, MiniYaml mapVoices, MiniYaml mapNotifications,
-			MiniYaml mapMusic, MiniYaml mapModelSequences)
+			MiniYaml mapMusic, MiniYaml mapSequences, MiniYaml mapModelSequences)
 		{
 			var m = modData.Manifest;
 			var dr = modData.DefaultRules;
 
 			Ruleset ruleset = null;
-			void LoadRuleset()
+			Action f = () =>
 			{
 				var actors = MergeOrDefault("Rules", fileSystem, m.Rules, mapRules, dr.Actors,
 					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value),
@@ -199,19 +204,23 @@ namespace OpenRA
 				// TODO: Add support for merging custom terrain modifications
 				var terrainInfo = modData.DefaultTerrainInfo[tileSet];
 
+				// TODO: Top-level dictionary should be moved into the Ruleset instead of in its own object
+				var sequences = mapSequences == null ? modData.DefaultSequences[tileSet] :
+					new SequenceProvider(fileSystem, modData, tileSet, mapSequences);
+
 				var modelSequences = dr.ModelSequences;
 				if (mapModelSequences != null)
 					modelSequences = MergeOrDefault("ModelSequences", fileSystem, m.ModelSequences, mapModelSequences, dr.ModelSequences,
 						k => k);
 
-				ruleset = new Ruleset(actors, weapons, voices, notifications, music, terrainInfo, modelSequences);
-			}
+				ruleset = new Ruleset(actors, weapons, voices, notifications, music, terrainInfo, sequences, modelSequences);
+			};
 
 			if (modData.IsOnMainThread)
 			{
 				modData.HandleLoadingProgress();
 
-				var loader = new Task(LoadRuleset);
+				var loader = new Task(f);
 				loader.Start();
 
 				// Animate the loadscreen while we wait
@@ -219,7 +228,7 @@ namespace OpenRA
 					modData.HandleLoadingProgress();
 			}
 			else
-				LoadRuleset();
+				f();
 
 			return ruleset;
 		}
@@ -244,7 +253,7 @@ namespace OpenRA
 					}
 					catch (Exception ex)
 					{
-						Log.Write("debug", "Error in AnyFlaggedTraits\n" + ex.ToString());
+						Log.Write("debug", "Error in AnyFlaggedTraits\r\n" + ex.ToString());
 					}
 				}
 			}

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -17,14 +17,14 @@ namespace OpenRA.GameRules
 {
 	public class SoundInfo
 	{
-		public readonly Dictionary<string, string[]> Variants = new();
-		public readonly Dictionary<string, string[]> Prefixes = new();
-		public readonly Dictionary<string, string[]> Voices = new();
-		public readonly Dictionary<string, string[]> Notifications = new();
+		public readonly Dictionary<string, string[]> Variants = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Prefixes = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Voices = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Notifications = new Dictionary<string, string[]>();
 		public readonly string DefaultVariant = ".aud";
 		public readonly string DefaultPrefix = "";
-		public readonly HashSet<string> DisableVariants = new();
-		public readonly HashSet<string> DisablePrefixes = new();
+		public readonly HashSet<string> DisableVariants = new HashSet<string>();
+		public readonly HashSet<string> DisablePrefixes = new HashSet<string>();
 
 		public readonly Lazy<Dictionary<string, SoundPool>> VoicePools;
 		public readonly Lazy<Dictionary<string, SoundPool>> NotificationsPools;
@@ -69,7 +69,7 @@ namespace OpenRA.GameRules
 		public readonly float VolumeModifier;
 		public readonly InterruptType Type;
 		readonly string[] clips;
-		readonly List<string> liveclips = new();
+		readonly List<string> liveclips = new List<string>();
 
 		public SoundPool(float volumeModifier, InterruptType interruptType, params string[] clips)
 		{

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -99,20 +99,17 @@ namespace OpenRA.GameRules
 		[Desc("Number of shots in a single ammo magazine.")]
 		public readonly int Burst = 1;
 
-		[Desc("Can this weapon target the attacker itself?")]
-		public readonly bool CanTargetSelf = false;
-
 		[Desc("What types of targets are affected.")]
-		public readonly BitSet<TargetableType> ValidTargets = new("Ground", "Water");
+		public readonly BitSet<TargetableType> ValidTargets = new BitSet<TargetableType>("Ground", "Water");
 
 		[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
 		public readonly BitSet<TargetableType> InvalidTargets;
 
-		static readonly BitSet<TargetableType> TargetTypeAir = new("Air");
+		static readonly BitSet<TargetableType> TargetTypeAir = new BitSet<TargetableType>("Air");
 
 		[Desc("If weapon is not directly targeting an actor and targeted position is above this altitude,",
 			"the weapon will ignore terrain target types and only check TargetTypeAir for validity.")]
-		public readonly WDist AirThreshold = new(128);
+		public readonly WDist AirThreshold = new WDist(128);
 
 		[Desc("Delay in ticks between firing shots from the same ammo magazine. If one entry, it will be used for all bursts.",
 			"If multiple entries, their number needs to match Burst - 1.")]
@@ -128,10 +125,10 @@ namespace OpenRA.GameRules
 		public readonly IProjectileInfo Projectile;
 
 		[FieldLoader.LoadUsing(nameof(LoadWarheads))]
-		public readonly List<IWarhead> Warheads = new();
+		public readonly List<IWarhead> Warheads = new List<IWarhead>();
 
 		/// <summary>
-		/// This constructor is used solely for documentation generation.
+		/// This constructor is used solely for documentation generation!
 		/// </summary>
 		public WeaponInfo() { }
 
@@ -209,24 +206,29 @@ namespace OpenRA.GameRules
 		/// <summary>Checks if the weapon is valid against (can target) the actor.</summary>
 		public bool IsValidAgainst(Actor victim, Actor firedBy)
 		{
-			if (!CanTargetSelf && victim == firedBy)
-				return false;
-
 			var targetTypes = victim.GetEnabledTargetTypes();
 
-			return IsValidTarget(targetTypes);
+			if (!IsValidTarget(targetTypes))
+				return false;
+
+			// PERF: Avoid LINQ.
+			foreach (var warhead in Warheads)
+				if (warhead.IsValidAgainst(victim, firedBy))
+					return true;
+
+			return false;
 		}
 
 		/// <summary>Checks if the weapon is valid against (can target) the frozen actor.</summary>
 		public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
 		{
-			if (!victim.IsValid)
+			if (!IsValidTarget(victim.TargetTypes))
 				return false;
 
-			if (!CanTargetSelf && victim.Actor == firedBy)
+			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
 				return false;
 
-			return IsValidTarget(victim.TargetTypes);
+			return true;
 		}
 
 		/// <summary>Applies all the weapon's warheads to the target.</summary>

OpenRA.Game/GameSpeed.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -16,7 +16,6 @@ namespace OpenRA
 {
 	public class GameSpeed
 	{
-		[TranslationReference]
 		[FieldLoader.Require]
 		public readonly string Name;
 

OpenRA.Game/Graphics/Animation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -22,7 +22,7 @@ namespace OpenRA.Graphics
 		public string Name { get; private set; }
 		public bool IsDecoration { get; set; }
 
-		readonly SequenceSet sequences;
+		readonly SequenceProvider sequenceProvider;
 		readonly Func<WAngle> facingFunc;
 		readonly Func<bool> paused;
 
@@ -30,7 +30,7 @@ namespace OpenRA.Graphics
 		bool backwards;
 		bool tickAlways;
 		int timeUntilNextFrame;
-		Action tickFunc;
+		Action tickFunc = () => { };
 
 		public Animation(World world, string name)
 			: this(world, name, () => WAngle.Zero) { }
@@ -43,7 +43,7 @@ namespace OpenRA.Graphics
 
 		public Animation(World world, string name, Func<WAngle> facingFunc, Func<bool> paused)
 		{
-			sequences = world.Map.Sequences;
+			sequenceProvider = world.Map.Rules.Sequences;
 			Name = name.ToLowerInvariant();
 			this.facingFunc = facingFunc;
 			this.paused = paused;
@@ -61,9 +61,9 @@ namespace OpenRA.Graphics
 			var imageRenderable = new SpriteRenderable(image, pos, offset, CurrentSequence.ZOffset + zOffset, palette, CurrentSequence.Scale, alpha, float3.Ones, tintModifiers, IsDecoration,
 				rotation);
 
-			var shadow = CurrentSequence.GetShadow(CurrentFrame, facingFunc());
-			if (shadow != null)
+			if (CurrentSequence.ShadowStart >= 0)
 			{
+				var shadow = CurrentSequence.GetShadow(CurrentFrame, facingFunc());
 				var shadowRenderable = new SpriteRenderable(shadow, pos, offset, CurrentSequence.ShadowZOffset + zOffset, palette, CurrentSequence.Scale, 1f, float3.Ones, tintModifiers,
 					true, rotation);
 				return new IRenderable[] { shadowRenderable, imageRenderable };
@@ -80,9 +80,9 @@ namespace OpenRA.Graphics
 			var alpha = CurrentSequence.GetAlpha(CurrentFrame);
 			var imageRenderable = new UISpriteRenderable(Image, WPos.Zero + offset, imagePos, CurrentSequence.ZOffset + zOffset, palette, scale, alpha, rotation);
 
-			var shadow = CurrentSequence.GetShadow(CurrentFrame, facingFunc());
-			if (shadow != null)
+			if (CurrentSequence.ShadowStart >= 0)
 			{
+				var shadow = CurrentSequence.GetShadow(CurrentFrame, facingFunc());
 				var shadowPos = pos - new int2((int)(scale * shadow.Size.X / 2), (int)(scale * shadow.Size.Y / 2));
 				var shadowRenderable = new UISpriteRenderable(shadow, WPos.Zero + offset, shadowPos, CurrentSequence.ShadowZOffset + zOffset, palette, scale, 1f, rotation);
 				return new IRenderable[] { shadowRenderable, imageRenderable };
@@ -164,7 +164,7 @@ namespace OpenRA.Graphics
 				if (frame >= CurrentSequence.Length)
 				{
 					frame = CurrentSequence.Length - 1;
-					tickFunc = null;
+					tickFunc = () => { };
 					after?.Invoke();
 				}
 			};
@@ -212,13 +212,13 @@ namespace OpenRA.Graphics
 		public void Tick(int t)
 		{
 			if (tickAlways)
-				tickFunc?.Invoke();
+				tickFunc();
 			else
 			{
 				timeUntilNextFrame -= t;
 				while (timeUntilNextFrame <= 0)
 				{
-					tickFunc?.Invoke();
+					tickFunc();
 					timeUntilNextFrame += CurrentSequenceTickOrDefault();
 				}
 			}
@@ -236,11 +236,11 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public bool HasSequence(string seq) { return sequences.HasSequence(Name, seq); }
+		public bool HasSequence(string seq) { return sequenceProvider.HasSequence(Name, seq); }
 
 		public ISpriteSequence GetSequence(string sequenceName)
 		{
-			return sequences.GetSequence(Name, sequenceName);
+			return sequenceProvider.GetSequence(Name, sequenceName);
 		}
 
 		public string GetRandomExistingSequence(string[] sequences, MersenneTwister random)

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -49,7 +49,7 @@ namespace OpenRA.Graphics
 
 			public readonly int[] PanelRegion = null;
 			public readonly PanelSides PanelSides = PanelSides.All;
-			public readonly Dictionary<string, Rectangle> Regions = new();
+			public readonly Dictionary<string, Rectangle> Regions = new Dictionary<string, Rectangle>();
 		}
 
 		public static IReadOnlyDictionary<string, Collection> Collections => collections;
@@ -100,7 +100,9 @@ namespace OpenRA.Graphics
 
 		static void LoadCollection(string name, MiniYaml yaml)
 		{
-			Game.ModData.LoadScreen?.Display();
+			if (Game.ModData.LoadScreen != null)
+				Game.ModData.LoadScreen.Display();
+
 			collections.Add(name, FieldLoader.Load<Collection>(yaml));
 		}
 
@@ -263,13 +265,13 @@ namespace OpenRA.Graphics
 
 			if (!collections.TryGetValue(collectionName, out var collection))
 			{
-				Log.Write("debug", $"Could not find collection '{collectionName}'");
+				Log.Write("debug", "Could not find collection '{0}'", collectionName);
 				return new Size(0, 0);
 			}
 
 			if (collection.PanelRegion == null || collection.PanelRegion.Length != 8)
 			{
-				Log.Write("debug", $"Collection '{collectionName}' does not define a valid PanelRegion");
+				Log.Write("debug", "Collection '{0}' does not define a valid PanelRegion", collectionName);
 				return new Size(0, 0);
 			}
 

OpenRA.Game/Graphics/CursorManager.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -17,7 +17,7 @@ namespace OpenRA.Graphics
 {
 	public sealed class CursorManager
 	{
-		sealed class Cursor
+		class Cursor
 		{
 			public string Name;
 			public int2 PaddedSize;
@@ -28,7 +28,7 @@ namespace OpenRA.Graphics
 			public IHardwareCursor[] Cursors;
 		}
 
-		readonly Dictionary<string, Cursor> cursors = new();
+		readonly Dictionary<string, Cursor> cursors = new Dictionary<string, Cursor>();
 		readonly SheetBuilder sheetBuilder;
 		readonly GraphicSettings graphicSettings;
 
@@ -111,7 +111,8 @@ namespace OpenRA.Graphics
 				var template = kv.Value;
 				for (var i = 0; i < template.Sprites.Length; i++)
 				{
-					template.Cursors[i]?.Dispose();
+					if (template.Cursors[i] != null)
+						template.Cursors[i].Dispose();
 
 					// Calculate the padding to position the frame within sequenceBounds
 					var paddingTL = -(template.Bounds.Location - template.Sprites[i].Offset.XY.ToInt2());

OpenRA.Game/Graphics/CursorProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/CursorSequence.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -31,36 +31,28 @@ namespace OpenRA.Graphics
 			Palette = palette;
 			Name = name;
 
-			var cursorSprites = cache[cursorSrc];
-			Frames = cursorSprites.Skip(Start).ToArray();
+			Frames = cache[cursorSrc].Skip(Start).ToArray();
 
-			if ((d.TryGetValue("Length", out var yaml) && yaml.Value == "*") ||
-				(d.TryGetValue("End", out yaml) && yaml.Value == "*"))
+			if ((d.ContainsKey("Length") && d["Length"].Value == "*") || (d.ContainsKey("End") && d["End"].Value == "*"))
 				Length = Frames.Length;
-			else if (d.TryGetValue("Length", out yaml))
-				Length = Exts.ParseIntegerInvariant(yaml.Value);
-			else if (d.TryGetValue("End", out yaml))
-				Length = Exts.ParseIntegerInvariant(yaml.Value) - Start;
+			else if (d.ContainsKey("Length"))
+				Length = Exts.ParseIntegerInvariant(d["Length"].Value);
+			else if (d.ContainsKey("End"))
+				Length = Exts.ParseIntegerInvariant(d["End"].Value) - Start;
 			else
 				Length = 1;
 
 			Frames = Frames.Take(Length).ToArray();
 
-			if (Start > cursorSprites.Length)
-				throw new YamlException($"Cursor {name}: {nameof(Start)} is greater than the length of the sprite sequence.");
-
-			if (Length > cursorSprites.Length)
-				throw new YamlException($"Cursor {name}: {nameof(Length)} is greater than the length of the sprite sequence.");
-
-			if (d.TryGetValue("X", out yaml))
+			if (d.ContainsKey("X"))
 			{
-				Exts.TryParseIntegerInvariant(yaml.Value, out var x);
+				Exts.TryParseIntegerInvariant(d["X"].Value, out var x);
 				Hotspot = Hotspot.WithX(x);
 			}
 
-			if (d.TryGetValue("Y", out yaml))
+			if (d.ContainsKey("Y"))
 			{
-				Exts.TryParseIntegerInvariant(yaml.Value, out var y);
+				Exts.TryParseIntegerInvariant(d["Y"].Value, out var y);
 				Hotspot = Hotspot.WithY(y);
 			}
 		}

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -21,9 +21,9 @@ namespace OpenRA.Graphics
 		public ITexture ColorShifts { get; }
 
 		public int Height { get; private set; }
-		readonly Dictionary<string, ImmutablePalette> palettes = new();
-		readonly Dictionary<string, MutablePalette> mutablePalettes = new();
-		readonly Dictionary<string, int> indices = new();
+		readonly Dictionary<string, ImmutablePalette> palettes = new Dictionary<string, ImmutablePalette>();
+		readonly Dictionary<string, MutablePalette> mutablePalettes = new Dictionary<string, MutablePalette>();
+		readonly Dictionary<string, int> indices = new Dictionary<string, int>();
 		byte[] buffer = Array.Empty<byte>();
 		float[] colorShiftBuffer = Array.Empty<float>();
 
@@ -70,7 +70,7 @@ namespace OpenRA.Graphics
 			{
 				Height = Exts.NextPowerOf2(index + 1);
 				Array.Resize(ref buffer, Height * Palette.Size * 4);
-				Array.Resize(ref colorShiftBuffer, Height * 8);
+				Array.Resize(ref colorShiftBuffer, Height * 4);
 			}
 
 			if (allowModifiers)
@@ -79,9 +79,6 @@ namespace OpenRA.Graphics
 				CopyPaletteToBuffer(index, p);
 		}
 
-		[System.Diagnostics.CodeAnalysis.SuppressMessage(
-			"Performance", "CA1854:Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method",
-			Justification = "False positive - indexer is a set not a get.")]
 		public void ReplacePalette(string name, IPalette p)
 		{
 			if (mutablePalettes.ContainsKey(name))
@@ -93,20 +90,19 @@ namespace OpenRA.Graphics
 			CopyBufferToTexture();
 		}
 
-		public void SetColorShift(string name, float hueOffset, float satOffset, float valueMultiplier, float minHue, float maxHue)
+		public void SetColorShift(string name, float hueOffset, float satOffset, float minHue, float maxHue)
 		{
 			var index = GetPaletteIndex(name);
-			colorShiftBuffer[8 * index + 0] = minHue;
-			colorShiftBuffer[8 * index + 1] = maxHue;
-			colorShiftBuffer[8 * index + 4] = hueOffset;
-			colorShiftBuffer[8 * index + 5] = satOffset;
-			colorShiftBuffer[8 * index + 6] = valueMultiplier;
+			colorShiftBuffer[4 * index + 0] = hueOffset;
+			colorShiftBuffer[4 * index + 1] = satOffset;
+			colorShiftBuffer[4 * index + 2] = minHue;
+			colorShiftBuffer[4 * index + 3] = maxHue;
 		}
 
 		public bool HasColorShift(string name)
 		{
 			var index = GetPaletteIndex(name);
-			return colorShiftBuffer[8 * index] != 0 || colorShiftBuffer[8 * index + 1] != 0;
+			return colorShiftBuffer[4 * index + 2] != 0 || colorShiftBuffer[4 * index + 3] != 0;
 		}
 
 		public void Initialize()
@@ -129,7 +125,7 @@ namespace OpenRA.Graphics
 		void CopyBufferToTexture()
 		{
 			Texture.SetData(buffer, Palette.Size, Height);
-			ColorShifts.SetFloatData(colorShiftBuffer, 2, Height);
+			ColorShifts.SetFloatData(colorShiftBuffer, 1, Height);
 		}
 
 		public void ApplyModifiers(IEnumerable<IPaletteModifier> paletteMods)

OpenRA.Game/Graphics/Model.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -26,7 +26,7 @@ namespace OpenRA.Graphics
 		float[] Bounds(uint frame);
 		ModelRenderData RenderData(uint section);
 
-		/// <summary>Returns the smallest rectangle that covers all rotations of all frames in a model.</summary>
+		/// <summary>Returns the smallest rectangle that covers all rotations of all frames in a model</summary>
 		Rectangle AggregateBounds { get; }
 	}
 
@@ -62,7 +62,7 @@ namespace OpenRA.Graphics
 	{
 		public Action<string> OnMissingModelError { get; set; }
 
-		sealed class PlaceholderModelCache : IModelCache
+		class PlaceholderModelCache : IModelCache
 		{
 			public IVertexBuffer<Vertex> VertexBuffer => throw new NotImplementedException();
 
@@ -84,6 +84,7 @@ namespace OpenRA.Graphics
 			}
 		}
 
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "IDE0060:Remove unused parameter", Justification = "Load game API")]
 		public PlaceholderModelSequenceLoader(ModData modData) { }
 
 		public IModelCache CacheModels(IReadOnlyFileSystem fileSystem, ModData modData, IReadOnlyDictionary<string, MiniYamlNode> modelDefinitions)

OpenRA.Game/Graphics/ModelAnimation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/ModelRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -37,7 +37,7 @@ namespace OpenRA.Graphics
 		// Static constants
 		static readonly float[] ShadowDiffuse = new float[] { 0, 0, 0 };
 		static readonly float[] ShadowAmbient = new float[] { 1, 1, 1 };
-		static readonly float2 SpritePadding = new(2, 2);
+		static readonly float2 SpritePadding = new float2(2, 2);
 		static readonly float[] ZeroVector = new float[] { 0, 0, 0, 1 };
 		static readonly float[] ZVector = new float[] { 0, 0, 1, 1 };
 		static readonly float[] FlipMtx = Util.ScaleMatrix(1, -1, 1);
@@ -47,9 +47,9 @@ namespace OpenRA.Graphics
 		readonly Renderer renderer;
 		readonly IShader shader;
 
-		readonly Dictionary<Sheet, IFrameBuffer> mappedBuffers = new();
-		readonly Stack<KeyValuePair<Sheet, IFrameBuffer>> unmappedBuffers = new();
-		readonly List<(Sheet Sheet, Action Func)> doRender = new();
+		readonly Dictionary<Sheet, IFrameBuffer> mappedBuffers = new Dictionary<Sheet, IFrameBuffer>();
+		readonly Stack<KeyValuePair<Sheet, IFrameBuffer>> unmappedBuffers = new Stack<KeyValuePair<Sheet, IFrameBuffer>>();
+		readonly List<(Sheet Sheet, Action Func)> doRender = new List<(Sheet, Action)>();
 
 		SheetBuilder sheetBuilderForFrame;
 		bool isInFrame;
@@ -167,7 +167,8 @@ namespace OpenRA.Graphics
 			CalculateSpriteGeometry(tl, br, 1, out var spriteSize, out var spriteOffset);
 			CalculateSpriteGeometry(stl, sbr, 2, out var shadowSpriteSize, out var shadowSpriteOffset);
 
-			sheetBuilderForFrame ??= new SheetBuilder(SheetType.BGRA, AllocateSheet);
+			if (sheetBuilderForFrame == null)
+				sheetBuilderForFrame = new SheetBuilder(SheetType.BGRA, AllocateSheet);
 
 			var sprite = sheetBuilderForFrame.Allocate(spriteSize, 0, spriteOffset);
 			var shadowSprite = sheetBuilderForFrame.Allocate(shadowSpriteSize, 0, shadowSpriteOffset);
@@ -302,7 +303,7 @@ namespace OpenRA.Graphics
 			return fbo;
 		}
 
-		static void DisableFrameBuffer(IFrameBuffer fbo)
+		void DisableFrameBuffer(IFrameBuffer fbo)
 		{
 			Game.Renderer.Flush();
 			Game.Renderer.Context.DisableDepthBuffer();

OpenRA.Game/Graphics/Palette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -40,7 +40,7 @@ namespace OpenRA.Graphics
 			return new ReadOnlyPalette(palette);
 		}
 
-		sealed class ReadOnlyPalette : IPalette
+		class ReadOnlyPalette : IPalette
 		{
 			readonly IPalette palette;
 			public ReadOnlyPalette(IPalette palette) { this.palette = palette; }

OpenRA.Game/Graphics/PaletteReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/PlatformInterfaces.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/PlayerColorRemap.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -20,14 +20,12 @@ namespace OpenRA.Graphics
 		readonly int[] remapIndices;
 		readonly float hue;
 		readonly float saturation;
-		readonly float value;
 
-		public PlayerColorRemap(int[] remapIndices, Color color)
+		public PlayerColorRemap(int[] remapIndices, float hue, float saturation)
 		{
 			this.remapIndices = remapIndices;
-
-			var (r, g, b) = color.ToLinear();
-			(hue, saturation, value) = Color.RgbToHsv(r, g, b);
+			this.hue = hue;
+			this.saturation = saturation;
 		}
 
 		public Color GetRemappedColor(Color original, int index)
@@ -44,7 +42,7 @@ namespace OpenRA.Graphics
 			var value = Math.Max(Math.Max(r, g), b);
 
 			// Construct the new RGB color
-			(r, g, b) = Color.HsvToRgb(hue, saturation, value * this.value);
+			(r, g, b) = Color.HsvToRgb(hue, saturation, value);
 
 			// Convert linear back to SRGB and pre-multiply by the alpha
 			return Color.FromLinear(original.A, r, g, b);

OpenRA.Game/Graphics/Renderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/RgbaColorRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -18,7 +18,7 @@ namespace OpenRA.Graphics
 {
 	public class RgbaColorRenderer
 	{
-		static readonly float3 Offset = new(0.5f, 0.5f, 0f);
+		static readonly float3 Offset = new float3(0.5f, 0.5f, 0f);
 
 		readonly SpriteRenderer parent;
 		readonly Vertex[] vertices = new Vertex[6];
@@ -78,9 +78,9 @@ namespace OpenRA.Graphics
 		/// <summary>
 		/// Calculate the 2D intersection of two lines.
 		/// Will behave badly if the lines are parallel.
-		/// Z position is the average of a and b (ignores actual intersection point if it exists).
+		/// Z position is the average of a and b (ignores actual intersection point if it exists)
 		/// </summary>
-		static float3 IntersectionOf(in float3 a, in float3 da, in float3 b, in float3 db)
+		float3 IntersectionOf(in float3 a, in float3 da, in float3 b, in float3 db)
 		{
 			var crossA = a.X * (a.Y + da.Y) - a.Y * (a.X + da.X);
 			var crossB = b.X * (b.Y + db.Y) - b.Y * (b.X + db.X);
@@ -138,7 +138,7 @@ namespace OpenRA.Graphics
 			// Segment is part of closed loop
 			if (closed)
 			{
-				var prev = points[^1];
+				var prev = points[points.Length - 1];
 				var prevDir = (start - prev) / (start - prev).XY.Length;
 				var prevCorner = width / 2 * new float3(-prevDir.Y, prevDir.X, prevDir.Z);
 				ca = IntersectionOf(start - prevCorner, prevDir, start - corner, dir);

OpenRA.Game/Graphics/RgbaSpriteRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -0,0 +1,152 @@
+#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.FileSystem;
+using OpenRA.Primitives;
+
+namespace OpenRA.Graphics
+{
+	using Sequences = IReadOnlyDictionary<string, Lazy<IReadOnlyDictionary<string, ISpriteSequence>>>;
+	using UnitSequences = Lazy<IReadOnlyDictionary<string, ISpriteSequence>>;
+
+	public interface ISpriteSequence
+	{
+		string Name { get; }
+		int Start { get; }
+		int Length { get; }
+		int Stride { get; }
+		int Facings { get; }
+		int InterpolatedFacings { get; }
+		int Tick { get; }
+		int ZOffset { get; }
+		int ShadowStart { get; }
+		int ShadowZOffset { get; }
+		int[] Frames { get; }
+		Rectangle Bounds { get; }
+		bool IgnoreWorldTint { get; }
+		float Scale { get; }
+
+		Sprite GetSprite(int frame);
+		Sprite GetSprite(int frame, WAngle facing);
+		(Sprite, WAngle) GetSpriteWithRotation(int frame, WAngle facing);
+		Sprite GetShadow(int frame, WAngle facing);
+		float GetAlpha(int frame);
+	}
+
+	public interface ISpriteSequenceLoader
+	{
+		IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, string tileSet, SpriteCache cache, MiniYamlNode node);
+	}
+
+	public class SequenceProvider : IDisposable
+	{
+		readonly ModData modData;
+		readonly string tileSet;
+		readonly Lazy<Sequences> sequences;
+		readonly Lazy<SpriteCache> spriteCache;
+		public SpriteCache SpriteCache => spriteCache.Value;
+
+		readonly Dictionary<string, UnitSequences> sequenceCache = new Dictionary<string, UnitSequences>();
+
+		public SequenceProvider(IReadOnlyFileSystem fileSystem, ModData modData, string tileSet, MiniYaml additionalSequences)
+		{
+			this.modData = modData;
+			this.tileSet = tileSet;
+			sequences = Exts.Lazy(() =>
+			{
+				using (new Support.PerfTimer("LoadSequences"))
+					return Load(fileSystem, additionalSequences);
+			});
+
+			spriteCache = Exts.Lazy(() => new SpriteCache(fileSystem, modData.SpriteLoaders));
+		}
+
+		public ISpriteSequence GetSequence(string unitName, string sequenceName)
+		{
+			if (!sequences.Value.TryGetValue(unitName, out var unitSeq))
+				throw new InvalidOperationException($"Unit `{unitName}` does not have any sequences defined.");
+
+			if (!unitSeq.Value.TryGetValue(sequenceName, out var seq))
+				throw new InvalidOperationException($"Unit `{unitName}` does not have a sequence named `{sequenceName}`");
+
+			return seq;
+		}
+
+		public IEnumerable<string> Images => sequences.Value.Keys;
+
+		public bool HasSequence(string unitName)
+		{
+			return sequences.Value.ContainsKey(unitName);
+		}
+
+		public bool HasSequence(string unitName, string sequenceName)
+		{
+			if (!sequences.Value.TryGetValue(unitName, out var unitSeq))
+				throw new InvalidOperationException($"Unit `{unitName}` does not have any sequences defined.");
+
+			return unitSeq.Value.ContainsKey(sequenceName);
+		}
+
+		public IEnumerable<string> Sequences(string unitName)
+		{
+			if (!sequences.Value.TryGetValue(unitName, out var unitSeq))
+				throw new InvalidOperationException($"Unit `{unitName}` does not have any sequences defined.");
+
+			return unitSeq.Value.Keys;
+		}
+
+		Sequences Load(IReadOnlyFileSystem fileSystem, MiniYaml additionalSequences)
+		{
+			var nodes = MiniYaml.Load(fileSystem, modData.Manifest.Sequences, additionalSequences);
+			var items = new Dictionary<string, UnitSequences>();
+			foreach (var node in nodes)
+			{
+				// Nodes starting with ^ are inheritable but never loaded directly
+				if (node.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal))
+					continue;
+
+				var key = node.Value.ToLines(node.Key).JoinWith("|");
+
+				if (sequenceCache.TryGetValue(key, out var t))
+					items.Add(node.Key, t);
+				else
+				{
+					t = Exts.Lazy(() => modData.SpriteSequenceLoader.ParseSequences(modData, tileSet, SpriteCache, node));
+					sequenceCache.Add(key, t);
+					items.Add(node.Key, t);
+				}
+			}
+
+			return items;
+		}
+
+		public void Preload()
+		{
+			foreach (var sb in SpriteCache.SheetBuilders.Values)
+				sb.Current.CreateBuffer();
+
+			foreach (var unitSeq in sequences.Value.Values)
+				foreach (var seq in unitSeq.Value.Values) { }
+
+			foreach (var sb in SpriteCache.SheetBuilders.Values)
+				sb.Current.ReleaseBuffer();
+		}
+
+		public void Dispose()
+		{
+			if (spriteCache.IsValueCreated)
+				foreach (var sb in SpriteCache.SheetBuilders.Values)
+					sb.Dispose();
+		}
+	}
+}

OpenRA.Game/Graphics/SequenceSet.cs

@@ -1,119 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright (c) The OpenRA Developers and Contributors
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using OpenRA.FileSystem;
-using OpenRA.Primitives;
-
-namespace OpenRA.Graphics
-{
-	public interface ISpriteSequence
-	{
-		string Name { get; }
-		int Length { get; }
-		int Facings { get; }
-		int Tick { get; }
-		int ZOffset { get; }
-		int ShadowZOffset { get; }
-		Rectangle Bounds { get; }
-		bool IgnoreWorldTint { get; }
-		float Scale { get; }
-		void ResolveSprites(SpriteCache cache);
-		Sprite GetSprite(int frame);
-		Sprite GetSprite(int frame, WAngle facing);
-		(Sprite Sprite, WAngle Rotation) GetSpriteWithRotation(int frame, WAngle facing);
-		Sprite GetShadow(int frame, WAngle facing);
-		float GetAlpha(int frame);
-	}
-
-	public interface ISpriteSequenceLoader
-	{
-		int BgraSheetSize { get; }
-		int IndexedSheetSize { get; }
-		IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, string tileSet, SpriteCache cache, MiniYamlNode node);
-	}
-
-	public sealed class SequenceSet : IDisposable
-	{
-		readonly ModData modData;
-		readonly string tileSet;
-		readonly IReadOnlyDictionary<string, IReadOnlyDictionary<string, ISpriteSequence>> images;
-		public SpriteCache SpriteCache { get; }
-
-		public SequenceSet(IReadOnlyFileSystem fileSystem, ModData modData, string tileSet, MiniYaml additionalSequences)
-		{
-			this.modData = modData;
-			this.tileSet = tileSet;
-			SpriteCache = new SpriteCache(fileSystem, modData.SpriteLoaders, modData.SpriteSequenceLoader.BgraSheetSize, modData.SpriteSequenceLoader.IndexedSheetSize);
-			using (new Support.PerfTimer("LoadSequences"))
-				images = Load(fileSystem, additionalSequences);
-		}
-
-		public ISpriteSequence GetSequence(string image, string sequence)
-		{
-			if (!images.TryGetValue(image, out var sequences))
-				throw new InvalidOperationException($"Image `{image}` does not have any sequences defined.");
-
-			if (!sequences.TryGetValue(sequence, out var seq))
-				throw new InvalidOperationException($"Image `{image}` does not have a sequence named `{sequence}`.");
-
-			return seq;
-		}
-
-		public IEnumerable<string> Images => images.Keys;
-
-		public bool HasSequence(string image, string sequence)
-		{
-			if (!images.TryGetValue(image, out var sequences))
-				throw new InvalidOperationException($"Image `{image}` does not have any sequences defined.");
-
-			return sequences.ContainsKey(sequence);
-		}
-
-		public IEnumerable<string> Sequences(string image)
-		{
-			if (!images.TryGetValue(image, out var sequences))
-				throw new InvalidOperationException($"Image `{image}` does not have any sequences defined.");
-
-			return sequences.Keys;
-		}
-
-		IReadOnlyDictionary<string, IReadOnlyDictionary<string, ISpriteSequence>> Load(IReadOnlyFileSystem fileSystem, MiniYaml additionalSequences)
-		{
-			var nodes = MiniYaml.Load(fileSystem, modData.Manifest.Sequences, additionalSequences);
-			var images = new Dictionary<string, IReadOnlyDictionary<string, ISpriteSequence>>();
-			foreach (var node in nodes)
-			{
-				// Nodes starting with ^ are inheritable but never loaded directly
-				if (node.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal))
-					continue;
-
-				images[node.Key] = modData.SpriteSequenceLoader.ParseSequences(modData, tileSet, SpriteCache, node);
-			}
-
-			return images;
-		}
-
-		public void LoadSprites()
-		{
-			SpriteCache.LoadReservations(modData);
-			foreach (var sequences in images.Values)
-				foreach (var sequence in sequences)
-					sequence.Value.ResolveSprites(SpriteCache);
-		}
-
-		public void Dispose()
-		{
-			SpriteCache.Dispose();
-		}
-	}
-}

OpenRA.Game/Graphics/Sheet.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -34,16 +34,15 @@ namespace OpenRA.Graphics
 	public sealed class SheetBuilder : IDisposable
 	{
 		public readonly SheetType Type;
-		readonly List<Sheet> sheets = new();
+		readonly List<Sheet> sheets = new List<Sheet>();
 		readonly Func<Sheet> allocateSheet;
 		readonly int margin;
+
+		Sheet current;
+		TextureChannel channel;
 		int rowHeight = 0;
 		int2 p;
 
-		public Sheet Current { get; private set; }
-		public TextureChannel CurrentChannel { get; private set; }
-		public IEnumerable<Sheet> AllSheets => sheets;
-
 		public static Sheet AllocateSheet(SheetType type, int sheetSize)
 		{
 			return new Sheet(type, new Size(sheetSize, sheetSize));
@@ -74,10 +73,10 @@ namespace OpenRA.Graphics
 
 		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet, int margin = 1)
 		{
-			CurrentChannel = t == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
+			channel = t == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
 			Type = t;
-			Current = allocateSheet();
-			sheets.Add(Current);
+			current = allocateSheet();
+			sheets.Add(current);
 			this.allocateSheet = allocateSheet;
 			this.margin = margin;
 		}
@@ -88,19 +87,19 @@ namespace OpenRA.Graphics
 		{
 			// Don't bother allocating empty sprites
 			if (size.Width == 0 || size.Height == 0)
-				return new Sprite(Current, Rectangle.Empty, 0, spriteOffset, CurrentChannel, BlendMode.Alpha);
+				return new Sprite(current, Rectangle.Empty, 0, spriteOffset, channel, BlendMode.Alpha);
 
 			var rect = Allocate(size, zRamp, spriteOffset);
 			Util.FastCopyIntoChannel(rect, src, type);
-			Current.CommitBufferedData();
+			current.CommitBufferedData();
 			return rect;
 		}
 
 		public Sprite Add(Png src, float scale = 1f)
 		{
-			var rect = Allocate(new Size(src.Width, src.Height), scale);
+			var rect = Allocate(new Size(src.Width, src.Height),  scale);
 			Util.FastCopyIntoSprite(rect, src);
-			Current.CommitBufferedData();
+			current.CommitBufferedData();
 			return rect;
 		}
 
@@ -116,7 +115,7 @@ namespace OpenRA.Graphics
 		public Sprite Allocate(Size imageSize, float scale = 1f) { return Allocate(imageSize, 0, float3.Zero, scale); }
 		public Sprite Allocate(Size imageSize, float zRamp, in float3 spriteOffset, float scale = 1f)
 		{
-			if (imageSize.Width + p.X + margin > Current.Size.Width)
+			if (imageSize.Width + p.X + margin > current.Size.Width)
 			{
 				p = new int2(0, p.Y + rowHeight + margin);
 				rowHeight = imageSize.Height;
@@ -125,29 +124,33 @@ namespace OpenRA.Graphics
 			if (imageSize.Height > rowHeight)
 				rowHeight = imageSize.Height;
 
-			if (p.Y + imageSize.Height + margin > Current.Size.Height)
+			if (p.Y + imageSize.Height + margin > current.Size.Height)
 			{
-				var next = NextChannel(CurrentChannel);
+				var next = NextChannel(channel);
 				if (next == null)
 				{
-					Current.ReleaseBuffer();
-					Current = allocateSheet();
-					sheets.Add(Current);
-					CurrentChannel = Type == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
+					current.ReleaseBuffer();
+					current = allocateSheet();
+					sheets.Add(current);
+					channel = Type == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
 				}
 				else
-					CurrentChannel = next.Value;
+					channel = next.Value;
 
 				rowHeight = imageSize.Height;
 				p = int2.Zero;
 			}
 
-			var rect = new Sprite(Current, new Rectangle(p.X + margin, p.Y + margin, imageSize.Width, imageSize.Height), zRamp, spriteOffset, CurrentChannel, BlendMode.Alpha, scale);
+			var rect = new Sprite(current, new Rectangle(p.X + margin, p.Y + margin, imageSize.Width, imageSize.Height), zRamp, spriteOffset, channel, BlendMode.Alpha, scale);
 			p += new int2(imageSize.Width + margin, 0);
 
 			return rect;
 		}
 
+		public Sheet Current => current;
+		public TextureChannel CurrentChannel => channel;
+		public IEnumerable<Sheet> AllSheets => sheets;
+
 		public void Dispose()
 		{
 			foreach (var sheet in sheets)

OpenRA.Game/Graphics/Sprite.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/SpriteCache.cs

@@ -1,174 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright (c) The OpenRA Developers and Contributors
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using OpenRA.FileSystem;
-using OpenRA.Primitives;
-
-namespace OpenRA.Graphics
-{
-	public sealed class SpriteCache : IDisposable
-	{
-		public readonly Dictionary<SheetType, SheetBuilder> SheetBuilders;
-		readonly ISpriteLoader[] loaders;
-		readonly IReadOnlyFileSystem fileSystem;
-
-		readonly Dictionary<int, (int[] Frames, MiniYamlNode.SourceLocation Location)> spriteReservations = new();
-		readonly Dictionary<int, (int[] Frames, MiniYamlNode.SourceLocation Location)> frameReservations = new();
-		readonly Dictionary<string, List<int>> reservationsByFilename = new();
-
-		readonly Dictionary<int, ISpriteFrame[]> resolvedFrames = new();
-		readonly Dictionary<int, Sprite[]> resolvedSprites = new();
-
-		readonly Dictionary<int, (string Filename, MiniYamlNode.SourceLocation Location)> missingFiles = new();
-
-		int nextReservationToken = 1;
-
-		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders, int bgraSheetSize, int indexedSheetSize, int bgraSheetMargin = 1, int indexedSheetMargin = 1)
-		{
-			SheetBuilders = new Dictionary<SheetType, SheetBuilder>
-			{
-				{ SheetType.Indexed, new SheetBuilder(SheetType.Indexed, indexedSheetSize, indexedSheetMargin) },
-				{ SheetType.BGRA, new SheetBuilder(SheetType.BGRA, bgraSheetSize, bgraSheetMargin) }
-			};
-
-			this.fileSystem = fileSystem;
-			this.loaders = loaders;
-		}
-
-		public int ReserveSprites(string filename, IEnumerable<int> frames, MiniYamlNode.SourceLocation location)
-		{
-			var token = nextReservationToken++;
-			spriteReservations[token] = (frames?.ToArray(), location);
-			reservationsByFilename.GetOrAdd(filename, _ => new List<int>()).Add(token);
-			return token;
-		}
-
-		public int ReserveFrames(string filename, IEnumerable<int> frames, MiniYamlNode.SourceLocation location)
-		{
-			var token = nextReservationToken++;
-			frameReservations[token] = (frames?.ToArray(), location);
-			reservationsByFilename.GetOrAdd(filename, _ => new List<int>()).Add(token);
-			return token;
-		}
-
-		static ISpriteFrame[] GetFrames(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders, out TypeDictionary metadata)
-		{
-			metadata = null;
-			if (!fileSystem.TryOpen(filename, out var stream))
-				return null;
-
-			using (stream)
-			{
-				foreach (var loader in loaders)
-					if (loader.TryParseSprite(stream, filename, out var frames, out metadata))
-						return frames;
-
-				return null;
-			}
-		}
-
-		public void LoadReservations(ModData modData)
-		{
-			foreach (var sb in SheetBuilders.Values)
-				sb.Current.CreateBuffer();
-
-			var spriteCache = new Dictionary<int, Sprite>();
-			foreach (var (filename, tokens) in reservationsByFilename)
-			{
-				modData.LoadScreen?.Display();
-				var loadedFrames = GetFrames(fileSystem, filename, loaders, out _);
-				foreach (var token in tokens)
-				{
-					if (frameReservations.TryGetValue(token, out var r))
-					{
-						if (loadedFrames != null)
-						{
-							if (r.Frames != null)
-							{
-								var resolved = new ISpriteFrame[loadedFrames.Length];
-								foreach (var i in r.Frames)
-									resolved[i] = loadedFrames[i];
-								resolvedFrames[token] = resolved;
-							}
-							else
-								resolvedFrames[token] = loadedFrames;
-						}
-						else
-						{
-							resolvedFrames[token] = null;
-							missingFiles[token] = (filename, r.Location);
-						}
-					}
-
-					if (spriteReservations.TryGetValue(token, out r))
-					{
-						if (loadedFrames != null)
-						{
-							var resolved = new Sprite[loadedFrames.Length];
-							var frames = r.Frames ?? Enumerable.Range(0, loadedFrames.Length);
-							foreach (var i in frames)
-								resolved[i] = spriteCache.GetOrAdd(i,
-									f => SheetBuilders[SheetBuilder.FrameTypeToSheetType(loadedFrames[f].Type)].Add(loadedFrames[f]));
-
-							resolvedSprites[token] = resolved;
-						}
-						else
-						{
-							resolvedSprites[token] = null;
-							missingFiles[token] = (filename, r.Location);
-						}
-					}
-				}
-
-				spriteCache.Clear();
-			}
-
-			spriteReservations.Clear();
-			frameReservations.Clear();
-			reservationsByFilename.Clear();
-
-			foreach (var sb in SheetBuilders.Values)
-				sb.Current.ReleaseBuffer();
-		}
-
-		public Sprite[] ResolveSprites(int token)
-		{
-			var resolved = resolvedSprites[token];
-			resolvedSprites.Remove(token);
-			if (missingFiles.TryGetValue(token, out var r))
-				throw new FileNotFoundException($"{r.Location}: {r.Filename} not found", r.Filename);
-
-			return resolved;
-		}
-
-		public ISpriteFrame[] ResolveFrames(int token)
-		{
-			var resolved = resolvedFrames[token];
-			resolvedFrames.Remove(token);
-			if (missingFiles.TryGetValue(token, out var r))
-				throw new FileNotFoundException($"{r.Location}: {r.Filename} not found", r.Filename);
-
-			return resolved;
-		}
-
-		public IEnumerable<(string Filename, MiniYamlNode.SourceLocation Location)> MissingFiles => missingFiles.Values.ToHashSet();
-
-		public void Dispose()
-		{
-			foreach (var sb in SheetBuilders.Values)
-				sb.Dispose();
-		}
-	}
-}

OpenRA.Game/Graphics/SpriteFont.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -123,7 +123,7 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		static float2 Rotate(float2 v, float sina, float cosa, float2 offset)
+		float2 Rotate(float2 v, float sina, float cosa, float2 offset)
 		{
 			return new float2(
 				v.X * cosa - v.Y * sina + offset.X,
@@ -427,7 +427,7 @@ namespace OpenRA.Graphics
 		}
 	}
 
-	sealed class GlyphInfo
+	class GlyphInfo
 	{
 		public float Advance;
 		public int2 Offset;

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -9,7 +9,10 @@
  */
 #endregion
 
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using OpenRA.FileSystem;
 using OpenRA.Primitives;
 
@@ -18,7 +21,7 @@ namespace OpenRA.Graphics
 	/// <summary>
 	/// Describes the format of the pixel data in a ISpriteFrame.
 	/// Note that the channel order is defined for little-endian bytes, so BGRA corresponds
-	/// to a 32bit ARGB value, such as that returned by Color.ToArgb().
+	/// to a 32bit ARGB value, such as that returned by Color.ToArgb()!
 	/// </summary>
 	public enum SpriteFrameType
 	{
@@ -64,6 +67,94 @@ namespace OpenRA.Graphics
 		bool DisableExportPadding { get; }
 	}
 
+	public class SpriteCache
+	{
+		public readonly Cache<SheetType, SheetBuilder> SheetBuilders;
+		readonly ISpriteLoader[] loaders;
+		readonly IReadOnlyFileSystem fileSystem;
+
+		readonly Dictionary<string, List<Sprite[]>> sprites = new Dictionary<string, List<Sprite[]>>();
+		readonly Dictionary<string, ISpriteFrame[]> unloadedFrames = new Dictionary<string, ISpriteFrame[]>();
+		readonly Dictionary<string, TypeDictionary> metadata = new Dictionary<string, TypeDictionary>();
+
+		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
+		{
+			SheetBuilders = new Cache<SheetType, SheetBuilder>(t => new SheetBuilder(t));
+
+			this.fileSystem = fileSystem;
+			this.loaders = loaders;
+		}
+
+		/// <summary>
+		/// Returns the first set of sprites with the given filename.
+		/// If getUsedFrames is defined then the indices returned by the function call
+		/// are guaranteed to be loaded.  The value of other indices in the returned
+		/// array are undefined and should never be accessed.
+		/// </summary>
+		public Sprite[] this[string filename, Func<int, IEnumerable<int>> getUsedFrames = null]
+		{
+			get
+			{
+				var allSprites = sprites.GetOrAdd(filename);
+				var sprite = allSprites.FirstOrDefault();
+
+				if (!unloadedFrames.TryGetValue(filename, out var unloaded))
+					unloaded = null;
+
+				// This is the first time that the file has been requested
+				// Load all of the frames into the unused buffer and initialize
+				// the loaded cache (initially empty)
+				if (sprite == null)
+				{
+					unloaded = FrameLoader.GetFrames(fileSystem, filename, loaders, out var fileMetadata);
+					unloadedFrames[filename] = unloaded;
+					metadata[filename] = fileMetadata;
+
+					sprite = new Sprite[unloaded.Length];
+					allSprites.Add(sprite);
+				}
+
+				// HACK: The sequence code relies on side-effects from getUsedFrames
+				var indices = getUsedFrames != null ? getUsedFrames(sprite.Length) :
+					Enumerable.Range(0, sprite.Length);
+
+				// Load any unused frames into the SheetBuilder
+				if (unloaded != null)
+				{
+					foreach (var i in indices)
+					{
+						if (unloaded[i] != null)
+						{
+							sprite[i] = SheetBuilders[SheetBuilder.FrameTypeToSheetType(unloaded[i].Type)].Add(unloaded[i]);
+							unloaded[i] = null;
+						}
+					}
+
+					// All frames have been loaded
+					if (unloaded.All(f => f == null))
+						unloadedFrames.Remove(filename);
+				}
+
+				return sprite;
+			}
+		}
+
+		/// <summary>
+		/// Returns a TypeDictionary containing any metadata defined by the frame
+		/// or null if the frame does not define metadata.
+		/// </summary>
+		public TypeDictionary FrameMetadata(string filename)
+		{
+			if (!metadata.TryGetValue(filename, out var fileMetadata))
+			{
+				FrameLoader.GetFrames(fileSystem, filename, loaders, out fileMetadata);
+				metadata[filename] = fileMetadata;
+			}
+
+			return fileMetadata;
+		}
+	}
+
 	public class FrameCache
 	{
 		readonly Cache<string, ISpriteFrame[]> frames;

OpenRA.Game/Graphics/SpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -21,95 +21,102 @@ namespace OpenRA.Graphics
 
 		readonly Sprite sprite;
 		readonly WPos pos;
+		readonly WVec offset;
+		readonly int zOffset;
+		readonly PaletteReference palette;
 		readonly float scale;
 		readonly WAngle rotation = WAngle.Zero;
+		readonly float3 tint;
+		readonly TintModifiers tintModifiers;
+		readonly float alpha;
+		readonly bool isDecoration;
 
 		public SpriteRenderable(Sprite sprite, WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale, float alpha,
 			float3 tint, TintModifiers tintModifiers, bool isDecoration, WAngle rotation)
 		{
 			this.sprite = sprite;
 			this.pos = pos;
-			Offset = offset;
-			ZOffset = zOffset;
-			Palette = palette;
+			this.offset = offset;
+			this.zOffset = zOffset;
+			this.palette = palette;
 			this.scale = scale;
 			this.rotation = rotation;
-			Tint = tint;
-			IsDecoration = isDecoration;
-			TintModifiers = tintModifiers;
-			Alpha = alpha;
+			this.tint = tint;
+			this.isDecoration = isDecoration;
+			this.tintModifiers = tintModifiers;
+			this.alpha = alpha;
 
 			// PERF: Remove useless palette assignments for RGBA sprites
 			// HACK: This is working around the fact that palettes are defined on traits rather than sequences
 			// and can be removed once this has been fixed
 			if (sprite.Channel == TextureChannel.RGBA && !(palette?.HasColorShift ?? false))
-				Palette = null;
+				this.palette = null;
 		}
 
 		public SpriteRenderable(Sprite sprite, WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale, float alpha,
 			float3 tint, TintModifiers tintModifiers, bool isDecoration)
 			: this(sprite, pos, offset, zOffset, palette, scale, alpha, tint, tintModifiers, isDecoration, WAngle.Zero) { }
 
-		public WPos Pos => pos + Offset;
-		public WVec Offset { get; }
-		public PaletteReference Palette { get; }
-		public int ZOffset { get; }
-		public bool IsDecoration { get; }
+		public WPos Pos => pos + offset;
+		public WVec Offset => offset;
+		public PaletteReference Palette => palette;
+		public int ZOffset => zOffset;
+		public bool IsDecoration => isDecoration;
 
-		public float Alpha { get; }
-		public float3 Tint { get; }
-		public TintModifiers TintModifiers { get; }
+		public float Alpha => alpha;
+		public float3 Tint => tint;
+		public TintModifiers TintModifiers => tintModifiers;
 
 		public IPalettedRenderable WithPalette(PaletteReference newPalette)
 		{
-			return new SpriteRenderable(sprite, pos, Offset, ZOffset, newPalette, scale, Alpha, Tint, TintModifiers, IsDecoration, rotation);
+			return new SpriteRenderable(sprite, pos, offset, zOffset, newPalette, scale, alpha, tint, tintModifiers, isDecoration, rotation);
 		}
 
 		public IRenderable WithZOffset(int newOffset)
 		{
-			return new SpriteRenderable(sprite, pos, Offset, newOffset, Palette, scale, Alpha, Tint, TintModifiers, IsDecoration, rotation);
+			return new SpriteRenderable(sprite, pos, offset, newOffset, palette, scale, alpha, tint, tintModifiers, isDecoration, rotation);
 		}
 
 		public IRenderable OffsetBy(in WVec vec)
 		{
-			return new SpriteRenderable(sprite, pos + vec, Offset, ZOffset, Palette, scale, Alpha, Tint, TintModifiers, IsDecoration, rotation);
+			return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, alpha, tint, tintModifiers, isDecoration, rotation);
 		}
 
 		public IRenderable AsDecoration()
 		{
-			return new SpriteRenderable(sprite, pos, Offset, ZOffset, Palette, scale, Alpha, Tint, TintModifiers, true, rotation);
+			return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, alpha, tint, tintModifiers, true, rotation);
 		}
 
 		public IModifyableRenderable WithAlpha(float newAlpha)
 		{
-			return new SpriteRenderable(sprite, pos, Offset, ZOffset, Palette, scale, newAlpha, Tint, TintModifiers, IsDecoration, rotation);
+			return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, newAlpha, tint, tintModifiers, isDecoration, rotation);
 		}
 
 		public IModifyableRenderable WithTint(in float3 newTint, TintModifiers newTintModifiers)
 		{
-			return new SpriteRenderable(sprite, pos, Offset, ZOffset, Palette, scale, Alpha, newTint, newTintModifiers, IsDecoration, rotation);
+			return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, alpha, newTint, newTintModifiers, isDecoration, rotation);
 		}
 
 		float3 ScreenPosition(WorldRenderer wr)
 		{
 			var s = 0.5f * scale * sprite.Size;
-			return wr.Screen3DPxPosition(pos) + wr.ScreenPxOffset(Offset) - new float3((int)s.X, (int)s.Y, s.Z);
+			return wr.Screen3DPxPosition(pos) + wr.ScreenPxOffset(offset) - new float3((int)s.X, (int)s.Y, s.Z);
 		}
 
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
 			var wsr = Game.Renderer.WorldSpriteRenderer;
-			var t = Alpha * Tint;
-			if (wr.TerrainLighting != null && (TintModifiers & TintModifiers.IgnoreWorldTint) == 0)
+			var t = alpha * tint;
+			if (wr.TerrainLighting != null && (tintModifiers & TintModifiers.IgnoreWorldTint) == 0)
 				t *= wr.TerrainLighting.TintAt(pos);
 
 			// Shader interprets negative alpha as a flag to use the tint colour directly instead of multiplying the sprite colour
-			var a = Alpha;
-			if ((TintModifiers & TintModifiers.ReplaceColor) != 0)
+			var a = alpha;
+			if ((tintModifiers & TintModifiers.ReplaceColor) != 0)
 				a *= -1;
 
-			wsr.DrawSprite(sprite, Palette, ScreenPosition(wr), scale, t, a, rotation.RendererRadians());
+			wsr.DrawSprite(sprite, palette, ScreenPosition(wr), scale, t, a, rotation.RendererRadians());
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr)

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -114,7 +114,7 @@ namespace OpenRA.Graphics
 			return new int2(sheetIndex, secondarySheetIndex);
 		}
 
-		static float ResolveTextureIndex(Sprite s, PaletteReference pal)
+		float ResolveTextureIndex(Sprite s, PaletteReference pal)
 		{
 			if (pal == null)
 				return 0;

OpenRA.Game/Graphics/TargetLineRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/TerrainSpriteLayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -27,7 +27,7 @@ namespace OpenRA.Graphics
 		readonly IVertexBuffer<Vertex> vertexBuffer;
 		readonly Vertex[] vertices;
 		readonly bool[] ignoreTint;
-		readonly HashSet<int> dirtyRows = new();
+		readonly HashSet<int> dirtyRows = new HashSet<int>();
 		readonly int rowStride;
 		readonly bool restrictToBounds;
 
@@ -114,7 +114,7 @@ namespace OpenRA.Graphics
 			// transparent for isometric tiles
 			var tl = worldRenderer.TerrainLighting;
 			var pos = map.CenterOfCell(uv.ToCPos(map));
-			var step = map.Grid.TileScale / 2;
+			var step = map.Grid.Type == MapGridType.RectangularIsometric ? 724 : 512;
 			var weights = new[]
 			{
 				tl.TintAt(pos + new WVec(-step, -step, 0)),

OpenRA.Game/Graphics/UISpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -16,7 +16,10 @@ namespace OpenRA.Graphics
 	public class UISpriteRenderable : IRenderable, IPalettedRenderable, IFinalizedRenderable
 	{
 		readonly Sprite sprite;
+		readonly WPos effectiveWorldPos;
 		readonly int2 screenPos;
+		readonly int zOffset;
+		readonly PaletteReference palette;
 		readonly float scale;
 		readonly float alpha;
 		readonly float rotation = 0f;
@@ -24,10 +27,10 @@ namespace OpenRA.Graphics
 		public UISpriteRenderable(Sprite sprite, WPos effectiveWorldPos, int2 screenPos, int zOffset, PaletteReference palette, float scale = 1f, float alpha = 1f, float rotation = 0f)
 		{
 			this.sprite = sprite;
-			Pos = effectiveWorldPos;
+			this.effectiveWorldPos = effectiveWorldPos;
 			this.screenPos = screenPos;
-			ZOffset = zOffset;
-			Palette = palette;
+			this.zOffset = zOffset;
+			this.palette = palette;
 			this.scale = scale;
 			this.alpha = alpha;
 			this.rotation = rotation;
@@ -36,18 +39,18 @@ namespace OpenRA.Graphics
 			// HACK: This is working around the fact that palettes are defined on traits rather than sequences
 			// and can be removed once this has been fixed
 			if (sprite.Channel == TextureChannel.RGBA && !(palette?.HasColorShift ?? false))
-				Palette = null;
+				this.palette = null;
 		}
 
 		// Does not exist in the world, so a world positions don't make sense
-		public WPos Pos { get; }
+		public WPos Pos => effectiveWorldPos;
 		public WVec Offset => WVec.Zero;
 		public bool IsDecoration => true;
 
-		public PaletteReference Palette { get; }
-		public int ZOffset { get; }
+		public PaletteReference Palette => palette;
+		public int ZOffset => zOffset;
 
-		public IPalettedRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, Pos, screenPos, ZOffset, newPalette, scale, alpha, rotation); }
+		public IPalettedRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, effectiveWorldPos, screenPos, zOffset, newPalette, scale, alpha, rotation); }
 		public IRenderable WithZOffset(int newOffset) { return this; }
 		public IRenderable OffsetBy(in WVec vec) { return this; }
 		public IRenderable AsDecoration() { return this; }
@@ -55,7 +58,7 @@ namespace OpenRA.Graphics
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
-			Game.Renderer.SpriteRenderer.DrawSprite(sprite, Palette, screenPos, scale, float3.Ones, alpha, rotation);
+			Game.Renderer.SpriteRenderer.DrawSprite(sprite, palette, screenPos, scale, float3.Ones, alpha, rotation);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr)

OpenRA.Game/Graphics/Util.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -224,10 +224,10 @@ namespace OpenRA.Graphics
 		}
 
 		/// <summary>Rotates a quad about its center in the x-y plane.</summary>
-		/// <param name="tl">The top left vertex of the quad.</param>
-		/// <param name="size">A float3 containing the X, Y, and Z lengths of the quad.</param>
-		/// <param name="rotation">The number of radians to rotate by.</param>
-		/// <returns>An array of four vertices representing the rotated quad (top-left, top-right, bottom-right, bottom-left).</returns>
+		/// <param name="tl">The top left vertex of the quad</param>
+		/// <param name="size">A float3 containing the X, Y, and Z lengths of the quad</param>
+		/// <param name="rotation">The number of radians to rotate by</param>
+		/// <returns>An array of four vertices representing the rotated quad (top-left, top-right, bottom-right, bottom-left)</returns>
 		public static float3[] RotateQuad(float3 tl, float3 size, float rotation)
 		{
 			var center = tl + 0.5f * size;
@@ -258,15 +258,15 @@ namespace OpenRA.Graphics
 		/// <summary>
 		/// Returns the bounds of an object. Used for determining which objects need to be rendered on screen, and which do not.
 		/// </summary>
-		/// <param name="offset">The top left vertex of the object.</param>
-		/// <param name="size">A float 3 containing the X, Y, and Z lengths of the object.</param>
-		/// <param name="rotation">The angle to rotate the object by (use 0f if there is no rotation).</param>
+		/// <param name="offset">The top left vertex of the object</param>
+		/// <param name="size">A float 3 containing the X, Y, and Z lengths of the object</param>
+		/// <param name="rotation">The angle to rotate the object by (use 0f if there is no rotation)</param>
 		public static Rectangle BoundingRectangle(float3 offset, float3 size, float rotation)
 		{
 			if (rotation == 0f)
 				return new Rectangle((int)offset.X, (int)offset.Y, (int)size.X, (int)size.Y);
 
-			var rotatedQuad = RotateQuad(offset, size, rotation);
+			var rotatedQuad = Util.RotateQuad(offset, size, rotation);
 			var minX = rotatedQuad[0].X;
 			var maxX = rotatedQuad[0].X;
 			var minY = rotatedQuad[0].Y;

OpenRA.Game/Graphics/Vertex.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/Video.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/VideoLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Graphics/Viewport.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -53,7 +53,7 @@ namespace OpenRA.Graphics
 
 		public WPos CenterPosition => worldRenderer.ProjectedPosition(CenterLocation);
 
-		public Rectangle Rectangle => new(TopLeft, new Size(viewportSize.X, viewportSize.Y));
+		public Rectangle Rectangle => new Rectangle(TopLeft, new Size(viewportSize.X, viewportSize.Y));
 		public int2 TopLeft => CenterLocation - viewportSize / 2;
 		public int2 BottomRight => CenterLocation + viewportSize / 2;
 		int2 viewportSize;
@@ -66,6 +66,9 @@ namespace OpenRA.Graphics
 		WorldViewport lastViewportDistance;
 
 		float zoom = 1f;
+		float minZoom = 1f;
+		float maxZoom = 2f;
+
 		bool unlockMinZoom;
 		float unlockedMinZoomScale;
 		float unlockedMinZoom = 1f;
@@ -83,13 +86,12 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public float MinZoom { get; private set; } = 1f;
-		public float MaxZoom { get; private set; } = 2f;
+		public float MinZoom => minZoom;
 
 		public void AdjustZoom(float dz)
 		{
 			// Exponential ensures that equal positive and negative steps have the same effect
-			Zoom = (zoom * (float)Math.Exp(dz)).Clamp(unlockMinZoom ? unlockedMinZoom : MinZoom, MaxZoom);
+			Zoom = (zoom * (float)Math.Exp(dz)).Clamp(unlockMinZoom ? unlockedMinZoom : minZoom, maxZoom);
 		}
 
 		public void AdjustZoom(float dz, int2 center)
@@ -103,10 +105,10 @@ namespace OpenRA.Graphics
 		public void ToggleZoom()
 		{
 			// Unlocked zooms always reset to the default zoom
-			if (zoom < MinZoom)
-				Zoom = MinZoom;
+			if (zoom < minZoom)
+				Zoom = minZoom;
 			else
-				Zoom = zoom > MinZoom ? MinZoom : MaxZoom;
+				Zoom = zoom > minZoom ? minZoom : maxZoom;
 		}
 
 		public void UnlockMinimumZoom(float scale)
@@ -119,6 +121,23 @@ namespace OpenRA.Graphics
 		public static long LastMoveRunTime = 0;
 		public static int2 LastMousePos;
 
+		float ClosestTo(float[] collection, float target)
+		{
+			var closestValue = collection.First();
+			var subtractResult = Math.Abs(closestValue - target);
+
+			foreach (var element in collection)
+			{
+				if (Math.Abs(element - target) < subtractResult)
+				{
+					subtractResult = Math.Abs(element - target);
+					closestValue = element;
+				}
+			}
+
+			return closestValue;
+		}
+
 		public ScrollDirection GetBlockedDirections()
 		{
 			var ret = ScrollDirection.None;
@@ -172,7 +191,7 @@ namespace OpenRA.Graphics
 				UpdateViewportZooms();
 		}
 
-		static float CalculateMinimumZoom(float minHeight, float maxHeight)
+		float CalculateMinimumZoom(float minHeight, float maxHeight)
 		{
 			var h = Game.Renderer.NativeResolution.Height;
 
@@ -208,14 +227,14 @@ namespace OpenRA.Graphics
 
 			var vd = graphicSettings.ViewportDistance;
 			if (viewportSizes.AllowNativeZoom && vd == WorldViewport.Native)
-				MinZoom = viewportSizes.DefaultScale;
+				minZoom = 1;
 			else
 			{
 				var range = viewportSizes.GetSizeRange(vd);
-				MinZoom = CalculateMinimumZoom(range.X, range.Y) * viewportSizes.DefaultScale;
+				minZoom = CalculateMinimumZoom(range.X, range.Y);
 			}
 
-			MaxZoom = Math.Min(MinZoom * viewportSizes.MaxZoomScale, Game.Renderer.NativeResolution.Height * viewportSizes.DefaultScale / viewportSizes.MaxZoomWindowHeight);
+			maxZoom = Math.Min(minZoom * viewportSizes.MaxZoomScale, Game.Renderer.NativeResolution.Height * 1f / viewportSizes.MaxZoomWindowHeight);
 
 			if (unlockMinZoom)
 			{
@@ -223,19 +242,19 @@ namespace OpenRA.Graphics
 				// TODO: Allow zooming out until the full map is visible
 				// We need to improve our viewport scroll handling to center the map as we zoom out
 				// before this will work well enough to enable
-				unlockedMinZoom = MinZoom * unlockedMinZoomScale;
+				unlockedMinZoom = minZoom * unlockedMinZoomScale;
 			}
 
 			if (resetCurrentZoom)
-				Zoom = MinZoom;
+				Zoom = minZoom;
 			else
-				Zoom = Zoom.Clamp(MinZoom, MaxZoom);
+				Zoom = Zoom.Clamp(minZoom, maxZoom);
 
-			var maxSize = 1f / (unlockMinZoom ? unlockedMinZoom : MinZoom) * new float2(Game.Renderer.NativeResolution);
+			var maxSize = (1f / (unlockMinZoom ? unlockedMinZoom : minZoom) * new float2(Game.Renderer.NativeResolution));
 			Game.Renderer.SetMaximumViewportSize(new Size((int)maxSize.X, (int)maxSize.Y));
 
 			foreach (var t in worldRenderer.World.WorldActor.TraitsImplementing<INotifyViewportZoomExtentsChanged>())
-				t.ViewportZoomExtentsChanged(MinZoom, MaxZoom);
+				t.ViewportZoomExtentsChanged(minZoom, maxZoom);
 		}
 
 		public CPos ViewToWorld(int2 view)
@@ -278,7 +297,7 @@ namespace OpenRA.Graphics
 			return worldRenderer.World.Map.CellContaining(worldRenderer.ProjectedPosition(ViewToWorldPx(view)));
 		}
 
-		/// <summary>Returns an unfiltered list of all cells that could potentially contain the mouse cursor.</summary>
+		/// <summary> Returns an unfiltered list of all cells that could potentially contain the mouse cursor</summary>
 		IEnumerable<MPos> CandidateMouseoverCells(int2 world)
 		{
 			var map = worldRenderer.World.Map;
@@ -294,8 +313,8 @@ namespace OpenRA.Graphics
 		}
 
 		public int2 ViewToWorldPx(int2 view) { return (graphicSettings.UIScale / Zoom * view.ToFloat2()).ToInt2() + TopLeft; }
-		public int2 WorldToViewPx(int2 world) { return (Zoom / graphicSettings.UIScale * (world - TopLeft).ToFloat2()).ToInt2(); }
-		public int2 WorldToViewPx(in float3 world) { return (Zoom / graphicSettings.UIScale * (world - TopLeft).XY).ToInt2(); }
+		public int2 WorldToViewPx(int2 world) { return ((Zoom / graphicSettings.UIScale) * (world - TopLeft).ToFloat2()).ToInt2(); }
+		public int2 WorldToViewPx(in float3 world) { return ((Zoom / graphicSettings.UIScale) * (world - TopLeft).XY).ToInt2(); }
 
 		public void Center(IEnumerable<Actor> actors)
 		{

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -31,25 +31,25 @@ namespace OpenRA.Graphics
 
 		public event Action PaletteInvalidated = null;
 
-		readonly HashSet<Actor> onScreenActors = new();
-		readonly HardwarePalette palette = new();
-		readonly Dictionary<string, PaletteReference> palettes = new();
+		readonly HashSet<Actor> onScreenActors = new HashSet<Actor>();
+		readonly HardwarePalette palette = new HardwarePalette();
+		readonly Dictionary<string, PaletteReference> palettes = new Dictionary<string, PaletteReference>();
 		readonly IRenderTerrain terrainRenderer;
 		readonly Lazy<DebugVisualizations> debugVis;
 		readonly Func<string, PaletteReference> createPaletteReference;
 		readonly bool enableDepthBuffer;
 
-		readonly List<IFinalizedRenderable> preparedRenderables = new();
-		readonly List<IFinalizedRenderable> preparedOverlayRenderables = new();
-		readonly List<IFinalizedRenderable> preparedAnnotationRenderables = new();
+		readonly List<IFinalizedRenderable> preparedRenderables = new List<IFinalizedRenderable>();
+		readonly List<IFinalizedRenderable> preparedOverlayRenderables = new List<IFinalizedRenderable>();
+		readonly List<IFinalizedRenderable> preparedAnnotationRenderables = new List<IFinalizedRenderable>();
 
-		readonly List<IRenderable> renderablesBuffer = new();
+		readonly List<IRenderable> renderablesBuffer = new List<IRenderable>();
 
 		internal WorldRenderer(ModData modData, World world)
 		{
 			World = world;
 			TileSize = World.Map.Grid.TileSize;
-			TileScale = World.Map.Grid.TileScale;
+			TileScale = World.Map.Grid.Type == MapGridType.RectangularIsometric ? 1448 : 1024;
 			Viewport = new Viewport(this, world.Map);
 
 			createPaletteReference = CreatePaletteReference;
@@ -87,7 +87,7 @@ namespace OpenRA.Graphics
 		{
 			// HACK: This is working around the fact that palettes are defined on traits rather than sequences
 			// and can be removed once this has been fixed.
-			return string.IsNullOrEmpty(name) ? null : palettes.GetOrAdd(name, createPaletteReference);
+			return name == null ? null : palettes.GetOrAdd(name, createPaletteReference);
 		}
 
 		public void AddPalette(string name, ImmutablePalette pal, bool allowModifiers = false, bool allowOverwrite = false)
@@ -109,13 +109,13 @@ namespace OpenRA.Graphics
 			palette.ReplacePalette(name, pal);
 
 			// Update cached PlayerReference if one exists
-			if (palettes.TryGetValue(name, out var paletteReference))
-				paletteReference.Palette = pal;
+			if (palettes.ContainsKey(name))
+				palettes[name].Palette = pal;
 		}
 
-		public void SetPaletteColorShift(string name, float hueOffset, float satOffset, float valueModifier, float minHue, float maxHue)
+		public void SetPaletteColorShift(string name, float hueOffset, float satOffset, float minHue, float maxHue)
 		{
-			palette.SetColorShift(name, hueOffset, satOffset, valueModifier, minHue, maxHue);
+			palette.SetColorShift(name, hueOffset, satOffset, minHue, maxHue);
 		}
 
 		// PERF: Avoid LINQ.
@@ -177,7 +177,7 @@ namespace OpenRA.Graphics
 
 			foreach (var e in World.Effects)
 			{
-				if (e is not IEffectAboveShroud ea)
+				if (!(e is IEffectAboveShroud ea))
 					continue;
 
 				foreach (var renderable in ea.RenderAboveShroud(this))
@@ -218,7 +218,7 @@ namespace OpenRA.Graphics
 
 			foreach (var e in World.Effects)
 			{
-				if (e is not IEffectAnnotation ea)
+				if (!(e is IEffectAnnotation ea))
 					continue;
 
 				foreach (var renderAnnotation in ea.RenderAnnotation(this))

OpenRA.Game/HotkeyDefinition.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -19,8 +19,8 @@ namespace OpenRA
 		public readonly string Name;
 		public readonly Hotkey Default = Hotkey.Invalid;
 		public readonly string Description = "";
-		public readonly HashSet<string> Types = new();
-		public readonly HashSet<string> Contexts = new();
+		public readonly HashSet<string> Types = new HashSet<string>();
+		public readonly HashSet<string> Contexts = new HashSet<string>();
 		public readonly bool Readonly = false;
 		public bool HasDuplicates { get; internal set; }
 

OpenRA.Game/HotkeyManager.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -18,8 +18,8 @@ namespace OpenRA
 	public sealed class HotkeyManager
 	{
 		readonly Dictionary<string, Hotkey> settings;
-		readonly Dictionary<string, HotkeyDefinition> definitions = new();
-		readonly Dictionary<string, Hotkey> keys = new();
+		readonly Dictionary<string, HotkeyDefinition> definitions = new Dictionary<string, HotkeyDefinition>();
+		readonly Dictionary<string, Hotkey> keys = new Dictionary<string, Hotkey>();
 
 		public HotkeyManager(IReadOnlyFileSystem fileSystem, Dictionary<string, Hotkey> settings, Manifest manifest)
 		{
@@ -35,7 +35,7 @@ namespace OpenRA
 
 			foreach (var kv in settings)
 			{
-				if (definitions.TryGetValue(kv.Key, out var definition) && !definition.Readonly)
+				if (definitions.ContainsKey(kv.Key) && !definitions[kv.Key].Readonly)
 					keys[kv.Key] = kv.Value;
 			}
 
@@ -43,9 +43,6 @@ namespace OpenRA
 				hd.Value.HasDuplicates = GetFirstDuplicate(hd.Value, this[hd.Value.Name].GetValue()) != null;
 		}
 
-		[System.Diagnostics.CodeAnalysis.SuppressMessage(
-			"Performance", "CA1854:Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method",
-			Justification = "Func must perform a live lookup in the collection, as the lookup value can change.")]
 		internal Func<Hotkey> GetHotkeyReference(string name)
 		{
 			// Is this a mod-defined hotkey?
@@ -105,7 +102,7 @@ namespace OpenRA
 			return null;
 		}
 
-		public HotkeyReference this[string name] => new(GetHotkeyReference(name));
+		public HotkeyReference this[string name] => new HotkeyReference(GetHotkeyReference(name));
 
 		public IEnumerable<HotkeyDefinition> Definitions => definitions.Values;
 	}

OpenRA.Game/HttpExtension.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/IUtilityCommand.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -9,41 +9,12 @@
  */
 #endregion
 
-using System;
-using System.Reflection;
-using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA
 {
 	public class Utility
 	{
-		static readonly ConcurrentCache<Type, FieldInfo[]> TypeFields =
-			new(type => type.GetFields());
-
-		static readonly ConcurrentCache<(MemberInfo Member, Type AttributeType), bool> MemberHasAttribute =
-			new(x => Attribute.IsDefined(x.Member, x.AttributeType));
-
-		static readonly ConcurrentCache<(MemberInfo Member, Type AttributeType, bool Inherit), object[]> MemberCustomAttributes =
-			new(x => x.Member.GetCustomAttributes(x.AttributeType, x.Inherit));
-
-		public static FieldInfo[] GetFields(Type type)
-		{
-			return TypeFields[type];
-		}
-
-		public static bool HasAttribute<TAttribute>(MemberInfo member)
-			where TAttribute : Attribute
-		{
-			return MemberHasAttribute[(member, typeof(TAttribute))];
-		}
-
-		public static TAttribute[] GetCustomAttributes<TAttribute>(MemberInfo member, bool inherit)
-			where TAttribute : Attribute
-		{
-			return (TAttribute[])MemberCustomAttributes[(member, typeof(TAttribute), inherit)];
-		}
-
 		public readonly ModData ModData;
 		public readonly InstalledMods Mods;
 

OpenRA.Game/Input/Hotkey.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -15,7 +15,7 @@ namespace OpenRA
 {
 	public readonly struct Hotkey : IEquatable<Hotkey>
 	{
-		public static Hotkey Invalid = new(Keycode.UNKNOWN, Modifiers.None);
+		public static Hotkey Invalid = new Hotkey(Keycode.UNKNOWN, Modifiers.None);
 		public bool IsValid()
 		{
 			return Key != Keycode.UNKNOWN;
@@ -42,7 +42,7 @@ namespace OpenRA
 			var mods = Modifiers.None;
 			if (parts.Length >= 2)
 			{
-				var modString = s[s.IndexOf(' ')..];
+				var modString = s.Substring(s.IndexOf(' '));
 				if (!Enum<Modifiers>.TryParse(modString, true, out mods))
 					return false;
 			}
@@ -84,7 +84,7 @@ namespace OpenRA
 			return obj is Hotkey o && (Hotkey?)o == this;
 		}
 
-		public override string ToString() { return $"{Key} {Modifiers:F}"; }
+		public override string ToString() { return $"{Key} {Modifiers.ToString("F")}"; }
 
 		public string DisplayString()
 		{

OpenRA.Game/Input/HotkeyReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -14,7 +14,7 @@ using System;
 namespace OpenRA
 {
 	/// <summary>
-	/// A reference to either a named hotkey (defined in the game settings) or a statically assigned hotkey.
+	/// A reference to either a named hotkey (defined in the game settings) or a statically assigned hotkey
 	/// </summary>
 	public class HotkeyReference
 	{

OpenRA.Game/Input/IInputHandler.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Input/InputHandler.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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

OpenRA.Game/Input/Keycode.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -13,8 +13,7 @@ using System.Collections.Generic;
 
 namespace OpenRA
 {
-	// List of keycodes. Duplicated from SDL 2.0.1, with the addition
-	// of MOUSE4 and MOUSE5.
+	// List of keycodes, duplicated from SDL 2.0.1
 	public enum Keycode
 	{
 		UNKNOWN = 0,
@@ -253,13 +252,11 @@ namespace OpenRA
 		KBDILLUMUP = 280 | (1 << 30),
 		EJECT = 281 | (1 << 30),
 		SLEEP = 282 | (1 << 30),
-		MOUSE4 = 283 | (1 << 30),
-		MOUSE5 = 284 | (1 << 30)
 	}
 
 	public static class KeycodeExts
 	{
-		static readonly Dictionary<Keycode, string> KeyNames = new()
+		static readonly Dictionary<Keycode, string> KeyNames = new Dictionary<Keycode, string>
 		{
 			{ Keycode.UNKNOWN, "Undefined" },
 			{ Keycode.RETURN, "Return" },
@@ -497,8 +494,6 @@ namespace OpenRA
 			{ Keycode.KBDILLUMUP, "KBDIllumUp" },
 			{ Keycode.EJECT, "Eject" },
 			{ Keycode.SLEEP, "Sleep" },
-			{ Keycode.MOUSE4, "Mouse 4" },
-			{ Keycode.MOUSE5, "Mouse 5" },
 		};
 
 		public static string DisplayString(Keycode k)

OpenRA.Game/InstalledMods.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -54,7 +54,7 @@ namespace OpenRA
 			return mods;
 		}
 
-		static Manifest LoadMod(string id, string path)
+		Manifest LoadMod(string id, string path)
 		{
 			IReadOnlyPackage package = null;
 			try
@@ -79,7 +79,7 @@ namespace OpenRA
 			return null;
 		}
 
-		static Dictionary<string, Manifest> GetInstalledMods(IEnumerable<string> searchPaths, IEnumerable<string> explicitPaths)
+		Dictionary<string, Manifest> GetInstalledMods(IEnumerable<string> searchPaths, IEnumerable<string> explicitPaths)
 		{
 			var ret = new Dictionary<string, Manifest>();
 			var candidates = GetCandidateMods(searchPaths)

OpenRA.Game/LocalPlayerProfile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -66,10 +66,8 @@ namespace OpenRA
 			}
 			catch (Exception e)
 			{
-				Console.WriteLine("Failed to load keys:");
-				Console.WriteLine(e);
-				Log.Write("debug", $"Failed to load player keypair from `{filePath}` with exception:");
-				Log.Write("debug", e);
+				Console.WriteLine("Failed to load keys: {0}", e);
+				Log.Write("debug", "Failed to load player keypair from `{0}` with exception: {1}", filePath, e);
 			}
 		}
 
@@ -93,7 +91,7 @@ namespace OpenRA
 						innerData = FieldLoader.Load<PlayerProfile>(yaml.Value);
 						if (innerData.KeyRevoked)
 						{
-							Log.Write("debug", $"Revoking key with fingerprint {Fingerprint}");
+							Log.Write("debug", "Revoking key with fingerprint {0}", Fingerprint);
 							DeleteKeypair();
 						}
 						else
@@ -104,8 +102,7 @@ namespace OpenRA
 				}
 				catch (Exception e)
 				{
-					Log.Write("debug", "Failed to parse player data result with exception:");
-					Log.Write("debug", e);
+					Log.Write("debug", "Failed to parse player data result with exception: {0}", e);
 					innerState = LinkState.ConnectionFailed;
 				}
 				finally
@@ -139,10 +136,8 @@ namespace OpenRA
 				}
 				catch (Exception e)
 				{
-					Log.Write("debug", "Failed to generate keypair with exception:");
-					Log.Write("debug", e);
-					Console.WriteLine("Key generation failed:");
-					Console.WriteLine(e);
+					Log.Write("debug", "Failed to generate keypair with exception: {1}", e);
+					Console.WriteLine("Key generation failed: {0}", e);
 
 					innerState = LinkState.Uninitialized;
 				}
@@ -157,10 +152,8 @@ namespace OpenRA
 			}
 			catch (Exception e)
 			{
-				Log.Write("debug", "Failed to delete keypair with exception:");
-				Log.Write("debug", e);
-				Console.WriteLine("Key deletion failed:");
-				Console.WriteLine(e);
+				Log.Write("debug", "Failed to delete keypair with exception: {1}", e);
+				Console.WriteLine("Key deletion failed: {0}", e);
 			}
 
 			innerState = LinkState.Uninitialized;

OpenRA.Game/LogProxy.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -9,13 +9,18 @@
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
-
-namespace OpenRA.Mods.Common.Installer
+namespace OpenRA
 {
-	public interface ISourceAction
+	public interface ILog
 	{
-		void RunActionOnSource(MiniYaml actionYaml, string path, ModData modData, List<string> extracted, Action<string> updateMessage);
+		void Write(string channel, string format, params object[] args);
+	}
+
+	public class LogProxy : ILog
+	{
+		public void Write(string channel, string format, params object[] args)
+		{
+			Log.Write(channel, format, args);
+		}
 	}
 }

OpenRA.Game/MPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -19,7 +19,7 @@ namespace OpenRA
 		public readonly int U, V;
 
 		public MPos(int u, int v) { U = u; V = v; }
-		public static readonly MPos Zero = new(0, 0);
+		public static readonly MPos Zero = new MPos(0, 0);
 
 		public static bool operator ==(MPos me, MPos other) { return me.U == other.U && me.V == other.V; }
 		public static bool operator !=(MPos me, MPos other) { return !(me == other); }
@@ -27,7 +27,7 @@ namespace OpenRA
 		public override int GetHashCode() { return U.GetHashCode() ^ V.GetHashCode(); }
 
 		public bool Equals(MPos other) { return other == this; }
-		public override bool Equals(object obj) { return obj is MPos uv && Equals(uv); }
+		public override bool Equals(object obj) { return obj is MPos && Equals((MPos)obj); }
 
 		public MPos Clamp(Rectangle r)
 		{
@@ -64,14 +64,14 @@ namespace OpenRA
 	}
 
 	/// <summary>
-	/// Projected map position.
+	/// Projected map position
 	/// </summary>
 	public readonly struct PPos : IEquatable<PPos>
 	{
 		public readonly int U, V;
 
 		public PPos(int u, int v) { U = u; V = v; }
-		public static readonly PPos Zero = new(0, 0);
+		public static readonly PPos Zero = new PPos(0, 0);
 
 		public static bool operator ==(PPos me, PPos other) { return me.U == other.U && me.V == other.V; }
 		public static bool operator !=(PPos me, PPos other) { return !(me == other); }
@@ -88,7 +88,7 @@ namespace OpenRA
 		public override int GetHashCode() { return U.GetHashCode() ^ V.GetHashCode(); }
 
 		public bool Equals(PPos other) { return other == this; }
-		public override bool Equals(object obj) { return obj is PPos puv && Equals(puv); }
+		public override bool Equals(object obj) { return obj is PPos && Equals((PPos)obj); }
 
 		public override string ToString() { return U + "," + V; }
 	}

OpenRA.Game/Manifest.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -64,8 +64,8 @@ namespace OpenRA
 		public bool Hidden;
 	}
 
-	/// <summary>Describes what is to be loaded in order to run a mod.</summary>
-	public sealed class Manifest : IDisposable
+	/// <summary> Describes what is to be loaded in order to run a mod. </summary>
+	public class Manifest : IDisposable
 	{
 		public readonly string Id;
 		public readonly IReadOnlyPackage Package;
@@ -95,7 +95,7 @@ namespace OpenRA
 			"RequiresMods", "PackageFormats"
 		};
 
-		readonly TypeDictionary modules = new();
+		readonly TypeDictionary modules = new TypeDictionary();
 		readonly Dictionary<string, MiniYaml> yaml;
 
 		bool customDataLoaded;
@@ -157,25 +157,25 @@ namespace OpenRA
 			// Allow inherited mods to import parent maps.
 			var compat = new List<string> { Id };
 
-			if (yaml.TryGetValue("SupportsMapsFrom", out var entry))
-				compat.AddRange(entry.Value.Split(',').Select(c => c.Trim()));
+			if (yaml.ContainsKey("SupportsMapsFrom"))
+				compat.AddRange(yaml["SupportsMapsFrom"].Value.Split(',').Select(c => c.Trim()));
 
 			MapCompatibility = compat.ToArray();
 
-			if (yaml.TryGetValue("DefaultOrderGenerator", out entry))
-				DefaultOrderGenerator = entry.Value;
+			if (yaml.ContainsKey("DefaultOrderGenerator"))
+				DefaultOrderGenerator = yaml["DefaultOrderGenerator"].Value;
 
-			if (yaml.TryGetValue("PackageFormats", out entry))
-				PackageFormats = FieldLoader.GetValue<string[]>("PackageFormats", entry.Value);
+			if (yaml.ContainsKey("PackageFormats"))
+				PackageFormats = FieldLoader.GetValue<string[]>("PackageFormats", yaml["PackageFormats"].Value);
 
-			if (yaml.TryGetValue("SoundFormats", out entry))
-				SoundFormats = FieldLoader.GetValue<string[]>("SoundFormats", entry.Value);
+			if (yaml.ContainsKey("SoundFormats"))
+				SoundFormats = FieldLoader.GetValue<string[]>("SoundFormats", yaml["SoundFormats"].Value);
 
-			if (yaml.TryGetValue("SpriteFormats", out entry))
-				SpriteFormats = FieldLoader.GetValue<string[]>("SpriteFormats", entry.Value);
+			if (yaml.ContainsKey("SpriteFormats"))
+				SpriteFormats = FieldLoader.GetValue<string[]>("SpriteFormats", yaml["SpriteFormats"].Value);
 
-			if (yaml.TryGetValue("VideoFormats", out entry))
-				VideoFormats = FieldLoader.GetValue<string[]>("VideoFormats", entry.Value);
+			if (yaml.ContainsKey("VideoFormats"))
+				VideoFormats = FieldLoader.GetValue<string[]>("VideoFormats", yaml["VideoFormats"].Value);
 		}
 
 		public void LoadCustomData(ObjectCreator oc)

OpenRA.Game/Map/ActorInitializer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -54,7 +54,7 @@ namespace OpenRA
 			// Traits tagged with an instance name prefer inits with the same name.
 			// If a more specific init is not available, fall back to an unnamed init.
 			// If duplicate inits are defined, take the last to match standard yaml override expectations
-			if (!string.IsNullOrEmpty(info?.InstanceName))
+			if (info != null && !string.IsNullOrEmpty(info.InstanceName))
 				return inits.LastOrDefault(i => i.InstanceName == info.InstanceName) ??
 					inits.LastOrDefault(i => string.IsNullOrEmpty(i.InstanceName));
 
@@ -159,9 +159,9 @@ namespace OpenRA
 
 		public virtual void Initialize(T value)
 		{
-			typeof(ValueActorInit<T>)
-				.GetField(nameof(value), BindingFlags.NonPublic | BindingFlags.Instance)
-				?.SetValue(this, value);
+			var field = typeof(ValueActorInit<T>).GetField(nameof(value), BindingFlags.NonPublic | BindingFlags.Instance);
+			if (field != null)
+				field.SetValue(this, value);
 		}
 
 		public override MiniYaml Save()
@@ -246,16 +246,16 @@ namespace OpenRA
 
 		public void Initialize(MiniYaml yaml)
 		{
-			typeof(OwnerInit)
-				.GetField(nameof(InternalName), BindingFlags.Public | BindingFlags.Instance)
-				?.SetValue(this, yaml.Value);
+			var field = typeof(OwnerInit).GetField(nameof(InternalName), BindingFlags.Public | BindingFlags.Instance);
+			if (field != null)
+				field.SetValue(this, yaml.Value);
 		}
 
 		public void Initialize(Player player)
 		{
-			typeof(OwnerInit)
-				.GetField(nameof(value), BindingFlags.NonPublic | BindingFlags.Instance)
-				?.SetValue(this, player);
+			var field = typeof(OwnerInit).GetField(nameof(value), BindingFlags.NonPublic | BindingFlags.Instance);
+			if (field != null)
+				field.SetValue(this, player);
 		}
 
 		public override MiniYaml Save()

OpenRA.Game/Map/ActorReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -22,7 +22,7 @@ namespace OpenRA
 {
 	public interface ISuppressInitExport { }
 
-	public class ActorReference : IEnumerable<object>
+	public class ActorReference : IEnumerable
 	{
 		public string Type;
 		readonly Lazy<TypeDictionary> initDict;
@@ -87,14 +87,14 @@ namespace OpenRA
 			var ret = new MiniYaml(Type);
 			foreach (var o in initDict.Value)
 			{
-				if (o is not ActorInit init || o is ISuppressInitExport)
+				if (!(o is ActorInit init) || o is ISuppressInitExport)
 					continue;
 
 				if (initFilter != null && !initFilter(init))
 					continue;
 
 				var initTypeName = init.GetType().Name;
-				var initName = initTypeName[..^4];
+				var initName = initTypeName.Substring(0, initTypeName.Length - 4);
 				if (!string.IsNullOrEmpty(init.InstanceName))
 					initName += ActorInfo.TraitInstanceSeparator + init.InstanceName;
 
@@ -104,9 +104,7 @@ namespace OpenRA
 			return ret;
 		}
 
-		public IEnumerator<object> GetEnumerator() { return initDict.Value.GetEnumerator(); }
-
-		IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
+		public IEnumerator GetEnumerator() { return initDict.Value.GetEnumerator(); }
 
 		public ActorReference Clone()
 		{

OpenRA.Game/Map/CellLayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -72,7 +72,7 @@ namespace OpenRA
 			return uv.V * Size.Width + uv.U;
 		}
 
-		/// <summary>Gets or sets the <see cref="CellLayer"/> using cell coordinates.</summary>
+		/// <summary>Gets or sets the <see cref="CellLayer"/> using cell coordinates</summary>
 		public T this[CPos cell]
 		{
 			get => Entries[Index(cell)];
@@ -85,7 +85,7 @@ namespace OpenRA
 			}
 		}
 
-		/// <summary>Gets or sets the layer contents using raw map coordinates (not CPos!).</summary>
+		/// <summary>Gets or sets the layer contents using raw map coordinates (not CPos!)</summary>
 		public T this[MPos uv]
 		{
 			get => Entries[Index(uv)];

OpenRA.Game/Map/CellLayerBase.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -24,10 +24,10 @@ namespace OpenRA
 		protected readonly T[] Entries;
 		protected readonly Rectangle Bounds;
 
-		protected CellLayerBase(Map map)
+		public CellLayerBase(Map map)
 			: this(map.Grid.Type, new Size(map.MapSize.X, map.MapSize.Y)) { }
 
-		protected CellLayerBase(MapGridType gridType, Size size)
+		public CellLayerBase(MapGridType gridType, Size size)
 		{
 			Size = size;
 			Bounds = new Rectangle(0, 0, Size.Width, Size.Height);
@@ -43,13 +43,13 @@ namespace OpenRA
 			Array.Copy(anotherLayer.Entries, Entries, Entries.Length);
 		}
 
-		/// <summary>Clears the layer contents with their default value.</summary>
+		/// <summary>Clears the layer contents with their default value</summary>
 		public virtual void Clear()
 		{
 			Array.Clear(Entries, 0, Entries.Length);
 		}
 
-		/// <summary>Clears the layer contents with a known value.</summary>
+		/// <summary>Clears the layer contents with a known value</summary>
 		public virtual void Clear(T clearValue)
 		{
 			Array.Fill(Entries, clearValue);

OpenRA.Game/Map/CellRegion.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -102,7 +102,7 @@ namespace OpenRA
 			return uv.U >= mapTopLeft.U && uv.U <= mapBottomRight.U && uv.V >= mapTopLeft.V && uv.V <= mapBottomRight.V;
 		}
 
-		public MapCoordsRegion MapCoords => new(mapTopLeft, mapBottomRight);
+		public MapCoordsRegion MapCoords => new MapCoordsRegion(mapTopLeft, mapBottomRight);
 
 		public CellRegionEnumerator GetEnumerator()
 		{
@@ -126,12 +126,15 @@ namespace OpenRA
 			// Current position, in map coordinates
 			int u, v;
 
+			// Current position, in cell coordinates
+			CPos current;
+
 			public CellRegionEnumerator(CellRegion region)
 				: this()
 			{
 				r = region;
 				Reset();
-				Current = new MPos(u, v).ToCPos(r.gridType);
+				current = new MPos(u, v).ToCPos(r.gridType);
 			}
 
 			public bool MoveNext()
@@ -149,8 +152,7 @@ namespace OpenRA
 						return false;
 				}
 
-				// Current position, in cell coordinates
-				Current = new MPos(u, v).ToCPos(r.gridType);
+				current = new MPos(u, v).ToCPos(r.gridType);
 				return true;
 			}
 
@@ -161,7 +163,7 @@ namespace OpenRA
 				v = r.mapTopLeft.V;
 			}
 
-			public CPos Current { get; private set; }
+			public CPos Current => current;
 			object IEnumerator.Current => Current;
 			public void Dispose() { }
 		}

OpenRA.Game/Map/Map.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -65,7 +65,7 @@ namespace OpenRA
 		MissionSelector = 4
 	}
 
-	sealed class MapField
+	class MapField
 	{
 		enum Type { Normal, NodeList, MiniYaml }
 		readonly FieldInfo field;
@@ -149,13 +149,13 @@ namespace OpenRA
 		}
 	}
 
-	public sealed class Map : IReadOnlyFileSystem, IDisposable
+	public class Map : IReadOnlyFileSystem
 	{
 		public const int SupportedMapFormat = 11;
 		public const int CurrentMapFormat = 12;
 		const short InvalidCachedTerrainIndex = -1;
 
-		/// <summary>Defines the order of the fields in map.yaml.</summary>
+		/// <summary>Defines the order of the fields in map.yaml</summary>
 		static readonly MapField[] YamlFields =
 		{
 			new MapField("MapFormat"),
@@ -167,11 +167,11 @@ namespace OpenRA
 			new MapField("Bounds"),
 			new MapField("Visibility"),
 			new MapField("Categories"),
+			new MapField("Translations", required: false, ignoreIfValue: ""),
 			new MapField("LockPreview", required: false, ignoreIfValue: "False"),
 			new MapField("Players", "PlayerDefinitions"),
 			new MapField("Actors", "ActorDefinitions"),
 			new MapField("Rules", "RuleDefinitions", required: false),
-			new MapField("Translations", "TranslationDefinitions", required: false),
 			new MapField("Sequences", "SequenceDefinitions", required: false),
 			new MapField("ModelSequences", "ModelSequenceDefinitions", required: false),
 			new MapField("Weapons", "WeaponDefinitions", required: false),
@@ -193,16 +193,16 @@ namespace OpenRA
 		public Rectangle Bounds;
 		public MapVisibility Visibility = MapVisibility.Lobby;
 		public string[] Categories = { "Conquest" };
+		public string[] Translations;
 
 		public int2 MapSize { get; private set; }
 
 		// Player and actor yaml. Public for access by the map importers and lint checks.
-		public List<MiniYamlNode> PlayerDefinitions = new();
-		public List<MiniYamlNode> ActorDefinitions = new();
+		public List<MiniYamlNode> PlayerDefinitions = new List<MiniYamlNode>();
+		public List<MiniYamlNode> ActorDefinitions = new List<MiniYamlNode>();
 
 		// Custom map yaml. Public for access by the map importers and lint checks
 		public readonly MiniYaml RuleDefinitions;
-		public readonly MiniYaml TranslationDefinitions;
 		public readonly MiniYaml SequenceDefinitions;
 		public readonly MiniYaml ModelSequenceDefinitions;
 		public readonly MiniYaml WeaponDefinitions;
@@ -210,7 +210,7 @@ namespace OpenRA
 		public readonly MiniYaml MusicDefinitions;
 		public readonly MiniYaml NotificationDefinitions;
 
-		public readonly Dictionary<CPos, TerrainTile> ReplacedInvalidTerrainTiles = new();
+		public readonly Dictionary<CPos, TerrainTile> ReplacedInvalidTerrainTiles = new Dictionary<CPos, TerrainTile>();
 
 		// Generated data
 		public readonly MapGrid Grid;
@@ -218,8 +218,6 @@ namespace OpenRA
 		public string Uid { get; private set; }
 
 		public Ruleset Rules { get; private set; }
-		public SequenceSet Sequences { get; private set; }
-
 		public bool InvalidCustomRules { get; private set; }
 		public Exception InvalidCustomRulesException { get; private set; }
 
@@ -256,6 +254,8 @@ namespace OpenRA
 		CellLayer<byte> projectedHeight;
 		Rectangle projectionSafeBounds;
 
+		internal Translation Translation;
+
 		public static string ComputeUID(IReadOnlyPackage package)
 		{
 			return ComputeUID(package, GetMapFormat(package));
@@ -390,7 +390,7 @@ namespace OpenRA
 
 							// TODO: Remember to remove this when rewriting tile variants / PickAny
 							if (index == byte.MaxValue)
-								index = (byte)(i % 4 + j % 4 * 4);
+								index = (byte)(i % 4 + (j % 4) * 4);
 
 							Tiles[new MPos(i, j)] = new TerrainTile(tile, index);
 						}
@@ -437,18 +437,19 @@ namespace OpenRA
 			try
 			{
 				Rules = Ruleset.Load(modData, this, Tileset, RuleDefinitions, WeaponDefinitions,
-					VoiceDefinitions, NotificationDefinitions, MusicDefinitions, ModelSequenceDefinitions);
+					VoiceDefinitions, NotificationDefinitions, MusicDefinitions, SequenceDefinitions, ModelSequenceDefinitions);
 			}
 			catch (Exception e)
 			{
-				Log.Write("debug", $"Failed to load rules for {Title} with error");
-				Log.Write("debug", e);
+				Log.Write("debug", "Failed to load rules for {0} with error {1}", Title, e);
 				InvalidCustomRules = true;
 				InvalidCustomRulesException = e;
 				Rules = Ruleset.LoadDefaultsForTileSet(modData, Tileset);
 			}
 
-			Sequences = new SequenceSet(this, modData, Tileset, SequenceDefinitions);
+			Rules.Sequences.Preload();
+
+			Translation = new Translation(Game.Settings.Player.Language, Translations, this);
 
 			var tl = new MPos(0, 0).ToCPos(this);
 			var br = new MPos(MapSize.X - 1, MapSize.Y - 1).ToCPos(this);
@@ -479,17 +480,17 @@ namespace OpenRA
 			AllEdgeCells = UpdateEdgeCells();
 
 			// Invalidate the entry for a cell if anything could cause the terrain index to change.
-			void InvalidateTerrainIndex(CPos c)
+			Action<CPos> invalidateTerrainIndex = c =>
 			{
 				if (cachedTerrainIndexes != null)
 					cachedTerrainIndexes[c] = InvalidCachedTerrainIndex;
-			}
+			};
 
 			// Even though the cache is lazily initialized, we must attach these event handlers on init.
 			// This ensures our handler to invalidate the cache runs first,
 			// so other listeners to these same events will get correct data when calling GetTerrainIndex.
-			CustomTerrain.CellEntryChanged += InvalidateTerrainIndex;
-			Tiles.CellEntryChanged += InvalidateTerrainIndex;
+			CustomTerrain.CellEntryChanged += invalidateTerrainIndex;
+			Tiles.CellEntryChanged += invalidateTerrainIndex;
 		}
 
 		void UpdateRamp(CPos cell)
@@ -647,21 +648,12 @@ namespace OpenRA
 					toPackage.Update(file, Package.GetStream(file).ReadAllBytes());
 
 			if (!LockPreview)
-			{
-				var previewData = SavePreview();
-				if (Package != toPackage || !Enumerable.SequenceEqual(previewData, Package.GetStream("map.png").ReadAllBytes()))
-					toPackage.Update("map.png", previewData);
-			}
+				toPackage.Update("map.png", SavePreview());
 
 			// Update the package with the new map data
-			var textData = Encoding.UTF8.GetBytes(root.WriteToString());
-			if (Package != toPackage || !Enumerable.SequenceEqual(textData, Package.GetStream("map.yaml").ReadAllBytes()))
-				toPackage.Update("map.yaml", textData);
-
-			var binaryData = SaveBinaryData();
-			if (Package != toPackage || !Enumerable.SequenceEqual(binaryData, Package.GetStream("map.bin").ReadAllBytes()))
-				toPackage.Update("map.bin", binaryData);
-
+			var s = root.WriteToString();
+			toPackage.Update("map.yaml", Encoding.UTF8.GetBytes(s));
+			toPackage.Update("map.bin", SaveBinaryData());
 			Package = toPackage;
 
 			// Update UID to match the newly saved data
@@ -747,8 +739,8 @@ namespace OpenRA
 		public byte[] SavePreview()
 		{
 			var actorTypes = Rules.Actors.Values.Where(a => a.HasTraitInfo<IMapPreviewSignatureInfo>());
-			var actors = ActorDefinitions.Where(a => actorTypes.Any(ai => ai.Name == a.Value.Value));
-			var positions = new List<(MPos Uv, Color Color)>();
+			var actors = ActorDefinitions.Where(a => actorTypes.Where(ai => ai.Name == a.Value.Value).Any());
+			var positions = new List<(MPos Position, Color Color)>();
 			foreach (var actor in actors)
 			{
 				var s = new ActorReference(actor.Value.Value, actor.Value.ToDictionary());
@@ -805,17 +797,14 @@ namespace OpenRA
 			var minimapData = new byte[stride * height];
 			(Color Left, Color Right) terrainColor = default;
 
-			var colorsByPosition = positions
-				.GroupBy(p => p.Uv)
-				.ToDictionary(g => g.Key, g => g.First().Color);
 			for (var y = 0; y < height; y++)
 			{
 				for (var x = 0; x < width; x++)
 				{
 					var uv = new MPos(x + Bounds.Left, y + top);
 
-					// TryGetValue will return Color.Transparent if not found
-					colorsByPosition.TryGetValue(uv, out var actorColor);
+					// FirstOrDefault will return a (MPos.Zero, Color.Transparent) if positions is empty
+					var actorColor = positions.FirstOrDefault(ap => ap.Position == uv).Color;
 					if (actorColor.A == 0)
 						terrainColor = GetTerrainColorPair(uv);
 
@@ -994,11 +983,11 @@ namespace OpenRA
 		}
 
 		/// <summary>
-		/// The size of the map Height step in world units.
+		/// The size of the map Height step in world units
 		/// </summary>
 		/// RectangularIsometric defines 1024 units along the diagonal axis,
 		/// giving a half-tile height step of sqrt(2) * 512
-		public WDist CellHeightStep => new(Grid.Type == MapGridType.RectangularIsometric ? 724 : 512);
+		public WDist CellHeightStep => new WDist(Grid.Type == MapGridType.RectangularIsometric ? 724 : 512);
 
 		public CPos CellContaining(WPos pos)
 		{
@@ -1208,7 +1197,7 @@ namespace OpenRA
 				// This shouldn't happen.  But if it does, return the original value and hope the caller doesn't explode.
 				if (unProjected.Count == 0)
 				{
-					Log.Write("debug", $"Failed to clamp map cell {uv} to map bounds");
+					Log.Write("debug", "Failed to clamp map cell {0} to map bounds", uv);
 					return uv;
 				}
 			}
@@ -1250,8 +1239,8 @@ namespace OpenRA
 			if (allProjected.Length > 0)
 			{
 				var puv = allProjected.First();
-				var horizontalBound = (puv.U - Bounds.Left < Bounds.Width / 2) ? Bounds.Left : Bounds.Right;
-				var verticalBound = (puv.V - Bounds.Top < Bounds.Height / 2) ? Bounds.Top : Bounds.Bottom;
+				var horizontalBound = ((puv.U - Bounds.Left) < Bounds.Width / 2) ? Bounds.Left : Bounds.Right;
+				var verticalBound = ((puv.V - Bounds.Top) < Bounds.Height / 2) ? Bounds.Top : Bounds.Bottom;
 
 				var du = Math.Abs(horizontalBound - puv.U);
 				var dv = Math.Abs(verticalBound - puv.V);
@@ -1280,7 +1269,7 @@ namespace OpenRA
 				// This shouldn't happen.  But if it does, return the original value and hope the caller doesn't explode.
 				if (unProjected.Count == 0)
 				{
-					Log.Write("debug", $"Failed to find closest edge for map cell {uv}");
+					Log.Write("debug", "Failed to find closest edge for map cell {0}", uv);
 					return uv;
 				}
 			}
@@ -1411,9 +1400,12 @@ namespace OpenRA
 			return false;
 		}
 
-		public void Dispose()
+		public string Translate(string key, IDictionary<string, object> args = null)
 		{
-			Sequences.Dispose();
+			if (Translation.TryGetString(key, out var message, args))
+				return message;
+
+			return modData.Translation.GetString(key, args);
 		}
 	}
 }

OpenRA.Game/Map/MapCache.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -25,33 +25,32 @@ namespace OpenRA
 {
 	public sealed class MapCache : IEnumerable<MapPreview>, IDisposable
 	{
-		public static readonly MapPreview UnknownMap = new(null, null, MapGridType.Rectangular, null);
+		public static readonly MapPreview UnknownMap = new MapPreview(null, null, MapGridType.Rectangular, null);
 		public IReadOnlyDictionary<IReadOnlyPackage, MapClassification> MapLocations => mapLocations;
-		readonly Dictionary<IReadOnlyPackage, MapClassification> mapLocations = new();
-		public bool LoadPreviewImages = true;
+		readonly Dictionary<IReadOnlyPackage, MapClassification> mapLocations = new Dictionary<IReadOnlyPackage, MapClassification>();
 
 		readonly Cache<string, MapPreview> previews;
 		readonly ModData modData;
 		readonly SheetBuilder sheetBuilder;
 		Thread previewLoaderThread;
 		bool previewLoaderThreadShutDown = true;
-		readonly object syncRoot = new();
-		readonly Queue<MapPreview> generateMinimap = new();
+		readonly object syncRoot = new object();
+		readonly Queue<MapPreview> generateMinimap = new Queue<MapPreview>();
 
 		public Dictionary<string, string> StringPool { get; } = new Dictionary<string, string>();
 
-		readonly List<MapDirectoryTracker> mapDirectoryTrackers = new();
+		readonly List<MapDirectoryTracker> mapDirectoryTrackers = new List<MapDirectoryTracker>();
 
 		/// <summary>
-		/// The most recently modified or loaded map at runtime.
+		/// The most recenly modified or loaded map at runtime
 		/// </summary>
 		public string LastModifiedMap { get; private set; } = null;
-		readonly Dictionary<string, string> mapUpdates = new();
+		readonly Dictionary<string, string> mapUpdates = new Dictionary<string, string>();
 
 		string lastLoadedLastModifiedMap;
 
 		/// <summary>
-		/// If LastModifiedMap was picked already, returns a null.
+		/// If LastModifiedMap was picked already, returns a null
 		/// </summary>
 		public string PickLastModifiedMap(MapVisibility visibility)
 		{
@@ -99,7 +98,7 @@ namespace OpenRA
 				IReadOnlyPackage package;
 				var optional = name.StartsWith("~", StringComparison.Ordinal);
 				if (optional)
-					name = name[1..];
+					name = name.Substring(1);
 
 				try
 				{
@@ -123,12 +122,10 @@ namespace OpenRA
 				mapDirectoryTrackers.Add(new MapDirectoryTracker(mapGrid, package, classification));
 			}
 
-			// PERF: Load the mod YAML once outside the loop, and reuse it when resolving each maps custom YAML.
-			var modDataRules = modData.GetRulesYaml();
 			foreach (var kv in MapLocations)
 			{
 				foreach (var map in kv.Key.Contents)
-					LoadMapInternal(map, kv.Key, kv.Value, mapGrid, null, modDataRules);
+					LoadMap(map, kv.Key, kv.Value, mapGrid, null);
 			}
 
 			// We only want to track maps in runtime, not at loadtime
@@ -136,22 +133,17 @@ namespace OpenRA
 		}
 
 		public void LoadMap(string map, IReadOnlyPackage package, MapClassification classification, MapGrid mapGrid, string oldMap)
-		{
-			LoadMapInternal(map, package, classification, mapGrid, oldMap, null);
-		}
-
-		void LoadMapInternal(string map, IReadOnlyPackage package, MapClassification classification, MapGrid mapGrid, string oldMap, IEnumerable<List<MiniYamlNode>> modDataRules)
 		{
 			IReadOnlyPackage mapPackage = null;
 			try
 			{
-				using (new PerfTimer(map))
+				using (new Support.PerfTimer(map))
 				{
 					mapPackage = package.OpenPackage(map, modData.ModFiles);
 					if (mapPackage != null)
 					{
 						var uid = Map.ComputeUID(mapPackage);
-						previews[uid].UpdateFromMap(mapPackage, package, classification, modData.Manifest.MapCompatibility, mapGrid.Type, modDataRules);
+						previews[uid].UpdateFromMap(mapPackage, package, classification, modData.Manifest.MapCompatibility, mapGrid.Type);
 
 						if (oldMap != uid)
 						{
@@ -165,12 +157,10 @@ namespace OpenRA
 			catch (Exception e)
 			{
 				mapPackage?.Dispose();
-				Console.WriteLine($"Failed to load map: {map}");
-				Console.WriteLine("Details:");
-				Console.WriteLine(e);
-				Log.Write("debug", $"Failed to load map: {map}");
-				Log.Write("debug", "Details:");
-				Log.Write("debug", e);
+				Console.WriteLine("Failed to load map: {0}", map);
+				Console.WriteLine("Details: {0}", e);
+				Log.Write("debug", "Failed to load map: {0}", map);
+				Log.Write("debug", "Details: {0}", e);
 			}
 		}
 
@@ -192,7 +182,7 @@ namespace OpenRA
 				var name = kv.Key;
 				var optional = name.StartsWith("~", StringComparison.Ordinal);
 				if (optional)
-					name = name[1..];
+					name = name.Substring(1);
 
 				// Don't try to open the map directory in the support directory if it doesn't exist
 				var resolved = Platform.ResolvePath(name);
@@ -204,7 +194,7 @@ namespace OpenRA
 			}
 		}
 
-		public IEnumerable<(IReadWritePackage Package, string Map)> EnumerateMapDirPackagesAndNames(MapClassification classification = MapClassification.System)
+		public IEnumerable<(IReadWritePackage package, string map)> EnumerateMapDirPackagesAndNames(MapClassification classification = MapClassification.System)
 		{
 			var mapDirPackages = EnumerateMapDirPackages(classification);
 
@@ -223,6 +213,12 @@ namespace OpenRA
 						yield return mapPackage;
 		}
 
+		public IEnumerable<Map> EnumerateMapsWithoutCaching(MapClassification classification = MapClassification.System)
+		{
+			foreach (var mapPackage in EnumerateMapPackagesWithoutCaching(classification))
+				yield return new Map(modData, mapPackage);
+		}
+
 		public void QueryRemoteMapDetails(string repositoryUrl, IEnumerable<string> uids, Action<MapPreview> mapDetailsReceived = null, Action<MapPreview> mapQueryFailed = null)
 		{
 			var queryUids = uids.Distinct()
@@ -262,9 +258,8 @@ namespace OpenRA
 					}
 					catch (Exception e)
 					{
-						Log.Write("debug", "Remote map query failed with error:");
-						Log.Write("debug", e);
-						Log.Write("debug", $"URL was: {url}");
+						Log.Write("debug", "Remote map query failed with error: {0}", e);
+						Log.Write("debug", "URL was: {0}", url);
 
 						foreach (var uid in batchUids)
 						{
@@ -325,8 +320,7 @@ namespace OpenRA
 							}
 							catch (Exception e)
 							{
-								Log.Write("debug", "Failed to load minimap with exception:");
-								Log.Write("debug", e);
+								Log.Write("debug", "Failed to load minimap with exception: {0}", e);
 							}
 						});
 					}

OpenRA.Game/Map/MapCoordsRegion.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -19,6 +19,7 @@ namespace OpenRA
 		public struct MapCoordsEnumerator : IEnumerator<MPos>
 		{
 			readonly MapCoordsRegion r;
+			MPos current;
 
 			public MapCoordsEnumerator(MapCoordsRegion region)
 				: this()
@@ -29,38 +30,41 @@ namespace OpenRA
 
 			public bool MoveNext()
 			{
-				var u = Current.U + 1;
-				var v = Current.V;
+				var u = current.U + 1;
+				var v = current.V;
 
 				// Check for column overflow
-				if (u > r.BottomRight.U)
+				if (u > r.bottomRight.U)
 				{
 					v += 1;
-					u = r.TopLeft.U;
+					u = r.topLeft.U;
 
 					// Check for row overflow
-					if (v > r.BottomRight.V)
+					if (v > r.bottomRight.V)
 						return false;
 				}
 
-				Current = new MPos(u, v);
+				current = new MPos(u, v);
 				return true;
 			}
 
 			public void Reset()
 			{
-				Current = new MPos(r.TopLeft.U - 1, r.TopLeft.V);
+				current = new MPos(r.topLeft.U - 1, r.topLeft.V);
 			}
 
-			public MPos Current { get; private set; }
+			public MPos Current => current;
 			object IEnumerator.Current => Current;
 			public void Dispose() { }
 		}
 
+		readonly MPos topLeft;
+		readonly MPos bottomRight;
+
 		public MapCoordsRegion(MPos mapTopLeft, MPos mapBottomRight)
 		{
-			TopLeft = mapTopLeft;
-			BottomRight = mapBottomRight;
+			topLeft = mapTopLeft;
+			bottomRight = mapBottomRight;
 		}
 
 		public override string ToString()
@@ -83,7 +87,7 @@ namespace OpenRA
 			return GetEnumerator();
 		}
 
-		public MPos TopLeft { get; }
-		public MPos BottomRight { get; }
+		public MPos TopLeft => topLeft;
+		public MPos BottomRight => bottomRight;
 	}
 }

OpenRA.Game/Map/MapDirectoryTracker.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -25,7 +25,7 @@ namespace OpenRA
 		readonly MapClassification classification;
 
 		enum MapAction { Add, Delete, Update }
-		readonly Dictionary<string, MapAction> mapActionQueue = new();
+		readonly Dictionary<string, MapAction> mapActionQueue = new Dictionary<string, MapAction>();
 
 		bool dirty = false;
 

OpenRA.Game/Map/MapGrid.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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
@@ -29,10 +29,7 @@ namespace OpenRA
 		public readonly WVec[][] Polygons;
 		public readonly WRot Orientation;
 
-		public CellRamp(MapGridType type, WRot orientation,
-			RampCornerHeight tl = RampCornerHeight.Low, RampCornerHeight tr = RampCornerHeight.Low,
-			RampCornerHeight br = RampCornerHeight.Low, RampCornerHeight bl = RampCornerHeight.Low,
-			RampSplit split = RampSplit.Flat)
+		public CellRamp(MapGridType type, WRot orientation, RampCornerHeight tl = RampCornerHeight.Low, RampCornerHeight tr = RampCornerHeight.Low, RampCornerHeight br = RampCornerHeight.Low,  RampCornerHeight bl = RampCornerHeight.Low, RampSplit split = RampSplit.Flat)
 		{
 			Orientation = orientation;
 			if (type == MapGridType.RectangularIsometric)
@@ -106,7 +103,7 @@ namespace OpenRA
 	public class MapGrid : IGlobalModData
 	{
 		public readonly MapGridType Type = MapGridType.Rectangular;
-		public readonly Size TileSize = new(24, 24);
+		public readonly Size TileSize = new Size(24, 24);
 		public readonly byte MaximumTerrainHeight = 0;
 		public readonly SubCell DefaultSubCell = (SubCell)byte.MaxValue;
 
@@ -128,14 +125,10 @@ namespace OpenRA
 
 		internal readonly CVec[][] TilesByDistance;
 
-		public int TileScale { get; }
-
 		public MapGrid(MiniYaml yaml)
 		{
 			FieldLoader.Load(this, yaml);
 
-			TileScale = Type == MapGridType.RectangularIsometric ? 1448 : 1024;
-
 			// The default subcell index defaults to the middle entry
 			var defaultSubCellIndex = (byte)DefaultSubCell;
 			if (defaultSubCellIndex == byte.MaxValue)

OpenRA.Game/Map/MapPlayers.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright (c) The OpenRA Developers and Contributors
+ * 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