X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FLosers.js;h=ea2838096ff8b1d5196d58a2d6a53f312c231e37;hb=21704b041240cb440d03cfa64a90ed0be6f28415;hp=d82e57d5cc9ab2a68c54be776ce5b3f69713a53f;hpb=801e28709e778bd3a93b014d1f9cb2fb7906e303;p=vchess.git diff --git a/client/src/variants/Losers.js b/client/src/variants/Losers.js index d82e57d5..ea283809 100644 --- a/client/src/variants/Losers.js +++ b/client/src/variants/Losers.js @@ -3,6 +3,7 @@ import { ArrayFun } from "@/utils/array"; import { randInt } from "@/utils/alea"; export class LosersRules extends ChessRules { + // Trim all non-capturing moves static KeepCaptures(moves) { return moves.filter(m => m.vanish.length == 2 && m.appear.length == 1); @@ -11,15 +12,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; } @@ -69,4 +73,5 @@ export class LosersRules extends ChessRules { // Less material is better (more subtle in fact but...) return -super.evalPosition(); } + };