X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=1178b64abc7b54707f2dbdedb269eea8b3716652;hp=b91d72c0b89d7819287bc6e7f67de8fee1359ba5;hb=c148615e9e7296869f95895ef434fd8371d637c2;hpb=b8121223012a3eb331022adc465bbfb4014363c8 diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js index b91d72c0..1178b64a 100644 --- a/public/javascripts/components/game.js +++ b/public/javascripts/components/game.js @@ -1,4 +1,3 @@ -// TODO: use indexedDB instead of localStorage? (more flexible: allow several games) Vue.component('my-game', { data: function() { return { @@ -18,10 +17,11 @@ Vue.component('my-game', { incheck: [], pgnTxt: "", expert: document.cookie.length>0 ? document.cookie.substr(-1)=="1" : false, + gameId: "", //used to limit computer moves' time }; }, render(h) { - let [sizeX,sizeY] = VariantRules.size; + const [sizeX,sizeY] = VariantRules.size; // Precompute hints squares to facilitate rendering let hintSquares = doubleArray(sizeX, sizeY, false); this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; }); @@ -128,7 +128,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) + "%", @@ -136,8 +139,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=[]; } }, }) ] @@ -170,10 +174,12 @@ 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", }, } ) @@ -196,16 +202,18 @@ Vue.component('my-game', { ); } const lm = this.vr.lastMove; - const highlight = !!lm && _.isMatch(lm.end, {x:ci,y:cj}); + const showLight = !this.expert && + (this.mode!="idle" || this.cursor==this.vr.moves.length); 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, + 'highlight': showLight && !!lm && _.isMatch(lm.end, {x:ci,y:cj}), + 'incheck': showLight && incheckSq[ci][cj], }, attrs: { id: this.getSquareId({x:ci,y:cj}), @@ -232,24 +240,98 @@ Vue.component('my-game', { [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', + { + style: { "margin-left": "30px" }, + on: { click: e => this.undo() }, + attrs: { "aria-label": 'Undo' }, + }, + [h('i', { 'class': { "material-icons": true } }, "fast_rewind")]), + h('button', + { + on: { click: e => this.play() }, + attrs: { "aria-label": 'Play' }, + }, + [h('i', { 'class': { "material-icons": true } }, "fast_forward")]), + ] + ); + } elementArray.push(gameDiv); - // if (!!vr.reserve) - // { - // let reserve = h('div', - // {'class':{'game':true}}, [ - // h('div', - // { 'class': { 'row': true }}, - // [ - // h('div', - // {'class':{'board':true}}, - // [h('img',{'class':{"piece":true},attrs:{"src":"/images/pieces/wb.svg"}})] - // ) - // ] - // ) - // ], - // ); - // elementArray.push(reserve); - // } + if (!!this.vr.reserve) + { + const shiftIdx = (this.mycolor=="w" ? 0 : 1); + let myReservePiecesArray = []; + for (let i=0; i 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 @@ -391,6 +488,11 @@ Vue.component('my-game', { ? localStorage.getItem("myid") // random enough (TODO: function) : (Date.now().toString(36) + Math.random().toString(36).substr(2, 7)).toUpperCase(); + if (!continuation) + { + // HACK: play a small silent sound to allow "new game" sound later if tab not focused + new Audio("/sounds/silent.mp3").play().then(() => {}).catch(err => {}); + } this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant); const socketOpenListener = () => { if (continuation) @@ -406,7 +508,6 @@ 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"); } }; @@ -481,6 +582,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.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() { @@ -502,6 +615,7 @@ Vue.component('my-game', { 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) { @@ -520,21 +634,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); @@ -557,7 +656,13 @@ 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); + }, + clickGameSeek: function(e) { + this.getRidOfTooltip(e.currentTarget); if (this.mode == "human") return; //no newgame while playing if (this.seek) @@ -568,16 +673,31 @@ Vue.component('my-game', { 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"); }, + toggleExpertMode: function(e) { + this.getRidOfTooltip(e.currentTarget); + 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"); + }, newGame: function(mode, fenInit, color, oppId, moves, continuation) { - //const fen = "qrbnkbrn/pppppppp/8/8/8/8/PPPPPPPP/BNNBRKRQ 1111";//fenInit || VariantRules.GenRandInitFen(); const fen = fenInit || VariantRules.GenRandInitFen(); console.log(fen); //DEBUG - this.score = "*"; if (mode=="human" && !oppId) { const storageVariant = localStorage.getItem("variant"); @@ -603,7 +723,10 @@ Vue.component('my-game', { } return; } + // random enough (TODO: function) + this.gameId = (Date.now().toString(36) + Math.random().toString(36).substr(2, 7)).toUpperCase(); this.vr = new VariantRules(fen, moves || []); + this.score = "*"; this.pgnTxt = ""; //redundant with this.score = "*", but cleaner this.mode = mode; this.incheck = []; //in case of @@ -641,9 +764,21 @@ Vue.component('my-game', { } }, playComputerMove: function() { + const timeStart = Date.now(); + const nbMoves = this.vr.moves.length; //using played moves to know if search finished + const gameId = this.gameId; //to know if game was reset before timer end + setTimeout( + () => { + if (gameId != this.gameId) + return; //game stopped + const L = this.vr.moves.length; + if (nbMoves == L || !this.vr.moves[L-1].notation) //move search didn't finish + this.vr.shouldReturn = true; + }, 5000); 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) { @@ -657,6 +792,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")) { @@ -676,7 +824,8 @@ Vue.component('my-game', { this.possibleMoves = this.mode!="idle" && this.vr.canIplay(this.mycolor,startSquare) ? this.vr.getPossibleMovesFrom(startSquare) : []; - e.target.parentNode.appendChild(this.selectedPiece); + // 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) { @@ -686,8 +835,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) { @@ -696,7 +848,10 @@ Vue.component('my-game', { 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); + 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 landing = landing.parentNode; @@ -730,8 +885,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= 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.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: ?! + } }, })