X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FShogi.js;h=ac98835a94d23bc5f7ea7b3ca0096b0e79a3cf17;hb=723262f9b77ed0f916e5b9fcbfbae5ddfe94925c;hp=1b2ba03a4c4f13a475065889936e7c74c583a9d4;hpb=107dc1bd5361e2538b1551bdcc37c1e90a444b83;p=vchess.git diff --git a/client/src/variants/Shogi.js b/client/src/variants/Shogi.js index 1b2ba03a..ac98835a 100644 --- a/client/src/variants/Shogi.js +++ b/client/src/variants/Shogi.js @@ -1,8 +1,9 @@ import { ChessRules, PiPo, Move } from "@/base_rules"; import { ArrayFun } from "@/utils/array"; -import { shuffle } from "@/utils/alea"; +import { sample, shuffle } from "@/utils/alea"; export class ShogiRules extends ChessRules { + static get HasFlags() { return false; } @@ -15,6 +16,14 @@ export class ShogiRules extends ChessRules { return true; } + get showFirstTurn() { + return true; + } + + static get Notoodark() { + return true; + } + static IsGoodFen(fen) { if (!ChessRules.IsGoodFen(fen)) return false; const fenParsed = V.ParseFen(fen); @@ -106,20 +115,49 @@ export class ShogiRules extends ChessRules { "w 0 00000000000000" ); } - let pieces = { w: new Array(9), b: new Array(9) }; + // Randomization following these indications: + // http://www.shogi.net/shogi-l/Archive/2007/Nmar16-02.txt + let pieces1 = { w: new Array(4), b: new Array(4) }; + let positions2 = { w: new Array(2), b: new Array(2) }; for (let c of ["w", "b"]) { if (c == 'b' && randomness == 1) { - pieces['b'] = pieces['w']; + pieces1['b'] = JSON.parse(JSON.stringify(pieces1['w'])).reverse(); + positions2['b'] = + JSON.parse(JSON.stringify(positions2['w'])).reverse() + .map(p => 8 - p); break; } - let positions = shuffle(ArrayFun.range(9)); - const composition = ['l', 'l', 'n', 'n', 's', 's', 'g', 'g', 'k']; - for (let i = 0; i < 9; i++) pieces[c][positions[i]] = composition[i]; + let positions = shuffle(ArrayFun.range(4)); + const composition = ['s', 's', 'g', 'g']; + for (let i = 0; i < 4; i++) pieces1[c][positions[i]] = composition[i]; + positions2[c] = sample(ArrayFun.range(9), 2).sort(); } return ( - pieces["b"].join("") + - "/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/" + - pieces["w"].join("").toUpperCase() + + ( + "ln" + + pieces1["b"].slice(0, 2).join("") + + "k" + + pieces1["b"].slice(2, 4).join("") + + "nl/" + ) + + ( + (positions2['b'][0] || "") + 'r' + + (positions2['b'][1] - positions2['b'][0] - 1 || "") + 'b' + + (8 - positions2['b'][1] || "") + ) + + "/ppppppppp/9/9/9/PPPPPPPPP/" + + ( + (positions2['w'][0] || "") + 'B' + + (positions2['w'][1] - positions2['w'][0] - 1 || "") + 'R' + + (8 - positions2['w'][1] || "") + ) + + ( + "/LN" + + pieces1["w"].slice(0, 2).join("").toUpperCase() + + "K" + + pieces1["w"].slice(2, 4).join("").toUpperCase() + + "NL" + ) + " w 0 00000000000000" ); } @@ -143,26 +181,27 @@ export class ShogiRules extends ChessRules { setOtherVariables(fen) { super.setOtherVariables(fen); - const fenParsed = V.ParseFen(fen); // Also init reserves (used by the interface to show landable pieces) + const reserve = + V.ParseFen(fen).reserve.split("").map(x => parseInt(x, 10)); this.reserve = { w: { - [V.PAWN]: parseInt(fenParsed.reserve[0]), - [V.ROOK]: parseInt(fenParsed.reserve[1]), - [V.BISHOP]: parseInt(fenParsed.reserve[2]), - [V.GOLD_G]: parseInt(fenParsed.reserve[3]), - [V.SILVER_G]: parseInt(fenParsed.reserve[4]), - [V.KNIGHT]: parseInt(fenParsed.reserve[5]), - [V.LANCE]: parseInt(fenParsed.reserve[6]) + [V.PAWN]: reserve[0], + [V.ROOK]: reserve[1], + [V.BISHOP]: reserve[2], + [V.GOLD_G]: reserve[3], + [V.SILVER_G]: reserve[4], + [V.KNIGHT]: reserve[5], + [V.LANCE]: reserve[6] }, b: { - [V.PAWN]: parseInt(fenParsed.reserve[7]), - [V.ROOK]: parseInt(fenParsed.reserve[8]), - [V.BISHOP]: parseInt(fenParsed.reserve[9]), - [V.GOLD_G]: parseInt(fenParsed.reserve[10]), - [V.SILVER_G]: parseInt(fenParsed.reserve[11]), - [V.KNIGHT]: parseInt(fenParsed.reserve[12]), - [V.LANCE]: parseInt(fenParsed.reserve[13]) + [V.PAWN]: reserve[7], + [V.ROOK]: reserve[8], + [V.BISHOP]: reserve[9], + [V.GOLD_G]: reserve[10], + [V.SILVER_G]: reserve[11], + [V.KNIGHT]: reserve[12], + [V.LANCE]: reserve[13] } }; } @@ -243,7 +282,9 @@ export class ShogiRules extends ChessRules { if (p == V.PAWN) { // Do not drop on checkmate: this.play(mv); - const res = (this.underCheck(oppCol) && !this.atLeastOneMove()); + const res = ( + this.underCheck(oppCol) && !this.atLeastOneMove("noReserve") + ); this.undo(mv); if (res) continue; } @@ -273,7 +314,7 @@ export class ShogiRules extends ChessRules { case V.LANCE: return this.getPotentialLanceMoves([x, y]); case V.KING: - return this.getPotentialKingMoves([x, y]); + return super.getPotentialKingMoves([x, y]); case V.P_ROOK: return this.getPotentialDragonMoves([x, y]); case V.P_BISHOP: @@ -412,14 +453,6 @@ export class ShogiRules extends ChessRules { ); } - getPotentialKingMoves(sq) { - return this.getSlideNJumpMoves( - sq, - V.steps[V.ROOK].concat(V.steps[V.BISHOP]), - { oneStep: true } - ); - } - isAttacked(sq, color) { return ( this.isAttackedByPawn(sq, color) || @@ -517,14 +550,16 @@ export class ShogiRules extends ChessRules { return this.filterValid(moves); } - atLeastOneMove() { + atLeastOneMove(noReserve) { if (!super.atLeastOneMove()) { - // Search one reserve move - for (let i = 0; i < V.RESERVE_PIECES.length; i++) { - let moves = this.filterValid( - this.getReserveMoves([V.size.x + (this.turn == "w" ? 0 : 1), i]) - ); - if (moves.length > 0) return true; + if (!noReserve) { + // Search one reserve move + for (let i = 0; i < V.RESERVE_PIECES.length; i++) { + let moves = this.filterValid( + this.getReserveMoves([V.size.x + (this.turn == "w" ? 0 : 1), i]) + ); + if (moves.length > 0) return true; + } } return false; } @@ -622,4 +657,5 @@ export class ShogiRules extends ChessRules { ) ); } + };