From a9424d0fa7bf101c98735aa629ee1b09867b707b Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 19 Oct 2015 17:43:27 +0100 Subject: [PATCH 1/2] Hide the docking animation when it is not active. --- OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs index e21582a98e..db95eec69f 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs @@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits anim = new AnimationWithOffset(overlay, () => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))), - () => !buildComplete); + () => !buildComplete || !docked); rs.Add(anim, info.Palette, info.IsPlayerPalette); } From 8c50f444ecfc0f28716e299ec780fee93fbbe212 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 19 Oct 2015 17:54:05 +0100 Subject: [PATCH 2/2] Fix refinery flame animation. --- mods/d2k/rules/palettes.yaml | 5 ----- mods/d2k/rules/structures.yaml | 1 - mods/d2k/sequences/structures.yaml | 3 +++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mods/d2k/rules/palettes.yaml b/mods/d2k/rules/palettes.yaml index 97517ec828..5c71e3131f 100644 --- a/mods/d2k/rules/palettes.yaml +++ b/mods/d2k/rules/palettes.yaml @@ -51,11 +51,6 @@ Name: effect50alpha BasePalette: effect Alpha: 0.5 - PaletteFromPaletteWithAlpha@effectAdditive: - Name: effectAdditive - BasePalette: effect - Alpha: 0 - Premultiply: false PaletteFromScaledPalette@starportlights: Name: starportlights BasePalette: d2k diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 02914895b3..6dd1bf0483 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -224,7 +224,6 @@ refinery: ordos: refinery.ordos WithDockingOverlay@SMOKE: Sequence: smoke - Palette: effectAdditive Power: Amount: -75 WithIdleOverlay@TOP: diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml index 0195ad2ff3..e962abff2d 100644 --- a/mods/d2k/sequences/structures.yaml +++ b/mods/d2k/sequences/structures.yaml @@ -380,6 +380,7 @@ refinery.atreides: Length: 14 Offset: 10,-16 Tick: 200 + BlendMode: Additive silo.atreides: idle: DATA.R8 @@ -874,6 +875,7 @@ refinery.harkonnen: Length: 14 Offset: 10,-16 Tick: 200 + BlendMode: Additive silo.harkonnen: idle: DATA.R8 @@ -1277,6 +1279,7 @@ refinery.ordos: Length: 14 Offset: 10,-16 Tick: 200 + BlendMode: Additive silo.ordos: idle: DATA.R8