X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FKoopa.js;h=8d4f0e97ff7d9ff6728191797bece4fd87a0263f;hb=fccaa87852129f8f27c66a9d3b626f91868109c8;hp=dbce84217e674fd077364880f95e4a63c6d91a70;hpb=6d596afc7305916de4c7f9b6f29e3f0fcfe009cf;p=vchess.git diff --git a/client/src/variants/Koopa.js b/client/src/variants/Koopa.js index dbce8421..8d4f0e97 100644 --- a/client/src/variants/Koopa.js +++ b/client/src/variants/Koopa.js @@ -205,18 +205,28 @@ export class KoopaRules extends ChessRules { return moves.concat(promoteAfterStun); } + getPotentialKingMoves(sq) { + return ( + this.getSlideNJumpMoves( + sq, + V.steps[V.ROOK].concat(V.steps[V.BISHOP]), + "oneStep" + ).concat(super.getCastleMoves(sq, true, ['r'])) + ); + } + filterValid(moves) { // Forbid kicking own king out const color = this.turn; return moves.filter(m => { - const kingAppear = m.appear.some(a => a.c == color && a.p == V.KING); - return m.vanish.every(v => { - return ( - v.c != color || - !["k", "l"].includes(v.p) || - (v.p == "k" && kingAppear) - ); - }); + const kingVanish = + m.vanish.some(v => v.c == color && ['k', 'l'].includes(v.p)); + if (kingVanish) { + const kingAppear = + m.appear.some(a => a.c == color && ['k', 'l'].includes(a.p)); + return kingAppear; + } + return true; }); }