X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCapture.js;h=f0782a69bc346122f907af467a7d660d2c89e931;hb=32f6285ee325a14286562a53baefc647201df2af;hp=a43f1671916bbad0bc92a5bcf6fb1f54227c8f3b;hpb=6b7b2cf720e6255e4da0dc34fee363c456346a58;p=vchess.git diff --git a/client/src/variants/Capture.js b/client/src/variants/Capture.js index a43f1671..f0782a69 100644 --- a/client/src/variants/Capture.js +++ b/client/src/variants/Capture.js @@ -1,11 +1,9 @@ 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); + return moves.filter(m => m.vanish.length == 2 && m.appear.length == 1); } // Stop at the first capture found (if any) @@ -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;