X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FSuction.js;h=c3277e9c34ee78b1a7c676f7b9b83caa10bb7625;hb=bc0b9205e41c5db0552e4ccf060b945342e36ed0;hp=d15a7c84212938249c9003bd208bbc509e5abe80;hpb=32f6285ee325a14286562a53baefc647201df2af;p=vchess.git diff --git a/client/src/variants/Suction.js b/client/src/variants/Suction.js index d15a7c84..c3277e9c 100644 --- a/client/src/variants/Suction.js +++ b/client/src/variants/Suction.js @@ -1,6 +1,15 @@ import { ChessRules, PiPo, Move } from "@/base_rules"; export class SuctionRules extends ChessRules { + static get PawnSpecs() { + return Object.assign( + {}, + ChessRules.PawnSpecs, + // No promotions: + { promotions: [V.PAWN] } + ); + } + static get HasFlags() { return false; } @@ -20,16 +29,17 @@ export class SuctionRules extends ChessRules { } static ParseFen(fen) { - return Object.assign({}, ChessRules.ParseFen(fen), { - cmove: fen.split(" ")[4] - }); + return Object.assign( + ChessRules.ParseFen(fen), + { cmove: fen.split(" ")[4] } + ); } static IsGoodFen(fen) { if (!ChessRules.IsGoodFen(fen)) return false; const fenParts = fen.split(" "); - if (fenParts.length != 6) return false; - if (fenParts[5] != "-" && !fenParts[5].match(/^([a-h][1-8]){2}$/)) + if (fenParts.length != 5) return false; + if (fenParts[4] != "-" && !fenParts[4].match(/^([a-h][1-8]){2}$/)) return false; return true; } @@ -95,7 +105,7 @@ export class SuctionRules extends ChessRules { Math.abs(epSquare.y - y) == 1 ) { let enpassantMove = this.getBasicMove([x, y], [epSquare.x, epSquare.y]); - const oppCol = V.GetOppCol(color); + const oppCol = V.GetOppCol(this.turn); enpassantMove.vanish.push({ x: x, y: epSquare.y, @@ -120,7 +130,7 @@ export class SuctionRules extends ChessRules { // Does m2 un-do m1 ? (to disallow undoing captures) oppositeMoves(m1, m2) { return ( - m1 && + !!m1 && m2.vanish.length == 2 && m1.start.x == m2.start.x && m1.end.x == m2.end.x && @@ -143,13 +153,22 @@ export class SuctionRules extends ChessRules { return ChessRules.GenRandInitFen(randomness).slice(0, -6) + "- -"; } - getFen() { + getCmoveFen() { const L = this.cmoves.length; - const cmoveFen = !this.cmoves[L - 1] - ? "-" - : ChessRules.CoordsToSquare(this.cmoves[L - 1].start) + - ChessRules.CoordsToSquare(this.cmoves[L - 1].end); - return super.getFen() + " " + cmoveFen; + return ( + !this.cmoves[L - 1] + ? "-" + : ChessRules.CoordsToSquare(this.cmoves[L - 1].start) + + ChessRules.CoordsToSquare(this.cmoves[L - 1].end) + ); + } + + getFen() { + return super.getFen() + " " + this.getCmoveFen(); + } + + getFenForRepeat() { + return super.getFenForRepeat() + "_" + this.getCmoveFen(); } postPlay(move) { @@ -182,10 +201,8 @@ export class SuctionRules extends ChessRules { getCurrentScore() { const color = this.turn; const kp = this.kingPos[color]; - if (color == "w" && kp[0] == 0) - return "0-1"; - if (color == "b" && kp[0] == V.size.x - 1) - return "1-0"; + if (color == "w" && kp[0] == 0) return "0-1"; + if (color == "b" && kp[0] == V.size.x - 1) return "1-0"; // King is not on the opposite edge: game not over return "*"; }