Merge pull request #93 from Mind-Sports-Games/dev

Dev to master studies

Author: JamesHeppell

build.sbt

@@ -19,7 +19,7 @@ libraryDependencies += "io.lettuce"                  % "lettuce-core"
 libraryDependencies += "io.netty"                    % "netty-handler"                % nettyVersion
 libraryDependencies += "io.netty"                    % "netty-codec-http"             % nettyVersion
 libraryDependencies += "io.netty"                    % "netty-transport-native-epoll" % nettyVersion classifier "linux-x86_64"
-libraryDependencies += "org.playstrategy"           %% "strategygames"                % "10.2.1-pstrat121"
+libraryDependencies += "org.playstrategy"           %% "strategygames"                % "10.2.1-pstrat122"
 libraryDependencies += "com.typesafe.akka"          %% "akka-actor-typed"             % akkaVersion
 libraryDependencies += "com.typesafe.akka"          %% "akka-slf4j"                   % akkaVersion
 libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging"                % "3.9.3"

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.2
+sbt.version=1.7.2

src/main/scala/Chess.scala

@@ -1,11 +1,12 @@
 package lila.ws
 
 import scala.collection.MapView
+import scala.util.chaining._
 
 import play.api.libs.json._
 import strategygames.format.{ FEN, Forsyth, Uci, UciCharPair }
 import strategygames.opening.{ FullOpening, FullOpeningDB }
-import strategygames.{ Game, GameLogic, Pocket, PocketData, Pos, Role, Situation }
+import strategygames.{ Game, GameLogic, MoveMetrics, Pocket, PocketData, Pos, Role, Situation }
 import strategygames.variant.Variant
 import strategygames.draughts
 import com.typesafe.scalalogging.Logger
@@ -37,7 +38,7 @@ object Chess {
           finalSquare = fullCaptureFields.isDefined,
           captures = fullCaptureFields,
           partialCaptures = req.fullCapture.getOrElse(false)
-        ).toOption flatMap { case (game, move) =>
+        ).toOption.flatMap { case (game, move) =>
           //Get the san of the last action
           game.actionStrs.flatten.lastOption.map { san =>
             {
@@ -112,22 +113,33 @@ object Chess {
   def apply(req: ClientOut.AnaDrop): ClientIn =
     Monitor.time(_.chessMoveTime) {
       try {
-        Game(
+        val baseGame = Game(
           req.variant.gameLogic,
           req.variant.some,
           Some(req.fen)
-        ).drop(req.role, req.pos).toOption flatMap { case (game, drop) =>
-          //Get the san of the last action
-          game.actionStrs.flatten.lastOption map { san =>
-            makeNode(
-              game,
-              Uci.WithSan(req.variant.gameLogic, Uci(req.variant.gameLogic, drop), san),
-              req.path,
-              req.chapterId,
-              if (game.situation.playable(false)) game.situation.destinations else Map.empty
-            )
-          }
-        } getOrElse ClientIn.StepFailure
+        )
+        val g: Game = req.halfMove
+          .flatMap(m => {
+            Uci(req.variant, s"${m.orig}${m.dest}")
+          })
+          .flatMap(u => baseGame.applyUci(u, MoveMetrics()).toOption)
+          .map(_._1)
+          .getOrElse(baseGame)
+        g.drop(req.role, req.pos)
+          .toOption
+          .flatMap({ case (game, drop) =>
+            //Get the san of the last action
+            game.actionStrs.flatten.lastOption map { san =>
+              makeNode(
+                game,
+                Uci.WithSan(req.variant.gameLogic, Uci(req.variant.gameLogic, drop), san),
+                req.path,
+                req.chapterId,
+                if (game.situation.playable(false)) game.situation.destinations else Map.empty
+              )
+            }
+          })
+          .getOrElse(ClientIn.StepFailure)
       } catch {
         case e: java.lang.ArrayIndexOutOfBoundsException =>
           logger.warn(s"${req.fen} ${req.variant} ${req.role}@${req.pos}", e)

src/main/scala/ipc/ClientOut.scala

@@ -40,6 +40,8 @@ object ClientOut {
 
   case class Opening(variant: Variant, path: Path, fen: FEN) extends ClientOutSite
 
+  case class Move(orig: Pos, dest: Pos)
+
   case class AnaMove(
       orig: Pos,
       dest: Pos,
@@ -60,7 +62,8 @@ object ClientOut {
       path: Path,
       variant: Variant,
       chapterId: Option[ChapterId],
-      payload: JsObject
+      payload: JsObject,
+      halfMove: Option[Move] = None
   ) extends ClientOutSite
 
   case class AnaPass(
@@ -231,7 +234,13 @@ object ClientOut {
                 Path(path),
                 variant,
                 chapterId,
-                o
+                o,
+                (d obj "halfMove").flatMap(halfMove => {
+                  for {
+                    orig <- halfMove str "orig" flatMap (p => Pos.fromKey(lib, p))
+                    dest <- halfMove str "dest" flatMap (p => Pos.fromKey(lib, p))
+                  } yield Move(orig, dest)
+                })
               )
             case "anaPass" =>
               for {