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

Rename docking activities

Browse Source 
HarvesterDockSequence -> GenericDockSequence
DeliverResources -> MoveToDock
This commit is contained in:
Gustas
2023-01-25 19:09:13 +02:00
committed by Matthias Mailänder
parent 55536bba4c
commit da16e4ed99
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs
View File

@@ -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, // We have to make sure the actual "harvest" order is not skipped if a third order is queued,
// so we keep deliveredLoad false. // so we keep deliveredLoad false.
if (harv.IsFull) 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 an explicit "deliver" order is given, the harvester goes immediately to the refinery.
if (deliverActor != null) if (deliverActor != null)
{ {
QueueChild(new DeliverResources(self, deliverActor)); QueueChild(new MoveToDock(self, deliverActor));
hasDeliveredLoad = true; hasDeliveredLoad = true;
deliverActor = null; deliverActor = null;
} }
@@ -92,7 +92,7 @@ namespace OpenRA.Mods.Common.Activities
// Are we full or have nothing more to gather? Deliver resources. // Are we full or have nothing more to gather? Deliver resources.
if (harv.IsFull || (!harv.IsEmpty && LastSearchFailed)) if (harv.IsFull || (!harv.IsEmpty && LastSearchFailed))
{ {
QueueChild(new DeliverResources(self)); QueueChild(new MoveToDock(self));
hasDeliveredLoad = true; hasDeliveredLoad = true;
return false; return false;
} }

4
OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs → OpenRA.Mods.Common/Activities/GenericDockSequence.cs
View File

@@ -20,7 +20,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class HarvesterDockSequence : Activity public class GenericDockSequence : Activity
{ {
protected enum DockingState { Wait, Drag, Dock, Loop, Undock, Complete } protected enum DockingState { Wait, Drag, Dock, Loop, Undock, Complete }
@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Activities
bool dockInitiated = false; bool dockInitiated = false;
public HarvesterDockSequence(Actor self, Actor refineryActor, Refinery refinery) public GenericDockSequence(Actor self, Actor refineryActor, Refinery refinery)
{ {
dockingState = DockingState.Drag; dockingState = DockingState.Drag;
RefineryActor = refineryActor; RefineryActor = refineryActor;

4
OpenRA.Mods.Common/Activities/DeliverResources.cs → OpenRA.Mods.Common/Activities/MoveToDock.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class DeliverResources : Activity public class MoveToDock : Activity
{ {
readonly IMove movement; readonly IMove movement;
readonly Harvester harv; readonly Harvester harv;
@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Activities
Actor proc; Actor proc;
public DeliverResources(Actor self, Actor targetActor = null) public MoveToDock(Actor self, Actor targetActor = null)
{ {
movement = self.Trait<IMove>(); movement = self.Trait<IMove>();
harv = self.Trait<Harvester>(); harv = self.Trait<Harvester>();

2
OpenRA.Mods.Common/Traits/Buildings/Refinery.cs
View File

@@ -159,7 +159,7 @@ namespace OpenRA.Mods.Common.Traits
harv.Trait.UnlinkProc(harv.Actor, self); harv.Trait.UnlinkProc(harv.Actor, self);
} }
public void OnDock(Actor harv, DeliverResources dockOrder) public void OnDock(Actor harv, MoveToDock dockOrder)
{ {
if (!preventDock) if (!preventDock)
{ {

2
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -283,7 +283,7 @@ namespace OpenRA.Mods.Common.Traits
public interface IAcceptResourcesInfo : ITraitInfoInterface { } public interface IAcceptResourcesInfo : ITraitInfoInterface { }
public interface IAcceptResources public interface IAcceptResources
{ {
void OnDock(Actor harv, DeliverResources dockOrder); void OnDock(Actor harv, MoveToDock dockOrder);
int AcceptResources(string resourceType, int count = 1); int AcceptResources(string resourceType, int count = 1);
WPos DeliveryPosition { get; } WPos DeliveryPosition { get; }
WAngle DeliveryAngle { get; } WAngle DeliveryAngle { get; }