X-Git-Url: https://git.auder.net/js/rpsls.js?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCapture.js;h=d7cc57e5f0576b107ef6a1544012fdafc760cbe1;hb=dcb3637c5bd34c44806c6aeefe5964ce12a0261f;hp=5b286e0e778e9aa232ad3667a86bc13706307702;hpb=3a2a7b5fd3c6bfd0752838094c27e1fb6172d109;p=vchess.git

diff --git a/client/src/variants/Capture.js b/client/src/variants/Capture.js
index 5b286e0e..d7cc57e5 100644
--- a/client/src/variants/Capture.js
+++ b/client/src/variants/Capture.js
@@ -1,8 +1,6 @@
 import { ChessRules } from "@/base_rules";
-import { ArrayFun } from "@/utils/array";
-import { randInt } from "@/utils/alea";
 
-export const VariantRules = class LosersRules extends ChessRules {
+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);
@@ -17,8 +15,8 @@ export const VariantRules = class LosersRules extends ChessRules {
         if (
           this.board[i][j] != V.EMPTY &&
           this.getColor(i, j) != oppCol &&
-          this.getPotentialMovesFrom([i, j]).some(m =>
-            // Warning: duscard castle moves
+          this.filterValid(this.getPotentialMovesFrom([i, j])).some(m =>
+            // Warning: discard castle moves
             m.vanish.length == 2 && m.appear.length == 1)
         ) {
           return true;
@@ -38,7 +36,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;
   }