X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=3eb27f27130689013d72437bca18b5c61b40d8bd;hb=01ca2adce0ddcf246f184c6d19389262b0f5e6e5;hp=bd3a187853b59540d860e945425cfa3cb67b7abe;hpb=ea8417ff95096f626fae0286135d875a9c043e11;p=vchess.git diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js index bd3a1878..3eb27f27 100644 --- a/public/javascripts/components/game.js +++ b/public/javascripts/components/game.js @@ -16,6 +16,7 @@ Vue.component('my-game', { seek: false, fenStart: "", incheck: [], + expert: document.cookie.length>0 ? document.cookie.substr(-1)=="1" : false, }; }, render(h) { @@ -27,10 +28,6 @@ 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 = [ @@ -40,6 +37,7 @@ Vue.component('my-game', { attrs: { "aria-label": 'New game VS human' }, 'class': { "tooltip": true, + "bottom": true, //display below "seek": this.seek, "playing": playingHuman, }, @@ -51,6 +49,7 @@ Vue.component('my-game', { attrs: { "aria-label": 'New game VS computer' }, 'class': { "tooltip":true, + "bottom": true, "playing": playingComp, }, }, @@ -58,25 +57,67 @@ 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 expertSwitch = h( + 'button', + { + on: { click: this.toggleExpertMode }, + attrs: { "aria-label": 'Toggle expert mode' }, + 'class': { + "tooltip":true, + "topindicator": true, + "indic-right": true, + "expert-switch": true, + "expert-mode": this.expert, + }, + }, + [h('i', { 'class': { "material-icons": true } }, "remove_red_eye")] + ); + elementArray.push(expertSwitch); 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", @@ -137,7 +178,7 @@ Vue.component('my-game', { ) ); } - if (hintSquares[ci][cj]) + if (!this.expert && hintSquares[ci][cj]) { elems.push( h( @@ -160,10 +201,10 @@ Vue.component('my-game', { { 'class': { 'board': true, - 'light-square': !highlight && (i+j)%2==0, - 'dark-square': !highlight && (i+j)%2==1, - 'highlight': highlight, - 'incheck': incheckSq[ci][cj], + '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], }, attrs: { id: this.getSquareId({x:ci,y:cj}), @@ -180,7 +221,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")]) ); @@ -203,32 +247,6 @@ Vue.component('my-game', { // elementArray.push(reserve); // } const eogMessage = this.getEndgameMessage(this.score); - let elemsOfEog = - [ - h('label', - { - attrs: { "for": "modal-eog" }, - "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 modalEog = [ h('input', { @@ -244,7 +262,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 }, + } + ) + ] ) ] ) @@ -299,6 +330,33 @@ Vue.component('my-game', { actionArray ); elementArray.push(actions); + if (this.score != "*") + { + elementArray.push( + h('div', + { attrs: { id: "pgn-div" } }, + [ + h('a', + { + attrs: { + id: "download", + href: "#", + } + } + ), + h('p', + { + attrs: { id: "pgn-game" }, + on: { click: this.download }, + domProps: { + innerHTML: this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode) + } + } + ) + ] + ) + ); + } return h( 'div', { @@ -422,11 +480,20 @@ Vue.component('my-game', { this.conn.onclose = socketCloseListener; }, methods: { + download: function() { + let content = document.getElementById("pgn-game").innerHTML; + content = content.replace(/
/g, "\n"); + // 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.click(); + }, endGame: function(score) { this.score = score; 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"; @@ -448,6 +515,10 @@ 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) { @@ -485,13 +556,12 @@ Vue.component('my-game', { if (this.mode == "human") return; //no newgame while playing if (this.seek) + { delete localStorage["newgame"]; //cancel game seek + this.seek = false; + } else - { - localStorage["newgame"] = variant; this.newGame("human"); - } - this.seek = !this.seek; }, clickComputerGame: function() { if (this.mode == "human") @@ -507,11 +577,12 @@ 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})); @@ -549,7 +620,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"); }