From 5d416f0fb2e4c41b38d089d569c464496524ada8 Mon Sep 17 00:00:00 2001 From: Benjamin Auder <benjamin.auder@somewhere> Date: Sun, 31 May 2020 23:09:52 +0200 Subject: [PATCH] Fix capture-in-check bug for Capture and Losers variants --- client/src/variants/Capture.js | 13 ++++++++----- client/src/variants/Losers.js | 16 +++++++++++----- client/src/variants/Suicide.js | 3 +-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/client/src/variants/Capture.js b/client/src/variants/Capture.js index 19ce734e..c5f86dcd 100644 --- a/client/src/variants/Capture.js +++ b/client/src/variants/Capture.js @@ -9,15 +9,18 @@ export class CaptureRules extends ChessRules { // Stop at the first capture found (if any) atLeastOneCapture() { const color = this.turn; - const oppCol = V.GetOppCol(color); for (let i = 0; i < V.size.x; i++) { for (let j = 0; j < V.size.y; j++) { if ( this.board[i][j] != V.EMPTY && - this.getColor(i, j) != oppCol && - this.filterValid(this.getPotentialMovesFrom([i, j])).some(m => - // Warning: discard castle moves - m.vanish.length == 2 && m.appear.length == 1) + this.getColor(i, j) == color && + this.filterValid(this.getPotentialMovesFrom([i, j])).some(m => { + return ( + // Warning: discard castle moves + m.vanish.length == 2 && m.appear.length == 1 && + this.filterValid([m]).length == 1 + ); + }) ) { return true; } diff --git a/client/src/variants/Losers.js b/client/src/variants/Losers.js index d82e57d5..3ac46c2f 100644 --- a/client/src/variants/Losers.js +++ b/client/src/variants/Losers.js @@ -11,15 +11,18 @@ export class LosersRules extends ChessRules { // Stop at the first capture found (if any) atLeastOneCapture() { const color = this.turn; - const oppCol = V.GetOppCol(color); for (let i = 0; i < V.size.x; i++) { for (let j = 0; j < V.size.y; j++) { if ( this.board[i][j] != V.EMPTY && - this.getColor(i, j) != oppCol && - this.getPotentialMovesFrom([i, j]).some(m => - // Warning: discard castle moves - m.vanish.length == 2 && m.appear.length == 1) + this.getColor(i, j) == color && + this.getPotentialMovesFrom([i, j]).some(m => { + return ( + // Warning: discard castle moves + m.vanish.length == 2 && m.appear.length == 1 && + this.filterValid([m]).length == 1 + ); + }) ) { return true; } @@ -31,6 +34,9 @@ export class LosersRules extends ChessRules { getPossibleMovesFrom(sq) { let moves = this.filterValid(this.getPotentialMovesFrom(sq)); const captureMoves = V.KeepCaptures(moves); + +console.log(this.atLeastOneCapture()); + if (captureMoves.length > 0) return captureMoves; if (this.atLeastOneCapture()) return []; return moves; diff --git a/client/src/variants/Suicide.js b/client/src/variants/Suicide.js index ecb2aef1..e3630bb4 100644 --- a/client/src/variants/Suicide.js +++ b/client/src/variants/Suicide.js @@ -50,12 +50,11 @@ export class SuicideRules extends ChessRules { // Stop at the first capture found (if any) atLeastOneCapture() { const color = this.turn; - const oppCol = V.GetOppCol(color); for (let i = 0; i < V.size.x; i++) { for (let j = 0; j < V.size.y; j++) { if ( this.board[i][j] != V.EMPTY && - this.getColor(i, j) != oppCol && + this.getColor(i, j) == color && this.getPotentialMovesFrom([i, j]).some(m => m.vanish.length == 2) ) { return true; -- 2.44.0