X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FLosers.js;h=3ac46c2fdee410f1aea42a6940a8f5f6b6a87a06;hb=40bd6d5477933cb1bcee82eb4462911856af164e;hp=d82e57d5cc9ab2a68c54be776ce5b3f69713a53f;hpb=801e28709e778bd3a93b014d1f9cb2fb7906e303;p=vchess.git 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;