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

Fix caryall not removing influence when cargo dies

Browse Source
This commit is contained in:
Gustas
2023-05-21 14:56:45 +03:00
committed by Pavel Penev
parent c36609cc9f
commit a69417f0a6
1 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
OpenRA.Mods.Common/Activities/PickupUnit.cs
View File

@@ -65,32 +65,15 @@ namespace OpenRA.Mods.Common.Activities
public override bool Tick(Actor self) public override bool Tick(Actor self)
{ {
if (cargo != carryall.Carryable)
return true;
if (IsCanceling) if (IsCanceling)
{ return true;
if (carryall.State == Carryall.CarryallState.Reserved)
carryall.UnreserveCarryable(self);
// Make sure we run the TakeOff activity if we are / have landed if (cargo.IsDead || carryable.IsTraitDisabled || !cargo.AppearsFriendlyTo(self) || cargo != carryall.Carryable)
if (self.Trait<Aircraft>().HasInfluence())
{ {
ChildHasPriority = true; Cancel(self, true);
IsInterruptible = false;
QueueChild(new TakeOff(self));
return false; return false;
} }
return true;
}
if (cargo.IsDead || carryable.IsTraitDisabled || !cargo.AppearsFriendlyTo(self))
{
carryall.UnreserveCarryable(self);
return true;
}
// Wait until we are near the target before we try to lock it // Wait until we are near the target before we try to lock it
if (state == PickupState.Intercept && (cargo.CenterPosition - self.CenterPosition).HorizontalLengthSquared <= targetLockRange.LengthSquared) if (state == PickupState.Intercept && (cargo.CenterPosition - self.CenterPosition).HorizontalLengthSquared <= targetLockRange.LengthSquared)
state = PickupState.LockCarryable; state = PickupState.LockCarryable;
@@ -99,7 +82,10 @@ namespace OpenRA.Mods.Common.Activities
{ {
var lockResponse = carryable.LockForPickup(cargo, self); var lockResponse = carryable.LockForPickup(cargo, self);
if (lockResponse == LockResponse.Failed) if (lockResponse == LockResponse.Failed)
Cancel(self); {
Cancel(self, true);
return false;
}
else if (lockResponse == LockResponse.Success) else if (lockResponse == LockResponse.Success)
{ {
// Pickup position and facing are now known - swap the fly/wait activity with Land // Pickup position and facing are now known - swap the fly/wait activity with Land
@@ -120,14 +106,38 @@ namespace OpenRA.Mods.Common.Activities
} }
} }
// We don't want to allow TakeOff to be cancelled // Return once we are in the pickup state and the pickup activities have completed.
if (ChildActivity is TakeOff)
ChildHasPriority = true;
// Return once we are in the pickup state and the pickup activities have completed
return TickChild(self) && state == PickupState.Pickup; return TickChild(self) && state == PickupState.Pickup;
} }
public override void Cancel(Actor self, bool keepQueue = false)
{
base.Cancel(self, keepQueue);
// We are safe to bail here as base won't set IsCanceling to true if not interruptible.
if (!IsInterruptible)
return;
// This nulls caryall storage, so to avoid deleting units make sure it is not called while carrying one.
if (carryall.State == Carryall.CarryallState.Reserved)
carryall.UnreserveCarryable(self);
// TakeOff is not interruptible, but this activity is. To deal with it we bail. We transfer
// priority both to dispose of this activity and to make sure TakeOff is not disposed with it.
if (ChildActivity is TakeOff)
{
ChildHasPriority = true;
return;
}
// Make sure we run the TakeOff activity if we are / have landed.
if (self.Trait<Aircraft>().HasInfluence())
{
ChildHasPriority = true;
QueueChild(new TakeOff(self));
}
}
public override IEnumerable<TargetLineNode> TargetLineNodes(Actor self) public override IEnumerable<TargetLineNode> TargetLineNodes(Actor self)
{ {
if (targetLineColor != null) if (targetLineColor != null)