From c39c7cdc4e56f7e88c6e0b9e108778d487077292 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 30 Aug 2015 13:44:25 +0200 Subject: [PATCH] Fix d2k NukePower sequence requirement --- OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs | 7 +++++-- mods/d2k/rules/structures.yaml | 1 + mods/ts/sequences/structures.yaml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs index eb747d3a35..bf7663fe86 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs @@ -75,8 +75,11 @@ namespace OpenRA.Mods.Common.Traits else Sound.Play(Info.IncomingSound); - var wsb = self.Trait(); - wsb.PlayCustomAnimation(self, info.ActivationSequence); + if (!string.IsNullOrEmpty(info.ActivationSequence)) + { + var wsb = self.Trait(); + wsb.PlayCustomAnimation(self, info.ActivationSequence); + } var targetPosition = self.World.Map.CenterOfCell(order.TargetLocation); var missile = new NukeLaunch(self.Owner, info.MissileWeapon, diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index d228a27037..d1fe88a150 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -808,6 +808,7 @@ palace: DisplayBeacon: True DisplayRadarPing: True CameraActor: camera + ActivationSequence: CanPowerDown: DisabledOverlay: RequiresPower: diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index 24681114f5..f754685c44 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -1163,7 +1163,7 @@ namisl: make: ntmislmk Length: 18 ShadowStart: 18 - active: ntmisl_a + active: ntmisl_a # TODO: This is an overlay Length: 10 Tick: 80 damaged-active: ntmisl_a