X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=297ccc9dc55b011830412e0941a4a0cc3bd9c94a;hp=650cc232abbb4fad6d57582757e83c53839f085c;hb=8d7e2786f5a67a1b9a77c742d7951e0efbe8747d;hpb=aa78cc748cbf083ed733d860b64da6ab37b9a353 diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js index 650cc232..297ccc9d 100644 --- a/public/javascripts/components/game.js +++ b/public/javascripts/components/game.js @@ -1,972 +1,80 @@ // Game logic on a variant page Vue.component('my-game', { - props: ["problem"], + props: ["gameId"], //to find the game in storage (assumption: it exists) data: function() { return { - vr: null, //object to check moves, store them, FEN.. - mycolor: "w", - possibleMoves: [], //filled after each valid click/dragstart - choices: [], //promotion pieces, or checkered captures... (as moves) - start: {}, //pixels coordinates + id of starting square (click or drag) - selectedPiece: null, //moving piece (or clicked piece) - conn: null, //socket connection - score: "*", //'*' means 'unfinished' - mode: "idle", //human, chat, friend, problem, computer or idle (if not playing) + + // TODO: merge next variables into "game" + // if oppid == "computer" then mode = "computer" (otherwise human) myid: "", //our ID, always set + //this.myid = localStorage.getItem("myid") oppid: "", //opponent ID in case of HH game - myname: getCookie("username","anonymous"), - oppName: "anonymous", //opponent name, revealed after a game (if provided) - chats: [], //chat messages after human game + score: "*", //'*' means 'unfinished' + mycolor: "w", + fromChallenge: false, //if true, show chat during game + + conn: null, //socket connection oppConnected: false, seek: false, fenStart: "", - incheck: [], pgnTxt: "", - hints: (getCookie("hints") === "1" ? true : false), - color: getCookie("color", "lichess"), //lichess, chesscom or chesstempo // sound level: 0 = no sound, 1 = sound only on newgame, 2 = always - sound: parseInt(getCookie("sound", "2")), + sound: parseInt(localStorage["sound"] || "2"), // Web worker to play computer moves without freezing interface: compWorker: new Worker('/javascripts/playCompMove.js'), timeStart: undefined, //time when computer starts thinking }; }, - watch: { - problem: function(p) { - // 'problem' prop changed: update board state - this.newGame("problem", p.fen, V.ParseFen(p.fen).turn); + computed: { + mode: function() { + return (this.game.oppid == "computer" ? "computer" ? "human"); + }, + showChat: function() { + return this.mode=='human' && + (this.game.score != '*' || this.game.fromChallenge); + }, + showMoves: function() { + return window.innerWidth >= 768; }, }, - render(h) { - const [sizeX,sizeY] = [V.size.x,V.size.y]; - const smallScreen = (window.innerWidth <= 420); - // Precompute hints squares to facilitate rendering - let hintSquares = doubleArray(sizeX, sizeY, false); - this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; }); - // Also precompute in-check squares - let incheckSq = doubleArray(sizeX, sizeY, false); - this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; }); - let elementArray = []; - let actionArray = []; - actionArray.push( - h('button', - { - on: { click: this.clickGameSeek }, - attrs: { "aria-label": 'New online game' }, - 'class': { - "tooltip": true, - "bottom": true, //display below - "seek": this.seek, - "playing": this.mode == "human", - "small": smallScreen, - }, - }, - [h('i', { 'class': { "material-icons": true } }, "accessibility")]) - ); - if (["idle","chat","computer"].includes(this.mode)) - { - actionArray.push( - h('button', - { - on: { click: this.clickComputerGame }, - attrs: { "aria-label": 'New game VS computer' }, - 'class': { - "tooltip":true, - "bottom": true, - "playing": this.mode == "computer", - "small": smallScreen, - }, - }, - [h('i', { 'class': { "material-icons": true } }, "computer")]) - ); - } - if (["idle","chat","friend"].includes(this.mode)) - { - actionArray.push( - h('button', - { - on: { click: this.clickFriendGame }, - attrs: { "aria-label": 'New IRL game' }, - 'class': { - "tooltip":true, - "bottom": true, - "playing": this.mode == "friend", - "small": smallScreen, - }, - }, - [h('i', { 'class': { "material-icons": true } }, "people")]) - ); - } - if (!!this.vr) - { - const square00 = document.getElementById("sq-0-0"); - const squareWidth = !!square00 - ? parseFloat(window.getComputedStyle(square00).width.slice(0,-2)) - : 0; - const settingsBtnElt = document.getElementById("settingsBtn"); - const indicWidth = !!settingsBtnElt //-2 for border: - ? parseFloat(window.getComputedStyle(settingsBtnElt).height.slice(0,-2)) - 2 - : (smallScreen ? 31 : 37); - if (this.mode == "human") - { - const connectedIndic = h( - 'div', - { - "class": { - "topindicator": true, - "indic-left": true, - "connected": this.oppConnected, - "disconnected": !this.oppConnected, - }, - style: { - "width": indicWidth + "px", - "height": indicWidth + "px", - }, - } - ); - elementArray.push(connectedIndic); - } - else if (this.mode == "chat") - { - // Also show connection indication, but also nickname - const nicknameOpponent = h( - 'div', - { - "class": { - "clickable": true, - "topindicator": true, - "indic-left": true, - "name-connected": this.oppConnected, - "name-disconnected": !this.oppConnected, - }, - domProps: { - innerHTML: this.oppName, - }, - on: { - "click": () => { document.getElementById("modal-chat").checked = true; }, - }, - } - ); - elementArray.push(nicknameOpponent); - } - const turnIndic = h( - 'div', - { - "class": { - "topindicator": true, - "indic-right": true, - "white-turn": this.vr.turn=="w", - "black-turn": this.vr.turn=="b", - }, - style: { - "width": indicWidth + "px", - "height": indicWidth + "px", - }, - } - ); - elementArray.push(turnIndic); - const settingsBtn = h( - 'button', - { - on: { click: this.showSettings }, - attrs: { - "aria-label": 'Settings', - "id": "settingsBtn", - }, - 'class': { - "tooltip": true, - "topindicator": true, - "indic-right": true, - "settings-btn": !smallScreen, - "settings-btn-small": smallScreen, - }, - }, - [h('i', { 'class': { "material-icons": true } }, "settings")] - ); - elementArray.push(settingsBtn); - if (this.mode == "problem") - { - // Show problem instructions - elementArray.push( - h('div', - { - attrs: { id: "instructions-div" }, - "class": { - "clearer": true, - "section-content": true, - }, - }, - [ - h('p', - { - attrs: { id: "problem-instructions" }, - domProps: { innerHTML: this.problem.instructions } - } - ) - ] - ) - ); - } - const choices = h('div', - { - attrs: { "id": "choices" }, - 'class': { 'row': true }, - style: { - "display": this.choices.length>0?"block":"none", - "top": "-" + ((sizeY/2)*squareWidth+squareWidth/2) + "px", - "width": (this.choices.length * squareWidth) + "px", - "height": squareWidth + "px", - }, - }, - this.choices.map( m => { //a "choice" is a move - return h('div', - { - 'class': { - 'board': true, - ['board'+sizeY]: true, - }, - style: { - 'width': (100/this.choices.length) + "%", - 'padding-bottom': (100/this.choices.length) + "%", - }, - }, - [h('img', - { - attrs: { "src": '/images/pieces/' + - VariantRules.getPpath(m.appear[0].c+m.appear[0].p) + '.svg' }, - 'class': { 'choice-piece': true }, - on: { "click": e => { this.play(m); this.choices=[]; } }, - }) - ] - ); - }) - ); - // Create board element (+ reserves if needed by variant or mode) - const lm = this.vr.lastMove; - const showLight = this.hints && - (!["idle","chat"].includes(this.mode) || this.cursor==this.vr.moves.length); - const gameDiv = h('div', - { - 'class': { 'game': true }, - }, - [_.range(sizeX).map(i => { - let ci = (this.mycolor=='w' ? i : sizeX-i-1); - return h( - 'div', - { - 'class': { - 'row': true, - }, - style: { 'opacity': this.choices.length>0?"0.5":"1" }, - }, - _.range(sizeY).map(j => { - let cj = (this.mycolor=='w' ? j : sizeY-j-1); - let elems = []; - if (this.vr.board[ci][cj] != VariantRules.EMPTY) - { - elems.push( - h( - 'img', - { - 'class': { - 'piece': true, - 'ghost': !!this.selectedPiece - && this.selectedPiece.parentNode.id == "sq-"+ci+"-"+cj, - }, - attrs: { - src: "/images/pieces/" + - VariantRules.getPpath(this.vr.board[ci][cj]) + ".svg", - }, - } - ) - ); - } - if (this.hints && hintSquares[ci][cj]) - { - elems.push( - h( - 'img', - { - 'class': { - 'mark-square': true, - }, - attrs: { - src: "/images/mark.svg", - }, - } - ) - ); - } - return h( - 'div', - { - 'class': { - 'board': true, - ['board'+sizeY]: true, - 'light-square': (i+j)%2==0, - 'dark-square': (i+j)%2==1, - [this.color]: true, - 'highlight': showLight && !!lm && _.isMatch(lm.end, {x:ci,y:cj}), - 'incheck': showLight && incheckSq[ci][cj], - }, - attrs: { - id: this.getSquareId({x:ci,y:cj}), - }, - }, - elems - ); - }) - ); - }), choices] - ); - if (!["idle","chat"].includes(this.mode)) - { - actionArray.push( - h('button', - { - on: { click: this.resign }, - attrs: { "aria-label": 'Resign' }, - 'class': { - "tooltip":true, - "bottom": true, - "small": smallScreen, - }, - }, - [h('i', { 'class': { "material-icons": true } }, "flag")]) - ); - } - else if (this.vr.moves.length > 0) - { - // A game finished, and another is not started yet: allow navigation - actionArray = actionArray.concat([ - h('button', - { - on: { click: e => this.undo() }, - attrs: { "aria-label": 'Undo' }, - "class": { - "small": smallScreen, - "marginleft": true, - }, - }, - [h('i', { 'class': { "material-icons": true } }, "fast_rewind")]), - h('button', - { - on: { click: e => this.play() }, - attrs: { "aria-label": 'Play' }, - "class": { "small": smallScreen }, - }, - [h('i', { 'class': { "material-icons": true } }, "fast_forward")]), - ] - ); - } - if (["friend","problem"].includes(this.mode)) - { - actionArray = actionArray.concat( - [ - h('button', - { - on: { click: this.undoInGame }, - attrs: { "aria-label": 'Undo' }, - "class": { - "small": smallScreen, - "marginleft": true, - }, - }, - [h('i', { 'class': { "material-icons": true } }, "undo")] - ), - h('button', - { - on: { click: () => { this.mycolor = this.vr.getOppCol(this.mycolor) } }, - attrs: { "aria-label": 'Flip' }, - "class": { "small": smallScreen }, - }, - [h('i', { 'class': { "material-icons": true } }, "cached")] - ), - ]); - } - elementArray.push(gameDiv); - if (!!this.vr.reserve) - { - const shiftIdx = (this.mycolor=="w" ? 0 : 1); - let myReservePiecesArray = []; - for (let i=0; i { - const fen = document.getElementById("input-fen").value; - document.getElementById("modal-fenedit").checked = false; - this.newGame("friend", fen); - } - }, - domProps: { innerHTML: "Ok" }, - } - ), - h('button', - { - on: { click: - () => { - document.getElementById("input-fen").value = - VariantRules.GenRandInitFen(); - } - }, - domProps: { innerHTML: "Random" }, - } - ), - ] - ) - ] - ) - ]; - elementArray = elementArray.concat(modalFenEdit); - const modalSettings = [ - h('input', - { - attrs: { "id": "modal-settings", type: "checkbox" }, - "class": { "modal": true }, - }), - h('div', - { - attrs: { "role": "dialog", "aria-labelledby": "settingsTitle" }, - }, - [ - h('div', - { - "class": { "card": true, "smallpad": true }, - }, - [ - h('label', - { - attrs: { "id": "close-settings", "for": "modal-settings" }, - "class": { "modal-close": true }, - } - ), - h('h3', - { - attrs: { "id": "settingsTitle" }, - "class": { "section": true }, - domProps: { innerHTML: "Preferences" }, - } - ), - h('fieldset', - { }, - [ - h('label', - { - attrs: { for: "nameSetter" }, - domProps: { innerHTML: "My name is..." }, - }, - ), - h('input', - { - attrs: { - "id": "nameSetter", - type: "text", - value: this.myname, - }, - on: { "change": this.setMyname }, - } - ), - ] - ), - h('fieldset', - { }, - [ - h('label', - { - attrs: { for: "setHints" }, - domProps: { innerHTML: "Show hints?" }, - }, - ), - h('input', - { - attrs: { - "id": "setHints", - type: "checkbox", - checked: this.hints, - }, - on: { "change": this.toggleHints }, - } - ), - ] - ), - h('fieldset', - { }, - [ - h('label', - { - attrs: { for: "selectColor" }, - domProps: { innerHTML: "Board colors" }, - }, - ), - h("select", - { - attrs: { "id": "selectColor" }, - on: { "change": this.setColor }, - }, - [ - h("option", - { - domProps: { - "value": "lichess", - innerHTML: "brown" - }, - attrs: { "selected": this.color=="lichess" }, - } - ), - h("option", - { - domProps: { - "value": "chesscom", - innerHTML: "green" - }, - attrs: { "selected": this.color=="chesscom" }, - } - ), - h("option", - { - domProps: { - "value": "chesstempo", - innerHTML: "blue" - }, - attrs: { "selected": this.color=="chesstempo" }, - } - ), - ], - ), - ] - ), - h('fieldset', - { }, - [ - h('label', - { - attrs: { for: "selectSound" }, - domProps: { innerHTML: "Play sounds?" }, - }, - ), - h("select", - { - attrs: { "id": "selectSound" }, - on: { "change": this.setSound }, - }, - [ - h("option", - { - domProps: { - "value": "0", - innerHTML: "None" - }, - attrs: { "selected": this.sound==0 }, - } - ), - h("option", - { - domProps: { - "value": "1", - innerHTML: "Newgame" - }, - attrs: { "selected": this.sound==1 }, - } - ), - h("option", - { - domProps: { - "value": "2", - innerHTML: "All" - }, - attrs: { "selected": this.sound==2 }, - } - ), - ], - ), - ] - ), - ] - ) - ] - ) - ]; - elementArray = elementArray.concat(modalSettings); - let chatEltsArray = - [ - h('label', - { - attrs: { "id": "close-chat", "for": "modal-chat" }, - "class": { "modal-close": true }, - } - ), - h('h3', - { - attrs: { "id": "titleChat" }, - "class": { "section": true }, - domProps: { innerHTML: "Chat with " + this.oppName }, - } - ) - ]; - for (let chat of this.chats) - { - chatEltsArray.push( - h('p', - { - "class": { - "my-chatmsg": chat.author==this.myid, - "opp-chatmsg": chat.author==this.oppid, - }, - domProps: { innerHTML: chat.msg } - } - ) - ); - } - chatEltsArray = chatEltsArray.concat([ - h('input', - { - attrs: { - "id": "input-chat", - type: "text", - placeholder: "Type here", - }, - on: { keyup: this.trySendChat }, //if key is 'enter' - } - ), - h('button', - { - on: { click: this.sendChat }, - domProps: { innerHTML: "Send" }, - } - ) - ]); - const modalChat = [ - h('input', - { - attrs: { "id": "modal-chat", type: "checkbox" }, - "class": { "modal": true }, - }), - h('div', - { - attrs: { "role": "dialog", "aria-labelledby": "titleChat" }, - }, - [ - h('div', - { - "class": { "card": true, "smallpad": true }, - }, - chatEltsArray - ) - ] - ) - ]; - elementArray = elementArray.concat(modalChat); - const actions = h('div', - { - attrs: { "id": "actions" }, - 'class': { 'text-center': true }, - }, - actionArray - ); - elementArray.push(actions); - if (this.score != "*" && this.pgnTxt.length > 0) - { - elementArray.push( - h('div', - { - attrs: { id: "pgn-div" }, - "class": { "section-content": true }, - }, - [ - h('a', - { - attrs: { - id: "download", - href: "#", - } - } - ), - h('p', - { - attrs: { id: "pgn-game" }, - domProps: { innerHTML: this.pgnTxt } - } - ), - h('button', - { - attrs: { "id": "downloadBtn" }, - on: { click: this.download }, - domProps: { innerHTML: "Download game" }, - } - ), - ] - ) - ); - } - else if (this.mode != "idle") - { - if (this.mode == "problem") - { - // Show problem solution (on click) - elementArray.push( - h('div', - { - attrs: { id: "solution-div" }, - "class": { "section-content": true }, - }, - [ - h('h3', - { - domProps: { innerHTML: "Show solution" }, - on: { click: this.toggleShowSolution }, - } - ), - h('p', - { - attrs: { id: "problem-solution" }, - domProps: { innerHTML: this.problem.solution } - } - ) - ] - ) - ); - } - // Show current FEN - elementArray.push( - h('div', - { - attrs: { id: "fen-div" }, - "class": { "section-content": true }, - }, - [ - h('p', - { - attrs: { id: "fen-string" }, - domProps: { innerHTML: this.vr.getBaseFen() } - } - ) - ] - ) - ); - } - return h( - 'div', - { - 'class': { - "col-sm-12":true, - "col-md-8":true, - "col-md-offset-2":true, - "col-lg-6":true, - "col-lg-offset-3":true, - }, - // NOTE: click = mousedown + mouseup - on: { - mousedown: this.mousedown, - mousemove: this.mousemove, - mouseup: this.mouseup, - touchstart: this.mousedown, - touchmove: this.mousemove, - touchend: this.mouseup, - }, - }, - elementArray - ); - }, + // Modal end of game, and then sub-components + template: ` +
+ +
+
+ +

