Fix isometric tests for Backgammon

Author: Matt Tucker

src/main/scala/backgammon/format/FEN.scala

@@ -60,6 +60,10 @@ final case class FEN(value: String) extends AnyVal {
     }
     .toMap
 
+  def unusedDice: List[Int] = value.split(' ')(1).split('/').flatMap(_.toIntOption).toList
+
+  def usedDice: List[Int] = value.split(' ')(2).split('/').flatMap(_.toIntOption).toList
+
   def pocketData: Option[PocketData] = {
     val start = value.indexOf("[", 0)
     val end   = value.indexOf("]", start)

src/main/scala/backgammon/format/Forsyth.scala

@@ -19,7 +19,9 @@ object Forsyth {
         Board(
           pieces = fen.pieces,
           history = History(),
-          variant = variant
+          variant = variant,
+          pocketData = fen.pocketData,
+          unusedDice = fen.unusedDice
         ),
         fen.value.split(' ')(3) match {
           case "w" => P1
@@ -28,6 +30,9 @@ object Forsyth {
         }
       ).withHistory(
         History(
+          currentTurn = List((fen.unusedDice ++ fen.usedDice).take(2))
+            .filter(_.nonEmpty)
+            .map(Uci.DiceRoll(_)),
           score = Score(fen.player1Score, fen.player2Score),
           // seems like we might be using History.halfMoveClock incorrectly
           halfMoveClock = fen.fullMove.getOrElse(0)

src/test/scala/backgammon/BackgammonVariantTest.scala

@@ -5095,7 +5095,7 @@ class BackgammonVariantTestIsometry extends strategygames.chess.ChessTest {
   )
 
   val bgGameP1StartsActionStrs = Vector(
-    Vector("2/3", "13/10", "13/11", "endturn"),
+    Vector("2/3", "l2i2", "g1i1", "endturn"),
     Vector("3/1")
   )
 

src/test/scala/chess/ChessTest.scala

@@ -215,8 +215,7 @@ trait ChessTest extends Specification with ValidatedMatchers {
     // TODO: add in end game conditions, etc.
   }
 
-  def turnsAndPliesAreEqual(g1: StratGame, gameData: GameFenIsometryData) = {
-    gameData.plies must_== g1.plies
+  def turnsAreEqual(g1: StratGame, gameData: GameFenIsometryData) = {
     gameData.turnCount must_== g1.turnCount
   }
 
@@ -239,9 +238,9 @@ trait ChessTest extends Specification with ValidatedMatchers {
               newFenGame2 <- stratFenToGame(lib, fen1, v)
             } yield {
               val newGameData = gameData.nextPly(newBaseGame, newFenGame)
-              turnsAndPliesAreEqual(newBaseGame, newGameData)
-              turnsAndPliesAreEqual(newFenGame, newGameData)
-              turnsAndPliesAreEqual(newFenGame2, newGameData)
+              turnsAreEqual(newBaseGame, newGameData)
+              turnsAreEqual(newFenGame, newGameData)
+              turnsAreEqual(newFenGame2, newGameData)
               gamesAreEqual(lib, newBaseGame, newFenGame)
               gamesAreEqual(lib, newBaseGame, newFenGame2)
               gamesAreEqual(lib, newFenGame, newFenGame2)