X-Git-Url: https://git.auder.net/js/rpsls.js?a=blobdiff_plain;f=variants%2F_Antiking%2Fclass.js;h=2797cadd27e8846f4e8470f387fb8f6162b86fef;hb=b98feb3f6bb7e03319474f7a032e296750eb179f;hp=8e2173a695b2299e8370382d1590d91822c616eb;hpb=006c778a7d68e01f635d3d8faa74284512842356;p=xogo.git diff --git a/variants/_Antiking/class.js b/variants/_Antiking/class.js index 8e2173a..2797cad 100644 --- a/variants/_Antiking/class.js +++ b/variants/_Antiking/class.js @@ -37,8 +37,8 @@ export default class AbstractAntikingRules extends ChessRules { return ['k', 'a'].includes(p); } - // NOTE: canTake includes (wrong) captures of antiking, - // to not go to low-level using findDestSquares() + // NOTE: canTake includes (wrong) captures of (anti)king, + // to detect attacks on (anti)kings. canTake([x1, y1], [x2, y2]) { const piece1 = this.getPiece(x1, y1); const color1 = this.getColor(x1, y1); @@ -49,21 +49,21 @@ export default class AbstractAntikingRules extends ChessRules { ); } - // Remove captures of antiking (see above) + // Remove captures of (anti)king (see above) getPotentialMovesFrom([x, y]) { return super.getPotentialMovesFrom([x, y]).filter(m => - m.vanish.length == 1 || m.vanish[1].p != 'a'); + m.vanish.length == 1 || !['k', 'a'].includes(m.vanish[1].p)); } - underCheck(squares, color) { + underCheck(square_s, color) { let res = false; - squares.forEach(sq => { + square_s.forEach(sq => { switch (this.getPiece(sq[0], sq[1])) { case 'k': - res ||= super.underAttack(sq, color); + res ||= super.underAttack(sq, [color]); break; case 'a': - res ||= !super.underAttack(sq, color); + res ||= !super.underAttack(sq, [color]); break; } });