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

Added IDisableMove

Browse Source
This commit is contained in:
atlimit8
2014-10-02 14:23:32 -05:00
parent cead66668f
commit 3f6e1a608a
15 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Air
.ClosestTo(self);
if (nearestHpad == null)
return Util.SequenceActivities(new Turn(initialFacing), new HeliLand(true), NextActivity);
return Util.SequenceActivities(new Turn(self, initialFacing), new HeliLand(true), NextActivity);
else
return Util.SequenceActivities(new HeliFly(self, Target.FromActor(nearestHpad)));
}
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA.Air
return Util.SequenceActivities(
new HeliFly(self, Target.FromPos(dest.CenterPosition + offset)),
new Turn(initialFacing),
new Turn(self, initialFacing),
new HeliLand(false),
new ResupplyAircraft());
}

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

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA.Air
if (Info.LandWhenIdle)
{
if (Info.TurnToLand)
self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(true));
}
@@ -97,7 +97,7 @@ namespace OpenRA.Mods.RA.Air
self.CancelActivity();
self.QueueActivity(new HeliFly(self, Target.FromPos(order.TargetActor.CenterPosition + offset)));
self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(false));
self.QueueActivity(new ResupplyAircraft());
self.QueueActivity(new TakeOff());
@@ -117,7 +117,7 @@ namespace OpenRA.Mods.RA.Air
if (Info.LandWhenIdle)
{
if (Info.TurnToLand)
self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(true));
}
@@ -157,7 +157,7 @@ namespace OpenRA.Mods.RA.Air
public Activity MoveIntoTarget(Actor self, Target target) { return new HeliLand(false); }
public Activity MoveToTarget(Actor self, Target target)
{
return Util.SequenceActivities(new HeliFly(self, target), new Turn(Info.InitialFacing));
return Util.SequenceActivities(new HeliFly(self, target), new Turn(self, Info.InitialFacing));
}
public Activity VisualMove(Actor self, WPos fromPos, WPos toPos)