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

Helicopter style fixes.

Browse Source
This commit is contained in:
Paul Chote
2013-07-20 22:24:04 +12:00
parent 179f97a598
commit 031c17ab9c
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,17 +21,18 @@ namespace OpenRA.Mods.RA.Air
public readonly bool LandWhenIdle = true; public readonly bool LandWhenIdle = true;
public readonly int MinimalLandAltitude = 0; public readonly int MinimalLandAltitude = 0;
public override object Create( ActorInitializer init ) { return new Helicopter( init, this); } public override object Create(ActorInitializer init) { return new Helicopter(init, this); }
} }
class Helicopter : Aircraft, ITick, IResolveOrder class Helicopter : Aircraft, ITick, IResolveOrder
{ {
HelicopterInfo Info; HelicopterInfo info;
bool firstTick = true; bool firstTick = true;
public Helicopter( ActorInitializer init, HelicopterInfo info) : base( init, info ) public Helicopter(ActorInitializer init, HelicopterInfo info)
: base(init, info)
{ {
Info = info; this.info = info;
} }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
@@ -50,10 +51,10 @@ namespace OpenRA.Mods.RA.Air
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new HeliFly(target)); self.QueueActivity(new HeliFly(target));
if (Info.LandWhenIdle) if (info.LandWhenIdle)
{ {
self.QueueActivity(new Turn(Info.InitialFacing)); self.QueueActivity(new Turn(info.InitialFacing));
self.QueueActivity(new HeliLand(true, Info.MinimalLandAltitude)); self.QueueActivity(new HeliLand(true, info.MinimalLandAltitude));
} }
} }
@@ -78,8 +79,8 @@ namespace OpenRA.Mods.RA.Air
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new HeliFly(order.TargetActor.CenterPosition + offset)); self.QueueActivity(new HeliFly(order.TargetActor.CenterPosition + offset));
self.QueueActivity(new Turn(Info.InitialFacing)); self.QueueActivity(new Turn(info.InitialFacing));
self.QueueActivity(new HeliLand(false, Info.MinimalLandAltitude)); self.QueueActivity(new HeliLand(false, info.MinimalLandAltitude));
self.QueueActivity(new ResupplyAircraft()); self.QueueActivity(new ResupplyAircraft());
} }
} }
@@ -87,17 +88,17 @@ namespace OpenRA.Mods.RA.Air
if (order.OrderString == "ReturnToBase") if (order.OrderString == "ReturnToBase")
{ {
self.CancelActivity(); self.CancelActivity();
self.QueueActivity( new HeliReturn() ); self.QueueActivity(new HeliReturn());
} }
if (order.OrderString == "Stop") if (order.OrderString == "Stop")
{ {
self.CancelActivity(); self.CancelActivity();
if (Info.LandWhenIdle) if (info.LandWhenIdle)
{ {
self.QueueActivity(new Turn(Info.InitialFacing)); self.QueueActivity(new Turn(info.InitialFacing));
self.QueueActivity(new HeliLand(true, Info.MinimalLandAltitude)); self.QueueActivity(new HeliLand(true, info.MinimalLandAltitude));
} }
} }
} }
@@ -112,10 +113,10 @@ namespace OpenRA.Mods.RA.Air
} }
// Repulsion only applies when we're flying! // Repulsion only applies when we're flying!
if (Altitude != Info.CruiseAltitude) if (Altitude != info.CruiseAltitude)
return; return;
var otherHelis = self.World.FindActorsInCircle(self.CenterPosition, Info.IdealSeparation) var otherHelis = self.World.FindActorsInCircle(self.CenterPosition, info.IdealSeparation)
.Where(a => a.HasTrait<Helicopter>()); .Where(a => a.HasTrait<Helicopter>());
var f = otherHelis var f = otherHelis
@@ -133,18 +134,18 @@ namespace OpenRA.Mods.RA.Air
return WVec.Zero; return WVec.Zero;
var d = self.CenterPosition - other.CenterPosition; var d = self.CenterPosition - other.CenterPosition;
var dlSq = d.HorizontalLengthSquared; var distSq = d.HorizontalLengthSquared;
if (dlSq > Info.IdealSeparation.Range*Info.IdealSeparation.Range) if (distSq > info.IdealSeparation.Range * info.IdealSeparation.Range)
return WVec.Zero; return WVec.Zero;
if (dlSq < 1) if (distSq < 1)
{ {
var yaw = self.World.SharedRandom.Next(0, 1023); var yaw = self.World.SharedRandom.Next(0, 1023);
var rot = new WRot(WAngle.Zero, WAngle.Zero, new WAngle(yaw)); var rot = new WRot(WAngle.Zero, WAngle.Zero, new WAngle(yaw));
return new WVec(1024, 0, 0).Rotate(rot); return new WVec(1024, 0, 0).Rotate(rot);
} }
return (d * 1024 * 8) / (int)dlSq; return (d * 1024 * 8) / (int)distSq;
} }
} }
} }