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

Cache trait look-ups in the constructor where possible for Air activities/traits

Browse Source
This commit is contained in:
reaperrr
2015-03-14 03:59:37 +01:00
parent 9a780ba07d
commit 1e9d1a6cb7
22 changed files with 160 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
View File

@@ -59,16 +59,16 @@ namespace OpenRA.Mods.Cnc.Traits
return;
var altitude = self.World.Map.Rules.Actors[actorType].Traits.Get<PlaneInfo>().CruiseAltitude;
var a = w.CreateActor(actorType, new TypeDictionary
var actor = w.CreateActor(actorType, new TypeDictionary
{
new CenterPositionInit(w.Map.CenterOfCell(startPos) + new WVec(WRange.Zero, WRange.Zero, altitude)),
new OwnerInit(owner),
new FacingInit(64)
});
a.QueueActivity(new Fly(a, Target.FromCell(w, self.Location + new CVec(9, 0))));
a.QueueActivity(new Land(Target.FromActor(self)));
a.QueueActivity(new CallFunc(() =>
actor.QueueActivity(new Fly(actor, Target.FromCell(w, self.Location + new CVec(9, 0))));
actor.QueueActivity(new Land(actor, Target.FromActor(self)));
actor.QueueActivity(new CallFunc(() =>
{
if (!self.IsInWorld || self.IsDead)
return;
@@ -80,8 +80,8 @@ namespace OpenRA.Mods.Cnc.Traits
Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.ReadyAudio, self.Owner.Country.Race);
}));
a.QueueActivity(new Fly(a, Target.FromCell(w, endPos)));
a.QueueActivity(new RemoveSelf());
actor.QueueActivity(new Fly(actor, Target.FromCell(w, endPos)));
actor.QueueActivity(new RemoveSelf());
});
return true;

5
OpenRA.Mods.Common/Activities/Air/FallToEarth.cs
View File

