X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCapture.js;h=c5f86dcd1c19b0d6c252191d95c63b06155d566b;hb=1d67d9611c52fbe667cea39f68098f4e52464223;hp=d7cc57e5f0576b107ef6a1544012fdafc760cbe1;hpb=a34caaced0796c9118a12c609463582d656e9daf;p=vchess.git

diff --git a/client/src/variants/Capture.js b/client/src/variants/Capture.js
index d7cc57e5..c5f86dcd 100644
--- a/client/src/variants/Capture.js
+++ b/client/src/variants/Capture.js
@@ -6,18 +6,21 @@ export class CaptureRules extends ChessRules {
     return moves.filter(m => m.vanish.length == 2 && m.appear.length == 1);
   }
 
-	// Stop at the first capture found (if any)
+  // 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;
         }
@@ -40,8 +43,4 @@ export class CaptureRules extends ChessRules {
       return V.KeepCaptures(moves);
     return moves;
   }
-
-  static get SEARCH_DEPTH() {
-    return 4;
-  }
 };