e76c746b61
The unit will now path to the nearest adjacent cell, drag inside, do the inner activity, then (if still alive) drag back to its original location. This fixes: - Mismatch in logic between Enter and MoveAdjacentTo, which causes an infinite loop. - Building capturing failing from certain directions. - Being unable to enter buildings on unpathable tiles. - Units being stranded inside a building if the requirements for the inner order aren't met.
51 lines
1.3 KiB
C#
Executable File
51 lines
1.3 KiB
C#
Executable File
#region Copyright & License Information
|
|
/*
|
|
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
|
|
* This file is part of OpenRA, which is free software. It is made
|
|
* available to you under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation. For more information,
|
|
* see COPYING.
|
|
*/
|
|
#endregion
|
|
|
|
using OpenRA.Mods.RA.Move;
|
|
using OpenRA.Traits;
|
|
|
|
namespace OpenRA.Mods.RA.Activities
|
|
{
|
|
public class MoveAdjacentTo : Activity
|
|
{
|
|
readonly Target target;
|
|
|
|
public MoveAdjacentTo(Target target) { this.target = target; }
|
|
|
|
public override Activity Tick(Actor self)
|
|
{
|
|
if (IsCanceled || !target.IsValid)
|
|
return NextActivity;
|
|
|
|
var mobile = self.Trait<Mobile>();
|
|
var ps1 = new PathSearch(self.World, mobile.Info, self)
|
|
{
|
|
checkForBlocked = true,
|
|
heuristic = location => 0,
|
|
inReverse = true
|
|
};
|
|
|
|
foreach (var cell in Util.AdjacentCells(target))
|
|
{
|
|
if (cell == self.Location)
|
|
return NextActivity;
|
|
else
|
|
ps1.AddInitialCell(cell);
|
|
}
|
|
|
|
ps1.heuristic = PathSearch.DefaultEstimator(mobile.toCell);
|
|
var ps2 = PathSearch.FromPoint(self.World, mobile.Info, self, mobile.toCell, target.CenterLocation.ToCPos(), true);
|
|
var ret = self.World.WorldActor.Trait<PathFinder>().FindBidiPath(ps1, ps2);
|
|
|
|
return Util.SequenceActivities(mobile.MoveTo(() => ret), this);
|
|
}
|
|
}
|
|
}
|