@@ -18,20 +18,21 @@ namespace OpenRA.Mods.Common.Activities
{
public class FallToEarth : Activity
{
readonly Aircraft aircraft;
readonly FallsToEarthInfo info;
int acceleration = 0;
int spin = 0;
FallsToEarthInfo info;
public FallToEarth(Actor self, FallsToEarthInfo info)
{
this.info = info;
aircraft = self.Trait<Aircraft>();
if (info.Spins)
acceleration = self.World.SharedRandom.Next(2) * 2 - 1;
}
public override Activity Tick(Actor self)
{
var aircraft = self.Trait<Aircraft>();
if (self.CenterPosition.Z <= 0)
{
if (info.Explosion != null)

4
OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View File

@@ -52,9 +52,9 @@ namespace OpenRA.Mods.Common.Activities
// TODO: This should fire each weapon at its maximum range
if (target.IsInRange(self.CenterPosition, attackPlane.Armaments.Select(a => a.Weapon.MinRange).Min()))
inner = Util.SequenceActivities(new FlyTimed(ticksUntilTurn), new Fly(self, target), new FlyTimed(ticksUntilTurn));
inner = Util.SequenceActivities(new FlyTimed(ticksUntilTurn, self), new Fly(self, target), new FlyTimed(ticksUntilTurn, self));
else
inner = Util.SequenceActivities(new Fly(self, target), new FlyTimed(ticksUntilTurn));
inner = Util.SequenceActivities(new Fly(self, target), new FlyTimed(ticksUntilTurn, self));
}
inner = Util.RunActivity(self, inner);

13
OpenRA.Mods.Common/Activities/Air/FlyCircle.cs
View File

@@ -16,16 +16,23 @@ namespace OpenRA.Mods.Common.Activities
{
public class FlyCircle : Activity
{
readonly Plane plane;
readonly WRange cruiseAltitude;
public FlyCircle(Actor self)
{
plane = self.Trait<Plane>();
cruiseAltitude = plane.Info.CruiseAltitude;
}
public override Activity Tick(Actor self)
{
if (IsCanceled)
return NextActivity;
var plane = self.Trait<Plane>();
// We can't possibly turn this fast
var desiredFacing = plane.Facing + 64;
Fly.FlyToward(self, plane, desiredFacing, plane.Info.CruiseAltitude);
Fly.FlyToward(self, plane, desiredFacing, cruiseAltitude);
return this;
}

35
OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs Normal file
View File

@@ -0,0 +1,35 @@
#region Copyright & License Information
/*
* Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities
{
public class FlyOffMap : Activity
{
readonly Plane plane;
public FlyOffMap(Actor self)
{
plane = self.Trait<Plane>();
}
public override Activity Tick(Actor self)
{
if (IsCanceled || !self.World.Map.Contains(self.Location))
return NextActivity;
Fly.FlyToward(self, plane, plane.Facing, plane.Info.CruiseAltitude);
return this;
}
}
}

30
OpenRA.Mods.Common/Activities/Air/FlyTimed.cs
View File

@@ -16,37 +16,25 @@ namespace OpenRA.Mods.Common.Activities
{
public class FlyTimed : Activity
{
readonly Plane plane;
readonly WRange cruiseAltitude;
int remainingTicks;
public FlyTimed(int ticks) { remainingTicks = ticks; }
public FlyTimed(int ticks, Actor self)
{
remainingTicks = ticks;
plane = self.Trait<Plane>();
cruiseAltitude = plane.Info.CruiseAltitude;
}
public override Activity Tick(Actor self)
{
if (IsCanceled || remainingTicks-- == 0)
return NextActivity;
var plane = self.Trait<Plane>();
Fly.FlyToward(self, plane, plane.Facing, plane.Info.CruiseAltitude);
Fly.FlyToward(self, plane, plane.Facing, cruiseAltitude);
return this;
}
}
public class FlyOffMap : Activity
{
public override Activity Tick(Actor self)
{
if (IsCanceled || !self.World.Map.Contains(self.Location))
return NextActivity;
var plane = self.Trait<Plane>();
Fly.FlyToward(self, plane, plane.Facing, plane.Info.CruiseAltitude);
return this;
}
public override void Cancel(Actor self)
{
base.Cancel(self);
}
}
}

2
OpenRA.Mods.Common/Activities/Air/HeliAttack.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Activities
// If all ammo pools are depleted and none reload automatically, return to helipad to reload and then move to next activity
// TODO: This should check whether there is ammo left that is actually suitable for the target
if (ammoPools != null && ammoPools.All(x => !x.Info.SelfReloads && !x.HasAmmo()))
return Util.SequenceActivities(new HeliReturn(), NextActivity);
return Util.SequenceActivities(new HeliReturn(self), NextActivity);
var dist = target.CenterPosition - self.CenterPosition;

10
OpenRA.Mods.Common/Activities/Air/HeliLand.cs
View File

@@ -15,11 +15,15 @@ namespace OpenRA.Mods.Common.Activities
{
public class HeliLand : Activity
{
readonly Helicopter helicopter;
readonly WRange landAltitude;
bool requireSpace;
public HeliLand(bool requireSpace)
public HeliLand(Actor self, bool requireSpace)
{
this.requireSpace = requireSpace;
helicopter = self.Trait<Helicopter>();
landAltitude = helicopter.Info.LandAltitude;
}
public override Activity Tick(Actor self)
@@ -27,12 +31,10 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled)
return NextActivity;
var helicopter = self.Trait<Helicopter>();
if (requireSpace && !helicopter.CanLand(self.Location))
return this;
if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.LandAltitude))
if (HeliFly.AdjustAltitude(self, helicopter, landAltitude))
return this;
return NextActivity;

24
OpenRA.Mods.Common/Activities/Air/HeliReturn.cs
View File

@@ -17,7 +17,18 @@ namespace OpenRA.Mods.Common.Activities
{
public class HeliReturn : Activity
{
static Actor ChooseHelipad(Actor self)
readonly AircraftInfo aircraftInfo;
readonly Helicopter heli;
readonly HelicopterInfo heliInfo;
public HeliReturn(Actor self)
{
aircraftInfo = self.Info.Traits.Get<AircraftInfo>();
heli = self.Trait<Helicopter>();
heliInfo = self.Info.Traits.Get<HelicopterInfo>();
}
public static Actor ChooseHelipad(Actor self)
{
var rearmBuildings = self.Info.Traits.Get<HelicopterInfo>().RearmBuildings;
return self.World.Actors.Where(a => a.Owner == self.Owner).FirstOrDefault(
@@ -30,24 +41,23 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity;
var dest = ChooseHelipad(self);
var initialFacing = self.Info.Traits.Get<AircraftInfo>().InitialFacing;
var initialFacing = aircraftInfo.InitialFacing;
if (dest == null)
{
var rearmBuildings = self.Info.Traits.Get<HelicopterInfo>().RearmBuildings;
var rearmBuildings = heliInfo.RearmBuildings;
var nearestHpad = self.World.ActorsWithTrait<Reservable>()
.Where(a => a.Actor.Owner == self.Owner && rearmBuildings.Contains(a.Actor.Info.Name))
.Select(a => a.Actor)
.ClosestTo(self);
if (nearestHpad == null)
return Util.SequenceActivities(new Turn(self, initialFacing), new HeliLand(true), NextActivity);
return Util.SequenceActivities(new Turn(self, initialFacing), new HeliLand(self, true), NextActivity);
else
return Util.SequenceActivities(new HeliFly(self, Target.FromActor(nearestHpad)));
}
var res = dest.TraitOrDefault<Reservable>();
var heli = self.Trait<Helicopter>();
if (res != null)
{
@@ -61,8 +71,8 @@ namespace OpenRA.Mods.Common.Activities
return Util.SequenceActivities(
new HeliFly(self, Target.FromPos(dest.CenterPosition + offset)),
new Turn(self, initialFacing),
new HeliLand(false),
new ResupplyAircraft());
new HeliLand(self, false),
new ResupplyAircraft(self));
}
}
}

10
OpenRA.Mods.Common/Activities/Air/Land.cs
View File

@@ -16,9 +16,14 @@ namespace OpenRA.Mods.Common.Activities
{
public class Land : Activity
{
Target target;
readonly Target target;
readonly Plane plane;
public Land(Target t) { target = t; }
public Land(Actor self, Target t)
{
target = t;
plane = self.Trait<Plane>();
}
public override Activity Tick(Actor self)
{
@@ -28,7 +33,6 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled)
return NextActivity;
var plane = self.Trait<Plane>();
var d = target.CenterPosition - self.CenterPosition;
// The next move would overshoot, so just set the final position

8
OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
View File

@@ -20,9 +20,15 @@ namespace OpenRA.Mods.Common.Activities
{
public class ResupplyAircraft : Activity
{
readonly Aircraft aircraft;
public ResupplyAircraft(Actor self)
{
aircraft = self.Trait<Aircraft>();
}
public override Activity Tick(Actor self)
{
var aircraft = self.Trait<Aircraft>();
var host = aircraft.GetActorBelow();
if (host == null)

24
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -18,10 +18,19 @@ namespace OpenRA.Mods.Common.Activities
{
public class ReturnToBase : Activity
{
readonly Plane plane;
readonly PlaneInfo planeInfo;
bool isCalculated;
Actor dest;
WPos w1, w2, w3;
public ReturnToBase(Actor self, Actor dest)
{
this.dest = dest;
plane = self.Trait<Plane>();
planeInfo = self.Info.Traits.Get<PlaneInfo>();
}
public static Actor ChooseAirfield(Actor self, bool unreservedOnly)
{
var rearmBuildings = self.Info.Traits.Get<PlaneInfo>().RearmBuildings;
@@ -41,8 +50,6 @@ namespace OpenRA.Mods.Common.Activities
if (dest == null)
return;
var plane = self.Trait<Plane>();
var planeInfo = self.Info.Traits.Get<PlaneInfo>();
var res = dest.TraitOrDefault<Reservable>();
if (res != null)
{
@@ -54,7 +61,7 @@ namespace OpenRA.Mods.Common.Activities
var altitude = planeInfo.CruiseAltitude.Range;
// Distance required for descent.
var landDistance = altitude * 1024 / plane.Info.MaximumPitch.Tan();
var landDistance = altitude * 1024 / planeInfo.MaximumPitch.Tan();
// Land towards the east
var approachStart = landPos + new WVec(-landDistance, 0, altitude);
@@ -92,11 +99,6 @@ namespace OpenRA.Mods.Common.Activities
isCalculated = true;
}
public ReturnToBase(Actor self, Actor dest)
{
this.dest = dest;
}
public override Activity Tick(Actor self)
{
if (IsCanceled || self.IsDead)
@@ -111,16 +113,16 @@ namespace OpenRA.Mods.Common.Activities
self.CancelActivity();
if (nearestAfld != null)
return Util.SequenceActivities(new Fly(self, Target.FromActor(nearestAfld)), new FlyCircle());
return Util.SequenceActivities(new Fly(self, Target.FromActor(nearestAfld)), new FlyCircle(self));
else
return new FlyCircle();
return new FlyCircle(self);
}
return Util.SequenceActivities(
new Fly(self, Target.FromPos(w1)),
new Fly(self, Target.FromPos(w2)),
new Fly(self, Target.FromPos(w3)),
new Land(Target.FromActor(dest)),
new Land(self, Target.FromActor(dest)),
NextActivity);
}
}

13
OpenRA.Mods.Common/Activities/Air/TakeOff.cs
View File

@@ -16,10 +16,17 @@ namespace OpenRA.Mods.Common.Activities
{
public class TakeOff : Activity
{
readonly Aircraft aircraft;
readonly IMove move;
public TakeOff(Actor self)
{
aircraft = self.Trait<Aircraft>();
move = self.Trait<IMove>();
}
public override Activity Tick(Actor self)
{
var aircraft = self.Trait<Aircraft>();
self.CancelActivity();
var reservation = aircraft.Reservation;
@@ -36,7 +43,7 @@ namespace OpenRA.Mods.Common.Activities
var destination = rp != null ? rp.Location :
(hasHost ? self.World.Map.CellContaining(host.CenterPosition) : self.Location);
return new AttackMoveActivity(self, self.Trait<IMove>().MoveTo(destination, 1));
return new AttackMoveActivity(self, move.MoveTo(destination, 1));
}
}
}

1
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -81,6 +81,7 @@
<Compile Include="Activities\Air\FlyAttack.cs" />
<Compile Include="Activities\Air\FlyCircle.cs" />
<Compile Include="Activities\Air\FlyFollow.cs" />
<Compile Include="Activities\Air\FlyOffMap.cs" />
<Compile Include="Activities\Air\FlyTimed.cs" />
<Compile Include="Activities\Air\HeliAttack.cs" />
<Compile Include="Activities\Air\HeliFly.cs" />

2
OpenRA.Mods.Common/Scripting/Global/ReinforcementsGlobal.cs
View File

@@ -141,7 +141,7 @@ namespace OpenRA.Mods.Common.Scripting
if (heli != null)
{
transport.QueueActivity(new Turn(transport, heli.Info.InitialFacing));
transport.QueueActivity(new HeliLand(true));
transport.QueueActivity(new HeliLand(transport, true));
transport.QueueActivity(new Wait(15));
}

2
OpenRA.Mods.Common/Traits/Air/FlyAwayOnIdle.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits
{
public void TickIdle(Actor self)
{
self.QueueActivity(new FlyOffMap());
self.QueueActivity(new FlyOffMap(self));
self.QueueActivity(new RemoveSelf());
}
}

24
OpenRA.Mods.Common/Traits/Air/Helicopter.cs
View File

@@ -35,7 +35,8 @@ namespace OpenRA.Mods.Common.Traits
public class Helicopter : Aircraft, ITick, IResolveOrder, IMove
{
public HelicopterInfo Info;
public readonly HelicopterInfo Info;
readonly bool fallsToEarth;
Actor self;
bool firstTick = true;
public bool IsMoving { get { return self.CenterPosition.Z > 0; } set { } }
@@ -45,6 +46,7 @@ namespace OpenRA.Mods.Common.Traits
{
self = init.Self;
Info = info;
fallsToEarth = self.HasTrait<FallsToEarth>();
}
public void ResolveOrder(Actor self, Order order)
@@ -74,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits
if (Info.TurnToLand)
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(true));
self.QueueActivity(new HeliLand(self, true));
}
}
@@ -83,7 +85,7 @@ namespace OpenRA.Mods.Common.Traits
if (Reservable.IsReserved(order.TargetActor))
{
self.CancelActivity();
self.QueueActivity(new HeliReturn());
self.QueueActivity(new HeliReturn(self));
}
else
{
@@ -99,16 +101,16 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity();
self.QueueActivity(new HeliFly(self, Target.FromPos(order.TargetActor.CenterPosition + offset)));
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(false));
self.QueueActivity(new ResupplyAircraft());
self.QueueActivity(new TakeOff());
self.QueueActivity(new HeliLand(self, false));
self.QueueActivity(new ResupplyAircraft(self));
self.QueueActivity(new TakeOff(self));
}
}
if (order.OrderString == "ReturnToBase")
{
self.CancelActivity();
self.QueueActivity(new HeliReturn());
self.QueueActivity(new HeliReturn(self));
}
if (order.OrderString == "Stop")
@@ -120,7 +122,7 @@ namespace OpenRA.Mods.Common.Traits
if (Info.TurnToLand)
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(true));
self.QueueActivity(new HeliLand(self, true));
}
}
}
@@ -130,14 +132,14 @@ namespace OpenRA.Mods.Common.Traits
if (firstTick)
{
firstTick = false;
if (!self.HasTrait<FallsToEarth>()) // TODO: Aircraft husks don't properly unreserve.
if (!fallsToEarth) // TODO: Aircraft husks don't properly unreserve.
ReserveSpawnBuilding();
var host = GetActorBelow();
if (host == null)
return;
self.QueueActivity(new TakeOff());
self.QueueActivity(new TakeOff(self));
}
Repulse();
@@ -155,7 +157,7 @@ namespace OpenRA.Mods.Common.Traits
return new HeliFly(self, Target.FromCell(self.World, cell, subCell));
}
public Activity MoveIntoTarget(Actor self, Target target) { return new HeliLand(false); }
public Activity MoveIntoTarget(Actor self, Target target) { return new HeliLand(self, false); }
public Activity MoveToTarget(Actor self, Target target)
{
return Util.SequenceActivities(new HeliFly(self, target), new Turn(self, Info.InitialFacing));

22
OpenRA.Mods.Common/Traits/Air/Plane.cs
View File

@@ -26,6 +26,7 @@ namespace OpenRA.Mods.Common.Traits
public class Plane : Aircraft, IResolveOrder, IMove, ITick, ISync
{
public readonly PlaneInfo Info;
readonly bool fallsToEarth;
[Sync] public WPos RTBPathHash;
Actor self;
public bool IsMoving { get { return self.CenterPosition.Z > 0; } set { } }
@@ -35,6 +36,7 @@ namespace OpenRA.Mods.Common.Traits
{
self = init.Self;
Info = info;
fallsToEarth = self.HasTrait<FallsToEarth>();
}
bool firstTick = true;
@@ -43,14 +45,14 @@ namespace OpenRA.Mods.Common.Traits
if (firstTick)
{
firstTick = false;
if (!self.HasTrait<FallsToEarth>()) // TODO: Aircraft husks don't properly unreserve.
if (!fallsToEarth) // TODO: Aircraft husks don't properly unreserve.
ReserveSpawnBuilding();
var host = GetActorBelow();
if (host == null)
return;
self.QueueActivity(new TakeOff());
self.QueueActivity(new TakeOff(self));
}
Repulse();
@@ -89,7 +91,7 @@ namespace OpenRA.Mods.Common.Traits
self.SetTargetLine(target, Color.Green);
self.CancelActivity();
self.QueueActivity(new Fly(self, target));
self.QueueActivity(new FlyCircle());
self.QueueActivity(new FlyCircle(self));
}
else if (order.OrderString == "Enter")
{
@@ -101,7 +103,7 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity();
self.QueueActivity(new ReturnToBase(self, order.TargetActor));
self.QueueActivity(new ResupplyAircraft());
self.QueueActivity(new ResupplyAircraft(self));
}
else if (order.OrderString == "Stop")
{
@@ -117,7 +119,7 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity();
self.SetTargetLine(Target.FromActor(airfield), Color.Green);
self.QueueActivity(new ReturnToBase(self, airfield));
self.QueueActivity(new ResupplyAircraft());
self.QueueActivity(new ResupplyAircraft(self));
}
else
{
@@ -126,12 +128,12 @@ namespace OpenRA.Mods.Common.Traits
}
}
public Activity MoveTo(CPos cell, int nearEnough) { return Util.SequenceActivities(new Fly(self, Target.FromCell(self.World, cell)), new FlyCircle()); }
public Activity MoveTo(CPos cell, Actor ignoredActor) { return Util.SequenceActivities(new Fly(self, Target.FromCell(self.World, cell)), new FlyCircle()); }
public Activity MoveWithinRange(Target target, WRange range) { return Util.SequenceActivities(new Fly(self, target, WRange.Zero, range), new FlyCircle()); }
public Activity MoveTo(CPos cell, int nearEnough) { return Util.SequenceActivities(new Fly(self, Target.FromCell(self.World, cell)), new FlyCircle(self)); }
public Activity MoveTo(CPos cell, Actor ignoredActor) { return Util.SequenceActivities(new Fly(self, Target.FromCell(self.World, cell)), new FlyCircle(self)); }
public Activity MoveWithinRange(Target target, WRange range) { return Util.SequenceActivities(new Fly(self, target, WRange.Zero, range), new FlyCircle(self)); }
public Activity MoveWithinRange(Target target, WRange minRange, WRange maxRange)
{
return Util.SequenceActivities(new Fly(self, target, minRange, maxRange), new FlyCircle());
return Util.SequenceActivities(new Fly(self, target, minRange, maxRange), new FlyCircle(self));
}
public Activity MoveFollow(Actor self, Target target, WRange minRange, WRange maxRange) { return new FlyFollow(self, target, minRange, maxRange); }
@@ -144,6 +146,6 @@ namespace OpenRA.Mods.Common.Traits
}
public Activity MoveToTarget(Actor self, Target target) { return new Fly(self, target, WRange.FromCells(3), WRange.FromCells(5)); }
public Activity MoveIntoTarget(Actor self, Target target) { return new Land(target); }
public Activity MoveIntoTarget(Actor self, Target target) { return new Land(self, target); }
}
}

6
OpenRA.Mods.Common/Traits/Air/ReturnOnIdle.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Traits
if (airfield != null)
{
self.QueueActivity(new ReturnToBase(self, airfield));
self.QueueActivity(new ResupplyAircraft());
self.QueueActivity(new ResupplyAircraft(self));
}
else
{
@@ -49,13 +49,13 @@ namespace OpenRA.Mods.Common.Traits
if (someBuilding == null)
{
// ... going down the garden to eat worms ...
self.QueueActivity(new FlyOffMap());
self.QueueActivity(new FlyOffMap(self));
self.QueueActivity(new RemoveSelf());
return;
}
self.QueueActivity(new Fly(self, Target.FromActor(someBuilding)));
self.QueueActivity(new FlyCircle());
self.QueueActivity(new FlyCircle(self));
}
}
}

2
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -120,7 +120,7 @@ namespace OpenRA.Mods.Common.Traits
Unloading = true;
self.CancelActivity();
if (helicopter != null)
self.QueueActivity(new HeliLand(true));
self.QueueActivity(new HeliLand(self, true));
self.QueueActivity(new UnloadCargo(self, true));
}
}

2
OpenRA.Mods.D2k/Activities/PickupUnit.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.D2k.Activities
if (selfFacing.Facing != cargoFacing.Facing)
return Util.SequenceActivities(new Turn(self, cargoFacing.Facing), this);
state = State.Pickup;
return Util.SequenceActivities(new HeliLand(false), new Wait(10), this);
return Util.SequenceActivities(new HeliLand(self, false), new Wait(10), this);
case State.Pickup:
// Remove our carryable from world

2
OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Scripting
{
paradrop.SetLZ(cell, true);
Self.QueueActivity(new Fly(Self, Target.FromCell(Self.World, cell)));
Self.QueueActivity(new FlyOffMap());
Self.QueueActivity(new FlyOffMap(Self));
Self.QueueActivity(new RemoveSelf());
}
}