diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 09cba80057..70d5c10b32 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -266,6 +266,7 @@ + diff --git a/OpenRA.Mods.Common/Scripting/Properties/NukeProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/NukeProperties.cs new file mode 100644 index 0000000000..8643c737e3 --- /dev/null +++ b/OpenRA.Mods.Common/Scripting/Properties/NukeProperties.cs @@ -0,0 +1,39 @@ +#region Copyright & License Information +/* + * Copyright 2007-2018 The OpenRA Developers (see AUTHORS) + * This file is part of OpenRA, which is free software. It is made + * available to you under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. For more + * Information, see COPYING. + */ +#endregion + +using System.Linq; +using OpenRA.Effects; +using OpenRA.Mods.Common.Activities; +using OpenRA.Mods.Common.Effects; +using OpenRA.Mods.Common.Traits; +using OpenRA.Scripting; +using OpenRA.Traits; + +namespace OpenRA.Mods.Common.Scripting +{ + [ScriptPropertyGroup("Support Powers")] + public class NukeProperties : ScriptActorProperties, Requires + { + readonly NukePower np; + + public NukeProperties(ScriptContext context, Actor self) + : base(context, self) + { + np = self.TraitsImplementing().First(); + } + + [Desc("Activate the actor's NukePower.")] + public void ActivateNukePower(CPos target) + { + np.Activate(Self, Self.World.Map.CenterOfCell(target)); + } + } +} diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs index 672d0245e6..60095971cc 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs @@ -108,10 +108,14 @@ namespace OpenRA.Mods.Common.Traits base.Activate(self, order, manager); PlayLaunchSounds(); + Activate(self, self.World.Map.CenterOfCell(order.TargetLocation)); + } + + public void Activate(Actor self, WPos targetPosition) + { foreach (var launchpad in self.TraitsImplementing()) launchpad.Launching(self); - var targetPosition = self.World.Map.CenterOfCell(order.TargetLocation); var palette = info.IsPlayerPalette ? info.MissilePalette + self.Owner.InternalName : info.MissilePalette; var missile = new NukeLaunch(self.Owner, info.MissileWeapon, info.WeaponInfo, palette, info.MissileUp, info.MissileDown, self.CenterPosition + body.LocalToWorld(info.SpawnOffset), @@ -133,7 +137,7 @@ namespace OpenRA.Mods.Common.Traits if (Info.DisplayBeacon) { var beacon = new Beacon( - order.Player, + self.Owner, targetPosition, Info.BeaconPaletteIsPlayerPalette, Info.BeaconPalette,