X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=11f99b0191840eec6416f8dfd3bf4b78487d438f;hb=e64084dac6a278439e407733c69c324b8282900a;hp=aaef522ba40375ed3524200c446fe06152e85902;hpb=8a196305a09269888497995373658f953b9b5bf8;p=vchess.git diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js index aaef522b..11f99b01 100644 --- a/public/javascripts/components/game.js +++ b/public/javascripts/components/game.js @@ -17,6 +17,7 @@ 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) { @@ -238,24 +239,106 @@ 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' }, + 'class': { + "tooltip":true, + "bottom": true, + }, + }, + [h('i', { 'class': { "material-icons": true } }, "fast_rewind")]), + h('button', + { + on: { click: e => this.play() }, + attrs: { "aria-label": 'Play' }, + 'class': { + "tooltip":true, + "bottom": true, + }, + }, + [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 @@ -492,6 +590,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() { @@ -513,6 +623,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) { @@ -585,7 +696,6 @@ Vue.component('my-game', { this.newGame("computer"); }, newGame: function(mode, fenInit, color, oppId, moves, continuation) { - //const fen = "1n2T1n0/p2pO2p/1s1k1s2/8/3S2p1/2U2cO1/P3PuPP/3K1BR1 0100"; const fen = fenInit || VariantRules.GenRandInitFen(); console.log(fen); //DEBUG this.score = "*"; @@ -614,6 +724,8 @@ 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.pgnTxt = ""; //redundant with this.score = "*", but cleaner this.mode = mode; @@ -654,8 +766,11 @@ 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; @@ -677,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")) { @@ -696,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) { @@ -706,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) { @@ -716,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; @@ -772,6 +907,13 @@ 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); @@ -782,14 +924,28 @@ Vue.component('my-game', { 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.vr.play(move, "ingame"); + else + VariantRules.PlayOnBoard(this.vr.board, move); 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 + const move = this.vr.moves[--this.cursor]; + VariantRules.UndoOnBoard(this.vr.board, move); + this.$forceUpdate(); //TODO: ?! + } }, })