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 d752f98..ea28380 100644 (file)
--- a/client/src/variants/Losers.js
+++ b/client/src/variants/Losers.js
@@ -2,24 +2,28 @@ import { ChessRules } from "@/base_rules";
 import { ArrayFun } from "@/utils/array";
 import { randInt } from "@/utils/alea";
 
-export const VariantRules = class LosersRules extends ChessRules {
+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;
         }
@@ -38,7 +42,8 @@ export const VariantRules = class LosersRules extends ChessRules {
 
   getAllValidMoves() {
     const moves = super.getAllValidMoves();
-    if (moves.some(m => m.vanish.length == 2)) return V.KeepCaptures(moves);
+    if (moves.some(m => m.vanish.length == 2 && m.appear.length == 1))
+      return V.KeepCaptures(moves);
     return moves;
   }
 
@@ -64,12 +69,9 @@ export const VariantRules = class LosersRules extends ChessRules {
     return this.turn == "w" ? "1-0" : "0-1";
   }
 
-  static get SEARCH_DEPTH() {
-    return 4;
-  }
-
   evalPosition() {
     // Less material is better (more subtle in fact but...)
     return -super.evalPosition();
   }
+
 };