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

dev to master (backgammon fixes)

modules/game/src/main/Game.scala

@@ -108,10 +108,7 @@ case class Game(
 
   def opponent(c: PlayerIndex): Player = player(!c)
 
-  lazy val naturalOrientation = variant match {
-    case Variant.Chess(strategygames.chess.variant.RacingKings) => P1
-    case _                                                      => PlayerIndex.fromP1(p1Player before p2Player)
-  }
+  lazy val naturalOrientation = P1
 
   def turnPlayerIndex = stratGame.player
 
@@ -383,9 +380,11 @@ case class Game(
         val score = (if (playerIndex.name == "p1") fen.player1Score else fen.player2Score) / 10.0
         score.toString().replace(".0", "")
       case "backgammon" | "hyper" | "nackgammon" => {
-        multiPointState.fold(history.score(playerIndex)){mps => playerIndex.fold(mps.p1Points, mps.p2Points)}.toString()
+        multiPointState
+          .fold(history.score(playerIndex)) { mps => playerIndex.fold(mps.p1Points, mps.p2Points) }
+          .toString()
       }
-      case _                                     => ""
+      case _ => ""
     }
 
   def displayScore: Option[Score] =

modules/quote/src/main/Quote.scala

@@ -1301,10 +1301,6 @@ object Quote {
       ),
       new Quote("Chess is beautiful enough to waste your life for.", "Hans Ree"),
       new Quote("Chess is eminently and emphatically the philosopher's game.", "Paul Morphy"),
-      new Quote(
-        "Chess is far too complex to be definitively solved with any technology we can conceive of today. However, our looked-down-upon cousin, checkers, or draughts, suffered this fate quite recently thanks to the work of Jonathan Schaeffer at the University of Alberta and his unbeatable program Chinook.",
-        "Garry Kasparov"
-      ),
       new Quote(
         "Chess is infinite, and one has to make only one ill-considered move, and one`s opponent`s wildest dreams will become reality.",
         "David Bronstein"

modules/swiss/src/main/SwissForm.scala

@@ -270,8 +270,8 @@ final class SwissForm(implicit mode: Mode) {
 
 object SwissForm {
 
-  val clockLimits: Seq[Int] = Seq(0, 15, 30, 45, 60, 90) ++ {
-    (120 to 420 by 60) ++ (600 to 1800 by 300) ++ (2400 to 10800 by 600)
+  val clockLimits: Seq[Int] = Seq(0, 15, 30, 45, 60, 90, 120, 150) ++ {
+    (180 to 720 by 60) ++ (900 to 1800 by 300) ++ (2400 to 10800 by 600)
   }
   val clockLimitChoices = clockTimeChoicesFromSeconds(clockLimits)
 

modules/swiss/src/main/SwissJson.scala

@@ -388,6 +388,7 @@ object SwissJson {
           )
         }
       )
+      .add("multiPointScore" -> multiPointScoreJson(g))
 
   private[swiss] def boardPlayerFromGame(g: Game, b: SwissBoard, playerIndex: PlayerIndex) =
     if (playerIndex == P1)
@@ -416,7 +417,6 @@ object SwissJson {
           l.map(g =>
             boardGameJson(g, boardPlayerFromGame(g, b.board, P1), boardPlayerFromGame(g, b.board, P2))
               .add("boardSize" -> boardSizeJson(g.variant))
-              .add("multiPointScore" -> multiPointScoreJson(g))
           )
         )
       )