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

Auto carry action can be controlled by condition

Browse Source
This commit is contained in:
dnqbob
2022-10-25 20:03:00 +08:00
committed by Gustas
parent 98896f9a75
commit c9dfb215ae
4 changed files with 144 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Carryable.cs
View File

@@ -48,14 +48,12 @@ namespace OpenRA.Mods.Common.Traits
int carriedToken = Actor.InvalidConditionToken;
int lockedToken = Actor.InvalidConditionToken;
Mobile mobile;
IDelayCarryallPickup[] delayPickups;
public Actor Carrier { get; private set; }
public bool Reserved => state != State.Free;
public CPos? Destination { get; protected set; }
public bool WantsTransport => Destination != null && !IsTraitDisabled;
protected Mobile Mobile { get; private set; }
protected enum State { Free, Reserved, Locked }
protected State state = State.Free;
protected bool attached;
@@ -65,7 +63,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
mobile = self.TraitOrDefault<Mobile>();
Mobile = self.TraitOrDefault<Mobile>();
delayPickups = self.TraitsImplementing<IDelayCarryallPickup>().ToArray();
base.Created(self);
@@ -129,7 +127,7 @@ namespace OpenRA.Mods.Common.Traits
if (delayPickups.Any(d => d.IsTraitEnabled() && !d.TryLockForPickup(self, carrier)))
return LockResponse.Pending;
if (mobile != null && !mobile.CanStayInCell(self.Location))
if (Mobile != null && !Mobile.CanStayInCell(self.Location))
return LockResponse.Pending;
if (state != State.Locked)
@@ -142,7 +140,7 @@ namespace OpenRA.Mods.Common.Traits
}
// Make sure we are not moving and at our normal position with respect to the cell grid
if (mobile != null && mobile.IsMovingBetweenCells)
if (Mobile != null && Mobile.IsMovingBetweenCells)
return LockResponse.Pending;
return LockResponse.Success;