Fix captures and some moves for Grand & Wildebeest
[vchess.git] / public / javascripts / components / game.js
index bd66f73..86f2521 100644 (file)
@@ -1,4 +1,3 @@
-// TODO: use indexedDB instead of localStorage? (more flexible: allow several games)
 Vue.component('my-game', {
        data: function() {
                return {
@@ -16,11 +15,13 @@ Vue.component('my-game', {
                        seek: false,
                        fenStart: "",
                        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; });
@@ -127,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) + "%",
@@ -135,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=[]; } },
                                                        })
                                                ]
@@ -169,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",
                                                                                        },
                                                                                }
                                                                        )
@@ -201,6 +208,7 @@ Vue.component('my-game', {
                                                                {
                                                                        'class': {
                                                                                'board': true,
+                                                                               ['board'+sizeY]: true,
                                                                                'light-square': (i+j)%2==0 && (this.expert || !highlight),
                                                                                'dark-square': (i+j)%2==1 && (this.expert || !highlight),
                                                                                'highlight': !this.expert && highlight,
@@ -216,18 +224,21 @@ Vue.component('my-game', {
                                        );
                                }), choices]
                        );
-                       actionArray.push(
-                               h('button',
-                                       {
-                                               on: { click: this.resign },
-                                               attrs: { "aria-label": 'Resign' },
-                                               'class': {
-                                                       "tooltip":true,
-                                                       "bottom": true,
+                       if (this.mode != "idle")
+                       {
+                               actionArray.push(
+                                       h('button',
+                                               {
+                                                       on: { click: this.resign },
+                                                       attrs: { "aria-label": 'Resign' },
+                                                       'class': {
+                                                               "tooltip":true,
+                                                               "bottom": true,
+                                                       },
                                                },
-                                       },
-                                       [h('i', { 'class': { "material-icons": true } }, "flag")])
-                       );
+                                               [h('i', { 'class': { "material-icons": true } }, "flag")])
+                               );
+                       }
                        elementArray.push(gameDiv);
        //                      if (!!vr.reserve)
        //                      {
@@ -349,7 +360,7 @@ Vue.component('my-game', {
                                                                attrs: { id: "pgn-game" },
                                                                on: { click: this.download },
                                                                domProps: {
-                                                                       innerHTML: this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode)
+                                                                       innerHTML: this.pgnTxt
                                                                }
                                                        }
                                                )
@@ -387,6 +398,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)
@@ -408,7 +424,6 @@ 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
@@ -493,12 +508,12 @@ Vue.component('my-game', {
                        this.score = score;
                        let modalBox = document.getElementById("modal-eog");
                        modalBox.checked = true;
-                       setTimeout(() => {
-                               modalBox.checked = false;
-                               this.mode = "idle"; //TODO: not the best way... (to see correct opponent in PGN)
-                       }, 2000);
+                       // 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.oppid = "";
                },
                getEndgameMessage: function(score) {
@@ -599,7 +614,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.pgnTxt = ""; //redundant with this.score = "*", but cleaner
                        this.mode = mode;
                        this.incheck = []; //in case of
                        this.fenStart = continuation
@@ -636,9 +654,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) {
@@ -725,8 +755,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<squares.length; i++)