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

remove TODO list, use bug-tracker

Browse Source
This commit is contained in:
Matthias Mailänder
2012-07-28 00:04:48 +02:00
committed by Chris Forbes
parent 8e2d712688
commit 81f035904e
7 changed files with 21 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Air/HeliLand.cs
View File

@@ -14,15 +14,20 @@ namespace OpenRA.Mods.RA.Air
{
class HeliLand : Activity
{
public HeliLand(bool requireSpace) { this.requireSpace = requireSpace; }
public HeliLand(bool requireSpace, int minimalAltitude)
{
this.requireSpace = requireSpace;
this.minimalAltitude = minimalAltitude;
}
bool requireSpace;
int minimalAltitude = 0;
public override Activity Tick(Actor self)
{
if (IsCanceled) return NextActivity;
var aircraft = self.Trait<Aircraft>();
if (aircraft.Altitude == 0)
if (aircraft.Altitude == minimalAltitude)
return NextActivity;
if (requireSpace && !aircraft.CanLand(self.Location))

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

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Air
.ClosestTo(self.CenterLocation);
if (nearestHpad == null)
return Util.SequenceActivities(new Turn(initialFacing), new HeliLand(true), NextActivity);
return Util.SequenceActivities(new Turn(initialFacing), new HeliLand(true, 0), NextActivity);
else
return Util.SequenceActivities(new HeliFly(Util.CenterOfCell(nearestHpad.Location)));
}
@@ -56,7 +56,7 @@ namespace OpenRA.Mods.RA.Air
return Util.SequenceActivities(
new HeliFly(dest.Trait<IHasLocation>().PxPosition + offset),
new Turn(initialFacing),
new HeliLand(false),
new HeliLand(false, 0),
new Rearm(self),
NextActivity);
}

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

@@ -19,6 +19,7 @@ namespace OpenRA.Mods.RA.Air
{
public readonly int IdealSeparation = 40;
public readonly bool LandWhenIdle = true;
public readonly int MinimalLandAltitude = 0;
public override object Create( ActorInitializer init ) { return new Helicopter( init, this); }
}
@@ -52,7 +53,7 @@ namespace OpenRA.Mods.RA.Air
if (Info.LandWhenIdle)
{
self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new HeliLand(true));
self.QueueActivity(new HeliLand(true, Info.MinimalLandAltitude));
}
}
@@ -77,7 +78,7 @@ namespace OpenRA.Mods.RA.Air
self.CancelActivity();
self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset));
self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new HeliLand(false));
self.QueueActivity(new HeliLand(false, Info.MinimalLandAltitude));
self.QueueActivity(new ResupplyAircraft());
}
}
@@ -95,7 +96,7 @@ namespace OpenRA.Mods.RA.Air
if (Info.LandWhenIdle)
{
self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new HeliLand(true));
self.QueueActivity(new HeliLand(true, Info.MinimalLandAltitude));
}
}
}