Rename docking activities
HarvesterDockSequence -> GenericDockSequence DeliverResources -> MoveToDock
This commit is contained in:
committed by
Matthias Mailänder
parent
55536bba4c
commit
da16e4ed99
@@ -61,13 +61,13 @@ namespace OpenRA.Mods.Common.Activities
|
||||
// We have to make sure the actual "harvest" order is not skipped if a third order is queued,
|
||||
// so we keep deliveredLoad false.
|
||||
if (harv.IsFull)
|
||||
QueueChild(new DeliverResources(self));
|
||||
QueueChild(new MoveToDock(self));
|
||||
}
|
||||
|
||||
// If an explicit "deliver" order is given, the harvester goes immediately to the refinery.
|
||||
if (deliverActor != null)
|
||||
{
|
||||
QueueChild(new DeliverResources(self, deliverActor));
|
||||
QueueChild(new MoveToDock(self, deliverActor));
|
||||
hasDeliveredLoad = true;
|
||||
deliverActor = null;
|
||||
}
|
||||
@@ -92,7 +92,7 @@ namespace OpenRA.Mods.Common.Activities
|
||||
// Are we full or have nothing more to gather? Deliver resources.
|
||||
if (harv.IsFull || (!harv.IsEmpty && LastSearchFailed))
|
||||
{
|
||||
QueueChild(new DeliverResources(self));
|
||||
QueueChild(new MoveToDock(self));
|
||||
hasDeliveredLoad = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ using OpenRA.Traits;
|
||||
|
||||
namespace OpenRA.Mods.Common.Activities
|
||||
{
|
||||
public class HarvesterDockSequence : Activity
|
||||
public class GenericDockSequence : Activity
|
||||
{
|
||||
protected enum DockingState { Wait, Drag, Dock, Loop, Undock, Complete }
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Activities
|
||||
|
||||
bool dockInitiated = false;
|
||||
|
||||
public HarvesterDockSequence(Actor self, Actor refineryActor, Refinery refinery)
|
||||
public GenericDockSequence(Actor self, Actor refineryActor, Refinery refinery)
|
||||
{
|
||||
dockingState = DockingState.Drag;
|
||||
RefineryActor = refineryActor;
|
||||
@@ -17,7 +17,7 @@ using OpenRA.Traits;
|
||||
|
||||
namespace OpenRA.Mods.Common.Activities
|
||||
{
|
||||
public class DeliverResources : Activity
|
||||
public class MoveToDock : Activity
|
||||
{
|
||||
readonly IMove movement;
|
||||
readonly Harvester harv;
|
||||
@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Activities
|
||||
|
||||
Actor proc;
|
||||
|
||||
public DeliverResources(Actor self, Actor targetActor = null)
|
||||
public MoveToDock(Actor self, Actor targetActor = null)
|
||||
{
|
||||
movement = self.Trait<IMove>();
|
||||
harv = self.Trait<Harvester>();
|
||||
Reference in New Issue
Block a user