let [i, j] = [bp[0] + step[0], bp[1] + step[1]];
const horizontalStepOnGoalRow =
([0, 8].includes(bp[0]) && step.some(s => s == 0));
- if (emptySquare(i, j) && (!horizontalStepOnGoalRow || j != 4)) {
+ if (
+ emptySquare(i, j) &&
+ (this.movesCount >= 2 || j != 4 || ![0, 8].includes(i)) &&
+ (!horizontalStepOnGoalRow || j != 4)
+ ) {
moves.push(super.getBasicMove(bp, [i, j]));
if (!oneStep) {
do {
i += step[0];
j += step[1];
if (!emptySquare(i, j)) break;
- if (!horizontalStepOnGoalRow || j != 4)
+ if (
+ (this.movesCount >= 2 || j != 4 || ![0, 8].includes(i)) &&
+ (!horizontalStepOnGoalRow || j != 4)
+ ) {
+ moves.push(super.getBasicMove(bp, [i, j]));
+ }
+ } while (true);
+ }
+ }
+ // Try the other direction (TODO: experimental)
+ [i, j] = [bp[0] - 2*step[0], bp[1] - 2*step[1]];
+ if (
+ emptySquare(i, j) &&
+ (this.movesCount >= 2 || j != 4 || ![0, 8].includes(i)) &&
+ (!horizontalStepOnGoalRow || j != 4)
+ ) {
+ moves.push(super.getBasicMove(bp, [i, j]));
+ if (!oneStep) {
+ do {
+ i -= step[0];
+ j -= step[1];
+ if (!emptySquare(i, j)) break;
+ if (
+ (this.movesCount >= 2 || j != 4 || ![0, 8].includes(i)) &&
+ (!horizontalStepOnGoalRow || j != 4)
+ ) {
moves.push(super.getBasicMove(bp, [i, j]));
+ }
} while (true);
}
}
}
const kickedFrom = x + "-" + y;
- moves.forEach(m => m.by = kickedFrom)
+ moves.forEach(m => m.start.by = kickedFrom)
return moves;
}
getPotentialMovesFrom([x, y], computer) {
- if (V.PIECES.includes(this.getPiece(x, y))) {
+ const piece = this.getPiece(x, y);
+ if (V.PIECES.includes(piece)) {
if (this.subTurn > 1) return [];
- return (
- super.getPotentialMovesFrom([x, y])
- .filter(m => m.end.y != 4 || ![0, 8].includes(m.end.x))
- );
+ const moves = super.getPotentialMovesFrom([x, y])
+ .filter(m => m.end.y != 4 || ![0, 8].includes(m.end.x));
+ // If bishop stuck in a corner: allow to jump over the next obstacle
+ if (moves.length == 0 && piece == V.BISHOP) {
+ if (
+ x == 0 && y == 0 &&
+ this.board[1][1] != V.EMPTY &&
+ this.board[2][2] == V.EMPTY
+ ) {
+ return [super.getBasicMove([x, y], [2, 2])];
+ }
+ if (
+ x == 0 && y == 8 &&
+ this.board[1][7] != V.EMPTY &&
+ this.board[2][6] == V.EMPTY
+ ) {
+ return [super.getBasicMove([x, y], [2, 6])];
+ }
+ if (
+ x == 8 && y == 0 &&
+ this.board[7][1] != V.EMPTY &&
+ this.board[6][2] == V.EMPTY
+ ) {
+ return [super.getBasicMove([x, y], [6, 2])];
+ }
+ if (
+ x == 8 && y == 8 &&
+ this.board[7][7] != V.EMPTY &&
+ this.board[6][6] == V.EMPTY
+ ) {
+ return [super.getBasicMove([x, y], [6, 6])];
+ }
+ }
+ return moves;
}
// Kicking the ball: look for adjacent pieces.
const steps = V.steps[V.ROOK].concat(V.steps[V.BISHOP]);
const c = this.turn;
let moves = [];
+ let atLeastOnePotentialKick = false;
for (let s of steps) {
const [i, j] = [x + s[0], y + s[1]];
if (
this.board[i][j] != V.EMPTY &&
this.getColor(i, j) == c
) {
+ if (!atLeastOnePotentialKick) atLeastOnePotentialKick = true;
Array.prototype.push.apply(moves, this.tryKickFrom([i, j]));
}
}
- // And, always add the "end" move. For computer, keep only one
- outerLoop: for (let i=0; i < V.size.x; i++) {
- for (let j=0; j < V.size.y; j++) {
- if (this.board[i][j] != V.EMPTY && this.getColor(i, j) == c) {
- moves.push(super.getBasicMove([x, y], [i, j]));
- if (!!computer) break outerLoop;
+ if (atLeastOnePotentialKick) {
+ // And, always add the "end" move. For computer, keep only one
+ outerLoop: for (let i=0; i < V.size.x; i++) {
+ for (let j=0; j < V.size.y; j++) {
+ if (this.board[i][j] != V.EMPTY && this.getColor(i, j) == c) {
+ moves.push(super.getBasicMove([x, y], [i, j]));
+ if (!!computer) break outerLoop;
+ }
}
}
}
filterValid(moves) {
const L = this.kickedBy.length;
const kb = this.kickedBy[L-1];
- return moves.filter(m => !m.by || !kb[m.by]);
+ return moves.filter(m => !m.start.by || !kb[m.start.by]);
}
getCheckSquares() {
}
else {
this.subTurn++;
- if (!!move.by) {
+ if (!!move.start.by) {
const L = this.kickedBy.length;
- this.kickedBy[L-1][move.by] = true;
+ this.kickedBy[L-1][move.start.by] = true;
}
}
}
}
else {
this.subTurn--;
- if (!!move.by) {
+ if (!!move.start.by) {
const L = this.kickedBy.length;
- delete this.kickedBy[L-1][move.by];
+ delete this.kickedBy[L-1][move.start.by];
}
}
if (!passesOver) {