From 1be09254408b05e3c1dd43b34e4c06cebd50af72 Mon Sep 17 00:00:00 2001 From: Benjamin Auder Date: Thu, 16 Apr 2020 17:35:12 +0200 Subject: [PATCH] Fix Alice rules (en passant) --- client/src/base_rules.js | 1 - client/src/variants/Alice.js | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/client/src/base_rules.js b/client/src/base_rules.js index 53001f63..ec949fcc 100644 --- a/client/src/base_rules.js +++ b/client/src/base_rules.js @@ -807,7 +807,6 @@ export const ChessRules = class ChessRules { this.getEnpassantCaptures([x, y], pawnShiftX) ); } - return pMoves; } diff --git a/client/src/variants/Alice.js b/client/src/variants/Alice.js index 3fd02a32..57de5683 100644 --- a/client/src/variants/Alice.js +++ b/client/src/variants/Alice.js @@ -191,6 +191,31 @@ export class AliceRules extends ChessRules { return res; } + getEnpassantCaptures([x, y], shiftX) { + const Lep = this.epSquares.length; + const epSquare = this.epSquares[Lep - 1]; //always at least one element + let enpassantMove = null; + if ( + !!epSquare && + epSquare.x == x + shiftX && + Math.abs(epSquare.y - y) == 1 + ) { + enpassantMove = this.getBasicMove([x, y], [epSquare.x, epSquare.y]); + // May capture in same world or different: + const capturedPiece = + this.board[x][epSquare.y] != V.EMPTY + ? this.getPiece(x, epSquare.y) + : ['p','s'][1 - "ps".indexOf(this.getPiece(x, y))]; + enpassantMove.vanish.push({ + x: x, + y: epSquare.y, + p: capturedPiece, + c: V.GetOppCol(this.turn) + }); + } + return !!enpassantMove ? [enpassantMove] : []; + } + filterValid(moves, sideBoard) { if (moves.length == 0) return []; if (!sideBoard) sideBoard = [this.getSideBoard(1), this.getSideBoard(2)]; -- 2.44.0