More pathfinding changes

I've been playing with the pathfinding code a bit more (previous post). I've now got jumping over gaps work, and the start of terrain cost. So I thought I'd add post those up as well. I'm not sure how much more I'll change, but I figured I'd consolidate what I have so far into its own thread instead of hijacking the other one. The changes here are a bit more breaking and I'm expecting to have to change a few things once I hit the later parts of the tutorial series, but I like the result well enough so far.

The first change I made was to the Tile.cs file so I could keep track of which tiles are empty

[HideInInspector] public bool isEmpty;

The biggest changes are in Board.cs
To the Search function I added a couple addDirs, which replaces the array of tiles to check next so I can check beyond the immediate four tiles, and travelcost, which I needed so I can set distance to more than one when the distance is larger. Later on I'll also use it to determine difficultly traveling over different tile types, but I need to actually have different tile types first, so that will have to wait. Then I changed the for loop to use count instead of hardcoding 4 and used the functions I added.

public List<Tile> Search(Tile start, Func<Tile, Tile, decimal, bool> addTile, Func< Point[]> addDirs, Func<Tile, Tile, decimal> travelCost)
{
List<Tile> retValue = new List<Tile>();
dirs = addDirs();
retValue.Add(start);

ClearSearch();
Queue<Tile> checkNext = new Queue<Tile>();
Queue<Tile> checkNow = new Queue<Tile>();

start.distance = 0;
checkNow.Enqueue(start);

while (checkNow.Count > 0)
{
Tile t = checkNow.Dequeue();
for (int i = 0; i < dirs.Length; ++i)
{
Tile next = GetTile(t.pos + dirs[i]);
if (next == null)
{
GameObject instance = Instantiate(tilePrefab) as GameObject;
instance.SetActive(false);
next = instance.GetComponent<Tile>();
next.pos = t.pos + dirs[i];
next.isEmpty = true;
next.distance = int.MaxValue;
}
decimal cost = travelCost(t, next);
if (next.distance <= t.distance + cost)
continue;

if (addTile(t, next, cost))
{
next.distance = t.distance + cost;
next.prev = t;
checkNext.Enqueue(next);
retValue.Add(next);
}
}
if (checkNow.Count == 0)
SwapReference(ref checkNow, ref checkNext);
}
return retValue;
}

In Movement.cs 
I added a lot to movement. The 4 directions to check here

protected Board board;

protected virtual Point[] SurroundingTiles()
{
Point[] dirs = new Point[4]
{
new Point(0,1),
new Point(0,-1),
new Point(1,0),
new Point(-1, 0)
};
return dirs;
}
protected virtual decimal RangeFunction(Tile from, Tile to)
{
Point distVect = new Point(Mathf.Abs(from.pos.x - to.pos.x), Mathf.Abs(from.pos.y - to.pos.y));
decimal distance = distVect.x + distVect.y;
if (distance > 1)
return distance + 0.1m;
return distance;

}

public virtual List<Tile> GetTilesInRange(Board b)
{
board = b;
List<Tile> retValue = b.Search(unit.tile, ExpandSearch, SurroundingTiles, RangeFunction);
Filter(retValue);
return retValue;
}
protected virtual bool ExpandSearch(Tile from, Tile to, decimal cost)
{
if (to == null || to.isEmpty == true)
return false;
return ( from.distance + cost ) <= (decimal)range;
}
protected virtual void Filter(List<Tile> tiles)
{
for (int i = tiles.Count - 1; i >= 0; --i)
{
if (tiles[i] == null || tiles[i].isEmpty == true)
{
tiles.RemoveAt(i);
}
else if (tiles[i].content != null)
tiles.RemoveAt(i);
}
}


WalkMovement.cs got changed up this time around

protected override Point[] SurroundingTiles()
{
Point[] dirs = new Point[8]
{
new Point(0,1),
new Point(0,-1),
new Point(1,0),
new Point(-1, 0),
new Point(0,2),
new Point(0,-2),
new Point(2,0),
new Point(-2, 0)
};
return dirs;
}

protected override bool ExpandSearch(Tile from, Tile to, decimal cost)
{
//skip if the distance in height between the two tiles is more than the unit can jump
if (( Mathf.Abs(from.height - to.height) > jumpHeight ))
return false;
Point distVect = new Point(Mathf.Abs(from.pos.x - to.pos.x), Mathf.Abs(from.pos.y - to.pos.y));
decimal distance = distVect.x + distVect.y;
if (distance > 1)
{
for (int i = Math.Min(from.pos.x, to.pos.x); i <= Math.Max(from.pos.x, to.pos.x); ++i)
{
for (int j = Math.Min(from.pos.y, to.pos.y); j <= Math.Max(from.pos.y, to.pos.y); ++j)
{
Point newPoint= new Point(i, j);
if (newPoint == from.pos || newPoint == to.pos)
continue;
Tile test = board.GetTile(newPoint);
if (test != null && test.height >= from.height)
return false;
}
}
}

//skip if the tile is occupied by an enemy
if (to.content != null)
return false;

return base.ExpandSearch(from, to, cost);
}

And finally in FlyMovement.cs and TelportMovement.cs just tweaked these a little

protected override bool ExpandSearch(Tile from, Tile to, decimal cost)
{
return ( from.distance + cost ) <= range;
} 

In BattleState.cs I didn't change anything from before, but here's what I changed to make the selection indicator move over the blank spots to work with the new movement.

protected virtual void SelectTile(Point p)
{
if (pos == p)
return;
Vector3 indicatorPosition;
pos = p;
if (!board.tiles.ContainsKey(p))
indicatorPosition = new Vector3(p.x, 0, p.y);
else
indicatorPosition = board.tiles[p].center;
tileSelectionIndicator.localPosition = indicatorPosition;
}
And to make sure I don't get an error when trying to select over an empty tile
In SelectUnitState.cs(at the beginning of the OnFire method)

if (owner.currentTile == null)
return;

As before would love to hear anyone's comments/suggestions, and can maybe help someone else trying to do something similar.