X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FShatranj.js;h=bb00101e08b6d7cb6bdeb8a8b2cdc2dcd20e7fed;hp=e2e0c79398bde86c9e384d6e724775325e8a4338;hb=8055eabd23feaabe878b25522929c7273dcb0f24;hpb=d1be804633f9632b35662c0b10743ca50e10030f diff --git a/client/src/variants/Shatranj.js b/client/src/variants/Shatranj.js index e2e0c793..bb00101e 100644 --- a/client/src/variants/Shatranj.js +++ b/client/src/variants/Shatranj.js @@ -76,10 +76,19 @@ export const VariantRules = class ShatranjRules extends ChessRules { } getPotentialQueenMoves(sq) { - return this.getSlideNJumpMoves( + // Diagonal capturing moves + let captures = this.getSlideNJumpMoves( sq, V.steps[V.BISHOP], "oneStep" + ).filter(m => m.vanish.length == 2); + return captures.concat( + // Orthogonal non-capturing moves + this.getSlideNJumpMoves( + sq, + V.steps[V.ROOK], + "oneStep" + ).filter(m => m.vanish.length == 1) ); } @@ -111,13 +120,59 @@ export const VariantRules = class ShatranjRules extends ChessRules { ); } + getCurrentScore() { + const color = this.turn; + const getScoreLost = () => { + // Result if I lose: + return color == "w" ? "0-1" : "1-0"; + }; + if (!this.atLeastOneMove()) + // No valid move: I lose (this includes checkmate) + return getScoreLost(); + // Win if the opponent has no pieces left (except king), + // and cannot bare king on the next move. + let piecesLeft = { + // No need to remember all pieces' squares: + // variable only used if just one remaining piece. + "w": {count: 0, square: null}, + "b": {count: 0, square: null} + }; + outerLoop: for (let i=0; i v.count > 0)) + return "*"; + // No pieces left for some side: if both kings are bare, it's a draw + if (Object.values(piecesLeft).every(v => v.count == 0)) + return "1/2"; + if (piecesLeft[color].count > 0) + // He could have drawn, but didn't take my last piece... + return color == "w" ? "1-0" : "0-1"; + const oppCol = V.GetOppCol(color); + if (piecesLeft[oppCol].count >= 2) + // 2 enemy units or more: I lose + return getScoreLost(); + // I don't have any piece, my opponent have one: can I take it? + if (this.isAttacked(piecesLeft[oppCol].square, [color])) + // Yes! But I still need to take it + return "*"; + // No :( + return getScoreLost(); + } + static get VALUES() { return { p: 1, r: 5, n: 3, - b: 2.5, - q: 2, + b: 3, + q: 3, k: 1000 }; }