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

Allow PBOG to nudge blocking helicopters.

Browse Source
This commit is contained in:
Paul Chote
2019-07-27 09:48:46 +00:00
committed by teinarss
parent 2f99512bd4
commit a4b8ffa99d
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -301,20 +301,32 @@ namespace OpenRA.Mods.Common.Orders
IEnumerable<Order> ClearBlockersOrders(World world, CPos topLeft) IEnumerable<Order> ClearBlockersOrders(World world, CPos topLeft)
{ {
var allTiles = variants[variant].BuildingInfo.Tiles(topLeft).ToArray(); var allTiles = variants[variant].BuildingInfo.Tiles(topLeft).ToArray();
var neightborTiles = Util.ExpandFootprint(allTiles, true).Except(allTiles) var adjacentTiles = Util.ExpandFootprint(allTiles, true).Except(allTiles)
.Where(world.Map.Contains).ToList(); .Where(world.Map.Contains).ToList();
var blockers = allTiles.SelectMany(world.ActorMap.GetActorsAt) var blockers = allTiles.SelectMany(world.ActorMap.GetActorsAt)
.Where(a => a.Owner == queue.Actor.Owner && a.IsIdle) .Where(a => a.Owner == queue.Actor.Owner && a.IsIdle)
.Select(a => new TraitPair<Mobile>(a, a.TraitOrDefault<Mobile>())); .Select(a => new TraitPair<IMove>(a, a.TraitOrDefault<IMove>()))
.Where(x => x.Trait != null);
foreach (var blocker in blockers.Where(x => x.Trait != null)) foreach (var blocker in blockers)
{ {
var availableCells = neightborTiles.Where(t => blocker.Trait.CanEnterCell(t)).ToList(); CPos moveCell;
var mobile = blocker.Trait as Mobile;
if (mobile != null)
{
var availableCells = adjacentTiles.Where(t => mobile.CanEnterCell(t)).ToList();
if (availableCells.Count == 0) if (availableCells.Count == 0)
continue; continue;
yield return new Order("Move", blocker.Actor, Target.FromCell(world, blocker.Actor.ClosestCell(availableCells)), false) moveCell = blocker.Actor.ClosestCell(availableCells);
}
else if (blocker.Trait is Aircraft)
moveCell = blocker.Actor.Location;
else
continue;
yield return new Order("Move", blocker.Actor, Target.FromCell(world, moveCell), false)
{ {
SuppressVisualFeedback = true SuppressVisualFeedback = true
}; };