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

Update helis logic for returning to hpad, to mirror that of planes returning to aflds

Browse Source
This commit is contained in:
Curtis S
2011-10-22 13:26:51 -06:00
parent 9e21282341
commit 7d9641e195
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.RA/Air/HeliReturn.cs
View File

@@ -32,10 +32,16 @@ namespace OpenRA.Mods.RA.Air
var initialFacing = self.Info.Traits.Get<AircraftInfo>().InitialFacing; var initialFacing = self.Info.Traits.Get<AircraftInfo>().InitialFacing;
if (dest == null) if (dest == null)
return Util.SequenceActivities( {
new Turn(initialFacing), var rearmBuildings = self.Info.Traits.Get<HelicopterInfo>().RearmBuildings;
new HeliLand(true), var nearestHpad = self.World.ActorsWithTrait<Reservable>()
NextActivity); .Where(a => a.Actor.Owner == self.Owner && rearmBuildings.Contains(a.Actor.Info.Name))
.Select(a => a.Actor)
.ClosestTo(self.CenterLocation);
self.CancelActivity();
return Util.SequenceActivities(new HeliFly(Util.CenterOfCell(nearestHpad.Location)));
}
var res = dest.TraitOrDefault<Reservable>(); var res = dest.TraitOrDefault<Reservable>();
var heli = self.Trait<Helicopter>(); var heli = self.Trait<Helicopter>();

31
OpenRA.Mods.RA/Air/Helicopter.cs
View File

@@ -58,22 +58,29 @@ namespace OpenRA.Mods.RA.Air
if (order.OrderString == "Enter") if (order.OrderString == "Enter")
{ {
if (Reservable.IsReserved(order.TargetActor)) return; if (Reservable.IsReserved(order.TargetActor))
var res = order.TargetActor.TraitOrDefault<Reservable>(); {
if (res != null) self.CancelActivity();
reservation = res.Reserve(order.TargetActor, self, this); self.QueueActivity(new HeliReturn());
}
else
{
var res = order.TargetActor.TraitOrDefault<Reservable>();
if (res != null)
reservation = res.Reserve(order.TargetActor, self, this);
var exit = order.TargetActor.Info.Traits.WithInterface<ExitInfo>().FirstOrDefault(); var exit = order.TargetActor.Info.Traits.WithInterface<ExitInfo>().FirstOrDefault();
var offset = exit != null ? exit.SpawnOffset : int2.Zero; var offset = exit != null ? exit.SpawnOffset : int2.Zero;
self.SetTargetLine(Target.FromActor(order.TargetActor), Color.Green); self.SetTargetLine(Target.FromActor(order.TargetActor), Color.Green);
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset)); self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset));
self.QueueActivity(new Turn(Info.InitialFacing)); self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new HeliLand(false)); self.QueueActivity(new HeliLand(false));
QueueResupplyActivities(order.TargetActor); QueueResupplyActivities(order.TargetActor);
}
} }
if (order.OrderString == "ReturnToBase") if (order.OrderString == "ReturnToBase")