diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
index 248eb46ae0..0968edf256 100644
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -132,6 +132,7 @@
+
diff --git a/OpenRA.Mods.Cnc/Scripting/Properties/IonCannonProperties.cs b/OpenRA.Mods.Cnc/Scripting/Properties/IonCannonProperties.cs
new file mode 100644
index 0000000000..17769c37b6
--- /dev/null
+++ b/OpenRA.Mods.Cnc/Scripting/Properties/IonCannonProperties.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.Mods.Cnc.Effects;
+using OpenRA.Mods.Cnc.Traits;
+using OpenRA.Mods.Common.Activities;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Scripting;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.CnC.Scripting
+{
+ [ScriptPropertyGroup("Support Powers")]
+ public class IonCannonProperties : ScriptActorProperties, Requires
+ {
+ readonly IonCannonPower icp;
+
+ public IonCannonProperties(ScriptContext context, Actor self)
+ : base(context, self)
+ {
+ icp = self.TraitsImplementing().First();
+ }
+
+ [Desc("Activate the actor's IonCannonPower.")]
+ public void ActivateIonCannon(CPos target)
+ {
+ icp.Activate(Self, target);
+ }
+ }
+}
diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs
index 3800c490fc..584c005705 100644
--- a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs
+++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs
@@ -74,11 +74,16 @@ namespace OpenRA.Mods.Cnc.Traits
{
base.Activate(self, order, manager);
+ Activate(self, order.TargetLocation);
+ }
+
+ public void Activate(Actor self, CPos targetLocation)
+ {
self.World.AddFrameEndTask(w =>
{
PlayLaunchSounds();
- Game.Sound.Play(SoundType.World, info.OnFireSound, self.World.Map.CenterOfCell(order.TargetLocation));
- w.Add(new IonCannon(self.Owner, info.WeaponInfo, w, self.CenterPosition, order.TargetLocation,
+ Game.Sound.Play(SoundType.World, info.OnFireSound, self.World.Map.CenterOfCell(targetLocation));
+ w.Add(new IonCannon(self.Owner, info.WeaponInfo, w, self.CenterPosition, targetLocation,
info.Effect, info.EffectSequence, info.EffectPalette, info.WeaponDelay));
if (info.CameraActor == null)
@@ -86,7 +91,7 @@ namespace OpenRA.Mods.Cnc.Traits
var camera = w.CreateActor(info.CameraActor, new TypeDictionary
{
- new LocationInit(order.TargetLocation),
+ new LocationInit(targetLocation),
new OwnerInit(self.Owner),
});