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

moving Actor.Location onto the appropriate traits (bob)

Browse Source
This commit is contained in:
Chris Forbes
2010-06-19 14:37:06 +12:00
parent db465e1fdd
commit 66adbee2a6
25 changed files with 218 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.RA/Plane.cs
View File

@@ -27,23 +27,16 @@ using OpenRA.Mods.RA.Activities;
namespace OpenRA.Mods.RA
{
public class PlaneInfo : TraitInfo<Plane>
public class PlaneInfo : AircraftInfo
{
public readonly int CruiseAltitude = 20;
public readonly string[] RearmBuildings = { "afld" };
public readonly string[] RepairBuildings = { "fix" };
public override object Create( ActorInitializer init ) { return new Plane( init ); }
}
public class Plane : IIssueOrder, IResolveOrder, IMovement
public class Plane : Aircraft, IIssueOrder, IResolveOrder
{
public IDisposable reservation;
static bool PlaneCanEnter(Actor self, Actor a)
{
var plane = self.Info.Traits.Get<PlaneInfo>();
return plane.RearmBuildings.Contains(a.Info.Name)
|| plane.RepairBuildings.Contains(a.Info.Name);
}
public Plane( ActorInitializer init ) : base( init ) { }
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
@@ -52,7 +45,7 @@ namespace OpenRA.Mods.RA
if (underCursor == null)
return new Order("Move", self, xy);
if (PlaneCanEnter(self, underCursor)
if (AircraftCanEnter(self, underCursor)
&& underCursor.Owner == self.Owner
&& !Reservable.IsReserved(underCursor))
return new Order("Enter", self, underCursor);
@@ -90,8 +83,5 @@ namespace OpenRA.Mods.RA
? (IActivity)new Rearm() : new Repair(order.TargetActor));
}
}
public UnitMovementType GetMovementType() { return UnitMovementType.Fly; }
public bool CanEnterCell(int2 location) { return true; }
}
}