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.
54 lines
1.4 KiB
C#
Executable File
54 lines
1.4 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 System.Linq;
|
|
using OpenRA.Mods.RA.Move;
|
|
using OpenRA.Traits;
|
|
|
|
namespace OpenRA.Mods.RA.Activities
|
|
{
|
|
public class Enter : Activity
|
|
{
|
|
readonly Target target;
|
|
readonly Activity inner;
|
|
|
|
public Enter(Actor target, Activity inner)
|
|
{
|
|
this.target = Target.FromActor(target);
|
|
this.inner = inner;
|
|
}
|
|
|
|
public override Activity Tick(Actor self)
|
|
{
|
|
if (IsCanceled || !target.IsValid)
|
|
return NextActivity;
|
|
|
|
if (!Util.AdjacentCells(target).Any(c => c == self.Location))
|
|
return Util.SequenceActivities(new MoveAdjacentTo(target), this);
|
|
|
|
// Move to the middle of the target, ignoring impassable tiles
|
|
var mobile = self.Trait<Mobile>();
|
|
var to = target.CenterLocation;
|
|
var from = self.CenterLocation;
|
|
var speed = mobile.MovementSpeedForCell(self, self.Location);
|
|
var length = speed > 0 ? (int)((to - from).Length * 3 / speed) : 0;
|
|
|
|
return Util.SequenceActivities(
|
|
new Turn(Util.GetFacing(to - from, mobile.Facing)),
|
|
new Drag(from, to, length),
|
|
inner,
|
|
new Turn(Util.GetFacing(from - to, mobile.Facing)),
|
|
new Drag(to, from, length),
|
|
NextActivity
|
|
);
|
|
}
|
|
}
|
|
}
|