Have some activities count as idle activities
This commit is contained in:
@@ -152,6 +152,7 @@ namespace OpenRA.Activities
|
|||||||
set { NextActivity = value; }
|
set { NextActivity = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IsIdle { get; protected set; }
|
||||||
public bool IsInterruptible { get; protected set; }
|
public bool IsInterruptible { get; protected set; }
|
||||||
public bool IsCanceled { get { return State == ActivityState.Canceled; } }
|
public bool IsCanceled { get { return State == ActivityState.Canceled; } }
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ namespace OpenRA
|
|||||||
public IOccupySpace OccupiesSpace { get; private set; }
|
public IOccupySpace OccupiesSpace { get; private set; }
|
||||||
public ITargetable[] Targetables { get; private set; }
|
public ITargetable[] Targetables { get; private set; }
|
||||||
|
|
||||||
public bool IsIdle { get { return CurrentActivity == null; } }
|
public bool IsIdle { get { return CurrentActivity == null || CurrentActivity.IsIdle; } }
|
||||||
public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
|
public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
|
||||||
|
|
||||||
public CPos Location { get { return OccupiesSpace.TopLeft; } }
|
public CPos Location { get { return OccupiesSpace.TopLeft; } }
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ namespace OpenRA.Mods.Common.Activities
|
|||||||
|
|
||||||
public FlyCircle(Actor self)
|
public FlyCircle(Actor self)
|
||||||
{
|
{
|
||||||
|
IsIdle = true;
|
||||||
plane = self.Trait<Aircraft>();
|
plane = self.Trait<Aircraft>();
|
||||||
cruiseAltitude = plane.Info.CruiseAltitude;
|
cruiseAltitude = plane.Info.CruiseAltitude;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ namespace OpenRA.Mods.Common.Activities
|
|||||||
public HeliFlyCircle(Actor self)
|
public HeliFlyCircle(Actor self)
|
||||||
{
|
{
|
||||||
helicopter = self.Trait<Aircraft>();
|
helicopter = self.Trait<Aircraft>();
|
||||||
|
IsIdle = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Activity Tick(Actor self)
|
public override Activity Tick(Actor self)
|
||||||
|
|||||||
Reference in New Issue
Block a user