Draft Fullcavalry and Atomic2 (pawn removal). Fix Grand

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

diff --git a/client/src/variants/Losers.js b/client/src/variants/Losers.js
index daabbab..ea28380 100644 (file)
--- a/client/src/variants/Losers.js
+++ b/client/src/variants/Losers.js
@@ -3,23 +3,27 @@ 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);
   }
 
-       // 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.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();
   }
+
 };