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

fix MoveAdjacentTo so it doesnt suck so much

Browse Source
This commit is contained in:
Chris Forbes
2011-09-07 19:13:51 +12:00
parent cc18a6a515
commit a3818a6aa2
5 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.RA/HackyAI.cs
View File

@@ -149,24 +149,6 @@ namespace OpenRA.Mods.RA
return null;
}
IEnumerable<int2> Neighbours(int2 c)
{
/* only return 4-neighbors for now, maybe add 8s later. */
yield return c;
yield return new int2(c.X - 1, c.Y);
yield return new int2(c.X + 1, c.Y);
yield return new int2(c.X, c.Y - 1);
yield return new int2(c.X, c.Y + 1);
}
IEnumerable<int2> ExpandFootprint(IEnumerable<int2> cells)
{
var result = new Dictionary<int2, bool>();
foreach (var c in cells.SelectMany(c => Neighbours(c)))
result[c] = true;
return result.Keys;
}
bool NoBuildingsUnder(IEnumerable<int2> cells)
{
var bi = world.WorldActor.Trait<BuildingInfluence>();
@@ -181,8 +163,8 @@ namespace OpenRA.Mods.RA
foreach (var t in world.FindTilesInCircle(baseCenter, k))
if (world.CanPlaceBuilding(item.Item, bi, t, null))
if (bi.IsCloseEnoughToBase(world, p, item.Item, t))
if (NoBuildingsUnder(ExpandFootprint(
FootprintUtils.Tiles( item.Item, bi, t ))))
if (NoBuildingsUnder(Util.ExpandFootprint(
FootprintUtils.Tiles( item.Item, bi, t ), false)))
return t;
return null; // i don't know where to put it.