X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCapture.js;h=f919c60e7245037732fc92861810a18e970039e7;hb=HEAD;hp=19ce734e09d5330bd65d3e8cf990253015756226;hpb=801e28709e778bd3a93b014d1f9cb2fb7906e303;p=vchess.git

diff --git a/client/src/variants/Capture.js b/client/src/variants/Capture.js
index 19ce734e..f919c60e 100644
--- a/client/src/variants/Capture.js
+++ b/client/src/variants/Capture.js
@@ -1,6 +1,7 @@
 import { ChessRules } from "@/base_rules";
 
 export class CaptureRules extends ChessRules {
+
   // Trim all non-capturing moves
   static KeepCaptures(moves) {
     return moves.filter(m => m.vanish.length == 2 && m.appear.length == 1);
@@ -9,15 +10,18 @@ export class CaptureRules 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.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,4 +44,5 @@ export class CaptureRules extends ChessRules {
       return V.KeepCaptures(moves);
     return moves;
   }
+
 };