From 5dcb840f9f0f036d13600323e73fd2cbbf83aaee Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 7 May 2017 12:41:37 +0000 Subject: [PATCH] Fix WithHarvesterOffset.LocalOffset name. --- OpenRA.Mods.Common/Traits/Render/WithHarvestOverlay.cs | 4 ++-- OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs | 4 ++++ mods/ts/rules/shared-vehicles.yaml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Render/WithHarvestOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithHarvestOverlay.cs index 42fc270a8e..8274d9de06 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithHarvestOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithHarvestOverlay.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Traits.Render [SequenceReference] public readonly string Sequence = "harvest"; [Desc("Position relative to body")] - public readonly WVec Offset = WVec.Zero; + public readonly WVec LocalOffset = WVec.Zero; [PaletteReference] public readonly string Palette = "effect"; @@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits.Render anim.IsDecoration = true; anim.Play(info.Sequence); rs.Add(new AnimationWithOffset(anim, - () => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))), + () => body.LocalToWorld(info.LocalOffset.Rotate(body.QuantizeOrientation(self, self.Orientation))), () => !visible, p => ZOffsetFromCenter(self, p, 0)), info.Palette); } diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index dcf4d5b603..0ca15b6c8b 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -635,6 +635,10 @@ namespace OpenRA.Mods.Common.UtilityCommands } } + if (engineVersion < 20170507) + if (node.Key == "Offset" && parent.Key.StartsWith("WithHarvestOverlay", StringComparison.Ordinal)) + RenameNodeKey(node, "LocalOffset"); + UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1); } diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index cbff1e2e13..daec3800ff 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -95,7 +95,7 @@ HARV: Explodes: Weapon: TiberiumExplosion WithHarvestOverlay: - Offset: 384,0,0 + LocalOffset: 384,0,0 Palette: effect SelectionDecorations: VisualBounds: 36,36