Fix Progressive2. Fixing attempt on Doublemove1

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

diff --git a/client/src/variants/Capture.js b/client/src/variants/Capture.js
index d7cc57e..c5f86dc 100644 (file)
--- 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;
-  }
 };