From: Benjamin Auder Date: Sat, 14 Mar 2020 20:35:33 +0000 (+0100) Subject: Hopefully Eightpieces is less buggish now X-Git-Url: https://git.auder.net/game/current/%7B%7B%20asset%28%27mixstore/js/summernote.min.js%27%29%20%7D%7D?a=commitdiff_plain;h=b0a0468aa6f436f2ad4962492561ef430a3bc15c;p=vchess.git Hopefully Eightpieces is less buggish now --- diff --git a/TODO b/TODO index a993b216..6916bdf3 100644 --- a/TODO +++ b/TODO @@ -1,19 +1,4 @@ -Revise variants code by using more aggregate/disaggregate flags functions? - # New variants -8-pieces https://www.youtube.com/watch?v=XZ8K02Da7Ps&list=PLRyjH8DPuzTBiym6lA0r84P8N0HnTtZyN&index=6&t=0s -https://www.chessvariants.com/rules/8-piece-chess "Eightpieces" - -"Ball" Chess: 9x9 board, ball on center square. 2 queens ? -To take the ball when it's free you need to capture it. -To take the ball when it's used, u need to take the piece. -Goal: bring ball to final rank. -Possibles passes : soit à une pièce, soit sur une case. - --> remplace un déplacement de pièce. Par exemple pion a2 passe à cavalier a4 = 1 coup. - --> selon le mode de déplacement standard (donc tout droit pour les pions) -Pas de notion d'échec ou de mat (?) -Si une pièce est mat elle donne le ballon (?) - Landing pieces from empty board: https://www.chessvariants.com/diffsetup.dir/unachess.html @@ -36,6 +21,16 @@ Goal is still checkmate. Take(a)n(d)make : if capture a piece, take its power for the last of the turn and make a move like it. If a pawn taken: direction of the capturer. +"Ball" Chess: 9x9 board, ball on center square. 2 queens ? +To take the ball when it's free you need to capture it. +To take the ball when it's used, u need to take the piece. +Goal: bring ball to final rank. +Possibles passes : soit à une pièce, soit sur une case. + --> remplace un déplacement de pièce. Par exemple pion a2 passe à cavalier a4 = 1 coup. + --> selon le mode de déplacement standard (donc tout droit pour les pions) +Pas de notion d'échec ou de mat (?) +Si une pièce est mat elle donne le ballon (?) + Maxima, Interweave, Roccoco Synchrone Chess: allow to anticipate en-passant capture as well :) diff --git a/client/public/images/icons/SOURCE b/client/public/images/icons/SOURCE index eeb51d3e..88c25021 100644 --- a/client/public/images/icons/SOURCE +++ b/client/public/images/icons/SOURCE @@ -13,3 +13,5 @@ https://www.flaticon.com/free-icon/download_724933?term=download&page=1&position https://www.flaticon.com/free-icon/resize_512182?term=resize&page=1&position=49 https://www.flaticon.com/free-icon/clear_565313?term=delete&page=1&position=33 https://www.flaticon.com/free-icon/clear_1632708?term=delete&page=1&position=3 +https://iconscout.com/icon/discord-1 +https://www.onlinewebfonts.com/icon/154680 diff --git a/client/public/images/icons/discord.svg b/client/public/images/icons/discord.svg new file mode 100644 index 00000000..bf910158 --- /dev/null +++ b/client/public/images/icons/discord.svg @@ -0,0 +1 @@ +Icons8 \ No newline at end of file diff --git a/client/public/images/icons/github.svg b/client/public/images/icons/github.svg new file mode 100644 index 00000000..4c46ca3f --- /dev/null +++ b/client/public/images/icons/github.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/client/src/App.vue b/client/src/App.vue index 8258dc3e..d8e395f2 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -34,7 +34,9 @@ .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2 footer router-link.menuitem(to="/about") {{ st.tr["About"] }} - a.menuitem(href="https://discord.gg/a9ZFKBe") Discord + a.menuitem(href="https://github.com/yagu0/vchess") + span {{ st.tr["Code"] }} + img(src="/images/icons/github.svg") router-link.menuitem(to="/news") {{ st.tr["News"] }} p.clickable(onClick="window.doClick('modalContact')") | {{ st.tr["Contact"] }} @@ -68,8 +70,8 @@ export default { diff --git a/client/src/components/ContactForm.vue b/client/src/components/ContactForm.vue index e5d27326..b7aea942 100644 --- a/client/src/components/ContactForm.vue +++ b/client/src/components/ContactForm.vue @@ -10,6 +10,9 @@ div ) .card label.modal-close(for="modalContact") + a#discordLink(href="https://discord.gg/a9ZFKBe") + span {{ st.tr["Discord invitation"] }} + img(src="/images/icons/discord.svg") fieldset label(for="userEmail") {{ st.tr["Email"] }} input#userEmail(type="email" :value="st.user.email") @@ -98,6 +101,16 @@ textarea#mailContent width: 100% min-height: 100px +#discordLink + display: block + margin-top: 10px + text-align: center + font-size: 1.3em + & > img + height: 1.5em + display: inline-block + margin-left: 5px + #dialog padding: 5px color: blue diff --git a/client/src/translations/en.js b/client/src/translations/en.js index 3c0228c1..a37a75c1 100644 --- a/client/src/translations/en.js +++ b/client/src/translations/en.js @@ -27,6 +27,7 @@ export const translations = { "Challenge declined": "Challenge declined", "Chat here": "Chat here", "Clear history": "Clear history", + Code: "Code", "Connection token sent. Check your emails!": "Connection token sent. Check your emails!", Contact: "Contact", "Correspondance challenges": "Correspondance challenges", @@ -34,6 +35,7 @@ export const translations = { "Database error: stop private browsing, or update your browser": "Database error: stop private browsing, or update your browser", Delete: "Delete", Deterministic: "Deterministic", + "Discord invitation": "Discord invitation", Download: "Download", Draw: "Draw", "Draw offer only in your turn": "Draw offer only in your turn", diff --git a/client/src/translations/es.js b/client/src/translations/es.js index f31fc202..e1048b7d 100644 --- a/client/src/translations/es.js +++ b/client/src/translations/es.js @@ -27,6 +27,7 @@ export const translations = { "Challenge declined": "Desafío rechazado", "Chat here": "Chat aquí", "Clear history": "Clara historia", + Code: "Código", "Connection token sent. Check your emails!": "Token de conexión enviado. ¡Revisa tus correos!", Contact: "Contacto", "Correspondance challenges": "Desafíos por correspondencia", @@ -34,6 +35,7 @@ export const translations = { "Database error: stop private browsing, or update your browser": "Error de la base de datos: detener la navegación privada, o actualizar su navegador", Delete: "Borrar", Deterministic: "Determinista", + "Discord invitation": "Invitación Discord", Download: "Descargar", Draw: "Tablas", "Draw offer only in your turn": "Oferta de tablas solo en tu turno", diff --git a/client/src/translations/fr.js b/client/src/translations/fr.js index 0a8d5532..20b7b587 100644 --- a/client/src/translations/fr.js +++ b/client/src/translations/fr.js @@ -27,6 +27,7 @@ export const translations = { "Challenge declined": "Défi refusé", "Chat here": "Chattez ici", "Clear history": "Effacer l'historique", + Code: "Code", "Connection token sent. Check your emails!": "Token de connection envoyé. Allez voir vos emails !", Contact: "Contact", "Correspondance challenges": "Défis par correspondance", @@ -34,6 +35,7 @@ export const translations = { "Database error: stop private browsing, or update your browser": "Erreur de base de données : arrêtez la navigation privée, ou mettez à jour votre navigateur", Delete: "Supprimer", Deterministic: "Déterministe", + "Discord invitation": "Invitation Discord", Download: "Télécharger", Draw: "Nulle", "Draw offer only in your turn": "Proposition de nulle seulement sur votre temps", diff --git a/client/src/utils/playUndo.js b/client/src/utils/playUndo.js index ab11bff9..94e642cc 100644 --- a/client/src/utils/playUndo.js +++ b/client/src/utils/playUndo.js @@ -5,6 +5,7 @@ export function playMove(move, vr) { export function undoMove(move, vr) { if (!Array.isArray(move)) move = [move]; + // If multi-move, undo all submoves from last to first for (let i = move.length - 1; i >= 0; i--) vr.undo(move[i]); } diff --git a/client/src/variants/Eightpieces.js b/client/src/variants/Eightpieces.js index 88c3739a..465fbea9 100644 --- a/client/src/variants/Eightpieces.js +++ b/client/src/variants/Eightpieces.js @@ -214,6 +214,13 @@ export const VariantRules = class EightpiecesRules extends ChessRules { ); } + canTake([x1, y1], [x2, y2]) { + if (this.subTurn == 2) + // Only self captures on this subturn: + return this.getColor(x1, y1) == this.getColor(x2, y2); + return super.canTake([x1, y1], [x2, y2]); + } + // Is piece on square (x,y) immobilized? isImmobilized([x, y]) { const color = this.getColor(x, y); @@ -295,14 +302,6 @@ export const VariantRules = class EightpiecesRules extends ChessRules { return moves; } } - if (this.subTurn == 2) { - // Temporarily change pushed piece color. - // (Not using getPiece() because of lancers) - var oppCol = this.getColor(x, y); - var color = V.GetOppCol(oppCol); - var saveXYstate = this.board[x][y]; - this.board[x][y] = color + this.board[x][y].charAt(1); - } let moves = []; switch (this.getPiece(x, y)) { case V.JAILER: @@ -330,16 +329,12 @@ export const VariantRules = class EightpiecesRules extends ChessRules { } return true; }); - } - else if (this.subTurn == 2) { - // Don't forget to re-add the sentry on the board: - // Also fix color of pushed piece afterward: + } else if (this.subTurn == 2) { + // Put back the sentinel on board: + const color = this.turn; moves.forEach(m => { - m.appear.unshift({x: x, y: y, p: V.SENTRY, c: color}); - m.appear[1].c = oppCol; - m.vanish[0].c = oppCol; + m.appear.push({x: x, y: y, p: V.SENTRY, c: color}); }); - this.board[x][y] = saveXYstate; } return moves; } @@ -348,10 +343,14 @@ export const VariantRules = class EightpiecesRules extends ChessRules { const color = this.getColor(x, y); let moves = []; const [sizeX, sizeY] = [V.size.x, V.size.y]; - const shiftX = color == "w" ? -1 : 1; + let shiftX = color == "w" ? -1 : 1; + if (this.subTurn == 2) shiftX *= -1; const startRank = color == "w" ? sizeX - 2 : 1; const lastRank = color == "w" ? 0 : sizeX - 1; + // Pawns might be pushed on 1st rank and attempt to move again: + if (!V.OnBoard(x + shiftX, y)) return []; + const finalPieces = // No promotions after pushes! x + shiftX == lastRank && this.subTurn == 1 @@ -421,7 +420,12 @@ export const VariantRules = class EightpiecesRules extends ChessRules { getPotentialLancerMoves_aux([x, y], step, tr) { let moves = []; // Add all moves to vacant squares until opponent is met: - const oppCol = V.GetOppCol(this.getColor(x, y)); + const color = this.getColor(x, y); + const oppCol = + this.subTurn == 1 + ? V.GetOppCol(color) + // at subTurn == 2, consider own pieces as opponent + : color; let sq = [x + step[0], y + step[1]]; while (V.OnBoard(sq[0], sq[1]) && this.getColor(sq[0], sq[1]) != oppCol) { if (this.board[sq[0]][sq[1]] == V.EMPTY) @@ -451,7 +455,7 @@ export const VariantRules = class EightpiecesRules extends ChessRules { // do not change direction after moving, *except* if I keep the // same orientation in which I was pushed. const color = this.getColor(x, y); - const curDir = V.LANCER_DIRS[this.board[x][x].charAt(1)]; + const curDir = V.LANCER_DIRS[this.board[x][y].charAt(1)]; Object.values(V.LANCER_DIRS).forEach(step => { const dirCode = Object.keys(V.LANCER_DIRS).find(k => { return ( @@ -529,29 +533,13 @@ export const VariantRules = class EightpiecesRules extends ChessRules { m.vanish.pop(); } }); - // Can the pushed unit make any move? ...resulting in a non-self-check? const color = this.getColor(x, y); const fMoves = moves.filter(m => { - // Sentry push? + // Can the pushed unit make any move? ...resulting in a non-self-check? if (m.appear.length == 0) { let res = false; this.play(m); - let potentialMoves = this.getPotentialMovesFrom([m.end.x, m.end.y]); - // Add nudges (if any a priori possible) - for (let step of V.steps[V.ROOK].concat(V.steps[V.BISHOP])) { - if ( - V.OnBoard(m.end.x + step[0], m.end.y + step[1]) && - this.board[m.end.x + step[0]][m.end.y + step[1]] == V.EMPTY - ) { - potentialMoves.push( - this.getBasicMove( - [m.end.x, m.end.y], - [m.end.x + step[0], m.end.y + step[1]] - ) - ); - } - } - let moves2 = this.filterValid(potentialMoves); + let moves2 = this.getPotentialMovesFrom([m.end.x, m.end.y]); for (let m2 of moves2) { this.play(m2); res = !this.underCheck(color); @@ -573,6 +561,19 @@ export const VariantRules = class EightpiecesRules extends ChessRules { }); } + getPotentialKingMoves(sq) { + const moves = this.getSlideNJumpMoves( + sq, + V.steps[V.ROOK].concat(V.steps[V.BISHOP]), + "oneStep" + ); + return ( + this.subTurn == 1 + ? moves.concat(this.getCastleMoves(sq)) + : moves + ); + } + // Adapted: castle with jailer possible getCastleMoves([x, y]) { const c = this.getColor(x, y); @@ -655,30 +656,40 @@ export const VariantRules = class EightpiecesRules extends ChessRules { } filterValid(moves) { + if (moves.length == 0) return []; + const basicFilter = (m, c) => { + this.play(m); + const res = !this.underCheck(c); + this.undo(m); + return res; + }; // Disable check tests for sentry pushes, // because in this case the move isn't finished let movesWithoutSentryPushes = []; let movesWithSentryPushes = []; moves.forEach(m => { - if (m.appear.length > 0) movesWithoutSentryPushes.push(m); + // Second condition below for special king "pass" moves + if (m.appear.length > 0 || m.vanish.length == 0) + movesWithoutSentryPushes.push(m); else movesWithSentryPushes.push(m); }); - - // TODO: if after move a sentry can take king in 2 times?! - - const filteredMoves = super.filterValid(movesWithoutSentryPushes); - // If at least one full move made, everything is allowed: - if (this.movesCount >= 2) - return filteredMoves.concat(movesWithSentryPushes); - // Else, forbid checks and captures: - const oppCol = V.GetOppCol(this.turn); - return filteredMoves.filter(m => { - if (m.vanish.length == 2 && m.appear.length == 1) return false; - this.play(m); - const res = !this.underCheck(oppCol); - this.undo(m); - return res; - }).concat(movesWithSentryPushes); + const color = this.turn; + const oppCol = V.GetOppCol(color); + const filteredMoves = + movesWithoutSentryPushes.filter(m => basicFilter(m, color)); + // If at least one full move made, everything is allowed. + // Else: forbid checks and captures. + return ( + this.movesCount >= 2 + ? filteredMoves + : filteredMoves.filter(m => { + return ( + m.vanish.length <= 1 || + m.appear.length != 1 || + basicFilter(m, oppCol) + ); + }) + ).concat(movesWithSentryPushes); } getAllValidMoves() { @@ -689,10 +700,10 @@ export const VariantRules = class EightpiecesRules extends ChessRules { } prePlay(move) { - if (move.appear.length == 0 && move.vanish.length == 1) { + if (move.appear.length == 0 && move.vanish.length == 1) // The sentry is about to push a piece: subTurn goes from 1 to 2 this.sentryPos = { x: move.end.x, y: move.end.y }; - } else if (this.subTurn == 2 && move.vanish[0].p != V.PAWN) { + if (this.subTurn == 2 && move.vanish[0].p != V.PAWN) { // A piece is pushed: forbid array of squares between start and end // of move, included (except if it's a pawn) let squares = []; @@ -708,7 +719,7 @@ export const VariantRules = class EightpiecesRules extends ChessRules { ]; for ( let sq = {x: move.start.x, y: move.start.y}; - sq.x != move.end.x && sq.y != move.end.y; + sq.x != move.end.x || sq.y != move.end.y; sq.x += step[0], sq.y += step[1] ) { squares.push({ x: sq.x, y: sq.y }); @@ -721,9 +732,9 @@ export const VariantRules = class EightpiecesRules extends ChessRules { } play(move) { -// if (!this.states) this.states = []; -// const stateFen = this.getBaseFen() + this.getTurnFen() + this.getFlagsFen(); -// this.states.push(stateFen); + if (!this.states) this.states = []; + const stateFen = this.getFen(); + this.states.push(stateFen); this.prePlay(move); move.flags = JSON.stringify(this.aggregateFlags()); @@ -742,10 +753,35 @@ export const VariantRules = class EightpiecesRules extends ChessRules { } postPlay(move) { - if (move.vanish.length == 0) - // Special pass move of the king: nothing to update! + if (move.vanish.length == 0 || this.subTurn == 2) + // Special pass move of the king, or sentry pre-push: nothing to update return; - super.postPlay(move); + const c = move.vanish[0].c; + const piece = move.vanish[0].p; + const firstRank = c == "w" ? V.size.x - 1 : 0; + + if (piece == V.KING) { + this.kingPos[c][0] = move.appear[0].x; + this.kingPos[c][1] = move.appear[0].y; + this.castleFlags[c] = [V.size.y, V.size.y]; + return; + } + // Update castling flags if rooks are moved + const oppCol = V.GetOppCol(c); + const oppFirstRank = V.size.x - 1 - firstRank; + if ( + move.start.x == firstRank && //our rook moves? + this.castleFlags[c].includes(move.start.y) + ) { + const flagIdx = (move.start.y == this.castleFlags[c][0] ? 0 : 1); + this.castleFlags[c][flagIdx] = V.size.y; + } else if ( + move.end.x == oppFirstRank && //we took opponent rook? + this.castleFlags[oppCol].includes(move.end.y) + ) { + const flagIdx = (move.end.y == this.castleFlags[oppCol][0] ? 0 : 1); + this.castleFlags[oppCol][flagIdx] = V.size.y; + } } undo(move) { @@ -761,9 +797,9 @@ export const VariantRules = class EightpiecesRules extends ChessRules { } this.postUndo(move); -// const stateFen = this.getBaseFen() + this.getTurnFen() + this.getFlagsFen(); -// if (stateFen != this.states[this.states.length-1]) debugger; -// this.states.pop(); + const stateFen = this.getFen(); + if (stateFen != this.states[this.states.length-1]) debugger; + this.states.pop(); } postUndo(move) { @@ -779,6 +815,46 @@ export const VariantRules = class EightpiecesRules extends ChessRules { ); } + isAttackedBySlideNJump([x, y], colors, piece, steps, oneStep) { + for (let step of steps) { + let rx = x + step[0], + ry = y + step[1]; + while (V.OnBoard(rx, ry) && this.board[rx][ry] == V.EMPTY && !oneStep) { + rx += step[0]; + ry += step[1]; + } + if ( + V.OnBoard(rx, ry) && + this.getPiece(rx, ry) === piece && + colors.includes(this.getColor(rx, ry)) && + !this.isImmobilized([rx, ry]) + ) { + return true; + } + } + return false; + } + + isAttackedByPawn([x, y], colors) { + for (let c of colors) { + const pawnShift = c == "w" ? 1 : -1; + if (x + pawnShift >= 0 && x + pawnShift < V.size.x) { + for (let i of [-1, 1]) { + if ( + y + i >= 0 && + y + i < V.size.y && + this.getPiece(x + pawnShift, y + i) == V.PAWN && + this.getColor(x + pawnShift, y + i) == c && + !this.isImmobilized([x + pawnShift, y + i]) + ) { + return true; + } + } + } + } + return false; + } + isAttackedByLancer([x, y], colors) { for (let step of V.steps[V.ROOK].concat(V.steps[V.BISHOP])) { // If in this direction there are only enemy pieces and empty squares, @@ -793,8 +869,12 @@ export const VariantRules = class EightpiecesRules extends ChessRules { colors.includes(this.getColor(coord.x, coord.y)) ) ) { - if (this.getPiece(coord.x, coord.y) == V.LANCER) + if ( + this.getPiece(coord.x, coord.y) == V.LANCER && + !this.isImmobilized([coord.x, coord.y]) + ) { lancerPos.push({x: coord.x, y: coord.y}); + } coord.x += step[0]; coord.y += step[1]; } @@ -871,7 +951,8 @@ export const VariantRules = class EightpiecesRules extends ChessRules { for (let j=0; j should indicate Sxb2,bxc1 getNotation(move) { // Special case "king takes jailer" is a pass move if (move.appear.length == 0 && move.vanish.length == 0) return "pass"; + if (this.subTurn == 2) { + // Do not consider appear[1] (sentry) for sentry pushes + const simpleMove = { + appear: [move.appear[0]], + vanish: move.vanish, + start: move.start, + end: move.end + }; + return super.getNotation(simpleMove); + } return super.getNotation(move); } }; diff --git a/client/src/variants/Suction.js b/client/src/variants/Suction.js index 9ac5b442..a39bec0b 100644 --- a/client/src/variants/Suction.js +++ b/client/src/variants/Suction.js @@ -6,9 +6,6 @@ export const VariantRules = class SuctionRules extends ChessRules { } setOtherVariables(fen) { - -console.log(fen); - super.setOtherVariables(fen); // Local stack of "captures" this.cmoves = [];