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

Simplify IDockHost interface

Browse Source
This commit is contained in:
Gustas
2024-08-29 19:57:06 +03:00
committed by Paul Chote
parent 1334575ba9
commit d24533d561
3 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Traits/DockHost.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits
}
public class DockHost : ConditionalTrait<DockHostInfo>,
IDockHost, IDockHostDrag, ITick, INotifySold, INotifyCapture, INotifyOwnerChanged, ISync, INotifyKilled, INotifyActorDisposing
IDockHost, ITick, INotifySold, INotifyCapture, INotifyOwnerChanged, ISync, INotifyKilled, INotifyActorDisposing
{
readonly Actor self;
@@ -60,12 +60,6 @@ namespace OpenRA.Mods.Common.Traits
protected readonly List<DockClientManager> ReservedDockClients = new();
public WPos DockPosition => self.CenterPosition + Info.DockOffset;
public int DockWait => Info.DockWait;
public WAngle DockAngle => Info.DockAngle;
bool IDockHostDrag.IsDragRequired => Info.IsDragRequired;
WVec IDockHostDrag.DragOffset => Info.DragOffset;
int IDockHostDrag.DragLength => Info.DragLength;
[Sync]
bool preventDock = false;
@@ -141,10 +135,10 @@ namespace OpenRA.Mods.Common.Traits
// Make sure the actor is at dock, at correct facing, and aircraft are landed.
// Mobile cannot freely move in WPos, so when we calculate close enough we convert to CPos.
if ((move is Mobile ? clientActor.Location != clientActor.World.Map.CellContaining(DockPosition) : clientActor.CenterPosition != DockPosition)
|| move is not IFacing facing || facing.Facing != DockAngle)
|| move is not IFacing facing || facing.Facing != Info.DockAngle)
{
moveCooldownHelper.NotifyMoveQueued();
moveToDockActivity.QueueChild(move.MoveOntoTarget(clientActor, Target.FromActor(self), DockPosition - self.CenterPosition, DockAngle));
moveToDockActivity.QueueChild(move.MoveOntoTarget(clientActor, Target.FromActor(self), DockPosition - self.CenterPosition, Info.DockAngle));
return true;
}
@@ -153,7 +147,15 @@ namespace OpenRA.Mods.Common.Traits
public virtual void QueueDockActivity(Activity moveToDockActivity, Actor self, Actor clientActor, DockClientManager client)
{
moveToDockActivity.QueueChild(new GenericDockSequence(clientActor, client, self, this));
moveToDockActivity.QueueChild(new GenericDockSequence(
clientActor,
client,
self,
this,
Info.DockWait,
Info.IsDragRequired,
Info.DragOffset,
Info.DragLength));
}
protected override void TraitDisabled(Actor self) { UnreserveAll(); }