X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FGrand.js;h=5dc355f4d8c83d5ae6fa7bff3dfcbdb08821bf6b;hb=0fb43db7c2858201e8410670b90f95ad8b138964;hp=5523244ba1674763b29c0bb129e707cd0e981f1b;hpb=32f6285ee325a14286562a53baefc647201df2af;p=vchess.git diff --git a/client/src/variants/Grand.js b/client/src/variants/Grand.js index 5523244b..5dc355f4 100644 --- a/client/src/variants/Grand.js +++ b/client/src/variants/Grand.js @@ -2,33 +2,32 @@ import { ChessRules } from "@/base_rules"; import { ArrayFun } from "@/utils/array"; import { randInt } from "@/utils/alea"; -// NOTE: initial setup differs from the original; see -// https://www.chessvariants.com/large.dir/freeling.html export class GrandRules extends ChessRules { + + static get HasCastle() { + return false; + } + static IsGoodFen(fen) { if (!ChessRules.IsGoodFen(fen)) return false; const fenParsed = V.ParseFen(fen); // 5) Check captures - if (!fenParsed.captured || !fenParsed.captured.match(/^[0-9]{14,14}$/)) + if (!fenParsed.captured || !fenParsed.captured.match(/^[0-9]{12,12}$/)) return false; return true; } static IsGoodEnpassant(enpassant) { - if (enpassant != "-") { - const squares = enpassant.split(","); - if (squares.length > 2) return false; - for (let sq of squares) { - const ep = V.SquareToCoords(sq); - if (isNaN(ep.x) || !V.OnBoard(ep)) return false; - } - } + if (enpassant != "-") return !!enpassant.match(/^([a-j][0-9]{1,2},?)+$/); return true; } static ParseFen(fen) { const fenParts = fen.split(" "); - return Object.assign(ChessRules.ParseFen(fen), { captured: fenParts[5] }); + return Object.assign( + ChessRules.ParseFen(fen), + { captured: fenParts[4] } + ); } getPpath(b) { @@ -44,14 +43,14 @@ export class GrandRules extends ChessRules { } getCapturedFen() { - let counts = [...Array(14).fill(0)]; + let counts = [...Array(12).fill(0)]; let i = 0; for (let j = 0; j < V.PIECES.length; j++) { - if (V.PIECES[j] == V.KING) - //no king captured + if ([V.KING, V.PAWN].includes(V.PIECES[j])) + // No king captured, and pawns don't promote in pawns continue; - counts[i] = this.captured["w"][V.PIECES[i]]; - counts[7 + i] = this.captured["b"][V.PIECES[i]]; + counts[i] = this.captured["w"][V.PIECES[j]]; + counts[6 + i] = this.captured["b"][V.PIECES[j]]; i++; } return counts.join(""); @@ -59,26 +58,25 @@ export class GrandRules extends ChessRules { setOtherVariables(fen) { super.setOtherVariables(fen); - const fenParsed = V.ParseFen(fen); + const captured = + V.ParseFen(fen).captured.split("").map(x => parseInt(x, 10)); // Initialize captured pieces' counts from FEN this.captured = { w: { - [V.PAWN]: parseInt(fenParsed.captured[0]), - [V.ROOK]: parseInt(fenParsed.captured[1]), - [V.KNIGHT]: parseInt(fenParsed.captured[2]), - [V.BISHOP]: parseInt(fenParsed.captured[3]), - [V.QUEEN]: parseInt(fenParsed.captured[4]), - [V.MARSHALL]: parseInt(fenParsed.captured[5]), - [V.CARDINAL]: parseInt(fenParsed.captured[6]) + [V.ROOK]: captured[0], + [V.KNIGHT]: captured[1], + [V.BISHOP]: captured[2], + [V.QUEEN]: captured[3], + [V.MARSHALL]: captured[4], + [V.CARDINAL]: captured[5] }, b: { - [V.PAWN]: parseInt(fenParsed.captured[7]), - [V.ROOK]: parseInt(fenParsed.captured[8]), - [V.KNIGHT]: parseInt(fenParsed.captured[9]), - [V.BISHOP]: parseInt(fenParsed.captured[10]), - [V.QUEEN]: parseInt(fenParsed.captured[11]), - [V.MARSHALL]: parseInt(fenParsed.captured[12]), - [V.CARDINAL]: parseInt(fenParsed.captured[13]) + [V.ROOK]: captured[6], + [V.KNIGHT]: captured[7], + [V.BISHOP]: captured[8], + [V.QUEEN]: captured[9], + [V.MARSHALL]: captured[10], + [V.CARDINAL]: captured[11] } }; } @@ -87,63 +85,20 @@ export class GrandRules extends ChessRules { return { x: 10, y: 10 }; } + // Rook + knight: static get MARSHALL() { return "m"; - } //rook+knight + } + + // Bishop + knight static get CARDINAL() { return "c"; - } //bishop+knight + } static get PIECES() { return ChessRules.PIECES.concat([V.MARSHALL, V.CARDINAL]); } - // There may be 2 enPassant squares (if pawn jump 3 squares) - getEnpassantFen() { - const L = this.epSquares.length; - if (!this.epSquares[L - 1]) return "-"; //no en-passant - let res = ""; - this.epSquares[L - 1].forEach(sq => { - res += V.CoordsToSquare(sq) + ","; - }); - return res.slice(0, -1); //remove last comma - } - - // En-passant after 2-sq or 3-sq jumps - getEpSquare(moveOrSquare) { - if (!moveOrSquare) return undefined; - if (typeof moveOrSquare === "string") { - const square = moveOrSquare; - if (square == "-") return undefined; - let res = []; - square.split(",").forEach(sq => { - res.push(V.SquareToCoords(sq)); - }); - return res; - } - // Argument is a move: - const move = moveOrSquare; - const [sx, sy, ex] = [move.start.x, move.start.y, move.end.x]; - if (this.getPiece(sx, sy) == V.PAWN && Math.abs(sx - ex) >= 2) { - const step = (ex - sx) / Math.abs(ex - sx); - let res = [ - { - x: sx + step, - y: sy - } - ]; - if (sx + 2 * step != ex) { - //3-squares move - res.push({ - x: sx + 2 * step, - y: sy - }); - } - return res; - } - return undefined; //default - } - getPotentialMovesFrom([x, y]) { switch (this.getPiece(x, y)) { case V.MARSHALL: @@ -162,7 +117,7 @@ export class GrandRules extends ChessRules { let moves = []; const [sizeX, sizeY] = [V.size.x, V.size.y]; const shiftX = color == "w" ? -1 : 1; - const startRanks = color == "w" ? [sizeX - 2, sizeX - 3] : [1, 2]; + const startRank = (color == "w" ? sizeX - 3 : 2); const lastRanks = color == "w" ? [0, 1, 2] : [sizeX - 1, sizeX - 2, sizeX - 3]; const promotionPieces = [ @@ -179,23 +134,17 @@ export class GrandRules extends ChessRules { if (lastRanks.includes(x + shiftX)) { finalPieces = promotionPieces.filter(p => this.captured[color][p] > 0); if (x + shiftX != lastRanks[0]) finalPieces.push(V.PAWN); - } else finalPieces = [V.PAWN]; + } + else finalPieces = [V.PAWN]; if (this.board[x + shiftX][y] == V.EMPTY) { // One square forward for (let piece of finalPieces) moves.push( this.getBasicMove([x, y], [x + shiftX, y], { c: color, p: piece }) ); - if (startRanks.includes(x)) { - if (this.board[x + 2 * shiftX][y] == V.EMPTY) { - // Two squares jump - moves.push(this.getBasicMove([x, y], [x + 2 * shiftX, y])); - if (x == startRanks[0] && this.board[x + 3 * shiftX][y] == V.EMPTY) { - // Three squares jump - moves.push(this.getBasicMove([x, y], [x + 3 * shiftX, y])); - } - } - } + if (x == startRank && this.board[x + 2 * shiftX][y] == V.EMPTY) + // Two squares jump + moves.push(this.getBasicMove([x, y], [x + 2 * shiftX, y])); } // Captures for (let shiftY of [-1, 1]) { @@ -217,32 +166,14 @@ export class GrandRules extends ChessRules { } // En passant - const Lep = this.epSquares.length; - const epSquare = this.epSquares[Lep - 1]; - if (epSquare) { - for (let epsq of epSquare) { - // TODO: some redundant checks - if (epsq.x == x + shiftX && Math.abs(epsq.y - y) == 1) { - let enpassantMove = this.getBasicMove([x, y], [epsq.x, epsq.y]); - // WARNING: the captured pawn may be diagonally behind us, - // if it's a 3-squares jump and we take on 1st passing square - const px = this.board[x][epsq.y] != V.EMPTY ? x : x - shiftX; - enpassantMove.vanish.push({ - x: px, - y: epsq.y, - p: "p", - c: this.getColor(px, epsq.y) - }); - moves.push(enpassantMove); - } - } - } + Array.prototype.push.apply( + moves, + this.getEnpassantCaptures([x, y], shiftX) + ); return moves; } - // TODO: different castle? - getPotentialMarshallMoves(sq) { return this.getSlideNJumpMoves(sq, V.steps[V.ROOK]).concat( this.getSlideNJumpMoves(sq, V.steps[V.KNIGHT], "oneStep") @@ -291,22 +222,15 @@ export class GrandRules extends ChessRules { postPlay(move) { super.postPlay(move); - if (move.vanish.length == 2 && move.appear.length == 1) { + if (move.vanish.length == 2 && move.appear.length == 1) // Capture: update this.captured this.captured[move.vanish[1].c][move.vanish[1].p]++; - } - if (move.vanish[0].p != move.appear[0].p) { - // Promotion: update this.captured - this.captured[move.vanish[0].c][move.appear[0].p]--; - } } postUndo(move) { super.postUndo(move); if (move.vanish.length == 2 && move.appear.length == 1) this.captured[move.vanish[1].c][move.vanish[1].p]--; - if (move.vanish[0].p != move.appear[0].p) - this.captured[move.vanish[0].c][move.appear[0].p]++; } static get VALUES() { @@ -322,61 +246,59 @@ export class GrandRules extends ChessRules { static GenRandInitFen(randomness) { if (randomness == 0) { - // No castling in the official initial setup - return "r8r/1nbqkmcbn1/pppppppppp/10/10/10/10/PPPPPPPPPP/1NBQKMCBN1/R8R " + - "w 0 zzzz - 00000000000000"; + return ( + "r8r/1nbqkmcbn1/pppppppppp/91/91/91/91/PPPPPPPPPP/1NBQKMCBN1/R8R " + + "w 0 - 00000000000000" + ); } - let pieces = { w: new Array(10), b: new Array(10) }; - // Shuffle pieces on first and last rank + let pieces = { w: new Array(8), b: new Array(8) }; + // Shuffle pieces on second and before-last rank for (let c of ["w", "b"]) { if (c == 'b' && randomness == 1) { pieces['b'] = pieces['w']; break; } - let positions = ArrayFun.range(10); + let positions = ArrayFun.range(8); // Get random squares for bishops - let randIndex = 2 * randInt(5); + let randIndex = 2 * randInt(4); let bishop1Pos = positions[randIndex]; // The second bishop must be on a square of different color - let randIndex_tmp = 2 * randInt(5) + 1; + let randIndex_tmp = 2 * randInt(4) + 1; let bishop2Pos = positions[randIndex_tmp]; // Remove chosen squares positions.splice(Math.max(randIndex, randIndex_tmp), 1); positions.splice(Math.min(randIndex, randIndex_tmp), 1); // Get random squares for knights - randIndex = randInt(8); + randIndex = randInt(6); let knight1Pos = positions[randIndex]; positions.splice(randIndex, 1); - randIndex = randInt(7); + randIndex = randInt(5); let knight2Pos = positions[randIndex]; positions.splice(randIndex, 1); // Get random square for queen - randIndex = randInt(6); + randIndex = randInt(4); let queenPos = positions[randIndex]; positions.splice(randIndex, 1); // ...random square for marshall - randIndex = randInt(5); + randIndex = randInt(3); let marshallPos = positions[randIndex]; positions.splice(randIndex, 1); // ...random square for cardinal - randIndex = randInt(4); + randIndex = randInt(2); let cardinalPos = positions[randIndex]; positions.splice(randIndex, 1); - // Rooks and king positions are now fixed, because of the ordering rook-king-rook - let rook1Pos = positions[0]; - let kingPos = positions[1]; - let rook2Pos = positions[2]; + // King position is now fixed, + let kingPos = positions[0]; // Finally put the shuffled pieces in the board array - pieces[c][rook1Pos] = "r"; pieces[c][knight1Pos] = "n"; pieces[c][bishop1Pos] = "b"; pieces[c][queenPos] = "q"; @@ -385,13 +307,13 @@ export class GrandRules extends ChessRules { pieces[c][kingPos] = "k"; pieces[c][bishop2Pos] = "b"; pieces[c][knight2Pos] = "n"; - pieces[c][rook2Pos] = "r"; } return ( - pieces["b"].join("") + - "/pppppppppp/10/10/10/10/10/10/PPPPPPPPPP/" + - pieces["w"].join("").toUpperCase() + - " w 0 1111 - 00000000000000" + "r8r/1" + pieces["b"].join("") + "1/" + + "pppppppppp/91/91/91/91/PPPPPPPPPP/" + + "1" + pieces["w"].join("").toUpperCase() + "1/R8R" + + " w 0 " + " - 00000000000000" ); } + };