From f3210755c0c25ee05bba17dc01c203bd297d50dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 1 Jan 2016 22:07:04 +0100 Subject: [PATCH] rename WithDockingOverlay to WithDockedOverlay --- OpenRA.Mods.Common/OpenRA.Mods.Common.csproj | 2 +- .../{WithDockingOverlay.cs => WithDockedOverlay.cs} | 10 +++++----- OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs | 7 +++++++ mods/d2k/rules/structures.yaml | 2 +- mods/ts/rules/shared-structures.yaml | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) rename OpenRA.Mods.Common/Traits/Render/{WithDockingOverlay.cs => WithDockedOverlay.cs} (86%) diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 28f9e444aa..97f8d3f8e2 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -433,7 +433,7 @@ - + diff --git a/OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithDockedOverlay.cs similarity index 86% rename from OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs rename to OpenRA.Mods.Common/Traits/Render/WithDockedOverlay.cs index db95eec69f..65d9b730df 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithDockedOverlay.cs @@ -15,7 +15,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { [Desc("Rendered when a harvester is docked.")] - public class WithDockingOverlayInfo : ITraitInfo, Requires, Requires + public class WithDockedOverlayInfo : ITraitInfo, Requires, Requires { [Desc("Sequence name to use")] [SequenceReference] public readonly string Sequence = "docking-overlay"; @@ -29,17 +29,17 @@ namespace OpenRA.Mods.Common.Traits [Desc("Custom palette is a player palette BaseName")] public readonly bool IsPlayerPalette = false; - public object Create(ActorInitializer init) { return new WithDockingOverlay(init.Self, this); } + public object Create(ActorInitializer init) { return new WithDockedOverlay(init.Self, this); } } - public class WithDockingOverlay : INotifyDocking, INotifyBuildComplete, INotifySold + public class WithDockedOverlay : INotifyDocking, INotifyBuildComplete, INotifySold { - readonly WithDockingOverlayInfo info; + readonly WithDockedOverlayInfo info; readonly AnimationWithOffset anim; bool buildComplete; bool docked; - public WithDockingOverlay(Actor self, WithDockingOverlayInfo info) + public WithDockedOverlay(Actor self, WithDockedOverlayInfo info) { this.info = info; diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 41a8fd8377..1cac280126 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -2876,6 +2876,13 @@ namespace OpenRA.Mods.Common.UtilityCommands } } + // Rename WithDockingOverlay to WithDockedOverlay + if (engineVersion < 20160116) + { + if (node.Key.StartsWith("WithDockingOverlay")) + node.Key = "WithDockedOverlay" + node.Key.Substring(18); + } + UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 1500b3a6ac..f6384d6a35 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -260,7 +260,7 @@ refinery: FactionImages: atreides: refinery.atreides ordos: refinery.ordos - WithDockingOverlay@SMOKE: + WithDockedOverlay@SMOKE: Sequence: smoke Power: Amount: -75 diff --git a/mods/ts/rules/shared-structures.yaml b/mods/ts/rules/shared-structures.yaml index f422326b5b..025cb0da39 100644 --- a/mods/ts/rules/shared-structures.yaml +++ b/mods/ts/rules/shared-structures.yaml @@ -91,7 +91,7 @@ PROC: Sequence: idle-redlights WithIdleOverlay@BIB: Sequence: bib - WithDockingOverlay@flame: + WithDockedOverlay@FLAME: Sequence: flame Palette: effect Power: