From 0ac61d2b489198350425d327c0fb9e556469ad70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 24 Dec 2015 10:06:48 +0100 Subject: Revert "PathBuilder: always search for path even if distance is < 2, to check for objectives" This reverts commit 8a34706f23f479eead58a393c27e6a56eb3bcd4b. --- core/src/ch/asynk/rustanddust/engine/PathBuilder.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/ch/asynk/rustanddust/engine/PathBuilder.java b/core/src/ch/asynk/rustanddust/engine/PathBuilder.java index 8be3d79..3bc996b 100644 --- a/core/src/ch/asynk/rustanddust/engine/PathBuilder.java +++ b/core/src/ch/asynk/rustanddust/engine/PathBuilder.java @@ -107,7 +107,15 @@ public class PathBuilder implements Disposable this.to = to; // from and to are not part of the path this.distance = board.distance(from, to); - findAllPaths(from, pawn.getMovementPoints(), 0, true); + if (distance < 2) { + Orientation o = Orientation.fromMove(to.col, to.row, from.col, from.row); + Path path = Path.get(0); + path.roadMarch = to.road(o); + path.cost = to.costFrom(pawn, o); + paths.add(path); + } else { + findAllPaths(from, pawn.getMovementPoints(), 0, true); + } // printToErr("paths", paths); stack.clear(); -- cgit v1.1-2-g2b99