X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=829beaaddc4543cc9f24c832b864d2e251440585;hb=bdb1f12dbb7e2d72ce3a0803a0cf2626e1f821e0;hp=4a077417616bd791f7bb5f113669aea85d87301f;hpb=a29d9d6b7703d680ddb49cd3fe096f49b1d774f5;p=vchess.git diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js index 4a077417..829beaad 100644 --- a/public/javascripts/components/game.js +++ b/public/javascripts/components/game.js @@ -1,5 +1,4 @@ // TODO: use indexedDB instead of localStorage? (more flexible: allow several games) - Vue.component('my-game', { data: function() { return { @@ -28,32 +27,16 @@ Vue.component('my-game', { let incheckSq = doubleArray(sizeX, sizeY, false); this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; }); let elementArray = []; - let square00 = document.getElementById("sq-0-0"); - let squareWidth = !!square00 - ? parseFloat(window.getComputedStyle(square00).width.slice(0,-2)) - : 0; const playingHuman = (this.mode == "human"); const playingComp = (this.mode == "computer"); let actionArray = [ h('button', { - on: { - click: () => { - if (this.mode == "human") - return; //no newgame while playing - if (this.seek) - delete localStorage["newgame"]; //cancel game seek - else - { - localStorage["newgame"] = variant; - this.newGame("human"); - } - this.seek = !this.seek; - } - }, + on: { click: this.clickGameSeek }, attrs: { "aria-label": 'New game VS human' }, 'class': { "tooltip": true, + "bottom": true, //display below "seek": this.seek, "playing": playingHuman, }, @@ -61,16 +44,11 @@ Vue.component('my-game', { [h('i', { 'class': { "material-icons": true } }, "accessibility")]), h('button', { - on: { - click: () => { - if (this.mode == "human") - return; //no newgame while playing - this.newGame("computer"); - } - }, + on: { click: this.clickComputerGame }, attrs: { "aria-label": 'New game VS computer' }, 'class': { "tooltip":true, + "bottom": true, "playing": playingComp, }, }, @@ -78,25 +56,51 @@ Vue.component('my-game', { ]; 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); if (this.mode == "human") { let 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); } + let 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); let choices = h('div', { attrs: { "id": "choices" }, 'class': { 'row': true }, style: { - //"position": "relative", "display": this.choices.length>0?"block":"none", "top": "-" + ((sizeY/2)*squareWidth+squareWidth/2) + "px", "width": (this.choices.length * squareWidth) + "px", @@ -200,7 +204,10 @@ Vue.component('my-game', { { on: { click: this.resign }, attrs: { "aria-label": 'Resign' }, - 'class': { "tooltip":true }, + 'class': { + "tooltip":true, + "bottom": true, + }, }, [h('i', { 'class': { "material-icons": true } }, "flag")]) ); @@ -222,49 +229,11 @@ Vue.component('my-game', { // ); // elementArray.push(reserve); // } - let eogMessage = "Unfinished"; - switch (this.score) - { - case "1-0": - eogMessage = "White win"; - break; - case "0-1": - eogMessage = "Black win"; - break; - case "1/2": - eogMessage = "Draw"; - break; - } - let elemsOfEog = - [ - h('label', - { - attrs: { "for": "modal-control" }, - "class": { "modal-close": true }, - } - ), - h('h3', - { - "class": { "section": true }, - domProps: { innerHTML: eogMessage }, - } - ) - ]; - if (this.score != "*") - { - elemsOfEog.push( - h('p', //'textarea', //TODO: selectable! - { - domProps: { innerHTML: this.vr.getPGN(this.mycolor, this.score, this.fenStart) }, - //attrs: { "readonly": true }, - } - ) - ); - } + const eogMessage = this.getEndgameMessage(this.score); const modalEog = [ h('input', { - attrs: { "id": "modal-control", type: "checkbox" }, + attrs: { "id": "modal-eog", type: "checkbox" }, "class": { "modal": true }, }), h('div', @@ -276,7 +245,20 @@ Vue.component('my-game', { { "class": { "card": true, "smallpad": true }, }, - elemsOfEog + [ + h('label', + { + attrs: { "for": "modal-eog" }, + "class": { "modal-close": true }, + } + ), + h('h3', + { + "class": { "section": true }, + domProps: { innerHTML: eogMessage }, + } + ) + ] ) ] ) @@ -286,7 +268,7 @@ Vue.component('my-game', { const modalNewgame = [ h('input', { - attrs: { "id": "modal-control2", type: "checkbox" }, + attrs: { "id": "modal-newgame", type: "checkbox" }, "class": { "modal": true }, }), h('div', @@ -301,7 +283,7 @@ Vue.component('my-game', { [ h('label', { - attrs: { "id": "close-newgame", "for": "modal-control2" }, + attrs: { "id": "close-newgame", "for": "modal-newgame" }, "class": { "modal-close": true }, } ), @@ -331,6 +313,23 @@ Vue.component('my-game', { actionArray ); elementArray.push(actions); + if (this.score != "*") + { + elementArray.push( + h('div', + { }, + [ + h('p', + { + domProps: { + innerHTML: this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode) + } + } + ) + ] + ) + ); + } return h( 'div', { @@ -371,7 +370,7 @@ Vue.component('my-game', { 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})); + this.conn.send(JSON.stringify({code:"ping",oppid:this.oppid})); } else if (localStorage.getItem("newgame") === variant) { @@ -382,6 +381,7 @@ Vue.component('my-game', { }; const socketMessageListener = msg => { const data = JSON.parse(msg.data); + console.log("Receive message: " + data.code); switch (data.code) { case "newgame": //opponent found @@ -390,13 +390,13 @@ Vue.component('my-game', { case "newmove": //..he played! this.play(data.move, "animate"); break; - case "pong": //received if opponent sent a ping + case "pong": //received if we sent a ping (game still alive on our side) this.oppConnected = true; const L = this.vr.moves.length; - // Send our "last state" informations to opponent (we are still playing) + // Send our "last state" informations to opponent this.conn.send(JSON.stringify({ code:"lastate", - oppid:this.oppId, + oppid:this.oppid, lastMove:L>0?this.vr.moves[L-1]:undefined, movesCount:L, })); @@ -407,7 +407,7 @@ Vue.component('my-game', { // OK, we resigned this.conn.send(JSON.stringify({ code:"lastate", - oppid:this.oppId, + oppid:this.oppid, lastMove:undefined, movesCount:-1, })); @@ -423,17 +423,18 @@ Vue.component('my-game', { const L = this.vr.moves.length; this.conn.send(JSON.stringify({ code:"lastate", - oppid:this.oppId, + oppid:this.oppid, lastMove:this.vr.moves[L-1], movesCount:L, })); } else if (data.movesCount > this.vr.moves.length) //just got last move from him this.play(data.lastMove, "animate"); + break; case "resign": //..you won! this.endGame(this.mycolor=="w"?"1-0":"0-1"); break; - // TODO: also use (dis)connect info to count online players + // TODO: also use (dis)connect info to count online players? case "connect": case "disconnect": if (this.mode == "human" && this.oppid == data.id) @@ -442,7 +443,6 @@ Vue.component('my-game', { } }; const socketCloseListener = () => { - console.log("Lost connection -- reconnect"); this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant); this.conn.addEventListener('open', socketOpenListener); this.conn.addEventListener('message', socketMessageListener); @@ -455,14 +455,30 @@ Vue.component('my-game', { methods: { endGame: function(score) { this.score = score; - let modalBox = document.getElementById("modal-control"); + let modalBox = document.getElementById("modal-eog"); modalBox.checked = true; - //setTimeout(() => { modalBox.checked = false; }, 2000); //disabled, to show PGN + setTimeout(() => { modalBox.checked = false; }, 2000); if (this.mode == "human") this.clearStorage(); this.mode = "idle"; this.oppid = ""; }, + getEndgameMessage: function(score) { + let eogMessage = "Unfinished"; + switch (this.score) + { + case "1-0": + eogMessage = "White win"; + break; + case "0-1": + eogMessage = "Black win"; + break; + case "1/2": + eogMessage = "Draw"; + break; + } + return eogMessage; + }, resign: function() { if (this.mode == "human" && this.oppConnected) { @@ -496,6 +512,22 @@ Vue.component('my-game', { delete localStorage["fen"]; delete localStorage["moves"]; }, + clickGameSeek: function() { + if (this.mode == "human") + return; //no newgame while playing + if (this.seek) + { + delete localStorage["newgame"]; //cancel game seek + this.seek = false; + } + else + this.newGame("human"); + }, + clickComputerGame: function() { + if (this.mode == "human") + return; //no newgame while playing + this.newGame("computer"); + }, newGame: function(mode, fenInit, color, oppId, moves, continuation) { const fen = fenInit || VariantRules.GenRandInitFen(); console.log(fen); //DEBUG @@ -505,20 +537,21 @@ Vue.component('my-game', { const storageVariant = localStorage.getItem("variant"); if (!!storageVariant && storageVariant !== variant) { - // TODO: find a better way to ensure this. Newgame system is currently a mess. alert("Finish your " + storageVariant + " game first!"); return; } // Send game request and wait.. + localStorage["newgame"] = variant; + this.seek = true; this.clearStorage(); //in case of try { this.conn.send(JSON.stringify({code:"newgame", fen:fen})); } catch (INVALID_STATE_ERR) { return; //nothing achieved } - if (continuation == "reconnect") //TODO: bad HACK... + if (continuation !== "reconnect") //TODO: bad HACK... { - let modalBox = document.getElementById("modal-control2"); + let modalBox = document.getElementById("modal-newgame"); modalBox.checked = true; setTimeout(() => { modalBox.checked = false; }, 2000); } @@ -535,9 +568,9 @@ Vue.component('my-game', { // Opponent found! if (!continuation) { - // Playing sound fails on game continuation: - new Audio("/sounds/newgame.mp3").play(); - document.getElementById("modal-control2").checked = false; + // Not playing sound on game continuation: + new Audio("/sounds/newgame.mp3").play().then(() => {}).catch(err => {}); + document.getElementById("modal-newgame").checked = false; } this.oppid = oppId; this.oppConnected = true; @@ -547,7 +580,7 @@ Vue.component('my-game', { { const oppCol = this.vr.turn; const lastMove = moves[moves.length-1]; - this.vr.undo(lastMove, "ingame"); + this.vr.undo(lastMove); this.incheck = this.vr.getCheckSquares(lastMove, oppCol); this.vr.play(lastMove, "ingame"); } @@ -683,7 +716,7 @@ Vue.component('my-game', { // 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(); + new Audio("/sounds/chessmove1.mp3").play().then(() => {}).catch(err => {}); this.vr.play(move, "ingame"); if (this.mode == "human") this.updateStorage(); //after our moves and opponent moves