{{ endgameMessage }}

+ + + //TODO: connection + turn indicators en haut à droite (superposé au menu) + + // TODO: controls: abort, clear, resign, draw (avec confirm box) + // et si partie terminée : (mode analyse) just clear, back / play + // + flip button toujours disponible + +
+ + + + +
+ `, computed: { endgameMessage: function() { let eogMessage = "Unfinished"; - switch (this.score) + switch (this.game.score) { case "1-0": - eogMessage = "White win"; + eogMessage = translations["White win"]; break; case "0-1": - eogMessage = "Black win"; + eogMessage = translations["Black win"]; break; case "1/2": - eogMessage = "Draw"; + eogMessage = translations["Draw"]; break; } return eogMessage; @@ -974,93 +82,64 @@ Vue.component('my-game', { }, created: function() { const url = socketUrl; - const humanContinuation = (localStorage.getItem("variant") === variant); - const computerContinuation = (localStorage.getItem("comp-variant") === variant); - this.myid = (humanContinuation ? localStorage.getItem("myid") : getRandString()); - this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant); - const socketOpenListener = () => { - if (humanContinuation) //game VS human has priority - { - const fen = localStorage.getItem("fen"); - const mycolor = localStorage.getItem("mycolor"); - const oppid = localStorage.getItem("oppid"); - const moves = JSON.parse(localStorage.getItem("moves")); - this.newGame("human", fen, mycolor, oppid, moves, true); - // Send ping to server (answer pong if opponent is connected) - this.conn.send(JSON.stringify({code:"ping",oppid:this.oppid})); - } - else if (computerContinuation) - { - const fen = localStorage.getItem("comp-fen"); - const mycolor = localStorage.getItem("comp-mycolor"); - const moves = JSON.parse(localStorage.getItem("comp-moves")); - this.newGame("computer", fen, mycolor, undefined, moves, true); - } - }; + this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant._id); +// const socketOpenListener = () => { +// }; + +// TODO: after game, archive in indexedDB + + // TODO: this events listener is central. Refactor ? How ? const socketMessageListener = msg => { const data = JSON.parse(msg.data); + let L = undefined; switch (data.code) { - case "oppname": - // Receive opponent's name - this.oppName = data.name; - break; - case "newchat": - // Receive new chat - this.chats.push({msg:data.msg, author:this.oppid}); - break; - case "duplicate": - // We opened another tab on the same game - this.mode = "idle"; - this.vr = null; - alert("Already playing a game in this variant on another tab!"); - break; - case "newgame": //opponent found - // oppid: opponent socket ID - this.newGame("human", data.fen, data.color, data.oppid); - break; case "newmove": //..he played! - this.play(data.move, "animate"); + this.play(data.move, (variant.name!="Dark" ? "animate" : null)); break; case "pong": //received if we sent a ping (game still alive on our side) + if (this.gameId != data.gameId) + break; //games IDs don't match: definitely over... this.oppConnected = true; - const L = this.vr.moves.length; // Send our "last state" informations to opponent + L = this.vr.moves.length; this.conn.send(JSON.stringify({ - code:"lastate", - oppid:this.oppid, - lastMove:L>0?this.vr.moves[L-1]:undefined, - movesCount:L, + code: "lastate", + oppid: this.oppid, + gameId: this.gameId, + lastMove: (L>0?this.vr.moves[L-1]:undefined), + movesCount: L, })); break; - case "lastate": //got opponent infos about last move (we might have resigned) - if (this.mode!="human" || this.oppid!=data.oppid) + case "lastate": //got opponent infos about last move + L = this.vr.moves.length; + if (this.gameId != data.gameId) + break; //games IDs don't match: nothing we can do... + // OK, opponent still in game (which might be over) + if (this.score != "*") { - // OK, we resigned + // We finished the game (any result possible) this.conn.send(JSON.stringify({ - code:"lastate", - oppid:this.oppid, - lastMove:undefined, - movesCount:-1, + code: "lastate", + oppid: data.oppid, + gameId: this.gameId, + score: this.score, })); } - else if (data.movesCount < 0) - { - // OK, he resigned - this.endGame(this.mycolor=="w"?"1-0":"0-1"); - } - else if (data.movesCount < this.vr.moves.length) + else if (!!data.score) //opponent finished the game + this.endGame(data.score); + else if (data.movesCount < L) { // We must tell last move to opponent - const L = this.vr.moves.length; this.conn.send(JSON.stringify({ - code:"lastate", - oppid:this.oppid, - lastMove:this.vr.moves[L-1], - movesCount:L, + code: "lastate", + oppid: this.oppid, + gameId: this.gameId, + lastMove: this.vr.moves[L-1], + movesCount: L, })); } - else if (data.movesCount > this.vr.moves.length) //just got last move from him + else if (data.movesCount > L) //just got last move from him this.play(data.lastMove, "animate"); break; case "resign": //..you won! @@ -1069,9 +148,9 @@ Vue.component('my-game', { // TODO: also use (dis)connect info to count online players? case "connect": case "disconnect": - if (["human","chat"].includes(this.mode) && this.oppid == data.id) + if (this.mode=="human" && this.oppid == data.id) this.oppConnected = (data.code == "connect"); - if (this.oppConnected && this.mode == "chat") + if (this.oppConnected && this.score != "*") { // Send our name to the opponent, in case of he hasn't it this.conn.send(JSON.stringify({ @@ -1080,18 +159,22 @@ Vue.component('my-game', { break; } }; + const socketCloseListener = () => { - this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant); - this.conn.addEventListener('open', socketOpenListener); + this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant._id); + //this.conn.addEventListener('open', socketOpenListener); this.conn.addEventListener('message', socketMessageListener); this.conn.addEventListener('close', socketCloseListener); }; - this.conn.onopen = socketOpenListener; + //this.conn.onopen = socketOpenListener; this.conn.onmessage = socketMessageListener; this.conn.onclose = socketCloseListener; + + // Listen to keyboard left/right to navigate in game + // TODO: also mouse wheel ! document.onkeydown = event => { - if (["idle","chat"].includes(this.mode) && + if (["human","computer"].includes(this.mode) && !!this.vr && this.vr.moves.length > 0 && [37,39].includes(event.keyCode)) { event.preventDefault(); @@ -1101,53 +184,44 @@ Vue.component('my-game', { this.play(); } }; - // Computer moves web worker logic: - this.compWorker.postMessage(["scripts",variant]); + + + // Computer moves web worker logic: (TODO: also for observers in HH games) + this.compWorker.postMessage(["scripts",variant.name]); const self = this; this.compWorker.onmessage = function(e) { let compMove = e.data; - compMove.computer = true; //TODO: imperfect attempt to avoid ghost move + if (!compMove) + return; //may happen if MarseilleRules and subTurn==2 (TODO: a bit ugly...) + if (!Array.isArray(compMove)) + compMove = [compMove]; //to deal with MarseilleRules + // TODO: imperfect attempt to avoid ghost move: + compMove.forEach(m => { m.computer = true; }); // (first move) HACK: small delay to avoid selecting elements // before they appear on page: const delay = Math.max(500-(Date.now()-self.timeStart), 0); setTimeout(() => { + const animate = (variant.name!="Dark" ? "animate" : null); if (self.mode == "computer") //warning: mode could have changed! - self.play(compMove, "animate") + self.play(compMove[0], animate); + if (compMove.length == 2) + setTimeout( () => { + if (self.mode == "computer") + self.play(compMove[1], animate); + }, 750); }, delay); } }, + + methods: { - setMyname: function(e) { - this.myname = e.target.value; - setCookie("username",this.myname); - }, - trySendChat: function(e) { - if (e.keyCode == 13) //'enter' key - this.sendChat(); - }, - sendChat: function() { - let chatInput = document.getElementById("input-chat"); - const chatTxt = chatInput.value; - chatInput.value = ""; - this.chats.push({msg:chatTxt, author:this.myid}); - this.conn.send(JSON.stringify({ - code:"newchat", oppid: this.oppid, msg: chatTxt})); - }, - toggleShowSolution: function() { - let problemSolution = document.getElementById("problem-solution"); - problemSolution.style.display = - !problemSolution.style.display || problemSolution.style.display == "none" - ? "block" - : "none"; - }, download: function() { - let content = document.getElementById("pgn-game").innerHTML; - content = content.replace(/
/g, "\n"); + // Variants may have special PGN structure (so next function isn't defined here) + const content = V.GetPGN(this.moves, this.mycolor, this.score, this.fenStart, this.mode); // Prepare and trigger download link let downloadAnchor = document.getElementById("download"); downloadAnchor.setAttribute("download", "game.pgn"); - downloadAnchor.href = "data:text/plain;charset=utf-8," + - encodeURIComponent(content); + downloadAnchor.href = "data:text/plain;charset=utf-8," + encodeURIComponent(content); downloadAnchor.click(); }, showScoreMsg: function() { @@ -1157,93 +231,19 @@ Vue.component('my-game', { }, endGame: function(score) { this.score = score; + if (["human","computer"].includes(this.mode)) + { + const prefix = (this.mode=="computer" ? "comp-" : ""); + localStorage.setItem(prefix+"score", score); + } this.showScoreMsg(); - // Variants may have special PGN structure (so next function isn't defined here) - this.pgnTxt = this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode); if (this.mode == "human" && this.oppConnected) { // Send our nickname to opponent this.conn.send(JSON.stringify({ code:"myname", name:this.myname, oppid:this.oppid})); } - this.mode = (this.mode=="human" ? "chat" : "idle"); this.cursor = this.vr.moves.length; //to navigate in finished game - if (this.mode == "idle") //keep oppid in case of chat after human game - this.oppid = ""; - }, - setStorage: function() { - if (this.mode=="human") - { - localStorage.setItem("myid", this.myid); - localStorage.setItem("oppid", this.oppid); - } - // 'prefix' = "comp-" to resume games vs. computer - const prefix = (this.mode=="computer" ? "comp-" : ""); - localStorage.setItem(prefix+"variant", variant); - localStorage.setItem(prefix+"mycolor", this.mycolor); - localStorage.setItem(prefix+"fenStart", this.fenStart); - localStorage.setItem(prefix+"moves", JSON.stringify(this.vr.moves)); - localStorage.setItem(prefix+"fen", this.vr.getFen()); - }, - updateStorage: function() { - const prefix = (this.mode=="computer" ? "comp-" : ""); - localStorage.setItem(prefix+"moves", JSON.stringify(this.vr.moves)); - localStorage.setItem(prefix+"fen", this.vr.getFen()); - }, - // Now unused (maybe later, a button "clear all") - clearStorage: function() { - if (this.mode=="human") - { - delete localStorage["myid"]; - delete localStorage["oppid"]; - } - const prefix = (this.mode=="computer" ? "comp-" : ""); - delete localStorage[prefix+"variant"]; - delete localStorage[prefix+"mycolor"]; - delete localStorage[prefix+"fenStart"]; - delete localStorage[prefix+"fen"]; - delete localStorage[prefix+"moves"]; - }, - // HACK because mini-css tooltips are persistent after click... - getRidOfTooltip: function(elt) { - elt.style.visibility = "hidden"; - setTimeout(() => { elt.style.visibility="visible"; }, 100); - }, - showSettings: function(e) { - this.getRidOfTooltip(e.currentTarget); - document.getElementById("modal-settings").checked = true; - }, - toggleHints: function() { - this.hints = !this.hints; - setCookie("hints", this.hints ? "1" : "0"); - }, - setColor: function(e) { - this.color = e.target.options[e.target.selectedIndex].value; - setCookie("color", this.color); - }, - setSound: function(e) { - this.sound = parseInt(e.target.options[e.target.selectedIndex].value); - setCookie("sound", this.sound); - }, - clickGameSeek: function(e) { - this.getRidOfTooltip(e.currentTarget); - if (this.mode == "human") - return; //no newgame while playing - if (this.seek) - { - this.conn.send(JSON.stringify({code:"cancelnewgame"})); - this.seek = false; - } - else - this.newGame("human"); - }, - clickComputerGame: function(e) { - this.getRidOfTooltip(e.currentTarget); - this.newGame("computer"); - }, - clickFriendGame: function(e) { - this.getRidOfTooltip(e.currentTarget); - document.getElementById("modal-fenedit").checked = true; }, resign: function(e) { this.getRidOfTooltip(e.currentTarget); @@ -1257,293 +257,45 @@ Vue.component('my-game', { } this.endGame(this.mycolor=="w"?"0-1":"1-0"); }, - newGame: function(mode, fenInit, color, oppId, moves, continuation) { - let fen = fenInit || VariantRules.GenRandInitFen(); - console.log(fen); //DEBUG - if (mode=="human" && !oppId) - { - const storageVariant = localStorage.getItem("variant"); - if (!!storageVariant && storageVariant !== variant) - return alert("Finish your " + storageVariant + " game first!"); - // Send game request and wait.. - try { - this.conn.send(JSON.stringify({code:"newgame", fen:fen})); - } catch (INVALID_STATE_ERR) { - return; //nothing achieved - } - this.seek = true; - let modalBox = document.getElementById("modal-newgame"); - modalBox.checked = true; - setTimeout(() => { modalBox.checked = false; }, 2000); - return; - } - if (mode == "computer") - { - const storageVariant = localStorage.getItem("comp-variant"); - if (!!storageVariant) - { - if (storageVariant !== variant) - { - if (!confirm("Unfinished " + storageVariant + - " computer game will be erased")) - { - return; - } - } - else - { - // This is a continuation (click on new comp game after human game) - fen = localStorage.getItem("comp-fen"); - color = localStorage.getItem("comp-mycolor"); - moves = JSON.parse(localStorage.getItem("comp-moves")); - continuation = true; - } - } - } - this.vr = new VariantRules(fen, moves || []); - this.score = "*"; - this.pgnTxt = ""; //redundant with this.score = "*", but cleaner - this.mode = mode; - if (continuation && moves.length > 0) //NOTE: "continuation": redundant test - { - const lastMove = moves[moves.length-1]; - this.vr.undo(lastMove); - this.incheck = this.vr.getCheckSquares(lastMove); - this.vr.play(lastMove, "ingame"); - } - else - this.incheck = []; - if (continuation) - { - const prefix = (mode=="computer" ? "comp-" : ""); - this.fenStart = localStorage.getItem(prefix+"fenStart"); - } - else - this.fenStart = V.ParseFen(fen).position; //this is enough - if (mode=="human") - { - // Opponent found! - this.oppid = oppId; - this.oppConnected = !continuation; - this.mycolor = color; - this.seek = false; - if (!continuation) //not playing sound on game continuation - { - if (this.sound >= 1) - new Audio("/sounds/newgame.mp3").play().catch(err => {}); - document.getElementById("modal-newgame").checked = false; - this.setStorage(); //in case of interruptions - } - else - { - // Maybe we loaded a finished game (just enter chat mode) - const eog = this.vr.checkGameOver(); - if (eog != "*") - setTimeout(() => this.endGame(eog), 100); - } - } - else if (mode == "computer") - { - this.compWorker.postMessage(["init",this.vr.getFen()]); - this.mycolor = color || (Math.random() < 0.5 ? 'w' : 'b'); - if (!continuation) - this.setStorage(); //store game state - else - { - // Maybe we loaded a finished game (just show it) - const eog = this.vr.checkGameOver(); - if (eog != "*") - setTimeout(() => this.endGame(eog), 100); - } - if (this.mycolor != this.vr.turn) - this.playComputerMove(); - } - //else: against a (IRL) friend or problem solving: nothing more to do - }, playComputerMove: function() { this.timeStart = Date.now(); this.compWorker.postMessage(["askmove"]); }, - // Get the identifier of a HTML table cell from its numeric coordinates o.x,o.y. - getSquareId: function(o) { - // NOTE: a separator is required to allow any size of board - return "sq-" + o.x + "-" + o.y; - }, - // Inverse function - getSquareFromId: function(id) { - let idParts = id.split('-'); - return [parseInt(idParts[1]), parseInt(idParts[2])]; - }, - mousedown: function(e) { - e = e || window.event; - let ingame = false; - let elem = e.target; - while (!ingame && elem !== null) - { - if (elem.classList.contains("game")) - { - ingame = true; - break; - } - elem = elem.parentElement; - } - if (!ingame) //let default behavior (click on button...) - return; - e.preventDefault(); //disable native drag & drop - if (!this.selectedPiece && e.target.classList.contains("piece")) - { - // Next few lines to center the piece on mouse cursor - let rect = e.target.parentNode.getBoundingClientRect(); - this.start = { - x: rect.x + rect.width/2, - y: rect.y + rect.width/2, - id: e.target.parentNode.id - }; - this.selectedPiece = e.target.cloneNode(); - this.selectedPiece.style.position = "absolute"; - this.selectedPiece.style.top = 0; - this.selectedPiece.style.display = "inline-block"; - this.selectedPiece.style.zIndex = 3000; - const startSquare = this.getSquareFromId(e.target.parentNode.id); - this.possibleMoves = []; - if (!["idle","chat"].includes(this.mode)) - { - const color = ["friend","problem"].includes(this.mode) - ? this.vr.turn - : this.mycolor; - if (this.vr.canIplay(color,startSquare)) - this.possibleMoves = this.vr.getPossibleMovesFrom(startSquare); - } - // Next line add moving piece just after current image - // (required for Crazyhouse reserve) - e.target.parentNode.insertBefore(this.selectedPiece, e.target.nextSibling); - } - }, - mousemove: function(e) { - if (!this.selectedPiece) - return; - e = e || window.event; - // If there is an active element, move it around - if (!!this.selectedPiece) - { - const [offsetX,offsetY] = !!e.clientX - ? [e.clientX,e.clientY] //desktop browser - : [e.changedTouches[0].pageX, e.changedTouches[0].pageY]; //smartphone - this.selectedPiece.style.left = (offsetX-this.start.x) + "px"; - this.selectedPiece.style.top = (offsetY-this.start.y) + "px"; - } - }, - mouseup: function(e) { - if (!this.selectedPiece) - return; - e = e || window.event; - // Read drop target (or parentElement, parentNode... if type == "img") - this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coords - const [offsetX,offsetY] = !!e.clientX - ? [e.clientX,e.clientY] - : [e.changedTouches[0].pageX, e.changedTouches[0].pageY]; - let landing = document.elementFromPoint(offsetX, offsetY); - this.selectedPiece.style.zIndex = 3000; - // Next condition: classList.contains(piece) fails because of marks - while (landing.tagName == "IMG") - landing = landing.parentNode; - if (this.start.id == landing.id) - { - // A click: selectedPiece and possibleMoves are already filled - return; - } - // OK: process move attempt - let endSquare = this.getSquareFromId(landing.id); - let moves = this.findMatchingMoves(endSquare); - this.possibleMoves = []; - if (moves.length > 1) - this.choices = moves; - else if (moves.length==1) - this.play(moves[0]); - // Else: impossible move - this.selectedPiece.parentNode.removeChild(this.selectedPiece); - delete this.selectedPiece; - this.selectedPiece = null; - }, - findMatchingMoves: function(endSquare) { - // Run through moves list and return the matching set (if promotions...) - let moves = []; - this.possibleMoves.forEach(function(m) { - if (endSquare[0] == m.end.x && endSquare[1] == m.end.y) - moves.push(m); - }); - return moves; - }, - animateMove: function(move) { - let startSquare = document.getElementById(this.getSquareId(move.start)); - let endSquare = document.getElementById(this.getSquareId(move.end)); - let rectStart = startSquare.getBoundingClientRect(); - let rectEnd = endSquare.getBoundingClientRect(); - let translation = {x:rectEnd.x-rectStart.x, y:rectEnd.y-rectStart.y}; - let movingPiece = - document.querySelector("#" + this.getSquareId(move.start) + " > img.piece"); - // HACK for animation (with positive translate, image slides "under background") - // Possible improvement: just alter squares on the piece's way... - squares = document.getElementsByClassName("board"); - for (let i=0; i { - for (let i=0; i= this.vr.moves.length) + if (this.cursor >= this.moves.length) return; //already at the end - move = this.vr.moves[this.cursor++]; + move = this.moves[this.cursor++]; } if (!!programmatic) //computer or human opponent - { - this.animateMove(move); - return; - } + return this.animateMove(move); // Not programmatic, or animation is over if (this.mode == "human" && this.vr.turn == this.mycolor) this.conn.send(JSON.stringify({code:"newmove", move:move, oppid:this.oppid})); - if (this.sound == 2) - new Audio("/sounds/chessmove1.mp3").play().catch(err => {}); - if (!["idle","chat"].includes(this.mode)) + + + // TODO: play move, and stack it on this.moves (if a move was provided; otherwise just navigate) + + if (this.score == "*") //TODO: I don't like this if() { // Emergency check, if human game started "at the same time" // TODO: robustify this... if (this.mode == "human" && !!move.computer) return; - this.incheck = this.vr.getCheckSquares(move); //is opponent in check? this.vr.play(move, "ingame"); + // Is opponent in check? + this.incheck = this.vr.getCheckSquares(this.vr.turn); + if (this.sound == 2) + new Audio("/sounds/move.mp3").play().catch(err => {}); if (this.mode == "computer") { // Send the move to web worker (TODO: including his own moves?!) this.compWorker.postMessage(["newmove",move]); } - } - else - { - VariantRules.PlayOnBoard(this.vr.board, move); - this.$forceUpdate(); //TODO: ?! - } - if (["human","computer"].includes(this.mode)) - this.updateStorage(); //after our moves and opponent moves - if (!["idle","chat"].includes(this.mode)) - { - const eog = this.vr.checkGameOver(); + const eog = this.vr.getCurrentScore(); if (eog != "*") { if (["human","computer"].includes(this.mode)) @@ -1556,9 +308,17 @@ Vue.component('my-game', { } } } - if (this.mode == "computer" && this.vr.turn != this.mycolor) +// else +// { +// VariantRules.PlayOnBoard(this.vr.board, move); +// this.$forceUpdate(); //TODO: ?! +// } + if (["human","computer","friend"].includes(this.mode)) + this.updateStorage(); //after our moves and opponent moves + if (this.mode == "computer" && this.vr.turn != this.mycolor && this.score == "*") this.playComputerMove(); }, + // TODO: merge two next functions undo: function() { // Navigate after game is over if (this.cursor == 0) @@ -1574,16 +334,23 @@ Vue.component('my-game', { if (!!lm) { this.vr.undo(lm); - const lmBefore = this.vr.lastMove; - if (!!lmBefore) - { - this.vr.undo(lmBefore); - this.incheck = this.vr.getCheckSquares(lmBefore); - this.vr.play(lmBefore, "ingame"); - } - else - this.incheck = []; + if (this.sound == 2) + new Audio("/sounds/undo.mp3").play().catch(err => {}); + this.incheck = this.vr.getCheckSquares(this.vr.turn); } }, }, }) + +//// TODO: keep moves list here +//get lastMove() +// { +// const L = this.moves.length; +// return (L>0 ? this.moves[L-1] : null); +// } +// +//// here too: +// move.notation = this.getNotation(move); +//TODO: confirm dialog with "opponent offers draw", avec possible bouton "prevent future offers" + bouton "proposer nulle" +//+ bouton "abort" avec score == "?" + demander confirmation pour toutes ces actions, +//comme sur lichess