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

Fix harvesters doing nothing after being dropped of by a carryall

Browse Source
This commit is contained in:
Matthijs Benschop
2014-12-22 14:57:01 +01:00
parent 740595064a
commit 3c49364b57
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.D2k/Traits/Carryable.cs
View File

@@ -88,6 +88,7 @@ namespace OpenRA.Mods.D2k.Traits
return; return;
WantsTransport = false; WantsTransport = false;
afterLandActivity = null;
// TODO: We could implement something like a carrier.Trait<AutoCarryAll>().CancelTransportNotify(self) and call it here // TODO: We could implement something like a carrier.Trait<AutoCarryAll>().CancelTransportNotify(self) and call it here
} }

6
OpenRA.Mods.RA/Traits/Harvester.cs
View File

@@ -181,7 +181,7 @@ namespace OpenRA.Mods.RA.Traits
foreach (var n in notify) foreach (var n in notify)
n.MovingToResources(self, moveTo, next); n.MovingToResources(self, moveTo, next);
self.QueueActivity(next); self.QueueActivity(new FindResources());
return; return;
} }
} }
@@ -355,9 +355,9 @@ namespace OpenRA.Mods.RA.Traits
self.QueueActivity(new DeliverResources()); self.QueueActivity(new DeliverResources());
var notify = self.TraitsImplementing<INotifyHarvesterAction>(); var notify = self.TraitsImplementing<INotifyHarvesterAction>();
var next = new FindResources(); var next = new DeliverResources();
foreach (var n in notify) foreach (var n in notify)
n.MovingToResources(self, order.TargetLocation, next); n.MovingToRefinery(self, order.TargetLocation, next);
} }
else if (order.OrderString == "Stop" || order.OrderString == "Move") else if (order.OrderString == "Stop" || order.OrderString == "Move")
{ {