From: Benjamin Auder Date: Thu, 18 Mar 2021 10:44:43 +0000 (+0100) Subject: First draft of Shinobi (unworking) X-Git-Url: https://git.auder.net/images/pieces/%7B%7B%20path%28%27mixstore_user_board%27%29%20%7D%7D?a=commitdiff_plain;h=269f9cfd01c74902e6f443b881aa0e608f385c82;p=vchess.git First draft of Shinobi (unworking) --- diff --git a/client/public/images/pieces/Shinobi/bc.svg b/client/public/images/pieces/Shinobi/bc.svg new file mode 100644 index 00000000..75f91988 --- /dev/null +++ b/client/public/images/pieces/Shinobi/bc.svg @@ -0,0 +1,188 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wb.svg b/client/public/images/pieces/Shinobi/wb.svg new file mode 100644 index 00000000..335a7828 --- /dev/null +++ b/client/public/images/pieces/Shinobi/wb.svg @@ -0,0 +1,84 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wc.svg b/client/public/images/pieces/Shinobi/wc.svg new file mode 100644 index 00000000..ea711545 --- /dev/null +++ b/client/public/images/pieces/Shinobi/wc.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wh.svg b/client/public/images/pieces/Shinobi/wh.svg new file mode 100644 index 00000000..d4095e39 --- /dev/null +++ b/client/public/images/pieces/Shinobi/wh.svg @@ -0,0 +1,96 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wj.svg b/client/public/images/pieces/Shinobi/wj.svg new file mode 100644 index 00000000..70a320db --- /dev/null +++ b/client/public/images/pieces/Shinobi/wj.svg @@ -0,0 +1,122 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wk.svg b/client/public/images/pieces/Shinobi/wk.svg new file mode 100644 index 00000000..854df921 --- /dev/null +++ b/client/public/images/pieces/Shinobi/wk.svg @@ -0,0 +1,105 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wl.svg b/client/public/images/pieces/Shinobi/wl.svg new file mode 100644 index 00000000..6b4f6d1e --- /dev/null +++ b/client/public/images/pieces/Shinobi/wl.svg @@ -0,0 +1,107 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wm.svg b/client/public/images/pieces/Shinobi/wm.svg new file mode 100644 index 00000000..72edfaa9 --- /dev/null +++ b/client/public/images/pieces/Shinobi/wm.svg @@ -0,0 +1,98 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wn.svg b/client/public/images/pieces/Shinobi/wn.svg new file mode 100644 index 00000000..505cc174 --- /dev/null +++ b/client/public/images/pieces/Shinobi/wn.svg @@ -0,0 +1,79 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wp.svg b/client/public/images/pieces/Shinobi/wp.svg new file mode 100644 index 00000000..e0898cdd --- /dev/null +++ b/client/public/images/pieces/Shinobi/wp.svg @@ -0,0 +1,82 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/wr.svg b/client/public/images/pieces/Shinobi/wr.svg new file mode 100644 index 00000000..6e4360fa --- /dev/null +++ b/client/public/images/pieces/Shinobi/wr.svg @@ -0,0 +1,86 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/client/public/images/pieces/Shinobi/ws.svg b/client/public/images/pieces/Shinobi/ws.svg new file mode 100644 index 00000000..93ed344d --- /dev/null +++ b/client/public/images/pieces/Shinobi/ws.svg @@ -0,0 +1,234 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/src/variants/Copycat.js b/client/src/variants/Copycat.js index 089b92f8..78299c69 100644 --- a/client/src/variants/Copycat.js +++ b/client/src/variants/Copycat.js @@ -141,4 +141,8 @@ export class CopycatRules extends ChessRules { ); } + static get SEARCH_DEPTH() { + return 2; + } + }; diff --git a/client/src/variants/Shinobi.js b/client/src/variants/Shinobi.js new file mode 100644 index 00000000..5eed0d39 --- /dev/null +++ b/client/src/variants/Shinobi.js @@ -0,0 +1,377 @@ +import { ChessRules, PiPo, Move } from "@/base_rules"; +import { ArrayFun } from "@/utils/array"; + +export class ShinobiRules extends ChessRules { + + /* Would be unused: + static get PawnSpecs() { + return Object.assign( + { promotions: [V.PAWN] }, + ChessRules.PawnSpecs + ); + } */ + + static get CAPTAIN() { + return 'c'; + } + static get NINJA() { + return 'j'; + } + static get SAMURAI() { + return 's'; + } + static get MONK() { + return 'm'; + } + static get HORSE() { + return 'h'; + } + static get LANCE() { + return 'l'; + } + + static get PIECES() { + return ( + ChessRules.PIECES + .concat([V.CAPTAIN, V.NINJA, V.SAMURAI, V.MONK, V.HORSE, V.LANCE]) + ); + } + + getPpath(b) { + if (b[0] == 'b' && b[1] != 'c') return b; + return "Shinobi/" + b; + } + + getReservePpath(index, color) { + return "Shinobi/" + color + V.RESERVE_PIECES[index]; + } + + static IsGoodFen(fen) { + if (!ChessRules.IsGoodFen(fen)) return false; + const fenParsed = V.ParseFen(fen); + // 5) Check reserve + if (!fenParsed.reserve || !fenParsed.reserve.match(/^[0-9]{6,6}$/)) + return false; + return true; + } + + static ParseFen(fen) { + const fenParts = fen.split(" "); + return Object.assign( + ChessRules.ParseFen(fen), + { reserve: fenParts[5] } + ); + } + + // In hand initially: another captain, a ninja + a samurai, + // and 2 x monk, horse, lance (TODO) + static GenRandInitFen(randomness) { + const baseFen = ChessRules.GenRandInitFen(Math.min(randomness, 1)); + return ( + baseFen.substr(0, 33) + "3CK3 " + + "w 0 " + baseFen.substr(38, 2) + " - 111222" + ); + } + + getFen() { + return super.getFen() + " " + this.getReserveFen(); + } + + getFenForRepeat() { + return super.getFenForRepeat() + "_" + this.getReserveFen(); + } + + getReserveFen() { + // TODO: can simplify other drops variants with this code: + return Object.values(this.reserve['w']).join(""); + } + + setOtherVariables(fen) { + super.setOtherVariables(fen); + const reserve = + V.ParseFen(fen).reserve.split("").map(x => parseInt(x, 10)); + this.reserve = { + w: { + [V.CAPTAIN]: reserve[0], + [V.NINJA]: reserve[1], + [V.SAMURAI]: reserve[2], + [V.MONK]: reserve[3], + [V.HORSE]: reserve[4] + [V.LANCE]: reserve[5] + } + }; + } + + getColor(i, j) { + if (i >= V.size.x) return i == V.size.x ? "w" : "b"; + return this.board[i][j].charAt(0); + } + + getPiece(i, j) { + if (i >= V.size.x) return V.RESERVE_PIECES[j]; + return this.board[i][j].charAt(1); + } + + // Ordering on reserve pieces + static get RESERVE_PIECES() { + return [V.CAPTAIN, V.NINJA, V.SAMURAI, V.MONK, V.HORSE, V.LANCE]; + } + + getReserveMoves([x, y]) { + // color == 'w', no drops for black. + const p = V.RESERVE_PIECES[y]; + if (this.reserve['w'][p] == 0) return []; + let moves = []; + for (let i of [4, 5, 6, 7]) { + for (let j = 0; j < V.size.y; j++) { + if (this.board[i][j] == V.EMPTY) { + let mv = new Move({ + appear: [ + new PiPo({ + x: i, + y: j, + c: color, + p: p + }) + ], + vanish: [], + start: { x: x, y: y }, + end: { x: i, y: j } + }); + moves.push(mv); + } + } + } + return moves; + } + + static get MapUnpromoted() { + return { + m: 'b', + h: 'n', + l: 'r', + p: 'c' + }; + } + + getPotentialMovesFrom([x, y]) { + if (x >= V.size.x) { + // Reserves, outside of board: x == sizeX(+1) + if (this.turn == 'b') return []; + return this.getReserveMoves([x, y]); + } + // Standard moves + const piece = this.getPiece(x, y); + const sq = [x, y]; + if (ChessRules.includes(piece)) return super.getPotentialMovesFrom(sq); + switch (piece) { + case V.KING: return super.getPotentialKingMoves(sq); + case V.CAPTAIN: return this.getPotentialCaptainMoves(sq); + case V.NINJA: return this.getPotentialNinjaMoves(sq); + case V.SAMURAI: return this.getPotentialSamuraiMoves(sq); + } + let moves = []; + switch (piece) { + // Unpromoted + case V.PAWN: + moves = super.getPotentialPawnMoves(sq); + case V.MONK: + moves = this.getPotentialMonkMoves(sq); + break; + case V.HORSE: + moves = this.getPotentialHorseMoves(sq); + break; + case V.LANCE: + moves = this.getPotentialLanceMoves(sq); + break; + } + const promotionZone = (this.turn == 'w' ? [0, 1, 2] : [5, 6, 7]); + const promotedForm = V.MapUnpromoted[piece]; + moves.forEach(m => { + if (promotionZone.includes(m.end.x)) move.appear[0].p = promotedForm; + }); + return moves; + } + + getPotentialCaptainMoves([x, y]) { + } + + // TODO: adapt... + getPotentialNinjaMoves(sq) { + return super.getSlideNJumpMoves(sq, V.steps[V.BISHOP], "oneStep"); + } + + getPotentialSamuraiMoves(sq) { + const steps = V.steps[V.ROOK].concat(V.steps[V.BISHOP]); + return super.getSlideNJumpMoves(sq, steps, "oneStep"); + } + + getPotentialMonkMoves(sq) { + return ( + super.getSlideNJumpMoves(sq, V.steps[V.ROOK]) + .concat(super.getSlideNJumpMoves(sq, V.steps[V.KNIGHT], "oneStep")) + ); + } + + getPotentialHorseMoves(sq) { + const steps = + V.steps[V.BISHOP].concat(V.steps[V.ROOK]).concat(V.steps[V.KNIGHT]); + return super.getSlideNJumpMoves(sq, steps, "oneStep"); + } + + getPotentialLanceMoves(sq) { + return ( + super.getSlideNJumpMoves(sq, V.steps[V.BISHOP]) + .concat(super.getSlideNJumpMoves(sq, V.steps[V.KNIGHT], "oneStep")) + ); + } + + isAttacked(sq, color) { + if (color == 'b') + return (super.isAttacked(sq, 'b') || this.isAttackedByCaptain(sq, 'b')); + // Attacked by white: + return ( + super.isAttackedByKing(sq, 'w') || + this.isAttackedByCaptain(sq, 'w') || + this.isAttackedByNinja(sq, 'w') + this.isAttackedBySamurai(sq, 'w') + this.isAttackedByMonk(sq, 'w') || + this.isAttackedByHorse(sq, 'w') || + this.isAttackedByLance(sq, 'w') || + super.isAttackedByBishop(sq, 'w') || + super.isAttackedByKnight(sq, 'w') || + super.isAttackedByRook(sq, 'w') + ); + } + + isAttackedByCaptain(sq, color) { + const steps = V.steps[V.BISHOP].concat(V.steps[V.ROOK]); + return ( + super.isAttackedBySlideNJump(sq, color, V.DUCHESS, steps, "oneStep") + ); + } + + isAttackedByNinja(sq, color) { + return ( + super.isAttackedBySlideNJump( + sq, color, V.DUCHESS, V.steps[V.BISHOP], "oneStep") + ); + } + + isAttackedBySamurai(sq, color) { + return ( + super.isAttackedBySlideNJump(sq, color, V.MORTAR, V.steps[V.ROOK]) || + super.isAttackedBySlideNJump( + sq, color, V.MORTAR, V.steps[V.KNIGHT], "oneStep") + ); + } + + isAttackedByMonk(sq, color) { + const steps = + V.steps[V.BISHOP].concat(V.steps[V.ROOK]).concat(V.steps[V.KNIGHT]); + return ( + super.isAttackedBySlideNJump(sq, color, V.GENERAL, steps, "oneStep") + ); + } + + isAttackedByHorse(sq, color) { + return ( + super.isAttackedBySlideNJump(sq, color, V.ARCHBISHOP, V.steps[V.BISHOP]) + || + super.isAttackedBySlideNJump( + sq, color, V.ARCHBISHOP, V.steps[V.KNIGHT], "oneStep") + ); + } + + isAttackedByLance(sq, color) { + return ( + super.isAttackedBySlideNJump(sq, color, V.ARCHBISHOP, V.steps[V.BISHOP]) + || + super.isAttackedBySlideNJump( + sq, color, V.ARCHBISHOP, V.steps[V.KNIGHT], "oneStep") + ); + } + + getAllValidMoves() { + let moves = super.getAllPotentialMoves(); + const color = this.turn; + for (let i = 0; i < V.RESERVE_PIECES.length; i++) { + moves = moves.concat( + this.getReserveMoves([V.size.x + (color == "w" ? 0 : 1), i]) + ); + } + return this.filterValid(moves); + } + + atLeastOneMove() { + 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; + } + return false; + } + return true; + } + + // TODO: only black can castle (see Orda) + + postPlay(move) { + super.postPlay(move); + // Skip castle: + if (move.vanish.length == 2 && move.appear.length == 2) return; + const color = move.appear[0].c; + if (move.vanish.length == 0) this.reserve[color][move.appear[0].p]--; + } + + postUndo(move) { + super.postUndo(move); + if (move.vanish.length == 2 && move.appear.length == 2) return; + const color = this.turn; + if (move.vanish.length == 0) this.reserve[color][move.appear[0].p]++; + } + + /* + static get SEARCH_DEPTH() { + return 2; + } */ + + // TODO: + static get VALUES() { + return ( + Object.assign( + { + c: 4, + g: 5, + a: 7, + m: 7, + f: 2 + }, + ChessRules.VALUES + ) + ); + } + + evalPosition() { + let evaluation = super.evalPosition(); + // Add reserves: + for (let i = 0; i < V.RESERVE_PIECES.length; i++) { + const p = V.RESERVE_PIECES[i]; + evaluation += this.reserve["w"][p] * V.VALUES[p]; + evaluation -= this.reserve["b"][p] * V.VALUES[p]; + } + return evaluation; + } + + getNotation(move) { + if (move.vanish.length > 0) return super.getNotation(move); + // Drop: + const piece = + move.appear[0].p != V.PAWN ? move.appear[0].p.toUpperCase() : ""; + return piece + "@" + V.CoordsToSquare(move.end); + } + +};