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

Fix D2k harvesters getting stuck on spice field after drop by carryall

Browse Source
This commit is contained in:
reaperrr
2015-07-22 03:42:38 +02:00
parent 61c0b5d59b
commit 3b1607883d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
@@ -113,7 +114,15 @@ namespace OpenRA.Mods.D2k.Traits
locked = false; locked = false;
if (afterLandActivity != null) if (afterLandActivity != null)
self.QueueActivity(false, afterLandActivity); {
// HACK: Harvesters need special treatment to avoid getting stuck on resource fields,
// so if a Harvester's afterLandActivity is not DeliverResources, queue a new FindResources activity
var findResources = self.HasTrait<Harvester>() && !(afterLandActivity is DeliverResources);
if (findResources)
self.QueueActivity(new FindResources(self));
else
self.QueueActivity(false, afterLandActivity);
}
} }
public bool Reserve(Actor carrier) public bool Reserve(Actor carrier)
@@ -148,7 +157,7 @@ namespace OpenRA.Mods.D2k.Traits
if (locked || !WantsTransport) if (locked || !WantsTransport)
return false; return false;
// Last change to change our mind... // Last chance to change our mind...
var destPos = self.World.Map.CenterOfCell(Destination); var destPos = self.World.Map.CenterOfCell(Destination);
if ((self.CenterPosition - destPos).LengthSquared < info.MinDistance.LengthSquared) if ((self.CenterPosition - destPos).LengthSquared < info.MinDistance.LengthSquared)
{ {