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

Fix harvesters teleporting when produced

Browse Source 
And allow to interrupt actor creation child activities
This commit is contained in:
Gustas
2023-10-21 23:20:44 +03:00
committed by Paul Chote
parent 20f6e01afe
commit 018777472a
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -979,7 +979,6 @@ namespace OpenRA.Mods.Common.Traits
public LeaveProductionActivity(Actor self, int delay, CPos[] rallyPoint, ReturnToCellActivity returnToCell)
{
mobile = self.Trait<Mobile>();
IsInterruptible = false;
this.delay = delay;
this.rallyPoint = rallyPoint;
this.returnToCell = returnToCell;
@@ -987,14 +986,15 @@ namespace OpenRA.Mods.Common.Traits
protected override void OnFirstRun(Actor self)
{
// It is vital that ReturnToCell is queued first as it needs the power to intercept a possible cancellation of this activity.
if (returnToCell != null)
self.QueueActivity(returnToCell);
QueueChild(returnToCell);
else if (delay > 0)
self.QueueActivity(new Wait(delay));
QueueChild(new Wait(delay));
if (rallyPoint != null)
foreach (var cell in rallyPoint)
self.QueueActivity(new AttackMoveActivity(self, () => mobile.MoveTo(cell, 1, evaluateNearestMovableCell: true, targetLineColor: Color.OrangeRed)));
QueueChild(new AttackMoveActivity(self, () => mobile.MoveTo(cell, 1, evaluateNearestMovableCell: true, targetLineColor: Color.OrangeRed)));
}
}