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

Cancel carryall transport request when cancelling order.

Browse Source
This commit is contained in:
tovl
2019-07-21 17:37:47 +02:00
committed by teinarss
parent 9ac3d7507c
commit d9e1a68453
4 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Activities/HarvestResource.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
@@ -26,6 +27,7 @@ namespace OpenRA.Mods.Common.Activities
readonly BodyOrientation body;
readonly IMove move;
readonly CPos targetCell;
readonly INotifyHarvesterAction[] notifyHarvesterActions;
public HarvestResource(Actor self, CPos targetCell)
{
@@ -37,6 +39,7 @@ namespace OpenRA.Mods.Common.Activities
claimLayer = self.World.WorldActor.Trait<ResourceClaimLayer>();
resLayer = self.World.WorldActor.Trait<ResourceLayer>();
this.targetCell = targetCell;
notifyHarvesterActions = self.TraitsImplementing<INotifyHarvesterAction>().ToArray();
}
protected override void OnFirstRun(Actor self)
@@ -55,7 +58,7 @@ namespace OpenRA.Mods.Common.Activities
// Move towards the target cell
if (self.Location != targetCell)
{
foreach (var n in self.TraitsImplementing<INotifyHarvesterAction>())
foreach (var n in notifyHarvesterActions)
n.MovingToResources(self, targetCell);
self.SetTargetLine(Target.FromCell(self.World, targetCell), Color.Red, false);
@@ -84,7 +87,7 @@ namespace OpenRA.Mods.Common.Activities
harv.AcceptResource(self, resource);
foreach (var t in self.TraitsImplementing<INotifyHarvesterAction>())
foreach (var t in notifyHarvesterActions)
t.Harvested(self, resource);
QueueChild(new Wait(harvInfo.BaleLoadDelay));
@@ -95,5 +98,13 @@ namespace OpenRA.Mods.Common.Activities
{
claimLayer.RemoveClaim(self);
}
public override void Cancel(Actor self, bool keepQueue = false)
{
foreach (var n in notifyHarvesterActions)
n.MovementCancelled(self);
base.Cancel(self, keepQueue);
}
}
}