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

Fall back to target cell if there are no valid orders against the target actor.

Browse Source
This commit is contained in:
Paul Chote
2015-11-26 18:37:40 +00:00
parent fb99a1f3c2
commit 756bec69b3
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Orders
var target = TargetForInput(world, xy, mi); var target = TargetForInput(world, xy, mi);
var actorsAt = world.ActorMap.GetActorsAt(xy).ToList(); var actorsAt = world.ActorMap.GetActorsAt(xy).ToList();
var orders = world.Selection.Actors var orders = world.Selection.Actors
.Select(a => OrderForUnit(a, target, actorsAt, mi)) .Select(a => OrderForUnit(a, target, actorsAt, xy, mi))
.Where(o => o != null) .Where(o => o != null)
.ToList(); .ToList();
@@ -73,7 +73,7 @@ namespace OpenRA.Orders
useSelect = true; useSelect = true;
var ordersWithCursor = world.Selection.Actors var ordersWithCursor = world.Selection.Actors
.Select(a => OrderForUnit(a, target, actorsAt, mi)) .Select(a => OrderForUnit(a, target, actorsAt, xy, mi))
.Where(o => o != null && o.Cursor != null); .Where(o => o != null && o.Cursor != null);
var cursorOrder = ordersWithCursor.MaxByOrDefault(o => o.Order.OrderPriority); var cursorOrder = ordersWithCursor.MaxByOrDefault(o => o.Order.OrderPriority);
@@ -93,14 +93,19 @@ namespace OpenRA.Orders
var actorsAt = world.ActorMap.GetActorsAt(cell).ToList(); var actorsAt = world.ActorMap.GetActorsAt(cell).ToList();
var underCursor = world.Selection.Actors.WithHighestSelectionPriority(); var underCursor = world.Selection.Actors.WithHighestSelectionPriority();
var o = OrderForUnit(underCursor, target, actorsAt, mi); var o = OrderForUnit(underCursor, target, actorsAt, cell, mi);
if (o != null && o.Order.OverrideSelection) if (o != null && o.Order.OverrideSelection)
return false; return false;
return true; return true;
} }
static UnitOrderResult OrderForUnit(Actor self, Target target, List<Actor> actorsAt, MouseInput mi) /// <summary>
/// Returns the most appropriate order for a given actor and target.
/// First priority is given to orders that interact with the given actors.
/// Second priority is given to actors in the given cell.
/// </summary>
static UnitOrderResult OrderForUnit(Actor self, Target target, List<Actor> actorsAt, CPos xy, MouseInput mi)
{ {
if (mi.Button != Game.Settings.Game.MouseButtonPreference.Action) if (mi.Button != Game.Settings.Game.MouseButtonPreference.Action)
return null; return null;
@@ -122,15 +127,22 @@ namespace OpenRA.Orders
if (mi.Modifiers.HasModifier(Modifiers.Alt)) if (mi.Modifiers.HasModifier(Modifiers.Alt))
modifiers |= TargetModifiers.ForceMove; modifiers |= TargetModifiers.ForceMove;
foreach (var o in self.TraitsImplementing<IIssueOrder>() var orders = self.TraitsImplementing<IIssueOrder>()
.SelectMany(trait => trait.Orders .SelectMany(trait => trait.Orders.Select(x => new { Trait = trait, Order = x }))
.Select(x => new { Trait = trait, Order = x })) .OrderByDescending(x => x.Order.OrderPriority);
.OrderByDescending(x => x.Order.OrderPriority))
for (var i = 0; i < 2; i++)
{ {
var localModifiers = modifiers; foreach (var o in orders)
string cursor = null; {
if (o.Order.CanTarget(self, target, actorsAt, ref localModifiers, ref cursor)) var localModifiers = modifiers;
return new UnitOrderResult(self, o.Order, o.Trait, cursor, target); string cursor = null;
if (o.Order.CanTarget(self, target, actorsAt, ref localModifiers, ref cursor))
return new UnitOrderResult(self, o.Order, o.Trait, cursor, target);
}
// No valid orders, so check for orders against the cell
target = Target.FromCell(self.World, xy);
} }
return null; return null;