deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

minor tweaks

Browse source
This commit is contained in:
Thibault Duplessis 2013-05-09 12:27:38 -03:00
parent c3576b9989
commit 4890aa30fa
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/round/src/main/Hand.scala
View file

@ -51,17 +51,18 @@ final class Hand(
GameRepo initialFen progress.game.id
}
aiResult ← ai.play(progress.game.toChess, pgn.pp, initialFen, ~progress.game.aiLevel)
eventsAndFen ← aiResult.fold(fufail(_), {
case (newChessGame, move) ⇒ {
val (prog2, pgn2) = progress.game.update(newChessGame, move)
val progress2 = progress >> prog2
(GameRepo save progress2) >>
PgnRepo.save(povRef.gameId, pgn2) >>
finisher.moveFinish(progress2.game, !color) map { finishEvents ⇒
playResult(progress2.events ::: finishEvents, progress2)
}
}
}): PlayResult
eventsAndFen ← aiResult.fold(
err ⇒ fufail("[round hand] ai response fail " + err), {
case (newChessGame, move) ⇒ {
val (prog2, pgn2) = progress.game.update(newChessGame, move)
val progress2 = progress >> prog2
(GameRepo save progress2) >>
PgnRepo.save(povRef.gameId, pgn2) >>
finisher.moveFinish(progress2.game, !color) map { finishEvents ⇒
playResult(progress2.events ::: finishEvents, progress2)
}
}
}): PlayResult
} yield eventsAndFen
else (GameRepo save progress) >>
PgnRepo.save(povRef.gameId, pgn) inject
@ -174,7 +175,7 @@ final class Hand(
pgn ← PgnRepo get pov.game.id
result ← if (g1.player(!color).isAi)
takeback.double(pov.game, pgn, fen)
else if (g1.player(!color).isProposingTakeback)
else if (g1.player(!color).isProposingTakeback)
takeback(pov.game, pgn, fen)
else for {
p1 ← messenger.systemMessage(g1, _.takebackPropositionSent) map { es ⇒

5
modules/socket/src/main/Handler.scala
View file

@ -44,11 +44,10 @@ object Handler {
}
}
def errorHandler(err: String): JsSocketHandler = {
logwarn("[socket] " + err)
def errorHandler(err: String): JsSocketHandler =
Iteratee.skipToEof[JsValue] ->
Enumerator[JsValue](Json.obj(
"error" -> "Socket handler error: %s".format(err)
)).andThen(Enumerator.eof)
}
}

3
modules/socket/src/main/WithSocket.scala
View file

@ -12,7 +12,6 @@ trait WithSocket extends Zeros {
type JsSocketHandler = (Iteratee[JsValue, _], JsEnumerator)
implicit val LilaJsSocketHandlerZero = new Zero[JsSocketHandler] {
val zero: JsSocketHandler = Handler errorHandler "default error handler used"
val zero = Handler errorHandler "default error handler used"
}
}