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

Generalize FlyCircle activity Aircraft caching naming

Browse Source 
To make a possible future merger (or inheritance or other code-sharing) of these activities easier.
This commit is contained in:
reaperrr
2018-08-04 23:09:21 +02:00
committed by reaperrr
parent ae92255ded
commit c3a0d129a3
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Activities/Air/FlyCircle.cs
View File

@@ -16,21 +16,21 @@ namespace OpenRA.Mods.Common.Activities
{
public class FlyCircle : Activity
{
readonly Aircraft plane;
readonly Aircraft aircraft;
readonly WDist cruiseAltitude;
int remainingTicks;
public FlyCircle(Actor self, int ticks = -1)
{
plane = self.Trait<Aircraft>();
cruiseAltitude = plane.Info.CruiseAltitude;
aircraft = self.Trait<Aircraft>();
cruiseAltitude = aircraft.Info.CruiseAltitude;
remainingTicks = ticks;
}
public override Activity Tick(Actor self)
{
// Refuse to take off if it would land immediately again.
if (plane.ForceLanding)
if (aircraft.ForceLanding)
{
Cancel(self);
return NextActivity;
@@ -45,8 +45,8 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity;
// We can't possibly turn this fast
var desiredFacing = plane.Facing + 64;
Fly.FlyToward(self, plane, desiredFacing, cruiseAltitude);
var desiredFacing = aircraft.Facing + 64;
Fly.FlyToward(self, aircraft, desiredFacing, cruiseAltitude);
return this;
}

16
OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs
View File

@@ -17,17 +17,17 @@ namespace OpenRA.Mods.Common.Activities
{
public class HeliFlyCircle : Activity
{
readonly Aircraft helicopter;
readonly Aircraft aircraft;
public HeliFlyCircle(Actor self)
{
helicopter = self.Trait<Aircraft>();
aircraft = self.Trait<Aircraft>();
}
public override Activity Tick(Actor self)
{
// Refuse to take off if it would land immediately again.
if (helicopter.ForceLanding)
if (aircraft.ForceLanding)
{
Cancel(self);
return NextActivity;
@@ -36,14 +36,14 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled)
return NextActivity;
if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude))
if (HeliFly.AdjustAltitude(self, aircraft, aircraft.Info.CruiseAltitude))
return this;
var move = helicopter.FlyStep(helicopter.Facing);
helicopter.SetPosition(self, helicopter.CenterPosition + move);
var move = aircraft.FlyStep(aircraft.Facing);
aircraft.SetPosition(self, aircraft.CenterPosition + move);
var desiredFacing = helicopter.Facing + 64;
helicopter.Facing = Util.TickFacing(helicopter.Facing, desiredFacing, helicopter.TurnSpeed / 3);
var desiredFacing = aircraft.Facing + 64;
aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.TurnSpeed / 3);
return this;
}