From 60e45b9eb7407bacb17076f43175e2f5b4fce9b9 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 3 Dec 2016 17:23:58 +0000 Subject: [PATCH] Extract RenameNodeKey helper. --- .../UtilityCommands/UpgradeRules.cs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 7718eca762..72a4779425 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -92,6 +92,14 @@ namespace OpenRA.Mods.Common.UtilityCommands catch { } } + static void RenameNodeKey(MiniYamlNode node, string key) + { + var parts = node.Key.Split('@'); + node.Key = key; + if (parts.Length > 1) + node.Key += "@" + parts[1]; + } + internal static void UpgradeActorRules(ModData modData, int engineVersion, ref List nodes, MiniYamlNode parent, int depth) { var addNodes = new List(); @@ -118,10 +126,7 @@ namespace OpenRA.Mods.Common.UtilityCommands if (s != null) s.Key = "Image"; - var parts = node.Key.Split('@'); - node.Key = "WithDamageOverlay"; - if (parts.Length > 1) - node.Key += "@" + parts[1]; + RenameNodeKey(node, "WithDamageOverlay"); } } @@ -135,13 +140,9 @@ namespace OpenRA.Mods.Common.UtilityCommands if (engineVersion < 20160611) { // Deprecated WithSpriteRotorOverlay - if (depth == 1 && node.Key.StartsWith("WithSpriteRotorOverlay")) + if (depth == 1 && node.Key.StartsWith("WithSpriteRotorOverlay", StringComparison.Ordinal)) { - var parts = node.Key.Split('@'); - node.Key = "WithIdleOverlay"; - if (parts.Length > 1) - node.Key += "@" + parts[1]; - + RenameNodeKey(node, "WithIdleOverlay"); Console.WriteLine("The 'WithSpriteRotorOverlay' trait has been removed."); Console.WriteLine("Its functionality can be fully replicated with 'WithIdleOverlay' + upgrades."); Console.WriteLine("Look at the helicopters in our RA / C&C1 mods for implementation details.");