From a03165998ad8192a8464aa6cd9be35413037566d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 30 Jun 2020 08:52:16 +0200 Subject: HexBoard : possibleMoves, do not blindly follow roads --- core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java b/core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java index acdfd9f..8ddc2e1 100644 --- a/core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java +++ b/core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java @@ -544,7 +544,7 @@ public class HexBoard implements Board } } - public int possibleMoves(Piece piece, Tile from, Collection tiles) + @Override public int possibleMoves(Piece piece, Tile from, Collection tiles) { tiles.clear(); searchCount += 1; @@ -587,7 +587,7 @@ public class HexBoard implements Board dst.roadMarch = rm; stack.push(dst); tiles.add(dst); - } else if (r > dst.acc || (!dst.roadMarch && rm)) { + } else if (r > dst.acc || (rm && (r + roadMarchBonus > dst.acc + (dst.roadMarch ? roadMarchBonus : 0)))) { dst.acc = r; dst.parent = src; dst.roadMarch = rm; -- cgit v1.1-2-g2b99