diff --git a/moonlight/gfx/map.json b/moonlight/gfx/map.json
index 3ebcd5f..d64b5c7 100644
--- a/moonlight/gfx/map.json
+++ b/moonlight/gfx/map.json
@@ -277,7 +277,7 @@
                  "visible":true,
                  "width":0,
                  "x":320,
-                 "y":480
+                 "y":521
                 }, 
                 {
                  "gid":3544,
@@ -285,6 +285,7 @@
                  "name":"BigTopCustomer2",
                  "properties":
                     {
+                     "sprite_canmove":"true",
                      "sprite_group":"townsfolk-female",
                      "sprite_name":"townsfolk-female-2"
                     },
@@ -300,6 +301,7 @@
                  "name":"BigTopCustomer2",
                  "properties":
                     {
+                     "sprite_canmove":"false",
                      "sprite_group":"townsfolk-male",
                      "sprite_name":"townsfolk-male-3"
                     },
diff --git a/moonlight/index.html b/moonlight/index.html
index 0c41c07..3c3473c 100644
--- a/moonlight/index.html
+++ b/moonlight/index.html
@@ -5,8 +5,7 @@
 	<title>Moonlight Skulk (Working Title)</title>
 	<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript" src="js/phaser.js"></script>
-	<script type="text/javascript" src="js/PathFinderPlugin.js"></script>
-	<script type="text/javascript" src="js/easystar-0.1.5.js"></script>
+	<script type="text/javascript" src="js/pathfinding-browser.min.js"></script>
     <style type="text/css">
         body {
             margin: 0;
diff --git a/moonlight/js/PathFinderPlugin.js b/moonlight/js/PathFinderPlugin.js
deleted file mode 100644
index 1466931..0000000
--- a/moonlight/js/PathFinderPlugin.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Constructor.
- *
- * @param parent
- * @constructor
- */
-Phaser.Plugin.PathFinderPlugin = function (parent) {
-
-    if (typeof EasyStar !== 'object') {
-        throw new Error("Easystar is not defined!");
-    }
-
-    this.parent = parent;
-    this._easyStar = new EasyStar.js();
-    this._grid = null;
-    this._callback = null;
-    this._prepared = false;
-    this._walkables = [0];
-
-};
-
-Phaser.Plugin.PathFinderPlugin.prototype = Object.create(Phaser.Plugin.prototype);
-Phaser.Plugin.PathFinderPlugin.prototype.constructor = Phaser.Plugin.PathFinderPlugin;
-
-/**
- * Set Grid for Pathfinding.
- *
- * @param grid          Mapdata as a two dimensional array.
- * @param walkables     Tiles which are walkable. Every other tile is marked as blocked.
- * @param iterationsPerCount
- */
-Phaser.Plugin.PathFinderPlugin.prototype.setGrid = function (grid, walkables, iterationsPerCount) {
-    iterationsPerCount = iterationsPerCount || null;
-
-    this._grid = [];
-    for (var i = 0; i < grid.length; i++)
-    {
-        this._grid[i] = []
-        for (var j = 0; j < grid[i].length; j++)
-        {
-            if (grid[i][j])
-                this._grid[i][j] = grid[i][j].index
-            else
-                this._grid[i][j] = 0
-        }
-    }
-    this._walkables = walkables;
-
-    this._easyStar.setGrid(this._grid);
-    this._easyStar.setAcceptableTiles(this._walkables);
-
-    // initiate all walkable tiles with cost 1 so they will be walkable even if they are not on the grid map, jet.
-    for (var i = 0; i < walkables.length; i++)
-    {
-        this.setTileCost(walkables[i], 1);
-    }
-
-    if (iterationsPerCount !== null) {
-        this._easyStar.setIterationsPerCalculation(iterationsPerCount);
-    }
-};
-
-/**
- * Sets the tile cost for a particular tile type.
- *
- * @param {Number} The tile type to set the cost for.
- * @param {Number} The multiplicative cost associated with the given tile.
- */
-Phaser.Plugin.PathFinderPlugin.prototype.setTileCost = function (tileType, cost) {
-    this._easyStar.setTileCost(tileType, cost);
-}
-
-/**
- * Set callback function (Uh, really?)
- * @param callback
- */
-Phaser.Plugin.PathFinderPlugin.prototype.setCallbackFunction = function (callback) {
-    this._callback = callback;
-};
-
-/**
- * Prepare pathcalculation for easystar.
- *
- * @param from  array 0: x-coords, 1: y-coords ([x,y])
- * @param to    array 0: x-coords, 1: y-coords ([x,y])
- */
-Phaser.Plugin.PathFinderPlugin.prototype.preparePathCalculation = function (from, to) {
-    if (this._callback === null || typeof this._callback !== "function") {
-        throw new Error("No Callback set!");
-    }
-
-    var startX = from[0],
-        startY = from[1],
-        destinationX = to[0],
-        destinationY = to[1];
-
-    this._easyStar.findPath(startX, startY, destinationX, destinationY, this._callback);
-    this._prepared = true;
-};
-
-/**
- * Start path calculation.
- */
-Phaser.Plugin.PathFinderPlugin.prototype.calculatePath = function () {
-    if (this._prepared === null) {
-        throw new Error("no Calculation prepared!");
-    }
-
-    this._easyStar.calculate();
-};
diff --git a/moonlight/js/easystar-0.1.8.js b/moonlight/js/easystar-0.1.8.js
deleted file mode 100644
index ea8a046..0000000
--- a/moonlight/js/easystar-0.1.8.js
+++ /dev/null
@@ -1,555 +0,0 @@
-//For require.js
-if (typeof define === "function" && define.amd) {
-	define("easystar", [], function() {
-		return EasyStar;
-	});
-}
-
-//For browserify and node.js
-if (typeof module !== 'undefined' && module.exports) {
-	module.exports = EasyStar;
-}
-//NameSpace
-var EasyStar = EasyStar || {};
-
-/**
-* A simple Node that represents a single tile on the grid.
-* @param {Object} parent The parent node.
-* @param {Number} x The x position on the grid.
-* @param {Number} y The y position on the grid.
-* @param {Number} costSoFar How far this node is in moves*cost from the start.
-* @param {Number} simpleDistanceToTarget Manhatten distance to the end point.
-**/
-EasyStar.Node = function(parent, x, y, costSoFar, simpleDistanceToTarget) {
-	this.parent = parent;
-	this.x = x;
-	this.y = y;
-	this.costSoFar = costSoFar;
-	this.simpleDistanceToTarget = simpleDistanceToTarget;
-
-	/**
-	* @return {Number} Best guess distance of a cost using this node.
-	**/
-	this.bestGuessDistance = function() {
-		return this.costSoFar + this.simpleDistanceToTarget;
-	}
-};
-
-//Constants
-EasyStar.Node.OPEN_LIST = 0;
-EasyStar.Node.CLOSED_LIST = 1;
-/**
-* This is an improved Priority Queue data type implementation that can be used to sort any object type.
-* It uses a technique called a binary heap.
-* 
-* For more on binary heaps see: http://en.wikipedia.org/wiki/Binary_heap
-* 
-* @param {String} criteria The criteria by which to sort the objects. 
-* This should be a property of the objects you're sorting.
-* 
-* @param {Number} heapType either PriorityQueue.MAX_HEAP or PriorityQueue.MIN_HEAP.
-**/
-EasyStar.PriorityQueue = function(criteria,heapType) {
-	this.length = 0; //The current length of heap.
-	var queue = [];
-	var isMax = false;
-
-	//Constructor
-	if (heapType==EasyStar.PriorityQueue.MAX_HEAP) {
-		isMax = true;
-	} else if (heapType==EasyStar.PriorityQueue.MIN_HEAP) {
-		isMax = false;
-	} else {
-		throw heapType + " not supported.";
-	}
-
-	/**
-	* Inserts the value into the heap and sorts it.
-	* 
-	* @param value The object to insert into the heap.
-	**/
-	this.insert = function(value) {
-		if (!value.hasOwnProperty(criteria)) {
-			throw "Cannot insert " + value + " because it does not have a property by the name of " + criteria + ".";
-		}
-		queue.push(value);
-		this.length++;
-		bubbleUp(this.length-1);
-	}
-
-	/**
-	* Peeks at the highest priority element.
-	*
-	* @return the highest priority element
-	**/
-	this.getHighestPriorityElement = function() {
-		return queue[0];
-	}
-
-	/**
-	* Removes and returns the highest priority element from the queue.
-	*
-	* @return the highest priority element
-	**/
-	this.shiftHighestPriorityElement = function() {
-		if (this.length === 0) {
-			throw ("There are no more elements in your priority queue.");
-		} else if (this.length === 1) {
-			var onlyValue = queue[0];
-			queue = [];
-                        this.length = 0;
-			return onlyValue;
-		}
-		var oldRoot = queue[0];
-		var newRoot = queue.pop();
-		this.length--;
-		queue[0] = newRoot;
-		swapUntilQueueIsCorrect(0);
-		return oldRoot;
-	}
-
-	var bubbleUp = function(index) {
-		if (index===0) {
-			return;
-		}
-		var parent = getParentOf(index);
-		if (evaluate(index,parent)) {
-			swap(index,parent);
-			bubbleUp(parent);
-		} else {
-			return;
-		}
-	}
-
-	var swapUntilQueueIsCorrect = function(value) {
-		var left = getLeftOf(value);
-		var right = getRightOf(value);
-		if (evaluate(left,value)) {
-			swap(value,left);
-			swapUntilQueueIsCorrect(left);
-		} else if (evaluate(right,value)) {
-			swap(value,right);
-			swapUntilQueueIsCorrect(right);
-		} else if (value==0) {
-			return;
-		} else {
-			swapUntilQueueIsCorrect(0);
-		}
-	}
-
-	var swap = function(self,target) {
-		var placeHolder = queue[self];
-		queue[self] = queue[target];
-		queue[target] = placeHolder;
-	}
-
-	var evaluate = function(self,target) {
-		if (queue[target]===undefined||queue[self]===undefined) {
-			return false;
-		}
-		
-		var selfValue;
-		var targetValue;
-		
-		//Check if the criteria should be the result of a function call.
-		if (typeof queue[self][criteria] === 'function') {
-			selfValue = queue[self][criteria]();
-			targetValue = queue[target][criteria]();
-		} else {
-			selfValue = queue[self][criteria];
-			targetValue = queue[target][criteria];
-		}
-
-		if (isMax) {
-			if (selfValue > targetValue) {
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			if (selfValue < targetValue) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	var getParentOf = function(index) {
-		return Math.floor(index/2)-1;
-	}
-
-	var getLeftOf = function(index) {
-		return index*2 + 1;
-	}
-
-	var getRightOf = function(index) {
-		return index*2 + 2;
-	}
-};
-
-//Constants
-EasyStar.PriorityQueue.MAX_HEAP = 0;
-EasyStar.PriorityQueue.MIN_HEAP = 1;
-
-/**
- * Represents a single instance of EasyStar.
- * A path that is in the queue to eventually be found.
- */
-EasyStar.instance = function() {
-	this.isDoneCalculating = true;
-	this.pointsToAvoid = {};
-	this.startX;
-	this.callback;
-	this.startY;
-	this.endX;
-	this.endY;
-	this.nodeHash = {};
-	this.openList;
-};
-/**
-*	EasyStar.js
-*	github.com/prettymuchbryce/EasyStarJS
-*	Licensed under the MIT license.
-* 
-*	Implementation By Bryce Neal (@prettymuchbryce)
-**/
-EasyStar.js = function() {
-	var STRAIGHT_COST = 10;
-	var DIAGONAL_COST = 14;
-	var pointsToAvoid = {};
-	var collisionGrid;
-	var costMap = {};
-	var iterationsSoFar;
-	var instances = [];
-	var iterationsPerCalculation = Number.MAX_VALUE;
-	var acceptableTiles;
-	var diagonalsEnabled = false;
-
-	/**
-	* Sets the collision grid that EasyStar uses.
-	* 
-	* @param {Array|Number} tiles An array of numbers that represent 
-	* which tiles in your grid should be considered
-	* acceptable, or "walkable".
-	**/
-	this.setAcceptableTiles = function(tiles) {
-		if (tiles instanceof Array) {
-			//Array
-			acceptableTiles = tiles;
-		} else if (!isNaN(parseFloat(tiles)) && isFinite(tiles)) {
-			//Number
-			acceptableTiles = [tiles];
-		}
-	};
-
-	/**
-	 * Enable diagonal pathfinding.
-	 */
-	this.enableDiagonals = function() {
-		diagonalsEnabled = true;
-	}
-
-	/**
-	 * Disable diagonal pathfinding.
-	 */
-	this.disableDiagonals = function() {
-		diagonalsEnabled = false;
-	}
-
-	/**
-	* Sets the collision grid that EasyStar uses.
-	* 
-	* @param {Array} grid The collision grid that this EasyStar instance will read from. 
-	* This should be a 2D Array of Numbers.
-	**/
-	this.setGrid = function(grid) {
-		collisionGrid = grid;
-
-		//Setup cost map
-		for (var y = 0; y < collisionGrid.length; y++) {
-			for (var x = 0; x < collisionGrid[0].length; x++) {
-				if (!costMap[collisionGrid[y][x]]) {
-					costMap[collisionGrid[y][x]] = 1
-				}
-			}
-		}
-	};
-
-	/**
-	* Sets the tile cost for a particular tile type.
-	*
-	* @param {Number} The tile type to set the cost for.
-	* @param {Number} The multiplicative cost associated with the given tile.
-	**/
-	this.setTileCost = function(tileType, cost) {
-		costMap[tileType] = cost;
-	};
-
-	/**
-	* Sets the number of search iterations per calculation. 
-	* A lower number provides a slower result, but more practical if you 
-	* have a large tile-map and don't want to block your thread while
-	* finding a path.
-	* 
-	* @param {Number} iterations The number of searches to prefrom per calculate() call.
-	**/
-	this.setIterationsPerCalculation = function(iterations) {
-		iterationsPerCalculation = iterations;
-	};
-	
-	/**
-	* Avoid a particular point on the grid, 
-	* regardless of whether or not it is an acceptable tile.
-	*
-	* @param {Number} x The x value of the point to avoid.
-	* @param {Number} y The y value of the point to avoid.
-	**/
-	this.avoidAdditionalPoint = function(x, y) {
-		pointsToAvoid[x + "_" + y] = 1;
-	};
-
-	/**
-	* Stop avoiding a particular point on the grid.
-	*
-	* @param {Number} x The x value of the point to stop avoiding.
-	* @param {Number} y The y value of the point to stop avoiding.
-	**/
-	this.stopAvoidingAdditionalPoint = function(x, y) {
-		delete pointsToAvoid[x + "_" + y];
-	};
-
-	/**
-	* Stop avoiding all additional points on the grid.
-	**/
-	this.stopAvoidingAllAdditionalPoints = function() {
-		pointsToAvoid = {};
-	};
-
-	/**
-	* Find a path.
-	* 
-	* @param {Number} startX The X position of the starting point.
-	* @param {Number} startY The Y position of the starting point.
-	* @param {Number} endX The X position of the ending point.
-	* @param {Number} endY The Y position of the ending point.
-	* @param {Function} callback A function that is called when your path
-	* is found, or no path is found.
-	* 
-	**/
-	this.findPath = function(startX, startY ,endX, endY, callback) {
-		//No acceptable tiles were set
-		if (acceptableTiles === undefined) {
-			throw "You can't set a path without first calling setAcceptableTiles() on EasyStar.";
-		}
-		//No grid was set
-		if (collisionGrid === undefined) {
-			throw "You can't set a path without first calling setGrid() on EasyStar.";
-		}
-
-		//Start or endpoint outside of scope.
-		if (startX < 0 || startY < 0 || endX < 0 || endX < 0 || 
-		startX > collisionGrid[0].length-1 || startY > collisionGrid.length-1 || 
-		endX > collisionGrid[0].length-1 || endY > collisionGrid.length-1) {
-			throw "Your start or end point is outside the scope of your grid.";
-		}
-
-		//Start and end are the same tile.
-		if (startX===endX && startY===endY) {
-			callback([]);
-		}
-
-		//End point is not an acceptable tile.
-		var endTile = collisionGrid[endY][endX];
-		var isAcceptable = false;
-		for (var i = 0; i < acceptableTiles.length; i++) {
-			if (endTile === acceptableTiles[i]) {
-				isAcceptable = true;
-				break;
-			}
-		}
-
-		if (isAcceptable === false) {
-			callback(null);
-			return;
-		}
-
-		//Create the instance
-		var instance = new EasyStar.instance();
-		instance.openList = new EasyStar.PriorityQueue("bestGuessDistance",EasyStar.PriorityQueue.MIN_HEAP);
-		instance.isDoneCalculating = false;
-		instance.nodeHash = {};
-		instance.startX = startX;
-		instance.startY = startY;
-		instance.endX = endX;
-		instance.endY = endY;
-		instance.callback = callback;
-		
-		instance.openList.insert(coordinateToNode(instance, instance.startX, 
-			instance.startY, null, STRAIGHT_COST));
-		
-		instances.push(instance);
-	};
-
-	/**
-	* This method steps through the A* Algorithm in an attempt to
-	* find your path(s). It will search 4 tiles for every calculation.
-	* You can change the number of calculations done in a call by using
-	* easystar.setIteratonsPerCalculation().
-	**/
-	this.calculate = function() {
-		if (instances.length === 0 || collisionGrid === undefined || acceptableTiles === undefined) {
-			return;
-		}
-		for (iterationsSoFar = 0; iterationsSoFar < iterationsPerCalculation; iterationsSoFar++) {
-			if (instances.length === 0) {
-				return;
-			}
-
-			//Couldn't find a path.
-			if (instances[0].openList.length===0) {
-				instances[0].callback(null);
-				instances.shift();
-				continue;
-			}
-
-			var searchNode = instances[0].openList.shiftHighestPriorityElement();
-			searchNode.list = EasyStar.Node.CLOSED_LIST;
-
-			if (searchNode.y > 0) {
-				checkAdjacentNode(instances[0], searchNode, 0, -1, STRAIGHT_COST * 
-					costMap[collisionGrid[searchNode.y-1][searchNode.x]]);
-				if (instances[0].isDoneCalculating===true) {
-					instances.shift();
-					continue;
-				}
-			}
-			if (searchNode.x < collisionGrid[0].length-1) {
-				checkAdjacentNode(instances[0], searchNode, 1, 0, STRAIGHT_COST *
-					costMap[collisionGrid[searchNode.y][searchNode.x+1]]);
-				if (instances[0].isDoneCalculating===true) {
-					instances.shift();
-					continue;
-				}
-			}
-			if (searchNode.y < collisionGrid.length-1) {
-				checkAdjacentNode(instances[0], searchNode, 0, 1, STRAIGHT_COST *
-					costMap[collisionGrid[searchNode.y+1][searchNode.x]]);
-				if (instances[0].isDoneCalculating===true) {
-					instances.shift();
-					continue;
-				}
-			}
-			if (searchNode.x > 0) {
-				checkAdjacentNode(instances[0], searchNode, -1, 0, STRAIGHT_COST *
-					costMap[collisionGrid[searchNode.y][searchNode.x-1]]);
-				if (instances[0].isDoneCalculating===true) {
-					instances.shift();
-					continue;
-				}
-			}
-			if (diagonalsEnabled) {
-				if (searchNode.x > 0 && searchNode.y > 0) {
-					checkAdjacentNode(instances[0], searchNode, -1, -1,  DIAGONAL_COST *
-						costMap[collisionGrid[searchNode.y-1][searchNode.x-1]]);
-					if (instances[0].isDoneCalculating===true) {
-						instances.shift();
-						continue;
-					}
-				}
-				if (searchNode.x < collisionGrid[0].length-1 && searchNode.y < collisionGrid.length-1) {
-					checkAdjacentNode(instances[0], searchNode, 1, 1, DIAGONAL_COST *
-						costMap[collisionGrid[searchNode.y+1][searchNode.x+1]]);
-					if (instances[0].isDoneCalculating===true) {
-						instances.shift();
-						continue;
-					}
-				}
-				if (searchNode.x < collisionGrid[0].length-1 && searchNode.y > 0) {
-					checkAdjacentNode(instances[0], searchNode, 1, -1, DIAGONAL_COST *
-						costMap[collisionGrid[searchNode.y-1][searchNode.x+1]]);
-					if (instances[0].isDoneCalculating===true) {
-						instances.shift();
-						continue;
-					}
-				}
-				if (searchNode.x > 0 && searchNode.y < collisionGrid.length-1) {
-					checkAdjacentNode(instances[0], searchNode, -1, 1, DIAGONAL_COST *
-						costMap[collisionGrid[searchNode.y+1][searchNode.x-1]]);
-					if (instances[0].isDoneCalculating===true) {
-						instances.shift();
-						continue;
-					}
-				}
-			}
-		}
-	};
-
-	//Private methods follow
-
-	var checkAdjacentNode = function(instance, searchNode, x, y, cost) {
-		var adjacentCoordinateX = searchNode.x+x;
-		var adjacentCoordinateY = searchNode.y+y;
-		
-		if (instance.endX === adjacentCoordinateX && instance.endY === adjacentCoordinateY) {
-			instance.isDoneCalculating = true;
-			var path = [];
-			var pathLen = 0;
-			path[pathLen] = {x: adjacentCoordinateX, y: adjacentCoordinateY};
-			pathLen++;
-			path[pathLen] = {x: searchNode.x, y:searchNode.y};
-			pathLen++;
-			var parent = searchNode.parent;
-			while (parent!=null) {
-				path[pathLen] = {x: parent.x, y:parent.y};
-				pathLen++;
-				parent = parent.parent;
-			}
-			path.reverse();
-			instance.callback(path);
-		}
-
-		if (pointsToAvoid[adjacentCoordinateX + "_" + adjacentCoordinateY] === undefined) {
-			for (var i = 0; i < acceptableTiles.length; i++) {
-				if (collisionGrid[adjacentCoordinateY][adjacentCoordinateX] === acceptableTiles[i]) {
-					
-					var node = coordinateToNode(instance, adjacentCoordinateX, 
-						adjacentCoordinateY, searchNode, cost);
-					
-					if (node.list === undefined) {
-						node.list = EasyStar.Node.OPEN_LIST;
-						instance.openList.insert(node);
-					} else if (node.list === EasyStar.Node.OPEN_LIST) {
-						if (searchNode.costSoFar + cost < node.costSoFar) {
-							node.costSoFar = searchNode.costSoFar + cost;
-							node.parent = searchNode;
-						}
-					}
-					break;
-				}
-			}
-
-		}
-	};
-
-	//Helpers
-
-	var coordinateToNode = function(instance, x, y, parent, cost) {
-		if (instance.nodeHash[x + "_" + y]!==undefined) {
-			return instance.nodeHash[x + "_" + y];
-		}
-		var simpleDistanceToTarget = getDistance(x, y, instance.endX, instance.endY);
-		if (parent!==null) {
-			var costSoFar = parent.costSoFar + cost;
-		} else {
-			costSoFar = simpleDistanceToTarget;
-		}
-		var node = new EasyStar.Node(parent,x,y,costSoFar,simpleDistanceToTarget);
-		instance.nodeHash[x + "_" + y] = node;
-		return node;
-	};
-
-	var getDistance = function(x1,y1,x2,y2) {
-		return Math.sqrt(Math.abs(x2-x1)*Math.abs(x2-x1) + Math.abs(y2-y1)*Math.abs(y2-y1)) * STRAIGHT_COST;
-	};
-}
\ No newline at end of file
diff --git a/moonlight/js/moonlight-skulk.js b/moonlight/js/moonlight-skulk.js
index be6d7a0..6ee5568 100644
--- a/moonlight/js/moonlight-skulk.js
+++ b/moonlight/js/moonlight-skulk.js
@@ -1,3 +1,12 @@
+SPEED_WALKING = 8;
+SPEED_RUNNING = 14;
+
+// Millisecond durations per tweens, per tile
+TWEEN_DURATION_PERTILE_RUNNING = 160;
+TWEEN_DURATION_PERTILE_WALKING = 224;
+TWEEN_DURATION_PERPIXEL_RUNNING = 5;
+TWEEN_DURATION_PERPIXEL_WALKING = 7;
+
 STATE_NONE = 0;
 STATE_UNAWARE = 1 << 1;
 STATE_CONCERNED = 1 << 2;
@@ -33,6 +42,7 @@ SPRITE_TOWNSFOLK_GUARD1 = 9;
 SPRITE_TOWNSFOLK_GUARD2 = 10;
 
 var pathfinder = null;
+var pathfinder_grid = null;
 
 var game = new Phaser.Game(640, 480, Phaser.AUTO, '');
 
@@ -623,6 +633,21 @@ var moonlightDialog = {
     }
 };
 
+// Return new array with duplicate values removed
+function array_unique(arr) {
+    var a = [];
+    var l = arr.length;
+    for(var i=0; i<l; i++) {
+	for(var j=i+1; j<l; j++) {
+	    // If arr[i] is found later in the array
+	    if (arr[i] === arr[j])
+		j = ++i;
+	}
+	a.push(arr[i]);
+    }
+    return a;
+}
+
 function stringSize(str, font)
 {
     var width = 0;
@@ -696,8 +721,6 @@ var AISprite = function(game, x, y, key, frame) {
 
 	var hyp = Math.sqrt(Number(xd * xd) + Number(yd * yd));
 	if ( hyp > this.view_distance ) {
-	    if ( debug == true )
-		console.log(spr + " is too far away");
 	    return false;
 	}
 
@@ -853,38 +876,136 @@ var AISprite = function(game, x, y, key, frame) {
 	this.bubble_text.position.y = ty;
     }
 
+    this.blocked = function() {
+	function f() {
+	    if ( hasState(this, STATE_FACE_LEFT) &&
+		 this.body.blocked.left == true )
+		return true;
+	    if ( hasState(this, STATE_FACE_RIGHT) &&
+		 this.body.blocked.right == true )
+		return true;
+	    if ( hasState(this, STATE_FACE_DOWN) &&
+		 this.body.blocked.down == true )
+		return true;
+	    if ( hasState(this, STATE_FACE_UP) &&
+		 this.body.blocked.up == true )
+		return true;
+	    return false;
+	}
+	console.log("this.blocked? " + f());
+	return f();
+    }
+
+    this.path_set = function(target, force) {
+	force = ( typeof force == undefined ? false : force );
+	if ( force == false &&
+	     this.path.length > 0 && 
+	     this.path_index < this.path_maximum_steps ) {
+	    return false;
+	}
+	this.path = [];
+	this.path_index = 0;
+	tpath = pathfinder.findPath(
+	    parseInt(this.x/32), 
+	    parseInt(this.y/32),
+	    parseInt(target.x/32), 
+	    parseInt(target.y/32),
+	    pathfinder_grid.clone()
+	);
+	prevpoint = [this.x, this.y];
+	for ( var i = 0 ; i < tpath.length ; i++ ) {
+	    if ( (prevpoint[0]+prevpoint[1]) == ((tpath[i][0]*32)+(tpath[i][1]*32)) )
+		continue;
+	    this.path.push(new Phaser.Line(prevpoint[0], prevpoint[1], 
+					   tpath[i][0]*32, tpath[i][1]*32));
+	    prevpoint = [tpath[i][0]*32, tpath[i][1]*32];
+	}
+	console.log("New path");
+	console.log(this.path);
+	return true;
+    }
+
+    this.path_tween_start = function()
+    {
+	this.path_tweens = [];
+	prevpos = [this.x, this.y]
+	for ( var i = 0; 
+	      i < Math.min(this.path_maximum_steps, this.path.length) ; 
+	      i++ ) {
+	    pl = this.path[i];
+	    movingstate = STATE_MOVING;
+	    if ( pl.end.x < prevpos[0]) {
+		movingstate = movingstate | STATE_FACE_LEFT;
+	    } else if ( pl.end.x > prevpos[0] ) {
+		movingstate = movingstate | STATE_FACE_RIGHT;
+	    }
+	    if ( pl.end.y < prevpos[1] ) {
+		movingstate = movingstate | STATE_FACE_UP;
+	    } else if ( pl.end.y > prevpos[1] ) {
+		movingstate = movingstate | STATE_FACE_DOWN;
+	    }
+	    prevpos = [pl.end.x, pl.end.y];
+	    tween = game.add.tween(this);
+	    tween.movingstate = movingstate;
+	    this.path_tweens.push(tween);
+	    tween.to(
+		{x: (pl.end.x), y: (pl.end.y)},
+		(TWEEN_DURATION_PERPIXEL_WALKING * pl.length),
+		null);
+	    tween.onStart.add(function() {
+		setMovingState(this._object, this.movingstate);
+		setSpriteMovement(this._object, false);
+	    }, tween);
+	    tween.onComplete.add(function() {
+		this._object.path_index += 1;
+		setMovingState(this._object, getFaceState(this._object));
+		setSpriteMovement(this._object, false);
+	    }, tween);
+	    if ( i > 0 ) {
+		this.path_tweens[i-1].onComplete.add(tween.start, 
+						     tween);
+	    }
+	}
+	console.log(this.path_tweens);
+	if ( this.path_tweens.length > 0 )
+	    this.path_tweens[0].start();
+    }
+
+    this.path_tween_stop = function()
+    {
+	this.path_tweens.forEach(function(x) {
+	    x.stop();
+	    game.tweens.remove(x);
+	}, this);
+    }
+
     this.action_chaseplayer = function()
     {
-	var newpath = []
 	var movingstate = STATE_NONE;
-	pathfinder.setCallbackFunction(function(path) {
-            newpath = (path || []);
-	});	
-	this.path = newpath;
-	pathfinder.preparePathCalculation([0,0], [player.x/32, player.y/32]);
-	pathfinder.calculatePath();
-	if ( this.path[0].x < this.x ) {
-	    movingstate = STATE_FACE_LEFT | STATE_MOVING | STATE_RUNNING;
-	} else if ( this.path[0].x > this.x ) {
-	    movingstate = STATE_FACE_RIGHT | STATE_MOVING | STATE_RUNNING;
-	} else if ( this.path[0].y < this.y ) {
-	    movingstate = STATE_FACE_UP | STATE_MOVING | STATE_RUNNING;
-	} else if ( this.path[0].y > this.y ) {
-	    movingstate = STATE_FACE_DOWN | STATE_MOVING | STATE_RUNNING;
+	if ( game.physics.arcade.collide(this, player) )
+	    return;
+
+	if ( this.path_index >= this.path.length ) {
+	    this.path_tween_stop();
+	    this.path_set(player, true);
+	    this.path_tween_start();
 	} else {
-	    movingstate = (this.state & STATES_FACE);
+	    if ( this.path_set(player, this.blocked(true)) )
+		this.path_tween_start();
 	}
-	setMovingState(this, movingstate);
+	return;
     }
 
     this.action_reportplayer = function()
     {
 	console.log("I AM REPORTING THE PLAYER");
+	setSpriteMovement(this);
     }
 
     this.action_huntplayer = function()
     {
 	console.log("I AM HUNTING FOR THE PLAYER");
+	setSpriteMovement(this);
     }
 
     this.action_wander = function()
@@ -952,7 +1073,6 @@ var AISprite = function(game, x, y, key, frame) {
 	} else {
 	    this.action_wander();
 	}
-	setSpriteMovement(this);
     }
 
     this.update_new_values = function() {
@@ -968,6 +1088,7 @@ var AISprite = function(game, x, y, key, frame) {
 	this.collide_with_map = parseBoolean(this.collide_with_map);
 	this.carries_light = parseBoolean(this.carries_light);
 
+	this.path_maximum_steps = parseInt(this.path_maximum_steps);
 	this.loadTexture(this.sprite_name, 0);
 	addAnimation(this, 'bipedwalkleft');
 	addAnimation(this, 'bipedwalkright');
@@ -997,6 +1118,11 @@ var AISprite = function(game, x, y, key, frame) {
     Phaser.Sprite.call(this, game, x, y, null);
     game.physics.arcade.enable(this);
     this.body.immovable = true;
+    pathfinder_grid = [];
+    this.walkables = [];
+    this.path = [];
+    this.path_tweens = [];
+    this.path_maximum_steps = 4;
     this.awareness_change_enabled = true;
     this.lightmeter = 1.0;
     this.sprite_can_see_lightmeter = 0.3;
@@ -1040,14 +1166,13 @@ var GameState = function(game) {
 
 GameState.prototype.create = function()
 {
-    this.pathfinding_grid = []
     this.map = this.add.tilemap('map');
     for (var k in moonlightSettings['map']['tilesets']) {
 	var ts = moonlightSettings['map']['tilesets'][k];
 	this.map.addTilesetImage(ts['name']);
     }
-
     this.map_collision_layers = [];
+    pfgrid = [];
 
     for (var ln in moonlightSettings['map']['layers']) {
 	lp = moonlightSettings['map']['layers'][ln];
@@ -1061,6 +1186,7 @@ GameState.prototype.create = function()
 	    );
 	    if ( lp['inject_sprites'] == true ) {
 		this.aiSprites = game.add.group();
+		this.aiSprites.debug = true;
 		this.map.createFromObjects('AI', 3544, 'player', 0, true, false, this.aiSprites, AISprite);
 		this.aiSprites.forEach(function(spr) {
 		    spr.update_new_values();
@@ -1071,29 +1197,38 @@ GameState.prototype.create = function()
 	    };
 	    if ( lp['collides'] == true ) {
 		this.map_collision_layers.push(layer);
-		for (var i = 0; i < layer.data.length; i++)
+		console.log(layer);
+		for (var i = 0; i < layer.layer.data.length; i++)
 		{
-		    if ( this.pathfinding_grid.length <= i )
-			this.pathfinding_grid[i] = [];
-		    for (var j = 0; j < layer.data[i].length; j++)
+		    if ( i >= pfgrid.length )
+			pfgrid[i] = [];
+		    for (var j = 0; j < layer.layer.data[i].length; j++)
 		    {
-			if (layer.data[i][j])
-			    this.pathfinding_grid[i][j] = layer.data[i][j].index;
-			else
-			    this.pathfinding_grid[i][j] = 0;
+			if (layer.layer.data[i][j].index > 0) {
+			    pfgrid[i][j] = 1;
+			} else if ( pfgrid[i][j] != 1 ) {
+			    pfgrid[i][j] = 0;
+			}
 		    }
 		}
 	    }
 	    layer.resizeWorld();
 	}
     }
-	
-    pathfinder = game.plugins.add(Phaser.Plugin.PathFinderPlugin);
-    pathfinder.setGrid(map.layers[0].data, walkables);
+
+    console.log(pfgrid)
+    pathfinder_grid = new PF.Grid(this.map.width,
+				  this.map.height,
+				  pfgrid);
+    pathfinder = new PF.AStarFinder({allowDiagonal: false});
+    
+    console.log(pathfinder_grid);
+    console.log(pathfinder);
 
     this.physics.arcade.enable(player);
     player.body.center = new Phaser.Point(player.body.width / 2, player.body.height + player.body.halfHeight);
     player.body.collideWorldBounds = true;
+    player.body.immovable = true;
 
     addAnimation(player, 'bipedwalkleft');
     addAnimation(player, 'bipedwalkright');
@@ -1195,6 +1330,20 @@ GameState.prototype.updateShadowTexture = function() {
     this.shadowTexture.dirty = true;
 };
 
+function getFaceState(spr)
+{
+    return ( hasState(spr, STATE_FACE_LEFT) ||
+	     hasState(spr, STATE_FACE_RIGHT) ||
+	     hasState(spr, STATE_FACE_DOWN) ||
+	     hasState(spr, STATE_FACE_UP) );
+}
+
+function getMoveState(spr)
+{
+    return ( hasState(spr, STATE_MOVING) ||
+	     hasState(spr, STATE_RUNNING) );
+}
+
 function delState(spr, state)
 {
     if ( hasState(spr, state) )
@@ -1266,41 +1415,49 @@ function parseBoolean(val)
     return ( val == 'true' || val == true );
 }
 
-function setSpriteMovement(spr)
+function setSpriteMovement(spr, velocity)
 {
     var x = 0;
     var y = 0;
     var dir = spriteFacing(spr);
+    velocity = ( typeof velocity == undefined ? velocity : [SPEED_WALKING, 
+							    SPEED_RUNNING] );
 
     spr.body.setSize(16, 16, 8, 16);
 
     if ( hasState(spr, STATE_RUNNING) ) {
-	x = 200;
-	y = 200;
+	if ( velocity !== false )
+	    velocity = velocity[1];
+	console.log("Playing bipedrun" + dir);
 	spr.animations.play("bipedrun" + dir);
     } else if ( hasState(spr, STATE_MOVING) ) {
-	x = 75;
-	y = 75;
+	if ( velocity !== false )
+	    velocity = velocity[0];
+	console.log("Playing bipedwalk" + dir);
 	spr.animations.play("bipedwalk" + dir);
     } else {
-	spr.body.velocity.x = 0;
-	spr.body.velocity.y = 0;
+	if ( velocity !== false ) {
+	    spr.body.velocity.x = 0;
+	    spr.body.velocity.y = 0;
+	}
 	spr.animations.stop();
 	return;
     }
 
-    if ( dir == "left" ) {
-	spr.body.velocity.x = -x;
-	spr.body.velocity.y = 0;
-    } else if ( dir == "right" ) {
-	spr.body.velocity.x = x;
-	spr.body.velocity.y = 0;
-    } else if ( dir == "up" ) {
-	spr.body.velocity.x = 0;
-	spr.body.velocity.y = -y;
-    } else if ( dir == "down" ) {
-	spr.body.velocity.x = 0;
-	spr.body.velocity.y = y;
+    if ( velocity !== false ) {
+	if ( dir == "left" ) {
+	    spr.body.velocity.x = -(velocity * velocity);
+	    spr.body.velocity.y = 0;
+	} else if ( dir == "right" ) {
+	    spr.body.velocity.x = (velocity * velocity);
+	    spr.body.velocity.y = 0;
+	} else if ( dir == "up" ) {
+	    spr.body.velocity.x = 0;
+	    spr.body.velocity.y = -(velocity * velocity);
+	} else if ( dir == "down" ) {
+	    spr.body.velocity.x = 0;
+	    spr.body.velocity.y = (velocity * velocity);
+	}
     }
 }
 
@@ -1416,18 +1573,32 @@ GameState.prototype.update = function()
     this.aiSprites.forEach(_inner_collide, this);
     this.updateShadowTexture();
 
-    // function _draw_viewrect(x) {
-    // 	var r = x.viewRectangle();
-    // 	if ( r == null ) 
-    // 	    return;
-    // 	this.shadowTexture.context.fillStyle = 'rgb(128, 128, 128)';
-    // 	this.shadowTexture.context.fillRect(r.left, 
-    // 					    r.top, 
-    // 					    r.width,
-    // 					    r.height);
+    // if ( this.aiSprites.debug == true ) {
+    // 	function _draw_viewrect(x) {
+    // 	    var r = x.viewRectangle();
+    // 	    if ( r == null ) 
+    // 		return;
+    // 	    this.shadowTexture.context.fillStyle = 'rgb(128, 128, 128)';
+    // 	    this.shadowTexture.context.fillRect(r.left, 
+    // 						r.top, 
+    // 						r.width,
+    // 						r.height);
+    // 	}
+    // 	this.aiSprites.forEach(_draw_viewrect, this);
+    // 	function _draw_aipath(x) {
+    // 	    var p = x.path;
+    // 	    if ( p == null )
+    // 		return;
+    // 	    this.shadowTexture.context.fillStyle = 'rgb(255, 128, 128)';
+    // 	    p.forEach(function(r) {
+    // 		this.shadowTexture.context.fillRect(r.start.x, 
+    // 						    r.start.y, 
+    // 						    r.end.x - r.start.x,
+    // 						    r.end.y - r.start.y);
+    // 	    }, this);
+    // 	}
+    // 	this.aiSprites.forEach(_draw_aipath, this);
     // }
-    // this.aiSprites.forEach(_draw_viewrect, this);
-
     if (game.time.fps !== 0) {
         this.fpsText.setText(game.time.fps + ' FPS');
     }
@@ -1443,15 +1614,13 @@ var Boot = function(game) {
 
 Boot.prototype.preload = function()
 {
-    console.log("Boot.preload");
     game.load.image('preloader', 'gfx/ui/preloader.png');
 };
 
 Boot.prototype.create = function()
 {
-    console.log("Boot.create");
     this.input.maxPointers = 1;
-    this.stage.disableVisibilityChange = true;
+    this.stage.disableVisibilityChange = false;
     this.stage.scale.pageAlignHoritzontally = true;
     game.state.start('preloader', true, false);
 }
@@ -1461,7 +1630,6 @@ var Preloader = function(game) {
 
 Preloader.prototype.preload = function()
 {
-    console.log("Preloader.preload");
     this.preloadBar = game.add.sprite(0, 0, 'preloader');
     this.preloadBar.anchor.setTo(0.5, 0.5);
     this.preloadBar.x = game.camera.x + (game.camera.width / 2);
@@ -1489,12 +1657,10 @@ Preloader.prototype.preload = function()
 		      moonlightSettings['map']['path'],
 		      null,
 		      Phaser.Tilemap.TILED_JSON);
-
 }
 
 Preloader.prototype.create = function()
 {
-    console.log("Preloader.create");
     function goalready() {
 	this.preloadBar.destroy();
 	game.state.start('game', true, false);
@@ -1504,11 +1670,8 @@ Preloader.prototype.create = function()
     tween.onComplete.add(goalready, this);
 }
 
-console.log("Adding boot");
 game.state.add('boot', Boot, false);
-console.log("Adding preloader");
 game.state.add('preloader', Preloader, false);
-console.log("Adding game");
 game.state.add('game', GameState, false);
 
 game.state.start('boot');
diff --git a/moonlight/js/pathfinding-browser.min.js b/moonlight/js/pathfinding-browser.min.js
new file mode 100644
index 0000000..c25dd0a
--- /dev/null
+++ b/moonlight/js/pathfinding-browser.min.js
@@ -0,0 +1 @@
+!function(t){if("function"==typeof bootstrap)bootstrap("pf",t);else if("object"==typeof exports)module.exports=t();else if("function"==typeof define&&define.amd)define(t);else if("undefined"!=typeof ses){if(!ses.ok())return;ses.makePF=t}else"undefined"!=typeof window?window.PF=t():global.PF=t()}(function(){return function(t,e,r){function i(r,o){if(!e[r]){if(!t[r]){var s="function"==typeof require&&require;if(!o&&s)return s(r,!0);if(n)return n(r,!0);throw new Error("Cannot find module '"+r+"'")}var a=e[r]={exports:{}};t[r][0].call(a.exports,function(e){var n=t[r][1][e];return i(n?n:e)},a,a.exports)}return e[r].exports}for(var n="function"==typeof require&&require,o=0;o<r.length;o++)i(r[o]);return i}({1:[function(t,e){e.exports=t("./lib/heap")},{"./lib/heap":2}],2:[function(t,e){!function(){var t,r,i,n,o,s,a,u,h,l,p,c,f,d,g;i=Math.floor,l=Math.min,r=function(t,e){return e>t?-1:t>e?1:0},h=function(t,e,n,o,s){var a;if(null==n&&(n=0),null==s&&(s=r),0>n)throw new Error("lo must be non-negative");for(null==o&&(o=t.length);o>n;)a=i((n+o)/2),s(e,t[a])<0?o=a:n=a+1;return[].splice.apply(t,[n,n-n].concat(e)),e},s=function(t,e,i){return null==i&&(i=r),t.push(e),d(t,0,t.length-1,i)},o=function(t,e){var i,n;return null==e&&(e=r),i=t.pop(),t.length?(n=t[0],t[0]=i,g(t,0,e)):n=i,n},u=function(t,e,i){var n;return null==i&&(i=r),n=t[0],t[0]=e,g(t,0,i),n},a=function(t,e,i){var n;return null==i&&(i=r),t.length&&i(t[0],e)<0&&(n=[t[0],e],e=n[0],t[0]=n[1],g(t,0,i)),e},n=function(t,e){var n,o,s,a,u,h;for(null==e&&(e=r),a=function(){h=[];for(var e=0,r=i(t.length/2);r>=0?r>e:e>r;r>=0?e++:e--)h.push(e);return h}.apply(this).reverse(),u=[],o=0,s=a.length;s>o;o++)n=a[o],u.push(g(t,n,e));return u},f=function(t,e,i){var n;return null==i&&(i=r),n=t.indexOf(e),-1!==n?(d(t,0,n,i),g(t,n,i)):void 0},p=function(t,e,i){var o,s,u,h,l;if(null==i&&(i=r),s=t.slice(0,e),!s.length)return s;for(n(s,i),l=t.slice(e),u=0,h=l.length;h>u;u++)o=l[u],a(s,o,i);return s.sort(i).reverse()},c=function(t,e,i){var s,a,u,p,c,f,d,g,b,y;if(null==i&&(i=r),10*e<=t.length){if(p=t.slice(0,e).sort(i),!p.length)return p;for(u=p[p.length-1],g=t.slice(e),c=0,d=g.length;d>c;c++)s=g[c],i(s,u)<0&&(h(p,s,0,null,i),p.pop(),u=p[p.length-1]);return p}for(n(t,i),y=[],a=f=0,b=l(e,t.length);b>=0?b>f:f>b;a=b>=0?++f:--f)y.push(o(t,i));return y},d=function(t,e,i,n){var o,s,a;for(null==n&&(n=r),o=t[i];i>e&&(a=i-1>>1,s=t[a],n(o,s)<0);)t[i]=s,i=a;return t[i]=o},g=function(t,e,i){var n,o,s,a,u;for(null==i&&(i=r),o=t.length,u=e,s=t[e],n=2*e+1;o>n;)a=n+1,o>a&&!(i(t[n],t[a])<0)&&(n=a),t[e]=t[n],e=n,n=2*e+1;return t[e]=s,d(t,u,e,i)},t=function(){function t(t){this.cmp=null!=t?t:r,this.nodes=[]}return t.push=s,t.pop=o,t.replace=u,t.pushpop=a,t.heapify=n,t.nlargest=p,t.nsmallest=c,t.prototype.push=function(t){return s(this.nodes,t,this.cmp)},t.prototype.pop=function(){return o(this.nodes,this.cmp)},t.prototype.peek=function(){return this.nodes[0]},t.prototype.contains=function(t){return-1!==this.nodes.indexOf(t)},t.prototype.replace=function(t){return u(this.nodes,t,this.cmp)},t.prototype.pushpop=function(t){return a(this.nodes,t,this.cmp)},t.prototype.heapify=function(){return n(this.nodes,this.cmp)},t.prototype.updateItem=function(t){return f(this.nodes,t,this.cmp)},t.prototype.clear=function(){return this.nodes=[]},t.prototype.empty=function(){return 0===this.nodes.length},t.prototype.size=function(){return this.nodes.length},t.prototype.clone=function(){var e;return e=new t,e.nodes=this.nodes.slice(0),e},t.prototype.toArray=function(){return this.nodes.slice(0)},t.prototype.insert=t.prototype.push,t.prototype.remove=t.prototype.pop,t.prototype.top=t.prototype.peek,t.prototype.front=t.prototype.peek,t.prototype.has=t.prototype.contains,t.prototype.copy=t.prototype.clone,t}(),("undefined"!=typeof e&&null!==e?e.exports:void 0)?e.exports=t:window.Heap=t}.call(this)},{}],3:[function(t,e){e.exports={Heap:t("heap"),Node:t("./core/Node"),Grid:t("./core/Grid"),Util:t("./core/Util"),Heuristic:t("./core/Heuristic"),AStarFinder:t("./finders/AStarFinder"),BestFirstFinder:t("./finders/BestFirstFinder"),BreadthFirstFinder:t("./finders/BreadthFirstFinder"),DijkstraFinder:t("./finders/DijkstraFinder"),BiAStarFinder:t("./finders/BiAStarFinder"),BiBestFirstFinder:t("./finders/BiBestFirstFinder"),BiBreadthFirstFinder:t("./finders/BiBreadthFirstFinder"),BiDijkstraFinder:t("./finders/BiDijkstraFinder"),IDAStarFinder:t("./finders/IDAStarFinder"),JumpPointFinder:t("./finders/JumpPointFinder"),OrthogonalJumpPointFinder:t("./finders/OrthogonalJumpPointFinder"),TraceFinder:t("./finders/TraceFinder")}},{"./core/Grid":4,"./core/Heuristic":5,"./core/Node":6,"./core/Util":7,"./finders/AStarFinder":8,"./finders/BestFirstFinder":9,"./finders/BiAStarFinder":10,"./finders/BiBestFirstFinder":11,"./finders/BiBreadthFirstFinder":12,"./finders/BiDijkstraFinder":13,"./finders/BreadthFirstFinder":14,"./finders/DijkstraFinder":15,"./finders/IDAStarFinder":16,"./finders/JumpPointFinder":17,"./finders/OrthogonalJumpPointFinder":18,"./finders/TraceFinder":19,heap:1}],4:[function(t,e){function r(t,e,r){this.width=t,this.height=e,this.nodes=this._buildNodes(t,e,r)}var i=t("./Node");r.prototype._buildNodes=function(t,e,r){var n,o,s=new Array(e);for(n=0;e>n;++n)for(s[n]=new Array(t),o=0;t>o;++o)s[n][o]=new i(o,n);if(void 0===r)return s;if(r.length!==e||r[0].length!==t)throw new Error("Matrix size does not fit");for(n=0;e>n;++n)for(o=0;t>o;++o)r[n][o]&&(s[n][o].walkable=!1);return s},r.prototype.getNodeAt=function(t,e){return this.nodes[e][t]},r.prototype.isWalkableAt=function(t,e){return this.isInside(t,e)&&this.nodes[e][t].walkable},r.prototype.isInside=function(t,e){return t>=0&&t<this.width&&e>=0&&e<this.height},r.prototype.setWalkableAt=function(t,e,r){this.nodes[e][t].walkable=r},r.prototype.getNeighbors=function(t,e,r){var i=t.x,n=t.y,o=[],s=!1,a=!1,u=!1,h=!1,l=!1,p=!1,c=!1,f=!1,d=this.nodes;return this.isWalkableAt(i,n-1)&&(o.push(d[n-1][i]),s=!0),this.isWalkableAt(i+1,n)&&(o.push(d[n][i+1]),u=!0),this.isWalkableAt(i,n+1)&&(o.push(d[n+1][i]),l=!0),this.isWalkableAt(i-1,n)&&(o.push(d[n][i-1]),c=!0),e?(r?(a=c&&s,h=s&&u,p=u&&l,f=l&&c):(a=c||s,h=s||u,p=u||l,f=l||c),a&&this.isWalkableAt(i-1,n-1)&&o.push(d[n-1][i-1]),h&&this.isWalkableAt(i+1,n-1)&&o.push(d[n-1][i+1]),p&&this.isWalkableAt(i+1,n+1)&&o.push(d[n+1][i+1]),f&&this.isWalkableAt(i-1,n+1)&&o.push(d[n+1][i-1]),o):o},r.prototype.clone=function(){var t,e,n=this.width,o=this.height,s=this.nodes,a=new r(n,o),u=new Array(o);for(t=0;o>t;++t)for(u[t]=new Array(n),e=0;n>e;++e)u[t][e]=new i(e,t,s[t][e].walkable);return a.nodes=u,a},e.exports=r},{"./Node":6}],5:[function(t,e){e.exports={manhattan:function(t,e){return t+e},euclidean:function(t,e){return Math.sqrt(t*t+e*e)},chebyshev:function(t,e){return Math.max(t,e)}}},{}],6:[function(t,e){function r(t,e,r){this.x=t,this.y=e,this.walkable=void 0===r?!0:r}e.exports=r},{}],7:[function(t,e,r){function i(t){for(var e=[[t.x,t.y]];t.parent;)t=t.parent,e.push([t.x,t.y]);return e.reverse()}function n(t,e){var r=i(t),n=i(e);return r.concat(n.reverse())}function o(t){var e,r,i,n,o,s=0;for(e=1;e<t.length;++e)r=t[e-1],i=t[e],n=r[0]-i[0],o=r[1]-i[1],s+=Math.sqrt(n*n+o*o);return s}function s(t,e,r,i){var n,o,s,a,u,h,l=Math.abs,p=[];for(s=l(r-t),a=l(i-e),n=r>t?1:-1,o=i>e?1:-1,u=s-a;;){if(p.push([t,e]),t===r&&e===i)break;h=2*u,h>-a&&(u-=a,t+=n),s>h&&(u+=s,e+=o)}return p}function a(t){var e,r,i,n,o,a,u=[],h=t.length;if(2>h)return u;for(o=0;h-1>o;++o)for(e=t[o],r=t[o+1],i=s(e[0],e[1],r[0],r[1]),n=i.length,a=0;n-1>a;++a)u.push(i[a]);return u.push(t[h-1]),u}function u(t,e){var r,i,n,o,a,u,h,l,p,c,f,d,g,b=e.length,y=e[0][0],A=e[0][1],k=e[b-1][0],m=e[b-1][1];for(r=y,i=A,a=e[1][0],u=e[1][1],h=[[r,i]],l=2;b>l;++l){for(c=e[l],n=c[0],o=c[1],f=s(r,i,n,o),g=!1,p=1;p<f.length;++p)if(d=f[p],!t.isWalkableAt(d[0],d[1])){g=!0,h.push([a,u]),r=a,i=u;break}g||(a=n,u=o)}return h.push([k,m]),h}function h(t){if(t.length<3)return t;var e,r,i,n,o,s,a=[],u=t[0][0],h=t[0][1],l=t[1][0],p=t[1][1],c=l-u,f=p-h;for(o=Math.sqrt(c*c+f*f),c/=o,f/=o,a.push([u,h]),s=2;s<t.length;s++)e=l,r=p,i=c,n=f,l=t[s][0],p=t[s][1],c=l-e,f=p-r,o=Math.sqrt(c*c+f*f),c/=o,f/=o,(c!==i||f!==n)&&a.push([e,r]);return a.push([l,p]),a}r.backtrace=i,r.biBacktrace=n,r.pathLength=o,r.interpolate=s,r.expandPath=a,r.smoothenPath=u,r.compressPath=h},{}],8:[function(t,e){function r(t){t=t||{},this.allowDiagonal=t.allowDiagonal,this.dontCrossCorners=t.dontCrossCorners,this.heuristic=t.heuristic||o.manhattan,this.weight=t.weight||1}var i=t("heap"),n=t("../core/Util"),o=t("../core/Heuristic");r.prototype.findPath=function(t,e,r,o,s){var a,u,h,l,p,c,f,d,g=new i(function(t,e){return t.f-e.f}),b=s.getNodeAt(t,e),y=s.getNodeAt(r,o),A=this.heuristic,k=this.allowDiagonal,m=this.dontCrossCorners,v=this.weight,w=Math.abs,x=Math.SQRT2;for(b.g=0,b.f=0,g.push(b),b.opened=!0;!g.empty();){if(a=g.pop(),a.closed=!0,a===y)return n.backtrace(y);for(u=s.getNeighbors(a,k,m),l=0,p=u.length;p>l;++l)h=u[l],h.closed||(c=h.x,f=h.y,d=a.g+(0===c-a.x||0===f-a.y?1:x),(!h.opened||d<h.g)&&(h.g=d,h.h=h.h||v*A(w(c-r),w(f-o)),h.f=h.g+h.h,h.parent=a,h.opened?g.updateItem(h):(g.push(h),h.opened=!0)))}return[]},e.exports=r},{"../core/Heuristic":5,"../core/Util":7,heap:1}],9:[function(t,e){function r(t){i.call(this,t);var e=this.heuristic;this.heuristic=function(t,r){return 1e6*e(t,r)}}var i=t("./AStarFinder");r.prototype=new i,r.prototype.constructor=r,e.exports=r},{"./AStarFinder":8}],10:[function(t,e){function r(t){t=t||{},this.allowDiagonal=t.allowDiagonal,this.dontCrossCorners=t.dontCrossCorners,this.heuristic=t.heuristic||o.manhattan,this.weight=t.weight||1}var i=t("heap"),n=t("../core/Util"),o=t("../core/Heuristic");r.prototype.findPath=function(t,e,r,o,s){var a,u,h,l,p,c,f,d,g=function(t,e){return t.f-e.f},b=new i(g),y=new i(g),A=s.getNodeAt(t,e),k=s.getNodeAt(r,o),m=this.heuristic,v=this.allowDiagonal,w=this.dontCrossCorners,x=this.weight,F=Math.abs,W=Math.SQRT2,N=1,C=2;for(A.g=0,A.f=0,b.push(A),A.opened=N,k.g=0,k.f=0,y.push(k),k.opened=C;!b.empty()&&!y.empty();){for(a=b.pop(),a.closed=!0,u=s.getNeighbors(a,v,w),l=0,p=u.length;p>l;++l)if(h=u[l],!h.closed){if(h.opened===C)return n.biBacktrace(a,h);c=h.x,f=h.y,d=a.g+(0===c-a.x||0===f-a.y?1:W),(!h.opened||d<h.g)&&(h.g=d,h.h=h.h||x*m(F(c-r),F(f-o)),h.f=h.g+h.h,h.parent=a,h.opened?b.updateItem(h):(b.push(h),h.opened=N))}for(a=y.pop(),a.closed=!0,u=s.getNeighbors(a,v,w),l=0,p=u.length;p>l;++l)if(h=u[l],!h.closed){if(h.opened===N)return n.biBacktrace(h,a);c=h.x,f=h.y,d=a.g+(0===c-a.x||0===f-a.y?1:W),(!h.opened||d<h.g)&&(h.g=d,h.h=h.h||x*m(F(c-t),F(f-e)),h.f=h.g+h.h,h.parent=a,h.opened?y.updateItem(h):(y.push(h),h.opened=C))}}return[]},e.exports=r},{"../core/Heuristic":5,"../core/Util":7,heap:1}],11:[function(t,e){function r(t){i.call(this,t);var e=this.heuristic;this.heuristic=function(t,r){return 1e6*e(t,r)}}var i=t("./BiAStarFinder");r.prototype=new i,r.prototype.constructor=r,e.exports=r},{"./BiAStarFinder":10}],12:[function(t,e){function r(t){t=t||{},this.allowDiagonal=t.allowDiagonal,this.dontCrossCorners=t.dontCrossCorners}var i=t("../core/Util");r.prototype.findPath=function(t,e,r,n,o){var s,a,u,h,l,p=o.getNodeAt(t,e),c=o.getNodeAt(r,n),f=[],d=[],g=this.allowDiagonal,b=this.dontCrossCorners,y=0,A=1;for(f.push(p),p.opened=!0,p.by=y,d.push(c),c.opened=!0,c.by=A;f.length&&d.length;){for(u=f.shift(),u.closed=!0,s=o.getNeighbors(u,g,b),h=0,l=s.length;l>h;++h)if(a=s[h],!a.closed)if(a.opened){if(a.by===A)return i.biBacktrace(u,a)}else f.push(a),a.parent=u,a.opened=!0,a.by=y;for(u=d.shift(),u.closed=!0,s=o.getNeighbors(u,g,b),h=0,l=s.length;l>h;++h)if(a=s[h],!a.closed)if(a.opened){if(a.by===y)return i.biBacktrace(a,u)}else d.push(a),a.parent=u,a.opened=!0,a.by=A}return[]},e.exports=r},{"../core/Util":7}],13:[function(t,e){function r(t){i.call(this,t),this.heuristic=function(){return 0}}var i=t("./BiAStarFinder");r.prototype=new i,r.prototype.constructor=r,e.exports=r},{"./BiAStarFinder":10}],14:[function(t,e){function r(t){t=t||{},this.allowDiagonal=t.allowDiagonal,this.dontCrossCorners=t.dontCrossCorners}var i=t("../core/Util");r.prototype.findPath=function(t,e,r,n,o){var s,a,u,h,l,p=[],c=this.allowDiagonal,f=this.dontCrossCorners,d=o.getNodeAt(t,e),g=o.getNodeAt(r,n);for(p.push(d),d.opened=!0;p.length;){if(u=p.shift(),u.closed=!0,u===g)return i.backtrace(g);for(s=o.getNeighbors(u,c,f),h=0,l=s.length;l>h;++h)a=s[h],a.closed||a.opened||(p.push(a),a.opened=!0,a.parent=u)}return[]},e.exports=r},{"../core/Util":7}],15:[function(t,e){function r(t){i.call(this,t),this.heuristic=function(){return 0}}var i=t("./AStarFinder");r.prototype=new i,r.prototype.constructor=r,e.exports=r},{"./AStarFinder":8}],16:[function(t,e){function r(t){t=t||{},this.allowDiagonal=t.allowDiagonal,this.dontCrossCorners=t.dontCrossCorners,this.heuristic=t.heuristic||i.manhattan,this.weight=t.weight||1,this.trackRecursion=t.trackRecursion||!1,this.timeLimit=t.timeLimit||1/0}t("../core/Util");var i=t("../core/Heuristic"),n=t("../core/Node");r.prototype.findPath=function(t,e,r,i,o){var s,a,u,h=0,l=(new Date).getTime(),p=function(t,e){return this.heuristic(Math.abs(e.x-t.x),Math.abs(e.y-t.y))}.bind(this),c=function(t,e){return t.x===e.x||t.y===e.y?1:Math.SQRT2},f=function(t,e,r,i,s){if(h++,this.timeLimit>0&&(new Date).getTime()-l>1e3*this.timeLimit)return 1/0;var a=e+p(t,g)*this.weight;if(a>r)return a;if(t==g)return i[s]=[t.x,t.y],t;var u,d,b,y,A=o.getNeighbors(t,this.allowDiagonal,this.dontCrossCorners);for(b=0,u=1/0;y=A[b];++b){if(this.trackRecursion&&(y.retainCount=y.retainCount+1||1,y.tested!==!0&&(y.tested=!0)),d=f(y,e+c(t,y),r,i,s+1),d instanceof n)return i[s]=[t.x,t.y],d;this.trackRecursion&&0===--y.retainCount&&(y.tested=!1),u>d&&(u=d)}return u}.bind(this),d=o.getNodeAt(t,e),g=o.getNodeAt(r,i),b=p(d,g);for(s=0;!0;++s){if(a=[],u=f(d,0,b,a,0),1/0===u)return[];if(u instanceof n)return a;b=u}return[]},e.exports=r},{"../core/Heuristic":5,"../core/Node":6,"../core/Util":7}],17:[function(t,e){function r(t){t=t||{},this.heuristic=t.heuristic||o.manhattan,this.trackJumpRecursion=t.trackJumpRecursion||!1}var i=t("heap"),n=t("../core/Util"),o=t("../core/Heuristic");r.prototype.findPath=function(t,e,r,o,s){var a,u=this.openList=new i(function(t,e){return t.f-e.f}),h=this.startNode=s.getNodeAt(t,e),l=this.endNode=s.getNodeAt(r,o);for(this.grid=s,h.g=0,h.f=0,u.push(h),h.opened=!0;!u.empty();){if(a=u.pop(),a.closed=!0,a===l)return n.expandPath(n.backtrace(l));this._identifySuccessors(a)}return[]},r.prototype._identifySuccessors=function(t){var e,r,i,n,s,a,u,h,l,p,c=this.grid,f=this.heuristic,d=this.openList,g=this.endNode.x,b=this.endNode.y,y=t.x,A=t.y,k=Math.abs;for(Math.max,e=this._findNeighbors(t),n=0,s=e.length;s>n;++n)if(r=e[n],i=this._jump(r[0],r[1],y,A)){if(a=i[0],u=i[1],p=c.getNodeAt(a,u),p.closed)continue;h=o.euclidean(k(a-y),k(u-A)),l=t.g+h,(!p.opened||l<p.g)&&(p.g=l,p.h=p.h||f(k(a-g),k(u-b)),p.f=p.g+p.h,p.parent=t,p.opened?d.updateItem(p):(d.push(p),p.opened=!0))}},r.prototype._jump=function(t,e,r,i){var n=this.grid,o=t-r,s=e-i;if(!n.isWalkableAt(t,e))return null;if(this.trackJumpRecursion===!0&&(n.getNodeAt(t,e).tested=!0),n.getNodeAt(t,e)===this.endNode)return[t,e];if(0!==o&&0!==s){if(n.isWalkableAt(t-o,e+s)&&!n.isWalkableAt(t-o,e)||n.isWalkableAt(t+o,e-s)&&!n.isWalkableAt(t,e-s))return[t,e]}else if(0!==o){if(n.isWalkableAt(t+o,e+1)&&!n.isWalkableAt(t,e+1)||n.isWalkableAt(t+o,e-1)&&!n.isWalkableAt(t,e-1))return[t,e]}else if(n.isWalkableAt(t+1,e+s)&&!n.isWalkableAt(t+1,e)||n.isWalkableAt(t-1,e+s)&&!n.isWalkableAt(t-1,e))return[t,e];return 0!==o&&0!==s&&(this._jump(t+o,e,t,e)||this._jump(t,e+s,t,e))?[t,e]:n.isWalkableAt(t+o,e)||n.isWalkableAt(t,e+s)?this._jump(t+o,e+s,t,e):null},r.prototype._findNeighbors=function(t){var e,r,i,n,o,s,a,u,h=t.parent,l=t.x,p=t.y,c=this.grid,f=[];if(h)e=h.x,r=h.y,i=(l-e)/Math.max(Math.abs(l-e),1),n=(p-r)/Math.max(Math.abs(p-r),1),0!==i&&0!==n?(c.isWalkableAt(l,p+n)&&f.push([l,p+n]),c.isWalkableAt(l+i,p)&&f.push([l+i,p]),(c.isWalkableAt(l,p+n)||c.isWalkableAt(l+i,p))&&f.push([l+i,p+n]),!c.isWalkableAt(l-i,p)&&c.isWalkableAt(l,p+n)&&f.push([l-i,p+n]),!c.isWalkableAt(l,p-n)&&c.isWalkableAt(l+i,p)&&f.push([l+i,p-n])):0===i?c.isWalkableAt(l,p+n)&&(f.push([l,p+n]),c.isWalkableAt(l+1,p)||f.push([l+1,p+n]),c.isWalkableAt(l-1,p)||f.push([l-1,p+n])):c.isWalkableAt(l+i,p)&&(f.push([l+i,p]),c.isWalkableAt(l,p+1)||f.push([l+i,p+1]),c.isWalkableAt(l,p-1)||f.push([l+i,p-1]));else for(o=c.getNeighbors(t,!0),a=0,u=o.length;u>a;++a)s=o[a],f.push([s.x,s.y]);return f},e.exports=r},{"../core/Heuristic":5,"../core/Util":7,heap:1}],18:[function(t,e){function r(t){n.call(this,t),t=t||{},this.heuristic=t.heuristic||i.manhattan}var i=t("../core/Heuristic"),n=t("./JumpPointFinder");r.prototype=new n,r.prototype.constructor=r,r.prototype._jump=function(t,e,r,i){var n=this.grid,o=t-r,s=e-i;if(!n.isWalkableAt(t,e))return null;if(this.trackJumpRecursion===!0&&(n.getNodeAt(t,e).tested=!0),n.getNodeAt(t,e)===this.endNode)return[t,e];if(0!==o){if(n.isWalkableAt(t,e-1)&&!n.isWalkableAt(t-o,e-1)||n.isWalkableAt(t,e+1)&&!n.isWalkableAt(t-o,e+1))return[t,e]}else{if(0===s)throw new Error("Only horizontal and vertical movements are allowed");if(n.isWalkableAt(t-1,e)&&!n.isWalkableAt(t-1,e-s)||n.isWalkableAt(t+1,e)&&!n.isWalkableAt(t+1,e-s))return[t,e];if(this._jump(t+1,e,t,e)||this._jump(t-1,e,t,e))return[t,e]}return this._jump(t+o,e+s,t,e)},r.prototype._findNeighbors=function(t){var e,r,i,n,o,s,a,u,h=t.parent,l=t.x,p=t.y,c=this.grid,f=[];if(h)e=h.x,r=h.y,i=(l-e)/Math.max(Math.abs(l-e),1),n=(p-r)/Math.max(Math.abs(p-r),1),0!==i?(c.isWalkableAt(l,p-1)&&f.push([l,p-1]),c.isWalkableAt(l,p+1)&&f.push([l,p+1]),c.isWalkableAt(l+i,p)&&f.push([l+i,p])):0!==n&&(c.isWalkableAt(l-1,p)&&f.push([l-1,p]),c.isWalkableAt(l+1,p)&&f.push([l+1,p]),c.isWalkableAt(l,p+n)&&f.push([l,p+n]));else for(o=c.getNeighbors(t,!1),a=0,u=o.length;u>a;++a)s=o[a],f.push([s.x,s.y]);return f},e.exports=r},{"../core/Heuristic":5,"./JumpPointFinder":17}],19:[function(t,e){function r(t){t=t||{},this.allowDiagonal=t.allowDiagonal,this.dontCrossCorners=t.dontCrossCorners,this.heuristic=t.heuristic||o.manhattan}var i=t("heap"),n=t("../core/Util"),o=t("../core/Heuristic");r.prototype.findPath=function(t,e,r,o,s){var a,u,h,l,p,c,f,d,g=new i(function(t,e){return t.f-e.f}),b=s.getNodeAt(t,e),y=s.getNodeAt(r,o),A=this.heuristic,k=this.allowDiagonal,m=this.dontCrossCorners,v=Math.abs,w=Math.SQRT2;for(b.g=0,b.f=0,g.push(b),b.opened=!0;!g.empty();){if(a=g.pop(),a.closed=!0,a===y)return n.backtrace(y);u=s.getNeighbors(a,k,m);var x=u.length;for(l=0,p=u.length;p>l;++l)h=u[l],h.closed||(c=h.x,f=h.y,d=a.g+(0===c-a.x||0===f-a.y?1:w),(!h.opened||d<h.g)&&(h.g=d*x/9,h.h=h.h||A(v(c-r),v(f-o)),h.f=h.g+h.h,h.parent=a,h.opened?g.updateItem(h):(g.push(h),h.opened=!0)))}return[]},e.exports=r},{"../core/Heuristic":5,"../core/Util":7,heap:1}]},{},[3])(3)});
\ No newline at end of file