epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename HeliReturn

Browse Source 
Rename HeliReturn to HeliReturnToBase to keep somewhat with the convention established for Plane- against Heli- oriented traits.
This commit is contained in:
Pavel Penev
2015-09-05 18:01:35 +03:00
parent 15a5bde7e7
commit 0ee38de4bb
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Activities/Air/HeliAttack.cs
View File

@@ -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 // 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 // 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())) 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; var dist = target.CenterPosition - self.CenterPosition;

4
OpenRA.Mods.Common/Activities/Air/HeliReturn.cs → OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs
View File

@@ -15,11 +15,11 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class HeliReturn : Activity public class HeliReturnToBase : Activity
{ {
readonly Aircraft heli; readonly Aircraft heli;
public HeliReturn(Actor self) public HeliReturnToBase(Actor self)
{ {
heli = self.Trait<Aircraft>(); heli = self.Trait<Aircraft>();
} }

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -101,7 +101,7 @@
<Compile Include="Activities\Air\HeliFly.cs" /> <Compile Include="Activities\Air\HeliFly.cs" />
<Compile Include="Activities\Air\HeliFlyCircle.cs" /> <Compile Include="Activities\Air\HeliFlyCircle.cs" />
<Compile Include="Activities\Air\HeliLand.cs" /> <Compile Include="Activities\Air\HeliLand.cs" />
<Compile Include="Activities\Air\HeliReturn.cs" /> <Compile Include="Activities\Air\HeliReturnToBase.cs" />
<Compile Include="Activities\Air\Land.cs" /> <Compile Include="Activities\Air\Land.cs" />
<Compile Include="Activities\Air\ResupplyAircraft.cs" /> <Compile Include="Activities\Air\ResupplyAircraft.cs" />
<Compile Include="Activities\Air\ReturnToBase.cs" /> <Compile Include="Activities\Air\ReturnToBase.cs" />

2
OpenRA.Mods.Common/Scripting/Properties/AircraftProperties.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Scripting
if (isPlane) if (isPlane)
Self.QueueActivity(new ReturnToBase(Self, airfield)); Self.QueueActivity(new ReturnToBase(Self, airfield));
else else
Self.QueueActivity(new HeliReturn(Self)); Self.QueueActivity(new HeliReturnToBase(Self));
} }
} }
} }

4
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -527,7 +527,7 @@ namespace OpenRA.Mods.Common.Traits
if (IsPlane) if (IsPlane)
self.QueueActivity(new ReturnToBase(self)); self.QueueActivity(new ReturnToBase(self));
else else
self.QueueActivity(new HeliReturn(self)); self.QueueActivity(new HeliReturnToBase(self));
} }
else else
{ {
@@ -588,7 +588,7 @@ namespace OpenRA.Mods.Common.Traits
if (IsPlane) if (IsPlane)
self.QueueActivity(new ReturnToBase(self)); self.QueueActivity(new ReturnToBase(self));
else else
self.QueueActivity(new HeliReturn(self)); self.QueueActivity(new HeliReturnToBase(self));
self.QueueActivity(new ResupplyAircraft(self)); self.QueueActivity(new ResupplyAircraft(self));
} }