diff --git a/OpenRA.Mods.Common/Activities/Air/HeliAttack.cs b/OpenRA.Mods.Common/Activities/Air/HeliAttack.cs index e977c6de3f..a3964930dd 100644 --- a/OpenRA.Mods.Common/Activities/Air/HeliAttack.cs +++ b/OpenRA.Mods.Common/Activities/Air/HeliAttack.cs @@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Activities // If all ammo pools are depleted and none reload automatically, return to helipad to reload and then move to next activity // TODO: This should check whether there is ammo left that is actually suitable for the target if (ammoPools.All(x => !x.Info.SelfReloads && !x.HasAmmo())) - return Util.SequenceActivities(new HeliReturn(self), NextActivity); + return Util.SequenceActivities(new HeliReturnToBase(self), NextActivity); var dist = target.CenterPosition - self.CenterPosition; diff --git a/OpenRA.Mods.Common/Activities/Air/HeliReturn.cs b/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs similarity index 96% rename from OpenRA.Mods.Common/Activities/Air/HeliReturn.cs rename to OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs index efc4eb9fef..7c9ee1a58a 100644 --- a/OpenRA.Mods.Common/Activities/Air/HeliReturn.cs +++ b/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs @@ -15,11 +15,11 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Activities { - public class HeliReturn : Activity + public class HeliReturnToBase : Activity { readonly Aircraft heli; - public HeliReturn(Actor self) + public HeliReturnToBase(Actor self) { heli = self.Trait(); } diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 734bfb3fe6..a049b6dc9f 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -101,7 +101,7 @@ - + diff --git a/OpenRA.Mods.Common/Scripting/Properties/AircraftProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/AircraftProperties.cs index 68006b7c5d..747f19d2ab 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/AircraftProperties.cs +++ b/OpenRA.Mods.Common/Scripting/Properties/AircraftProperties.cs @@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Scripting if (isPlane) Self.QueueActivity(new ReturnToBase(Self, airfield)); else - Self.QueueActivity(new HeliReturn(Self)); + Self.QueueActivity(new HeliReturnToBase(Self)); } } } \ No newline at end of file diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs index 8ab5610403..620d732280 100644 --- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs +++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs @@ -527,7 +527,7 @@ namespace OpenRA.Mods.Common.Traits if (IsPlane) self.QueueActivity(new ReturnToBase(self)); else - self.QueueActivity(new HeliReturn(self)); + self.QueueActivity(new HeliReturnToBase(self)); } else { @@ -588,7 +588,7 @@ namespace OpenRA.Mods.Common.Traits if (IsPlane) self.QueueActivity(new ReturnToBase(self)); else - self.QueueActivity(new HeliReturn(self)); + self.QueueActivity(new HeliReturnToBase(self)); self.QueueActivity(new ResupplyAircraft(self)); }