fix: get rid of autoEndTurn in Move

Author: vincentfrochot

src/main/scala/Game.scala

@@ -1278,7 +1278,7 @@ object Game {
       sys.error("Can't diceroll in Abalone")
 
     def undo(metrics: MoveMetrics = MoveMetrics()): Validated[String, (Game, Undo)] =
-      sys.error("Can't undo in abalone")
+      sys.error("Can't undo in abalone") // @TODO: might want to be able to undo, actually
 
     def endTurn(metrics: MoveMetrics = MoveMetrics()): Validated[String, (Game, EndTurn)] =
       sys.error("Can't endTurn in abalone")

src/main/scala/Move.scala

@@ -358,7 +358,7 @@ object Move {
         Pos.Abalone(m.dest),
         Situation.Abalone(m.situationBefore),
         Board.Abalone(m.after),
-        m.autoEndTurn,
+        false,
         None, // capture. @TODO: Could be the pos of the piece that was on targetSquare described by the move (because line moves (and by extension, pushes) are basically just marbles jumping over other ones)
         None,
         None,

src/main/scala/abalone/Move.scala

@@ -9,7 +9,6 @@ case class Move(
     dest: Pos,
     situationBefore: Situation,
     after: Board,
-    autoEndTurn: Boolean,
     capture: Option[Pos] = None,
     promotion: Option[PromotableRole] = None,
     metrics: MoveMetrics = MoveMetrics()
@@ -19,8 +18,8 @@ case class Move(
 
   override def finalizeAfter: Board = {
     val board = after.updateHistory({ h1 => h1.copy(
-      lastTurn = if (autoEndTurn) h1.currentTurn :+ toUci else h1.lastTurn,
-      currentTurn = if (autoEndTurn) List() else h1.currentTurn :+ toUci,
+      lastTurn = h1.currentTurn :+ toUci,
+      currentTurn = List(),
       score = if (captures) h1.score.add(situationBefore.player) else h1.score,
       halfMoveClock =
         if (captures) 0

src/main/scala/abalone/variant/Variant.scala

@@ -96,7 +96,7 @@ abstract class Variant private[variant] (
         Map(pos ->
           pos.neighboursAsDirs.flatMap(d => d(pos)).filterNot(situation.board.pieces.contains(_))
           .map(landingSquare =>
-            Move(piece, pos, landingSquare, situation, boardAfter(situation, pos, landingSquare), false)
+            Move(piece, pos, landingSquare, situation, boardAfter(situation, pos, landingSquare))
           )
         )
     }.toMap
@@ -106,7 +106,7 @@ abstract class Variant private[variant] (
     val opponentPieces = situation.board.piecesOf(!situation.player)
 
     def createMove(category: String, orig: Pos, dest: Pos, directions: Directions = List()): (String, Move) =
-      (category, Move(Piece(situation.player, Role.defaultRole), orig, dest, situation, boardAfter(situation, orig, dest, directions), true, if (category == "pushout") Some(dest) else None))
+      (category, Move(Piece(situation.player, Role.defaultRole), orig, dest, situation, boardAfter(situation, orig, dest, directions), if (category == "pushout") Some(dest) else None))
 
     def generateSideMoves(lineOfMarbles: List[Pos], direction: Direction): List[(String, Move)] = {
       def canMoveTowards(pos: Pos, direction: Direction): Boolean = situation.board.isEmptySquare(direction(pos))

src/test/scala/abalone/AbaloneForsythTest.scala

@@ -42,6 +42,4 @@ class AbaloneForsythTest extends AbaloneTest with ValidatedMatchers {
             Forsyth>>(game4.situation) must_== FEN("1S1ss/SSSsss/1SS1ss1/3S4/4s4/3s4/1ss1SS1/s1sSSS/1s1SS 0 0 w 3 1")
         }
     }
-
-
 }

src/test/scala/abalone/AbaloneVariantTest.scala

@@ -8,7 +8,7 @@ import strategygames.{Score, Status}
 
 class AbaloneVariantTest extends AbaloneTest with ValidatedMatchers {
 
-// @TODO:  use new type of tests Lakin did
+// @TODO:  use new type of tests Lakin did - named "asymmetric"
 
     "custom basic position" should {
         val fen = format.FEN("5/6/7/8/4sssS1/4S3/7/6/5 0 0 b 0 0")