From d6011fd4e243fbd4b34b57cc3013487359cf2097 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 14 Dec 2019 10:17:32 +0000 Subject: [PATCH] Restore NukePower support for proxy actors. --- .../Traits/SupportPowers/NukePower.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs index 3901d9f98b7f..4de936858ef8 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs @@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits { - class NukePowerInfo : SupportPowerInfo, IRulesetLoaded, Requires + class NukePowerInfo : SupportPowerInfo { [WeaponReference] [FieldLoader.Require] @@ -124,15 +124,20 @@ public override void RulesetLoaded(Ruleset rules, ActorInfo ai) class NukePower : SupportPower { readonly NukePowerInfo info; - readonly BodyOrientation body; + BodyOrientation body; public NukePower(Actor self, NukePowerInfo info) : base(self, info) { - body = self.Trait(); this.info = info; } + protected override void Created(Actor self) + { + body = self.TraitOrDefault(); + base.Created(self); + } + public override void Activate(Actor self, Order order, SupportPowerManager manager) { base.Activate(self, order, manager); @@ -147,10 +152,13 @@ public void Activate(Actor self, WPos targetPosition) launchpad.Launching(self); var palette = info.IsPlayerPalette ? info.MissilePalette + self.Owner.InternalName : info.MissilePalette; + var skipAscent = info.SkipAscent || body == null; + var launchPos = skipAscent ? WPos.Zero : self.CenterPosition + body.LocalToWorld(info.SpawnOffset); + var missile = new NukeLaunch(self.Owner, info.MissileWeapon, info.WeaponInfo, palette, info.MissileUp, info.MissileDown, - self.CenterPosition + body.LocalToWorld(info.SpawnOffset), + launchPos, targetPosition, info.DetonationAltitude, info.RemoveMissileOnDetonation, - info.FlightVelocity, info.MissileDelay, info.FlightDelay, info.SkipAscent, + info.FlightVelocity, info.MissileDelay, info.FlightDelay, skipAscent, info.FlashType, info.TrailImage, info.TrailSequences, info.TrailPalette, info.TrailUsePlayerPalette, info.TrailDelay, info.TrailInterval);