X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FFootball.js;h=18a3ecad4ee3dbf691698677214ce600f42c7e5c;hb=5c27a4b518693204ee33f85b50cb2cd518d38941;hp=2410f0a6ddb26f5eb14f46eede9810f2d240c901;hpb=5d74fceaa93054b410f469fe6ed4d5a4609bf98d;p=vchess.git diff --git a/client/src/variants/Football.js b/client/src/variants/Football.js index 2410f0a6..18a3ecad 100644 --- a/client/src/variants/Football.js +++ b/client/src/variants/Football.js @@ -104,13 +104,13 @@ export class FootballRules extends ChessRules { } } - static GenRandInitFen(randomness) { - if (randomness == 0) + static GenRandInitFen(options) { + if (options.randomness == 0) return "rnbq1knbr/9/9/9/4a4/9/9/9/RNBQ1KNBR w 0"; let pieces = { w: new Array(8), b: new Array(8) }; for (let c of ["w", "b"]) { - if (c == 'b' && randomness == 1) { + if (c == 'b' && options.randomness == 1) { pieces['b'] = pieces['w']; break; } @@ -159,7 +159,7 @@ export class FootballRules extends ChessRules { V.OnBoard(i, j) && this.board[i][j] == V.EMPTY && ( - // In a corner? The, allow all ball moves + // In a corner? Then, allow all ball moves ([0, 8].includes(bp[0]) && [0, 8].includes(bp[1])) || // Do not end near the knight (Math.abs(i - x) >= 2 || Math.abs(j - y) >= 2) @@ -191,36 +191,81 @@ export class FootballRules extends ChessRules { 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 && + [0, 8].includes(x) && [0, 8].includes(y) + ) { + const indX = x == 0 ? [1, 2] : [7, 6]; + const indY = y == 0 ? [1, 2] : [7, 6]; + if ( + this.board[indX[0]][indY[0]] != V.EMPTY && + this.board[indX[1]][indY[1]] == V.EMPTY + ) { + return [super.getBasicMove([x, y], [indX[1], indY[1]])]; + } + } + 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 kicks = {}; for (let s of steps) { const [i, j] = [x + s[0], y + s[1]]; if ( @@ -228,37 +273,32 @@ export class FootballRules extends ChessRules { this.board[i][j] != V.EMPTY && this.getColor(i, j) == c ) { - Array.prototype.push.apply(moves, this.tryKickFrom([i, j])); + const kmoves = this.tryKickFrom([i, j]); + kmoves.forEach(km => { + const key = V.CoordsToSquare(km.start) + V.CoordsToSquare(km.end); + if (!kicks[key]) { + moves.push(km); + kicks[key] = true; + } + }); } } - // 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 (Object.keys(kicks).length > 0) { + // 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; + } } } } return moves; } - // No captures: - getSlideNJumpMoves([x, y], steps, oneStep) { - let moves = []; - outerLoop: for (let step of steps) { - let i = x + step[0]; - let j = y + step[1]; - let stepCount = 1; - while (V.OnBoard(i, j) && this.board[i][j] == V.EMPTY) { - moves.push(this.getBasicMove([x, y], [i, j])); - if (!!oneStep) continue outerLoop; - i += step[0]; - j += step[1]; - stepCount++; - } - } - return moves; + canTake() { + return false; } // Extra arg "computer" to avoid trimming all redundant pass moves: @@ -285,7 +325,7 @@ export class FootballRules extends ChessRules { 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() { @@ -332,9 +372,9 @@ export class FootballRules extends ChessRules { } 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; } } } @@ -348,9 +388,9 @@ export class FootballRules extends ChessRules { } 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) {