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

Merge pull request #10995 from scshunt/allow-empty-refinery-return

Browse Source 
Allow empty harvesters to be ordered to refineries
This commit is contained in:
Matthias Mailänder
2016-04-02 11:38:19 +02:00
parent f38d30a1ff c18987e293
commit 72eea3a746
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Harvester.cs
View File

@@ -302,7 +302,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
yield return new EnterAlliedActorTargeter<IAcceptResourcesInfo>("Deliver", 5, yield return new EnterAlliedActorTargeter<IAcceptResourcesInfo>("Deliver", 5,
proc => IsAcceptableProcType(proc), proc => IsAcceptableProcType(proc),
proc => !IsEmpty && proc.Trait<IAcceptResources>().AllowDocking); proc => proc.Trait<IAcceptResources>().AllowDocking);
yield return new HarvestOrderTargeter(); yield return new HarvestOrderTargeter();
} }
} }
@@ -386,9 +386,6 @@ namespace OpenRA.Mods.Common.Traits
if (order.TargetActor != OwnerLinkedProc) if (order.TargetActor != OwnerLinkedProc)
LinkProc(self, OwnerLinkedProc = order.TargetActor); LinkProc(self, OwnerLinkedProc = order.TargetActor);
if (IsEmpty)
return;
idleSmart = true; idleSmart = true;
self.SetTargetLine(Target.FromOrder(self.World, order), Color.Green); self.SetTargetLine(Target.FromOrder(self.World, order), Color.Green);