diff --git a/OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs b/OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs index 8d3f0cf8f4..bea05a80f1 100644 --- a/OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs +++ b/OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs @@ -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; } diff --git a/OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs b/OpenRA.Mods.Common/Activities/GenericDockSequence.cs similarity index 97% rename from OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs rename to OpenRA.Mods.Common/Activities/GenericDockSequence.cs index 430600166e..df21458e77 100644 --- a/OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs +++ b/OpenRA.Mods.Common/Activities/GenericDockSequence.cs @@ -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; diff --git a/OpenRA.Mods.Common/Activities/DeliverResources.cs b/OpenRA.Mods.Common/Activities/MoveToDock.cs similarity index 96% rename from OpenRA.Mods.Common/Activities/DeliverResources.cs rename to OpenRA.Mods.Common/Activities/MoveToDock.cs index 911871cebc..c3c6ea01e8 100644 --- a/OpenRA.Mods.Common/Activities/DeliverResources.cs +++ b/OpenRA.Mods.Common/Activities/MoveToDock.cs @@ -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(); harv = self.Trait(); diff --git a/OpenRA.Mods.Common/Traits/Buildings/Refinery.cs b/OpenRA.Mods.Common/Traits/Buildings/Refinery.cs index f009872ee0..1b8f0c2545 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/Refinery.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/Refinery.cs @@ -159,7 +159,7 @@ namespace OpenRA.Mods.Common.Traits harv.Trait.UnlinkProc(harv.Actor, self); } - public void OnDock(Actor harv, DeliverResources dockOrder) + public void OnDock(Actor harv, MoveToDock dockOrder) { if (!preventDock) { diff --git a/OpenRA.Mods.Common/TraitsInterfaces.cs b/OpenRA.Mods.Common/TraitsInterfaces.cs index 218e889b9c..ab0246c1d8 100644 --- a/OpenRA.Mods.Common/TraitsInterfaces.cs +++ b/OpenRA.Mods.Common/TraitsInterfaces.cs @@ -283,7 +283,7 @@ namespace OpenRA.Mods.Common.Traits public interface IAcceptResourcesInfo : ITraitInfoInterface { } public interface IAcceptResources { - void OnDock(Actor harv, DeliverResources dockOrder); + void OnDock(Actor harv, MoveToDock dockOrder); int AcceptResources(string resourceType, int count = 1); WPos DeliveryPosition { get; } WAngle DeliveryAngle { get; }