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

Fix harvs dragging to refinery even if it died while turning

Browse Source
This commit is contained in:
reaperrr
2020-10-18 14:01:39 +02:00
committed by abcdefg30
parent 996029ee38
commit 385f01247b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Activities
{ {
public abstract class HarvesterDockSequence : Activity public abstract class HarvesterDockSequence : Activity
{ {
protected enum DockingState { Wait, Turn, Dock, Loop, Undock, Complete } protected enum DockingState { Wait, Turn, Drag, Dock, Loop, Undock, Complete }
protected readonly Actor Refinery; protected readonly Actor Refinery;
protected readonly Harvester Harv; protected readonly Harvester Harv;
@@ -54,10 +54,18 @@ namespace OpenRA.Mods.Common.Activities
return false; return false;
case DockingState.Turn: case DockingState.Turn:
dockingState = DockingState.Dock; dockingState = DockingState.Drag;
QueueChild(new Turn(self, DockAngle)); QueueChild(new Turn(self, DockAngle));
return false;
case DockingState.Drag:
if (!Refinery.IsInWorld || Refinery.IsDead)
return true;
dockingState = DockingState.Dock;
if (IsDragRequired) if (IsDragRequired)
QueueChild(new Drag(self, StartDrag, EndDrag, DragLength)); QueueChild(new Drag(self, StartDrag, EndDrag, DragLength));
return false; return false;
case DockingState.Dock: case DockingState.Dock: