X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FBaroque.js;h=ae4b511f200c662891b0a5cb6149a7beadc0943e;hp=8f1f9ba079b0b23ed44777fff817aa0b26459ea7;hb=4404e58c0a30105472942367dce894223b05c7fe;hpb=658c47bf5843fb0855659f22f7b1c38318c66ce5 diff --git a/client/src/variants/Baroque.js b/client/src/variants/Baroque.js index 8f1f9ba0..ae4b511f 100644 --- a/client/src/variants/Baroque.js +++ b/client/src/variants/Baroque.js @@ -72,7 +72,7 @@ export const VariantRules = class BaroqueRules extends ChessRules { ) { const oppPiece = this.getPiece(i, j); if (oppPiece == V.IMMOBILIZER) { - // Moving is impossible only if this immobilizer is not neutralized + // Moving is possible only if this immobilizer is neutralized for (let step2 of adjacentSteps) { const [i2, j2] = [i + step2[0], j + step2[1]]; if (i2 == x && j2 == y) continue; //skip initial piece! @@ -474,8 +474,8 @@ export const VariantRules = class BaroqueRules extends ChessRules { } isAttackedByBishop([x, y], colors) { - // We cheat a little here: since this function is used exclusively for king, - // it's enough to check the immediate surrounding of the square. + // We cheat a little here: since this function is used exclusively for + // the king, it's enough to check the immediate surrounding of the square. const adjacentSteps = V.steps[V.ROOK].concat(V.steps[V.BISHOP]); for (let step of adjacentSteps) { const [i, j] = [x + step[0], y + step[1]]; @@ -512,6 +512,23 @@ export const VariantRules = class BaroqueRules extends ChessRules { return false; } + isAttackedByKing([x, y], colors) { + const steps = V.steps[V.ROOK].concat(V.steps[V.BISHOP]); + for (let step of steps) { + let rx = x + step[0], + ry = y + step[1]; + if ( + V.OnBoard(rx, ry) && + this.getPiece(rx, ry) === V.KING && + colors.includes(this.getColor(rx, ry)) && + !this.isImmobilized([rx, ry]) + ) { + return true; + } + } + return false; + } + static get VALUES() { return { p: 1,