validMoves and boardAfter

src/main/scala/Game.scala

@@ -1237,7 +1237,7 @@ object Game {
         partialCaptures: Boolean = false
     ): Validated[String, (Game, Move)] = (orig, dest) match {
       case (Pos.Abalone(orig), Pos.Abalone(dest)) =>
-        g.apply(orig, dest, None, metrics)
+        g.apply(orig, dest, metrics)
           .toEither
           .map(t => (Abalone(t._1), Move.Abalone(t._2)))
           .toValidated
@@ -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/Situation.scala

@@ -1287,7 +1287,7 @@ object Situation {
         partialCaptures: Boolean = false
     ): Validated[String, Move] = (from, to) match {
       case (Pos.Abalone(from), Pos.Abalone(to)) =>
-        s.move(from, to, promotion.map(_.toAbalone)).toEither.map(m => Move.Abalone(m)).toValidated
+        s.move(from, to).toEither.map(m => Move.Abalone(m)).toValidated
       case _                                    => sys.error("Not passed Abalone objects")
     }
 

src/main/scala/abalone/Board.scala

@@ -20,6 +20,8 @@ case class Board(
 
   def piecesOf(player: Player): PieceMap = pieces.filter(_._2.is(player))
 
+  def isEmptySquare(pos: Option[Pos]): Boolean = pos.fold(false)(!this.pieces.contains(_))
+
   def withHistory(h: History): Board       = copy(history = h)
   def updateHistory(f: History => History) = copy(history = f(history))
 
@@ -33,6 +35,8 @@ case class Board(
 
   def materialImbalance: Int = variant.materialImbalance(this)
 
+  def autoDraw: Boolean = history.threefoldRepetition && variant.repetitionEnabled
+
   override def toString = s"$variant Position after ${history.recentTurnUciString}"
 
   lazy val actors: Map[Pos, Actor] = pieces.map {

src/main/scala/abalone/Game.scala

@@ -17,10 +17,9 @@ case class Game(
   def apply(
       orig: Pos,
       dest: Pos,
-      promotion: Option[PromotableRole] = None,
       metrics: MoveMetrics = MoveMetrics()
   ): Validated[String, (Game, Move)] =
-    situation.move(orig, dest, promotion).map(_ withMetrics metrics) map { move =>
+    situation.move(orig, dest).map(_ withMetrics metrics) map { move =>
       apply(move) -> move
     }
 
@@ -38,7 +37,7 @@ case class Game(
   }
 
   def apply(uci: Uci.Move): Validated[String, (Game, Move)] =
-    apply(uci.orig, uci.dest, uci.promotion)
+    apply(uci.orig, uci.dest)
 
   private def applyClock(metrics: MoveMetrics, gameActive: Boolean, switchClock: Boolean) =
     clock.map { c =>