Fix #1157: Removed HARV minining from cell in front / using MoveAdjacentTo in logic. Was causing harvesters to get stuck - need to revisit this.

This commit is contained in:
Curtis S
2011-09-15 20:49:33 -06:00
parent 16fa2f2c1e
commit c1f522db63
4 changed files with 51 additions and 90 deletions

View File

@@ -61,9 +61,9 @@ namespace OpenRA.Mods.RA
{
if (LastHarvestedCell.HasValue)
{
var target = Target.FromCell(LastHarvestedCell.Value);
self.QueueActivity( new MoveAdjacentTo(target) );
self.SetTargetLine(target, Color.Red, false);
var mobile = self.Trait<Mobile>();
self.QueueActivity( mobile.MoveTo(LastHarvestedCell.Value, 5) );
self.SetTargetLine(Target.FromCell(LastHarvestedCell.Value), Color.Red, false);
}
self.QueueActivity( new FindResources() );
}
@@ -152,12 +152,11 @@ namespace OpenRA.Mods.RA
{
if (order.OrderString == "Harvest")
{
var target = Target.FromOrder(order);
var mobile = self.Trait<Mobile>();
self.CancelActivity();
self.QueueActivity(new MoveAdjacentTo(target));
self.QueueActivity(new HarvestResource(self, order.TargetLocation));
self.QueueActivity(mobile.MoveTo(order.TargetLocation, 0));
self.QueueActivity(new FindResources());
self.SetTargetLine(target, Color.Red);
self.SetTargetLine(Target.FromOrder(order), Color.Red);
}
else if (order.OrderString == "Deliver")
{