Slight change in Ultima rules. TODO: merge with removed code 'isAttacked'
[vchess.git] / public / javascripts / components / game.js
index 0720255..6af331b 100644 (file)
@@ -1,27 +1,31 @@
+// Game logic on a variant page
 Vue.component('my-game', {
        data: function() {
                return {
                        vr: null, //object to check moves, store them, FEN..
                        mycolor: "w",
                        possibleMoves: [], //filled after each valid click/dragstart
-                       choices: [], //promotion pieces, or checkered captures... (contain possible pieces)
+                       choices: [], //promotion pieces, or checkered captures... (as moves)
                        start: {}, //pixels coordinates + id of starting square (click or drag)
                        selectedPiece: null, //moving piece (or clicked piece)
-                       conn: null, //socket messages
+                       conn: null, //socket connection
                        score: "*", //'*' means 'unfinished'
-                       mode: "idle", //human, computer or idle (when not playing)
+                       mode: "idle", //human, friend, computer or idle (when not playing)
                        oppid: "", //opponent ID in case of HH game
                        oppConnected: false,
                        seek: false,
                        fenStart: "",
                        incheck: [],
                        pgnTxt: "",
-                       expert: getCookie("expert") === "1" ? true : false,
-                       gameId: "", //used to limit computer moves' time
+                       hints: (getCookie("hints") === "1" ? true : false),
+                       color: getCookie("color", "lichess"), //lichess, chesscom or chesstempo
+                       // sound level: 0 = no sound, 1 = sound only on newgame, 2 = always
+                       sound: parseInt(getCookie("sound", "2")),
                };
        },
        render(h) {
                const [sizeX,sizeY] = VariantRules.size;
+               const smallScreen = (screen.width <= 420);
                // Precompute hints squares to facilitate rendering
                let hintSquares = doubleArray(sizeX, sizeY, false);
                this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; });
@@ -29,40 +33,66 @@ Vue.component('my-game', {
                let incheckSq = doubleArray(sizeX, sizeY, false);
                this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; });
                let elementArray = [];
-               const playingHuman = (this.mode == "human");
-               const playingComp = (this.mode == "computer");
-               let actionArray = [
+               let actionArray = [];
+               actionArray.push(
                        h('button',
-                               {
-                                       on: { click: this.clickGameSeek },
-                                       attrs: { "aria-label": 'New game VS human' },
-                                       'class': {
-                                               "tooltip": true,
-                                               "bottom": true, //display below
-                                               "seek": this.seek,
-                                               "playing": playingHuman,
-                                       },
+                       {
+                               on: { click: this.clickGameSeek },
+                               attrs: { "aria-label": 'New online game' },
+                               'class': {
+                                       "tooltip": true,
+                                       "bottom": true, //display below
+                                       "seek": this.seek,
+                                       "playing": this.mode == "human",
+                                       "small": smallScreen,
                                },
-                               [h('i', { 'class': { "material-icons": true } }, "accessibility")]),
-                       h('button',
+                       },
+                       [h('i', { 'class': { "material-icons": true } }, "accessibility")])
+               );
+               if (["idle","computer"].includes(this.mode))
+               {
+                       actionArray.push(
+                               h('button',
                                {
                                        on: { click: this.clickComputerGame },
                                        attrs: { "aria-label": 'New game VS computer' },
                                        'class': {
                                                "tooltip":true,
                                                "bottom": true,
-                                               "playing": playingComp,
+                                               "playing": this.mode == "computer",
+                                               "small": smallScreen,
                                        },
                                },
                                [h('i', { 'class': { "material-icons": true } }, "computer")])
-               ];
+                       );
+               }
+               if (["idle","friend"].includes(this.mode))
+               {
+                       actionArray.push(
+                               h('button',
+                               {
+                                       on: { click: this.clickFriendGame },
+                                       attrs: { "aria-label": 'New IRL game' },
+                                       'class': {
+                                               "tooltip":true,
+                                               "bottom": true,
+                                               "playing": this.mode == "friend",
+                                               "small": smallScreen,
+                                       },
+                               },
+                               [h('i', { 'class': { "material-icons": true } }, "people")])
+                       );
+               }
                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);
+                       const settingsBtnElt = document.getElementById("settingsBtn");
+                       const indicWidth = !!settingsBtnElt //-2 for border:
+                               ? parseFloat(window.getComputedStyle(settingsBtnElt).height.slice(0,-2)) - 2
+                               : (smallScreen ? 31 : 37);
                        if (this.mode == "human")
                        {
                                let connectedIndic = h(
@@ -98,22 +128,25 @@ Vue.component('my-game', {
                                }
                        );
                        elementArray.push(turnIndic);
-                       let expertSwitch = h(
+                       let settingsBtn = h(
                                'button',
                                {
-                                       on: { click: this.toggleExpertMode },
-                                       attrs: { "aria-label": 'Toggle expert mode' },
+                                       on: { click: this.showSettings },
+                                       attrs: {
+                                               "aria-label": 'Settings',
+                                               "id": "settingsBtn",
+                                       },
                                        'class': {
-                                               "tooltip":true,
+                                               "tooltip": true,
                                                "topindicator": true,
                                                "indic-right": true,
-                                               "expert-switch": true,
-                                               "expert-mode": this.expert,
+                                               "settings-btn": !smallScreen,
+                                               "settings-btn-small": smallScreen,
                                        },
                                },
-                               [h('i', { 'class': { "material-icons": true } }, "remove_red_eye")]
+                               [h('i', { 'class': { "material-icons": true } }, "settings")]
                        );
-                       elementArray.push(expertSwitch);
+                       elementArray.push(settingsBtn);
                        let choices = h('div',
                                {
                                        attrs: { "id": "choices" },
@@ -149,6 +182,9 @@ Vue.component('my-game', {
                                })
                        );
                        // Create board element (+ reserves if needed by variant or mode)
+                       const lm = this.vr.lastMove;
+                       const showLight = this.hints &&
+                               (this.mode!="idle" || this.cursor==this.vr.moves.length);
                        let gameDiv = h('div',
                                {
                                        'class': { 'game': true },
@@ -185,7 +221,7 @@ Vue.component('my-game', {
                                                                        )
                                                                );
                                                        }
-                                                       if (!this.expert && hintSquares[ci][cj])
+                                                       if (this.hints && hintSquares[ci][cj])
                                                        {
                                                                elems.push(
                                                                        h(
@@ -201,9 +237,6 @@ Vue.component('my-game', {
                                                                        )
                                                                );
                                                        }
-                                                       const lm = this.vr.lastMove;
-                                                       const showLight = !this.expert &&
-                                                               (this.mode!="idle" || this.cursor==this.vr.moves.length);
                                                        return h(
                                                                'div',
                                                                {
@@ -212,6 +245,7 @@ Vue.component('my-game', {
                                                                                ['board'+sizeY]: true,
                                                                                'light-square': (i+j)%2==0,
                                                                                'dark-square': (i+j)%2==1,
+                                                                               [this.color]: true,
                                                                                'highlight': showLight && !!lm && _.isMatch(lm.end, {x:ci,y:cj}),
                                                                                'incheck': showLight && incheckSq[ci][cj],
                                                                        },
@@ -235,6 +269,7 @@ Vue.component('my-game', {
                                                        'class': {
                                                                "tooltip":true,
                                                                "bottom": true,
+                                                               "small": smallScreen,
                                                        },
                                                },
                                                [h('i', { 'class': { "material-icons": true } }, "flag")])
@@ -246,20 +281,49 @@ Vue.component('my-game', {
                                actionArray = actionArray.concat([
                                        h('button',
                                                {
-                                                       style: { "margin-left": "30px" },
                                                        on: { click: e => this.undo() },
                                                        attrs: { "aria-label": 'Undo' },
+                                                       "class": {
+                                                               "small": smallScreen,
+                                                               "marginleft": true,
+                                                       },
                                                },
                                                [h('i', { 'class': { "material-icons": true } }, "fast_rewind")]),
                                        h('button',
                                                {
                                                        on: { click: e => this.play() },
                                                        attrs: { "aria-label": 'Play' },
+                                                       "class": { "small": smallScreen },
                                                },
                                                [h('i', { 'class': { "material-icons": true } }, "fast_forward")]),
                                        ]
                                );
                        }
+                       if (this.mode == "friend")
+                       {
+                               actionArray = actionArray.concat(
+                               [
+                                       h('button',
+                                               {
+                                                       on: { click: this.undoInGame },
+                                                       attrs: { "aria-label": 'Undo' },
+                                                       "class": {
+                                                               "small": smallScreen,
+                                                               "marginleft": true,
+                                                       },
+                                               },
+                                               [h('i', { 'class': { "material-icons": true } }, "undo")]
+                                       ),
+                                       h('button',
+                                               {
+                                                       on: { click: () => { this.mycolor = this.vr.getOppCol(this.mycolor) } },
+                                                       attrs: { "aria-label": 'Flip' },
+                                                       "class": { "small": smallScreen },
+                                               },
+                                               [h('i', { 'class': { "material-icons": true } }, "cached")]
+                                       ),
+                               ]);
+                       }
                        elementArray.push(gameDiv);
                        if (!!this.vr.reserve)
                        {
@@ -282,7 +346,7 @@ Vue.component('my-game', {
                                                        }
                                                }),
                                                h('sup',
-                                                       {style: { "padding-left":"40%"} },
+                                                       {"class": { "reserve-count": true } },
                                                        [ this.vr.reserve[this.mycolor][VariantRules.RESERVE_PIECES[i]] ]
                                                )
                                        ]));
@@ -306,21 +370,25 @@ Vue.component('my-game', {
                                                        }
                                                }),
                                                h('sup',
-                                                       {style: { "padding-left":"40%"} },
+                                                       {"class": { "reserve-count": true } },
                                                        [ this.vr.reserve[oppCol][VariantRules.RESERVE_PIECES[i]] ]
                                                )
                                        ]));
                                }
                                let reserves = h('div',
                                        {
-                                               'class':{'game':true},
-                                               style: {"margin-bottom": "20px"},
+                                               'class':{
+                                                       'game': true,
+                                                       "reserve-div": true,
+                                               },
                                        },
                                        [
                                                h('div',
                                                        {
-                                                               'class': { 'row': true },
-                                                               style: {"margin-bottom": "15px"},
+                                                               'class': {
+                                                                       'row': true,
+                                                                       "reserve-row-1": true,
+                                                               },
                                                        },
                                                        myReservePiecesArray
                                                ),
@@ -368,6 +436,7 @@ Vue.component('my-game', {
                        ];
                        elementArray = elementArray.concat(modalEog);
                }
+               // NOTE: this modal could be in Pug view (no usage of Vue functions or variables)
                const modalNewgame = [
                        h('input',
                                {
@@ -408,6 +477,220 @@ Vue.component('my-game', {
                        )
                ];
                elementArray = elementArray.concat(modalNewgame);
+               const modalFenEdit = [
+                       h('input',
+                               {
+                                       attrs: { "id": "modal-fenedit", type: "checkbox" },
+                                       "class": { "modal": true },
+                               }),
+                       h('div',
+                               {
+                                       attrs: { "role": "dialog", "aria-labelledby": "modal-fenedit" },
+                               },
+                               [
+                                       h('div',
+                                               {
+                                                       "class": { "card": true, "smallpad": true },
+                                               },
+                                               [
+                                                       h('label',
+                                                               {
+                                                                       attrs: { "id": "close-fenedit", "for": "modal-fenedit" },
+                                                                       "class": { "modal-close": true },
+                                                               }
+                                                       ),
+                                                       h('h3',
+                                                               {
+                                                                       "class": { "section": true },
+                                                                       domProps: { innerHTML: "Position + flags (FEN):" },
+                                                               }
+                                                       ),
+                                                       h('input',
+                                                               {
+                                                                       attrs: {
+                                                                               "id": "input-fen",
+                                                                               type: "text",
+                                                                               value: VariantRules.GenRandInitFen(),
+                                                                       },
+                                                               }
+                                                       ),
+                                                       h('button',
+                                                               {
+                                                                       on: { click:
+                                                                               () => {
+                                                                                       const fen = document.getElementById("input-fen").value;
+                                                                                       document.getElementById("modal-fenedit").checked = false;
+                                                                                       this.newGame("friend", fen);
+                                                                               }
+                                                                       },
+                                                                       domProps: { innerHTML: "Ok" },
+                                                               }
+                                                       ),
+                                                       h('button',
+                                                               {
+                                                                       on: { click:
+                                                                               () => {
+                                                                                       document.getElementById("input-fen").value =
+                                                                                               VariantRules.GenRandInitFen();
+                                                                               }
+                                                                       },
+                                                                       domProps: { innerHTML: "Random" },
+                                                               }
+                                                       ),
+                                               ]
+                                       )
+                               ]
+                       )
+               ];
+               elementArray = elementArray.concat(modalFenEdit);
+               const modalSettings = [
+                       h('input',
+                               {
+                                       attrs: { "id": "modal-settings", type: "checkbox" },
+                                       "class": { "modal": true },
+                               }),
+                       h('div',
+                               {
+                                       attrs: { "role": "dialog", "aria-labelledby": "modal-settings" },
+                               },
+                               [
+                                       h('div',
+                                               {
+                                                       "class": { "card": true, "smallpad": true },
+                                               },
+                                               [
+                                                       h('label',
+                                                               {
+                                                                       attrs: { "id": "close-settings", "for": "modal-settings" },
+                                                                       "class": { "modal-close": true },
+                                                               }
+                                                       ),
+                                                       h('h3',
+                                                               {
+                                                                       "class": { "section": true },
+                                                                       domProps: { innerHTML: "Preferences" },
+                                                               }
+                                                       ),
+                                                       h('fieldset',
+                                                         { },
+                                                               [
+                                                                       //h('legend', { domProps: { innerHTML: "Legend title" } }),
+                                                                       h('label',
+                                                                               {
+                                                                                       attrs: { for: "setHints" },
+                                                                                       domProps: { innerHTML: "Show hints?" },
+                                                                               },
+                                                                       ),
+                                                                       h('input',
+                                                                               {
+                                                                                       attrs: {
+                                                                                               "id": "setHints",
+                                                                                               type: "checkbox",
+                                                                                               checked: this.hints,
+                                                                                       },
+                                                                                       on: { "change": this.toggleHints },
+                                                                               }
+                                                                       ),
+                                                               ]
+                                                       ),
+                                                       h('fieldset',
+                                                               { },
+                                                               [
+                                                                       h('label',
+                                                                               {
+                                                                                       attrs: { for: "selectColor" },
+                                                                                       domProps: { innerHTML: "Board colors" },
+                                                                               },
+                                                                       ),
+                                                                       h("select",
+                                                                               {
+                                                                                       attrs: { "id": "selectColor" },
+                                                                                       on: { "change": this.setColor },
+                                                                               },
+                                                                               [
+                                                                                       h("option",
+                                                                                               {
+                                                                                                       domProps: {
+                                                                                                               "value": "lichess",
+                                                                                                               innerHTML: "brown"
+                                                                                                       },
+                                                                                                       attrs: { "selected": this.color=="lichess" },
+                                                                                               }
+                                                                                       ),
+                                                                                       h("option",
+                                                                                               {
+                                                                                                       domProps: {
+                                                                                                               "value": "chesscom",
+                                                                                                               innerHTML: "green"
+                                                                                                       },
+                                                                                                       attrs: { "selected": this.color=="chesscom" },
+                                                                                               }
+                                                                                       ),
+                                                                                       h("option",
+                                                                                               {
+                                                                                                       domProps: {
+                                                                                                               "value": "chesstempo",
+                                                                                                               innerHTML: "blue"
+                                                                                                       },
+                                                                                                       attrs: { "selected": this.color=="chesstempo" },
+                                                                                               }
+                                                                                       ),
+                                                                               ],
+                                                                       ),
+                                                               ]
+                                                       ),
+                                                       h('fieldset',
+                                                               { },
+                                                               [
+                                                                       h('label',
+                                                                               {
+                                                                                       attrs: { for: "selectSound" },
+                                                                                       domProps: { innerHTML: "Play sounds?" },
+                                                                               },
+                                                                       ),
+                                                                       h("select",
+                                                                               {
+                                                                                       attrs: { "id": "selectSound" },
+                                                                                       on: { "change": this.setSound },
+                                                                               },
+                                                                               [
+                                                                                       h("option",
+                                                                                               {
+                                                                                                       domProps: {
+                                                                                                               "value": "0",
+                                                                                                               innerHTML: "None"
+                                                                                                       },
+                                                                                                       attrs: { "selected": this.sound==0 },
+                                                                                               }
+                                                                                       ),
+                                                                                       h("option",
+                                                                                               {
+                                                                                                       domProps: {
+                                                                                                               "value": "1",
+                                                                                                               innerHTML: "Newgame"
+                                                                                                       },
+                                                                                                       attrs: { "selected": this.sound==1 },
+                                                                                               }
+                                                                                       ),
+                                                                                       h("option",
+                                                                                               {
+                                                                                                       domProps: {
+                                                                                                               "value": "2",
+                                                                                                               innerHTML: "All"
+                                                                                                       },
+                                                                                                       attrs: { "selected": this.sound==2 },
+                                                                                               }
+                                                                                       ),
+                                                                               ],
+                                                                       ),
+                                                               ]
+                                                       ),
+                                               ]
+                                       )
+                               ]
+                       )
+               ];
+               elementArray = elementArray.concat(modalSettings);
                const actions = h('div',
                        {
                                attrs: { "id": "actions" },
@@ -420,7 +703,10 @@ Vue.component('my-game', {
                {
                        elementArray.push(
                                h('div',
-                                       { attrs: { id: "pgn-div" } },
+                                       {
+                                               attrs: { id: "pgn-div" },
+                                               "class": { "section-content": true },
+                                       },
                                        [
                                                h('a',
                                                        {
@@ -433,25 +719,34 @@ Vue.component('my-game', {
                                                h('p',
                                                        {
                                                                attrs: { id: "pgn-game" },
-                                                               on: { click: this.download },
                                                                domProps: { innerHTML: this.pgnTxt }
                                                        }
-                                               )
+                                               ),
+                                               h('button',
+                                                       {
+                                                               attrs: { "id": "downloadBtn" },
+                                                               on: { click: this.download },
+                                                               domProps: { innerHTML: "Download game" },
+                                                       }
+                                               ),
                                        ]
                                )
                        );
                }
                else if (this.mode != "idle")
                {
-                       // Show current FEN (at least for debug)
+                       // Show current FEN
                        elementArray.push(
                                h('div',
-                                       { attrs: { id: "fen-div" } },
+                                       {
+                                               attrs: { id: "fen-div" },
+                                               "class": { "section-content": true },
+                                       },
                                        [
                                                h('p',
                                                        {
                                                                attrs: { id: "fen-string" },
-                                                               domProps: { innerHTML: this.vr.getBaseFen() }
+                                                               domProps: { innerHTML: this.vr.getFen() }
                                                        }
                                                )
                                        ]
@@ -487,7 +782,8 @@ Vue.component('my-game', {
                this.myid = continuation ? localStorage.getItem("myid") : getRandString();
                if (!continuation)
                {
-                       // HACK: play a small silent sound to allow "new game" sound later if tab not focused
+                       // HACK: play a small silent sound to allow "new game" sound later
+                       // if tab not focused (TODO: does it really work ?!)
                        new Audio("/sounds/silent.mp3").play().then(() => {}).catch(err => {});
                }
                this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant);
@@ -513,7 +809,8 @@ Vue.component('my-game', {
                        switch (data.code)
                        {
                                case "newgame": //opponent found
-                                       this.newGame("human", data.fen, data.color, data.oppid); //oppid: opponent socket ID
+                                       // oppid: opponent socket ID
+                                       this.newGame("human", data.fen, data.color, data.oppid);
                                        break;
                                case "newmove": //..he played!
                                        this.play(data.move, "animate");
@@ -581,7 +878,7 @@ Vue.component('my-game', {
                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
+                       if (this.mode == "idle" && !!this.vr && this.vr.moves.length > 0
                                && [37,39].includes(event.keyCode))
                        {
                                event.preventDefault();
@@ -599,7 +896,8 @@ Vue.component('my-game', {
                        // 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.href = "data:text/plain;charset=utf-8," +
+                               encodeURIComponent(content);
                        downloadAnchor.click();
                },
                endGame: function(score) {
@@ -658,6 +956,22 @@ Vue.component('my-game', {
                        elt.style.visibility = "hidden";
                        setTimeout(() => { elt.style.visibility="visible"; }, 100);
                },
+               showSettings: function(e) {
+                       this.getRidOfTooltip(e.currentTarget);
+                       document.getElementById("modal-settings").checked = true;
+               },
+               toggleHints: function() {
+                       this.hints = !this.hints;
+                       setCookie("hints", this.hints ? "1" : "0");
+               },
+               setColor: function(e) {
+                       this.color = e.target.options[e.target.selectedIndex].value;
+                       setCookie("color", this.color);
+               },
+               setSound: function(e) {
+                       this.sound = parseInt(e.target.options[e.target.selectedIndex].value);
+                       setCookie("sound", this.sound);
+               },
                clickGameSeek: function(e) {
                        this.getRidOfTooltip(e.currentTarget);
                        if (this.mode == "human")
@@ -677,12 +991,12 @@ Vue.component('my-game', {
                                return; //no newgame while playing
                        this.newGame("computer");
                },
-               toggleExpertMode: function(e) {
+               clickFriendGame: function(e) {
                        this.getRidOfTooltip(e.currentTarget);
-                       this.expert = !this.expert;
-                       setCookie("expert", this.expert ? "1" : "0");
+                       document.getElementById("modal-fenedit").checked = true;
                },
-               resign: function() {
+               resign: function(e) {
+                       this.getRidOfTooltip(e.currentTarget);
                        if (this.mode == "human" && this.oppConnected)
                        {
                                try {
@@ -694,7 +1008,7 @@ Vue.component('my-game', {
                        this.endGame(this.mycolor=="w"?"0-1":"1-0");
                },
                newGame: function(mode, fenInit, color, oppId, moves, continuation) {
-                       const fen = fenInit || VariantRules.GenRandInitFen();
+                       const fen = "M7/8/8/3K1k2/8/8/8/8 0000";//fenInit || VariantRules.GenRandInitFen();
                        console.log(fen); //DEBUG
                        if (mode=="human" && !oppId)
                        {
@@ -721,22 +1035,19 @@ Vue.component('my-game', {
                                }
                                return;
                        }
-                       this.gameId = getRandString();
                        this.vr = new VariantRules(fen, moves || []);
                        this.score = "*";
                        this.pgnTxt = ""; //redundant with this.score = "*", but cleaner
                        this.mode = mode;
                        this.incheck = []; //in case of
-                       this.fenStart = continuation
-                               ? localStorage.getItem("fenStart")
-                               : fen.split(" ")[0]; //Only the position matters
+                       this.fenStart = (continuation ? localStorage.getItem("fenStart") : fen);
                        if (mode=="human")
                        {
                                // Opponent found!
-                               if (!continuation)
+                               if (!continuation) //not playing sound on game continuation
                                {
-                                       // Not playing sound on game continuation:
-                                       new Audio("/sounds/newgame.mp3").play().then(() => {}).catch(err => {});
+                                       if (this.sound >= 1)
+                                               new Audio("/sounds/newgame.mp3").play().then(() => {}).catch(err => {});
                                        document.getElementById("modal-newgame").checked = false;
                                }
                                this.oppid = oppId;
@@ -753,25 +1064,16 @@ Vue.component('my-game', {
                                delete localStorage["newgame"];
                                this.setStorage(); //in case of interruptions
                        }
-                       else //against computer
+                       else if (mode == "computer")
                        {
-                               this.mycolor = Math.random() < 0.5 ? 'w' : 'b';
+                               this.mycolor = "w";//Math.random() < 0.5 ? 'w' : 'b';
                                if (this.mycolor == 'b')
                                        setTimeout(this.playComputerMove, 500);
                        }
+                       //else: against a (IRL) friend: nothing more to do
                },
                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();
                        // (first move) HACK: avoid selecting elements before they appear on page:
                        const delay = Math.max(500-(Date.now()-timeStart), 0);
@@ -818,10 +1120,11 @@ Vue.component('my-game', {
                                this.selectedPiece.style.display = "inline-block";
                                this.selectedPiece.style.zIndex = 3000;
                                let startSquare = this.getSquareFromId(e.target.parentNode.id);
-                               this.possibleMoves = this.mode!="idle" && this.vr.canIplay(this.mycolor,startSquare)
-                                       ? this.vr.getPossibleMovesFrom(startSquare)
-                                       : [];
-                               // Next line add moving piece just after current image (required for Crazyhouse reserve)
+                               const iCanPlay = this.mode!="idle"
+                                       && (this.mode=="friend" || this.vr.canIplay(this.mycolor,startSquare));
+                               this.possibleMoves = iCanPlay ? this.vr.getPossibleMovesFrom(startSquare) : [];
+                               // Next line add moving piece just after current image
+                               // (required for Crazyhouse reserve)
                                e.target.parentNode.insertBefore(this.selectedPiece, e.target.nextSibling);
                        }
                },
@@ -844,16 +1147,20 @@ Vue.component('my-game', {
                                return;
                        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
+                       this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coords
                        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
+                       // Next condition: classList.contains(piece) fails because of marks
+                       while (landing.tagName == "IMG")
                                landing = landing.parentNode;
-                       if (this.start.id == landing.id) //a click: selectedPiece and possibleMoves already filled
+                       if (this.start.id == landing.id)
+                       {
+                               // A click: selectedPiece and possibleMoves are already filled
                                return;
+                       }
                        // OK: process move attempt
                        let endSquare = this.getSquareFromId(landing.id);
                        let moves = this.findMatchingMoves(endSquare);
@@ -884,7 +1191,7 @@ Vue.component('my-game', {
                        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 (with positive translate, image slides "under background"...)
+                       // 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++)
@@ -893,7 +1200,8 @@ Vue.component('my-game', {
                                if (square.id != this.getSquareId(move.start))
                                        square.style.zIndex = "-1";
                        }
-                       movingPiece.style.transform = "translate(" + translation.x + "px," + translation.y + "px)";
+                       movingPiece.style.transform = "translate(" + translation.x + "px," +
+                               translation.y + "px)";
                        movingPiece.style.transitionDuration = "0.2s";
                        movingPiece.style.zIndex = "3000";
                        setTimeout( () => {
@@ -919,7 +1227,8 @@ 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().then(() => {}).catch(err => {});
+                       if (this.sound == 2)
+                               new Audio("/sounds/chessmove1.mp3").play().then(() => {}).catch(err => {});
                        if (this.mode != "idle")
                        {
                                this.incheck = this.vr.getCheckSquares(move); //is opponent in check?
@@ -950,6 +1259,11 @@ Vue.component('my-game', {
                        const move = this.vr.moves[--this.cursor];
                        VariantRules.UndoOnBoard(this.vr.board, move);
                        this.$forceUpdate(); //TODO: ?!
-               }
+               },
+               undoInGame: function() {
+                       const lm = this.vr.lastMove;
+                       if (!!lm)
+                               this.vr.undo(lm);
+               },
        },
 })