From 8d1fcc37a933554e13bc996b5611f8307a4701e8 Mon Sep 17 00:00:00 2001 From: Benjamin Auder Date: Thu, 5 Mar 2020 00:57:42 +0100 Subject: [PATCH] Fix Berolina en passant --- client/src/variants/Berolina.js | 38 +++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/client/src/variants/Berolina.js b/client/src/variants/Berolina.js index 5f8d9c09..4cdbb88b 100644 --- a/client/src/variants/Berolina.js +++ b/client/src/variants/Berolina.js @@ -18,14 +18,41 @@ export const VariantRules = class BerolinaRules extends ChessRules { const move = moveOrSquare; const [sx, ex, sy] = [move.start.x, move.end.x, move.start.y]; if (this.getPiece(sx, sy) == V.PAWN && Math.abs(sx - ex) == 2) { - return { - x: (ex + sx) / 2, - y: (move.end.y + sy) / 2 - }; + return [ + { + x: (ex + sx) / 2, + y: (move.end.y + sy) / 2 + }, + // The arrival column must be remembered, because + // potentially two pawns could be candidates to be captured: + // one on our left, and one on our right. + move.end.y + ]; } return undefined; //default } + static IsGoodEnpassant(enpassant) { + if (enpassant != "-") { + const epParts = enpassant.split(","); + const epSq = V.SquareToCoords(epParts[0]); + if (isNaN(epSq.x) || isNaN(epSq.y) || !V.OnBoard(epSq)) return false; + const arrCol = V.ColumnToCoord(epParts[1]); + if (isNaN(arrCol) || arrCol < 0 || arrCol >= V.size.y) return false; + } + return true; + } + + getEnpassantFen() { + const L = this.epSquares.length; + if (!this.epSquares[L - 1]) return "-"; //no en-passant + return ( + V.CoordsToSquare(this.epSquares[L - 1][0]) + + "," + + V.CoordToColumn(this.epSquares[L - 1][1]) + ); + } + // Special pawns movements getPotentialPawnMoves([x, y]) { const color = this.turn; @@ -78,8 +105,7 @@ export const VariantRules = class BerolinaRules extends ChessRules { if ( !!epSquare && epSquare[0].x == x + shiftX && - epSquare[0].y == y && - Math.abs(epSquare[1] - y) == 1 + epSquare[0].y == y ) { let enpassantMove = this.getBasicMove([x, y], [x + shiftX, y]); enpassantMove.vanish.push({ -- 2.44.0