From d4944b8655e8a5ec72c2f35671541a62ace993dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 4 Jan 2016 12:21:56 +0100 Subject: PathBuilder: shorten code --- core/src/ch/asynk/rustanddust/engine/PathBuilder.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/ch/asynk/rustanddust/engine/PathBuilder.java b/core/src/ch/asynk/rustanddust/engine/PathBuilder.java index 16c2f86..af5d78b 100644 --- a/core/src/ch/asynk/rustanddust/engine/PathBuilder.java +++ b/core/src/ch/asynk/rustanddust/engine/PathBuilder.java @@ -145,12 +145,9 @@ public class PathBuilder implements Disposable if ((next == null) || next.isOffMap()) continue; Orientation o = board.getSide(i); - int n = next.costFrom(pawn, o); - boolean r = next.road(o); + int m = (mvtLeft - next.costFrom(pawn, o)); int f = (fitness + (next.isObjectiveFor(pawn) ? 1 : 0)); - - int m = (mvtLeft - n); - r &= roadMarch; + boolean r = (roadMarch && next.road(o)); int l = (m + (r ? pawn.getRoadMarchBonus() : 0)); -- cgit v1.1-2-g2b99