X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FAllmate1.js;h=bc10478ed38109439fca235681ce021339054338;hb=3a2a7b5fd3c6bfd0752838094c27e1fb6172d109;hp=5511dd54ddd6a35a3ab6c4a06005b4263b30369f;hpb=7ba4a5bc5b64e19a1e7f26aa232d5c50770d07ad;p=vchess.git diff --git a/client/src/variants/Allmate1.js b/client/src/variants/Allmate1.js index 5511dd54..bc10478e 100644 --- a/client/src/variants/Allmate1.js +++ b/client/src/variants/Allmate1.js @@ -11,7 +11,7 @@ export const VariantRules = class Allmate1Rules extends ChessRules { } static GenRandInitFen(randomness) { - return ChessRules.GenRandInitFen(randomness).replace(/ -$/, ""); + return ChessRules.GenRandInitFen(randomness).slice(0, -2); } getPotentialMovesFrom([x, y]) { @@ -118,7 +118,7 @@ export const VariantRules = class Allmate1Rules extends ChessRules { castleSide < 2; castleSide++ //large, then small ) { - if (!this.castleFlags[c][castleSide]) continue; + if (this.castleFlags[c][castleSide] >= 8) continue; // If this code is reached, rooks and king are on initial position // Nothing on the path of the king ? (and no checks) @@ -137,10 +137,10 @@ export const VariantRules = class Allmate1Rules extends ChessRules { // Nothing on the path to the rook? step = castleSide == 0 ? -1 : 1; - for (i = y + step; i != this.INIT_COL_ROOK[c][castleSide]; i += step) { + const rookPos = this.castleFlags[c][castleSide]; + for (i = y + step; i != rookPos; i += step) { if (this.board[x][i] != V.EMPTY) continue castlingCheck; } - const rookPos = this.INIT_COL_ROOK[c][castleSide]; // Nothing on final squares, except maybe king and castling rook? for (i = 0; i < 2; i++) { @@ -238,34 +238,32 @@ export const VariantRules = class Allmate1Rules extends ChessRules { }); } - updateVariables(move) { - super.updateVariables(move); - const color = V.GetOppCol(this.turn); + postPlay(move) { + super.postPlay(move); if (move.vanish.length >= 2 && move.appear.length == 1) { - move.vanish.forEach(v => { - if (v.c == color) - return; + for (let i = 1; i this.INIT_COL_KING[v.c] - this.castleFlags[v.c][1] = false; + this.castleFlags[v.c][1] = 8; } - }); + } } } - unupdateVariables(move) { - super.unupdateVariables(move); - const color = this.turn; + preUndo(move) { + super.preUndo(move); + const oppCol = this.turn; if (move.vanish.length >= 2 && move.appear.length == 1) { // Did opponent king disappeared? - const psq = move.vanish.find(v => v.p == V.KING && v.c != color) + const psq = move.vanish.find(v => v.p == V.KING && v.c == oppCol) if (psq) this.kingPos[psq.c] = [psq.x, psq.y]; } @@ -284,14 +282,14 @@ export const VariantRules = class Allmate1Rules extends ChessRules { } static get SEARCH_DEPTH() { - return 2; + return 1; } getNotation(move) { let notation = super.getNotation(move); // Add a capture mark (not describing what is captured...): if (move.vanish.length > 1 && move.appear.length == 1) { - if (notation.match(/^[a-h]x/)) + if (!!(notation.match(/^[a-h]x/))) // Pawn capture: remove initial "b" in bxc4 for example notation = notation.substr(1); notation = notation.replace("x","") + "X";