From 8f985118cd5c71d8649bedd553180428ac3e12ee Mon Sep 17 00:00:00 2001 From: JovialFeline Date: Fri, 29 Mar 2024 05:21:50 -0400 Subject: [PATCH] Fix RA+CnC map import of BARB/FENC --- OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs | 6 +++--- .../UtilityCommands/ImportTiberianDawnMapCommand.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs index cc1b550404..e2d36c53d4 100644 --- a/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs @@ -40,11 +40,11 @@ namespace OpenRA.Mods.Cnc.UtilityCommands // Mapping from RA95 overlay index to type string static readonly string[] RedAlertOverlayNames = { - "sbag", "cycl", "brik", "fenc", "wood", + "sbag", "cycl", "brik", "barb", "wood", "gold01", "gold02", "gold03", "gold04", "gem01", "gem02", "gem03", "gem04", "v12", "v13", "v14", "v15", "v16", "v17", "v18", - "fpls", "wcrate", "scrate", "barb", "sbag", + "fpls", "wcrate", "scrate", "fenc", "sbag", }; static readonly Dictionary OverlayResourceMapping = new() @@ -80,7 +80,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands static readonly string[] OverlayActors = new string[] { // Fences - "sbag", "cycl", "brik", "fenc", "wood", + "sbag", "cycl", "brik", "barb", "wood", "fenc", // Fields "v12", "v13", "v14", "v15", "v16", "v17", "v18", diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs index 3deca59a67..e16dce63df 100644 --- a/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs @@ -68,7 +68,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands static readonly string[] OverlayActors = new string[] { // Fences - "sbag", "cycl", "brik", "fenc", "wood", + "sbag", "cycl", "brik", "barb", "wood", // Fields "v12", "v13", "v14", "v15", "v16", "v17", "v18",