Fix capture-in-check bug for Capture and Losers variants

[vchess.git] / client / src / variants / Losers.js

diff --git a/client/src/variants/Losers.js b/client/src/variants/Losers.js
index d82e57d..3ac46c2 100644 (file)
--- 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;