X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=6af331b3158cd6436e858a633eb933a979f97511;hp=96833bc087130bc138690a86d9102314d55c2e2e;hb=9d218497ab97bc0e94ec4c1f0a40cf02df3ea0d4;hpb=0869b00a0e716a559c7a70ba2d854eed91689e33 diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js index 96833bc0..6af331b3 100644 --- a/public/javascripts/components/game.js +++ b/public/javascripts/components/game.js @@ -1,26 +1,31 @@ -// TODO: use indexedDB instead of localStorage? (more flexible: allow several games) +// Game logic on a variant page Vue.component('my-game', { 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... (contain possible pieces) + 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 messages + conn: null, //socket connection score: "*", //'*' means 'unfinished' - mode: "idle", //human, computer or idle (when not playing) + mode: "idle", //human, friend, computer or idle (when not playing) oppid: "", //opponent ID in case of HH game oppConnected: false, seek: false, fenStart: "", incheck: [], - expert: document.cookie.length>0 ? document.cookie.substr(-1)=="1" : false, + 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")), }; }, render(h) { - let [sizeX,sizeY] = VariantRules.size; + const [sizeX,sizeY] = VariantRules.size; + const smallScreen = (screen.width <= 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; }); @@ -28,40 +33,66 @@ Vue.component('my-game', { let incheckSq = doubleArray(sizeX, sizeY, false); this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; }); let elementArray = []; - const playingHuman = (this.mode == "human"); - const playingComp = (this.mode == "computer"); - let actionArray = [ + let actionArray = []; + actionArray.push( h('button', - { - on: { click: this.clickGameSeek }, - attrs: { "aria-label": 'New game VS human' }, - 'class': { - "tooltip": true, - "bottom": true, //display below - "seek": this.seek, - "playing": playingHuman, - }, + { + 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")]), - h('button', + }, + [h('i', { 'class': { "material-icons": true } }, "accessibility")]) + ); + if (["idle","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": playingComp, + "playing": this.mode == "computer", + "small": smallScreen, }, }, [h('i', { 'class': { "material-icons": true } }, "computer")]) - ]; + ); + } + if (["idle","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 indicWidth = (squareWidth>0 ? squareWidth/2 : 20); + 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") { let connectedIndic = h( @@ -97,22 +128,25 @@ Vue.component('my-game', { } ); elementArray.push(turnIndic); - let expertSwitch = h( + let settingsBtn = h( 'button', { - on: { click: this.toggleExpertMode }, - attrs: { "aria-label": 'Toggle expert mode' }, + on: { click: this.showSettings }, + attrs: { + "aria-label": 'Settings', + "id": "settingsBtn", + }, 'class': { - "tooltip":true, + "tooltip": true, "topindicator": true, "indic-right": true, - "expert-switch": true, - "expert-mode": this.expert, + "settings-btn": !smallScreen, + "settings-btn-small": smallScreen, }, }, - [h('i', { 'class': { "material-icons": true } }, "remove_red_eye")] + [h('i', { 'class': { "material-icons": true } }, "settings")] ); - elementArray.push(expertSwitch); + elementArray.push(settingsBtn); let choices = h('div', { attrs: { "id": "choices" }, @@ -127,7 +161,10 @@ Vue.component('my-game', { this.choices.map( m => { //a "choice" is a move return h('div', { - 'class': { 'board': true }, + 'class': { + 'board': true, + ['board'+sizeY]: true, + }, style: { 'width': (100/this.choices.length) + "%", 'padding-bottom': (100/this.choices.length) + "%", @@ -135,8 +172,9 @@ Vue.component('my-game', { }, [h('img', { - attrs: { "src": '/images/pieces/' + VariantRules.getPpath(m.appear[0].c+m.appear[0].p) + '.svg' }, - 'class': { 'choice-piece': true, 'board': true }, + 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=[]; } }, }) ] @@ -144,6 +182,9 @@ Vue.component('my-game', { }) ); // Create board element (+ reserves if needed by variant or mode) + const lm = this.vr.lastMove; + const showLight = this.hints && + (this.mode!="idle" || this.cursor==this.vr.moves.length); let gameDiv = h('div', { 'class': { 'game': true }, @@ -169,16 +210,18 @@ Vue.component('my-game', { { 'class': { 'piece': true, - 'ghost': !!this.selectedPiece && this.selectedPiece.parentNode.id == "sq-"+ci+"-"+cj, + 'ghost': !!this.selectedPiece + && this.selectedPiece.parentNode.id == "sq-"+ci+"-"+cj, }, attrs: { - src: "/images/pieces/" + VariantRules.getPpath(this.vr.board[ci][cj]) + ".svg", + src: "/images/pieces/" + + VariantRules.getPpath(this.vr.board[ci][cj]) + ".svg", }, } ) ); } - if (!this.expert && hintSquares[ci][cj]) + if (this.hints && hintSquares[ci][cj]) { elems.push( h( @@ -194,17 +237,17 @@ Vue.component('my-game', { ) ); } - const lm = this.vr.lastMove; - const highlight = !!lm && _.isMatch(lm.end, {x:ci,y:cj}); return h( 'div', { 'class': { 'board': true, - 'light-square': (i+j)%2==0 && (this.expert || !highlight), - 'dark-square': (i+j)%2==1 && (this.expert || !highlight), - 'highlight': !this.expert && highlight, - 'incheck': !this.expert && incheckSq[ci][cj], + ['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}), @@ -216,36 +259,147 @@ Vue.component('my-game', { ); }), choices] ); - actionArray.push( - h('button', + if (this.mode != "idle") + { + 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 (this.mode == "friend") + { + 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": "modal-settings" }, + }, + [ + h('div', + { + "class": { "card": true, "smallpad": true }, + }, + [ + h('label', + { + attrs: { "id": "close-settings", "for": "modal-settings" }, + "class": { "modal-close": true }, + } + ), + h('h3', + { + "class": { "section": true }, + domProps: { innerHTML: "Preferences" }, + } + ), + h('fieldset', + { }, + [ + //h('legend', { domProps: { innerHTML: "Legend title" } }), + 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); const actions = h('div', { attrs: { "id": "actions" }, @@ -334,7 +703,10 @@ Vue.component('my-game', { { elementArray.push( h('div', - { attrs: { id: "pgn-div" } }, + { + attrs: { id: "pgn-div" }, + "class": { "section-content": true }, + }, [ h('a', { @@ -347,10 +719,34 @@ Vue.component('my-game', { h('p', { attrs: { id: "pgn-game" }, + domProps: { innerHTML: this.pgnTxt } + } + ), + h('button', + { + attrs: { "id": "downloadBtn" }, on: { click: this.download }, - domProps: { - innerHTML: this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode) - } + domProps: { innerHTML: "Download game" }, + } + ), + ] + ) + ); + } + else if (this.mode != "idle") + { + // 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.getFen() } } ) ] @@ -367,14 +763,14 @@ Vue.component('my-game', { "col-lg-6":true, "col-lg-offset-3":true, }, - // NOTE: click = mousedown + mouseup --> what about smartphone?! + // NOTE: click = mousedown + mouseup on: { mousedown: this.mousedown, mousemove: this.mousemove, mouseup: this.mouseup, - touchdown: this.mousedown, + touchstart: this.mousedown, touchmove: this.mousemove, - touchup: this.mouseup, + touchend: this.mouseup, }, }, elementArray @@ -383,10 +779,13 @@ Vue.component('my-game', { created: function() { const url = socketUrl; const continuation = (localStorage.getItem("variant") === variant); - this.myid = continuation - ? localStorage.getItem("myid") - // random enough (TODO: function) - : (Date.now().toString(36) + Math.random().toString(36).substr(2, 7)).toUpperCase(); + this.myid = continuation ? localStorage.getItem("myid") : getRandString(); + if (!continuation) + { + // HACK: play a small silent sound to allow "new game" sound later + // if tab not focused (TODO: does it really work ?!) + new Audio("/sounds/silent.mp3").play().then(() => {}).catch(err => {}); + } this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant); const socketOpenListener = () => { if (continuation) @@ -402,17 +801,16 @@ Vue.component('my-game', { else if (localStorage.getItem("newgame") === variant) { // New game request has been cancelled on disconnect - this.seek = true; this.newGame("human", undefined, undefined, undefined, undefined, "reconnect"); } }; const socketMessageListener = msg => { const data = JSON.parse(msg.data); - console.log("Receive message: " + data.code); switch (data.code) { case "newgame": //opponent found - this.newGame("human", data.fen, data.color, data.oppid); //oppid: opponent socket ID + // oppid: opponent socket ID + this.newGame("human", data.fen, data.color, data.oppid); break; case "newmove": //..he played! this.play(data.move, "animate"); @@ -478,6 +876,18 @@ Vue.component('my-game', { this.conn.onopen = socketOpenListener; this.conn.onmessage = socketMessageListener; this.conn.onclose = socketCloseListener; + // Listen to keyboard left/right to navigate in game + document.onkeydown = event => { + if (this.mode == "idle" && !!this.vr && this.vr.moves.length > 0 + && [37,39].includes(event.keyCode)) + { + event.preventDefault(); + if (event.keyCode == 37) //Back + this.undo(); + else //Forward (39) + this.play(); + } + }; }, methods: { download: function() { @@ -486,17 +896,21 @@ Vue.component('my-game', { // 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(); }, endGame: function(score) { this.score = score; let modalBox = document.getElementById("modal-eog"); modalBox.checked = true; + // 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); setTimeout(() => { modalBox.checked = false; }, 2000); if (this.mode == "human") this.clearStorage(); this.mode = "idle"; + this.cursor = this.vr.moves.length; //to navigate in finished game this.oppid = ""; }, getEndgameMessage: function(score) { @@ -515,21 +929,6 @@ Vue.component('my-game', { } return eogMessage; }, - toggleExpertMode: function() { - this.expert = !this.expert; - document.cookie = "expert=" + (this.expert ? "1" : "0"); - }, - resign: function() { - if (this.mode == "human" && this.oppConnected) - { - try { - this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid})); - } catch (INVALID_STATE_ERR) { - return; //socket is not ready (and not yet reconnected) - } - } - this.endGame(this.mycolor=="w"?"0-1":"1-0"); - }, setStorage: function() { localStorage.setItem("myid", this.myid); localStorage.setItem("variant", variant); @@ -552,26 +951,65 @@ Vue.component('my-game', { delete localStorage["fen"]; delete localStorage["moves"]; }, - clickGameSeek: function() { + // 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"})); delete localStorage["newgame"]; //cancel game seek this.seek = false; } else this.newGame("human"); }, - clickComputerGame: function() { + clickComputerGame: function(e) { + this.getRidOfTooltip(e.currentTarget); if (this.mode == "human") return; //no newgame while playing this.newGame("computer"); }, + clickFriendGame: function(e) { + this.getRidOfTooltip(e.currentTarget); + document.getElementById("modal-fenedit").checked = true; + }, + resign: function(e) { + this.getRidOfTooltip(e.currentTarget); + if (this.mode == "human" && this.oppConnected) + { + try { + this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid})); + } catch (INVALID_STATE_ERR) { + return; //socket is not ready (and not yet reconnected) + } + } + this.endGame(this.mycolor=="w"?"0-1":"1-0"); + }, newGame: function(mode, fenInit, color, oppId, moves, continuation) { - const fen = fenInit || VariantRules.GenRandInitFen(); + const fen = "M7/8/8/3K1k2/8/8/8/8 0000";//fenInit || VariantRules.GenRandInitFen(); console.log(fen); //DEBUG - this.score = "*"; if (mode=="human" && !oppId) { const storageVariant = localStorage.getItem("variant"); @@ -598,25 +1036,24 @@ Vue.component('my-game', { return; } this.vr = new VariantRules(fen, moves || []); + this.score = "*"; + this.pgnTxt = ""; //redundant with this.score = "*", but cleaner this.mode = mode; this.incheck = []; //in case of - this.fenStart = continuation - ? localStorage.getItem("fenStart") - : fen.split(" ")[0]; //Only the position matters + this.fenStart = (continuation ? localStorage.getItem("fenStart") : fen); if (mode=="human") { // Opponent found! - if (!continuation) + if (!continuation) //not playing sound on game continuation { - // Not playing sound on game continuation: - new Audio("/sounds/newgame.mp3").play().then(() => {}).catch(err => {}); + if (this.sound >= 1) + new Audio("/sounds/newgame.mp3").play().then(() => {}).catch(err => {}); document.getElementById("modal-newgame").checked = false; } this.oppid = oppId; this.oppConnected = true; this.mycolor = color; this.seek = false; - this.mode = "human"; if (!!moves && moves.length > 0) //imply continuation { const lastMove = moves[moves.length-1]; @@ -627,18 +1064,20 @@ Vue.component('my-game', { delete localStorage["newgame"]; this.setStorage(); //in case of interruptions } - else //against computer + else if (mode == "computer") { - this.mode = "computer"; - this.mycolor = Math.random() < 0.5 ? 'w' : 'b'; + this.mycolor = "w";//Math.random() < 0.5 ? 'w' : 'b'; if (this.mycolor == 'b') setTimeout(this.playComputerMove, 500); } + //else: against a (IRL) friend: nothing more to do }, playComputerMove: function() { + const timeStart = Date.now(); const compMove = this.vr.getComputerMove(); - // HACK: avoid selecting elements before they appear on page: - setTimeout(() => this.play(compMove, "animate"), 500); + // (first move) HACK: avoid selecting elements before they appear on page: + const delay = Math.max(500-(Date.now()-timeStart), 0); + setTimeout(() => this.play(compMove, "animate"), delay); }, // Get the identifier of a HTML table cell from its numeric coordinates o.x,o.y. getSquareId: function(o) { @@ -652,6 +1091,19 @@ Vue.component('my-game', { }, 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")) { @@ -668,10 +1120,12 @@ Vue.component('my-game', { this.selectedPiece.style.display = "inline-block"; this.selectedPiece.style.zIndex = 3000; let startSquare = this.getSquareFromId(e.target.parentNode.id); - this.possibleMoves = this.mode!="idle" && this.vr.canIplay(this.mycolor,startSquare) - ? this.vr.getPossibleMovesFrom(startSquare) - : []; - e.target.parentNode.appendChild(this.selectedPiece); + const iCanPlay = this.mode!="idle" + && (this.mode=="friend" || this.vr.canIplay(this.mycolor,startSquare)); + this.possibleMoves = iCanPlay ? 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) { @@ -681,8 +1135,11 @@ Vue.component('my-game', { // If there is an active element, move it around if (!!this.selectedPiece) { - this.selectedPiece.style.left = (e.clientX-this.start.x) + "px"; - this.selectedPiece.style.top = (e.clientY-this.start.y) + "px"; + 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) { @@ -690,13 +1147,20 @@ Vue.component('my-game', { 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 coordinates - let landing = document.elementFromPoint(e.clientX, e.clientY); + 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; - while (landing.tagName == "IMG") //classList.contains(piece) fails because of mark/highlight + // 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 already filled + 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); @@ -725,8 +1189,9 @@ Vue.component('my-game', { 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 (otherwise with positive translate, image slides "under background"...) + 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 { @@ -746,24 +1212,58 @@ Vue.component('my-game', { }, 200); }, play: function(move, programmatic) { + if (!move) + { + // Navigate after game is over + if (this.cursor >= this.vr.moves.length) + return; //already at the end + move = this.vr.moves[this.cursor++]; + } if (!!programmatic) //computer or human opponent { this.animateMove(move); return; } - this.incheck = this.vr.getCheckSquares(move); //is opponent in check? // 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})); - new Audio("/sounds/chessmove1.mp3").play().then(() => {}).catch(err => {}); - this.vr.play(move, "ingame"); + if (this.sound == 2) + new Audio("/sounds/chessmove1.mp3").play().then(() => {}).catch(err => {}); + if (this.mode != "idle") + { + this.incheck = this.vr.getCheckSquares(move); //is opponent in check? + this.vr.play(move, "ingame"); + } + else + { + VariantRules.PlayOnBoard(this.vr.board, move); + this.$forceUpdate(); //TODO: ?! + } if (this.mode == "human") this.updateStorage(); //after our moves and opponent moves - const eog = this.vr.checkGameOver(); - if (eog != "*") - this.endGame(eog); - else if (this.mode == "computer" && this.vr.turn != this.mycolor) + if (this.mode != "idle") + { + const eog = this.vr.checkGameOver(); + if (eog != "*") + this.endGame(eog); + } + if (this.mode == "computer" && this.vr.turn != this.mycolor) setTimeout(this.playComputerMove, 500); }, + undo: function() { + // Navigate after game is over + if (this.cursor == 0) + return; //already at the beginning + if (this.cursor == this.vr.moves.length) + this.incheck = []; //in case of... + const move = this.vr.moves[--this.cursor]; + VariantRules.UndoOnBoard(this.vr.board, move); + this.$forceUpdate(); //TODO: ?! + }, + undoInGame: function() { + const lm = this.vr.lastMove; + if (!!lm) + this.vr.undo(lm); + }, }, })