Fix variants with captures forced: castling isn't a capture!

diff --git a/client/src/variants/Cannibal.js b/client/src/variants/Cannibal.js
index 1508f67..6166860 100644 (file)
--- a/client/src/variants/Cannibal.js
+++ b/client/src/variants/Cannibal.js
@@ -166,7 +166,8 @@ export class CannibalRules 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;
   }
 

diff --git a/client/src/variants/Capture.js b/client/src/variants/Capture.js
index f0782a6..d7cc57e 100644 (file)
--- a/client/src/variants/Capture.js
+++ b/client/src/variants/Capture.js
@@ -36,7 +36,8 @@ export class CaptureRules 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;
   }
 

diff --git a/client/src/variants/Losers.js b/client/src/variants/Losers.js
index 1c087ef..4bc6a61 100644 (file)
--- a/client/src/variants/Losers.js
+++ b/client/src/variants/Losers.js
@@ -38,7 +38,8 @@ export 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;
   }