X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FLosers.js;h=7bd5e5413273e31ccfcbb86ecea3a144c499ebdb;hb=7e8a7ea1cb66adb4a987badfb0a3c2f99a21bd0a;hp=b39d24fb6b0ae221bd49c4f6933b1323a3a08d1c;hpb=2f9fcef3eb606c6389249c35393265de7d8f392f;p=vchess.git

diff --git a/client/src/variants/Losers.js b/client/src/variants/Losers.js
index b39d24fb..7bd5e541 100644
--- 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);
+    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: duscard 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 +35,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;
@@ -69,4 +76,5 @@ export class LosersRules extends ChessRules {
     // Less material is better (more subtle in fact but...)
     return -super.evalPosition();
   }
+
 };