X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=f101702450c63310f87bb720f17ab032faf017f2;hb=39fe711a185ee73c907f3d61ddd459a33f40696b;hp=8a053765c56a680aac22cb4eb42a220f41e3e549;hpb=cd49e617866590dbc68530ad961b109cdbe1ce55;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 8a053765..f1017024 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -51,11 +51,12 @@ div#baseGame
         :firstNum="firstMoveNumber"
         :moves="moves"
         :cursor="cursor"
+        :vname="game.vname"
         @download="download"
         @showrules="showRules"
         @analyze="toggleAnalyze"
         @goto-move="gotoMove"
-        @reset-arrows="resetArrows"
+        @redraw-board="redrawBoard"
       )
     .clearer
 </template>
@@ -86,10 +87,12 @@ export default {
       endgameMessage: "",
       orientation: "w",
       mode: "",
+      gameMode: "",
       score: "*", //'*' means 'unfinished'
       moves: [],
       cursor: -1, //index of the move just played
       lastMove: null,
+      touchLastClick: "",
       firstMoveNumber: 0, //for printing
       incheck: [], //for Board
       inMultimove: false,
@@ -105,7 +108,7 @@ export default {
         return this.st.tr[
           (this.vr.turn == 'w' ? "White" : "Black") + " to move"];
       }
-      // Cannot flip: racing king or circular chess
+      // Cannot flip (racing king or circular chess), or Monochrome
       return (
         this.vr.movesCount == 0 && this.game.mycolor == "w"
           ? this.st.tr["It's your turn!"]
@@ -121,19 +124,26 @@ export default {
     // TODO: is it OK to pass "computed" as properties?
     // Also, some are seemingly not recomputed when vr is initialized.
     showMoves: function() {
-      return this.game.score != "*"
-        ? "all"
-        : (!!this.vr ? this.vr.showMoves : "none");
+      return (
+        !!this.game.score && this.game.score != "*"
+          ? "all"
+          : (!!this.vr ? this.vr.showMoves : "none")
+      );
     },
     showTurn: function() {
       return (
-        this.game.score == '*' &&
-        !!this.vr && (this.vr.showMoves != "all" || !this.vr.canFlip)
+        !!this.game.score && this.game.score == '*' &&
+        !!this.vr &&
+        (
+          this.vr.showMoves != "all" ||
+          !this.vr.canFlip ||
+          this.vr.showFirstTurn
+        )
       );
     },
     canAnalyze: function() {
       return (
-        this.game.mode != "analyze" &&
+        (!this.game.mode || this.game.mode != "analyze") &&
         !!this.vr && this.vr.canAnalyze
       );
     },
@@ -142,8 +152,8 @@ export default {
     },
     allowDownloadPGN: function() {
       return (
-        this.game.score != "*" ||
-        (!!this.vr && this.vr.showMoves == "all")
+        (!!this.game.score && this.game.score != "*") ||
+        (!!this.vr && !this.vr.someHiddenMoves)
       );
     }
   },
@@ -195,9 +205,8 @@ export default {
       if (e.deltaY < 0) this.undo();
       else if (e.deltaY > 0) this.play();
     },
-    resetArrows: function() {
-      // TODO: make arrows scale with board, and remove this
-      this.$refs["board"].cancelResetArrows();
+    redrawBoard: function() {
+      this.$refs["board"].re_setDrawings();
     },
     showRules: function() {
       // The button is here only on Game page:
@@ -213,35 +222,44 @@ export default {
       // Post-processing: decorate each move with notation and FEN
       this.vr = new V(game.fenStart);
       this.inMultimove = false; //in case of
-      this.$refs["board"].resetCurrentAttempt(); //also in case of
+      if (!!this.$refs["board"])
+        // Also in case of:
+        this.$refs["board"].resetCurrentAttempt();
       let analyseBtn = document.getElementById("analyzeBtn");
       if (!!analyseBtn) analyseBtn.classList.remove("active");
       const parsedFen = V.ParseFen(game.fenStart);
       const firstMoveColor = parsedFen.turn;
       this.firstMoveNumber = Math.floor(parsedFen.movesCount / 2) + 1;
       let L = this.moves.length;
-      if (L == 0) {
-        this.incheck = [];
-        this.score = "*";
-      }
       this.moves.forEach((move,idx) => {
         // Strategy working also for multi-moves:
         if (!Array.isArray(move)) move = [move];
-        const Lm = move.length;
-        move.forEach((m,idxM) => {
+        move.forEach(m => {
           m.notation = this.vr.getNotation(m);
           m.unambiguous = V.GetUnambiguousNotation(m);
           this.vr.play(m);
-          const checkSquares = this.vr.getCheckSquares();
-          if (checkSquares.length > 0) m.notation += "+";
-          if (idxM == Lm - 1) m.fen = this.vr.getFen();
-          if (idx == L - 1 && idxM == Lm - 1) {
-            this.incheck = checkSquares;
-            this.score = this.vr.getCurrentScore();
-            if (["1-0", "0-1"].includes(this.score)) m.notation += "#";
-          }
         });
+        const Lm = move.length;
+        move[Lm - 1].fen = this.vr.getFen();
+        if (idx < L - 1 && this.vr.getCheckSquares().length > 0)
+          move[Lm - 1].notation += "+";
       });
+      this.incheck = this.vr.getCheckSquares();
+      this.score = this.vr.getCurrentScore();
+      if (L >= 1) {
+        const move =
+          !Array.isArray(this.moves[L - 1])
+            ? [this.moves[L - 1]]
+            : this.moves[L - 1];
+        const Lm = move.length;
+        if (["1-0", "0-1"].includes(this.score)) move[Lm - 1].notation += "#";
+        else if (this.incheck.length > 0) move[Lm - 1].notation += "+";
+      }
+      if (this.score != '*') {
+        // Show score on screen
+        const message = getScoreMessage(this.score);
+        this.showEndgameMsg(this.score + " . " + this.st.tr[message]);
+      }
       if (firstMoveColor == "b") {
         // 'start' & 'end' is required for Board component
         this.moves.unshift({
@@ -263,19 +281,25 @@ export default {
     },
     toggleAnalyze: function() {
       // Freeze while choices are shown (and autoplay has priority)
-      if (this.$refs["board"].choices.length > 0 || this.autoplay) return;
+      if (
+        this.inPlay ||
+        this.$refs["board"].choices.length > 0 ||
+        this.autoplay
+      ) {
+        return;
+      }
       if (this.mode != "analyze") {
         // Enter analyze mode:
-        if (this.inMultimove) this.cancelCurrentMultimove();
         this.gameMode = this.mode; //was not 'analyze'
         this.mode = "analyze";
+        if (this.inMultimove) this.cancelCurrentMultimove();
         this.gameCursor = this.cursor;
         this.gameMoves = JSON.parse(JSON.stringify(this.moves));
         document.getElementById("analyzeBtn").classList.add("active");
       }
       else {
         // Exit analyze mode:
-        this.mode = this.gameMode ;
+        this.mode = this.gameMode;
         this.cursor = this.gameCursor;
         this.moves = this.gameMoves;
         let fen = this.game.fenStart;
@@ -409,13 +433,45 @@ export default {
     },
     clickSquare: function(square) {
       // Some variants make use of a single click at specific times:
-      const move = this.vr.doClick(square);
-      if (!!move) this.play(move);
+      const move_s = this.vr.doClick(square);
+      if (!!move_s) {
+        const playMove = () => {
+          if (!Array.isArray(move_s)) this.play(move_s);
+          else this.$refs["board"].choices = move_s;
+        }
+        if ("ontouchstart" in window) {
+          const squareId = "sq-" + square[0] + "-" + square[1];
+          const highlight = function(on, sq) {
+            let elt = document.getElementById(sq);
+            if (!!elt) {
+              if (on) elt.classList.add("touch-hover");
+              else elt.classList.remove("touch-hover");
+            }
+          }
+          // Touch screen (smartphone): require confirmation
+          const squareStr = square[0] + "_" + square[1]
+          if (this.touchLastClick == squareId) {
+            highlight(false, squareId);
+            playMove();
+          }
+          else {
+            highlight(true, squareId);
+            highlight(false, this.touchLastClick);
+          }
+          this.touchLastClick = squareId;
+        }
+        else playMove();
+      }
     },
     // "light": if gotoMove() or gotoEnd()
     play: function(move, received, light, autoplay) {
       // Freeze while choices are shown:
-      if (this.$refs["board"].choices.length > 0) return;
+      if (
+        !!this.$refs["board"].selectedPiece ||
+        this.$refs["board"].choices.length > 0
+      ) {
+        return;
+      }
       const navigate = !move;
       // Forbid navigation during autoplay:
       if (navigate && this.autoplay && !autoplay) return;
@@ -436,13 +492,13 @@ export default {
           this.stackToPlay.unshift(move);
           return;
         }
-        this.inPlay = true;
         if (this.mode == "analyze") this.toggleAnalyze();
         if (this.cursor < this.moves.length - 1)
           // To play a received move, cursor must be at the end of the game:
           this.gotoEnd();
+        this.inPlay = true;
       }
-      // The board may show some the possible moves: (TODO: bad solution)
+      // The board may show some possible moves: (TODO: bad solution)
       this.$refs["board"].resetCurrentAttempt();
       const playSubmove = (smove) => {
         smove.notation = this.vr.getNotation(smove);
@@ -453,9 +509,6 @@ export default {
             this.lastMove = [this.lastMove, smove];
           else this.lastMove.push(smove);
         }
-        // Is opponent (or me) in check?
-        this.incheck = this.vr.getCheckSquares();
-        if (this.incheck.length > 0) smove.notation += "+";
         if (!this.inMultimove) {
           // First sub-move:
           this.lastMove = smove;
@@ -467,7 +520,8 @@ export default {
           }
           this.inMultimove = true; //potentially
           this.cursor++;
-        } else if (!navigate) {
+        }
+        else if (!navigate) {
           // Already in the middle of a multi-move
           const L = this.moves.length;
           if (!Array.isArray(this.moves[L-1]))
@@ -487,14 +541,16 @@ export default {
         (function executeMove() {
           const smove = move[moveIdx++];
           // NOTE: condition "smove.start.x >= 0" required for Dynamo,
-          // because second move may be empty.
-          if (animate && smove.start.x >= 0) {
+          // because second move may be empty. noHighlight condition
+          // is used at least for Chakart.
+          if (animate && smove.start.x >= 0 && !smove.end.noHighlight) {
             self.animateMove(smove, () => {
               playSubmove(smove);
               if (moveIdx < move.length) setTimeout(executeMove, 500);
               else afterMove(smove, initurn);
             });
-          } else {
+          }
+          else {
             playSubmove(smove);
             if (moveIdx < move.length) executeMove();
             else afterMove(smove, initurn);
@@ -527,6 +583,8 @@ export default {
             smove.fen = this.vr.getFen();
           this.emitFenIfAnalyze();
           this.inMultimove = false;
+          this.incheck = this.vr.getCheckSquares();
+          if (this.incheck.length > 0) smove.notation += "+";
           this.score = computeScore();
           if (this.autoplay) {
             if (this.cursor < this.moves.length - 1)
@@ -544,7 +602,8 @@ export default {
               const L = this.moves.length;
               // NOTE: always emit the score, even in unfinished
               this.$emit("newmove", this.moves[L-1], { score: this.score });
-            } else {
+            }
+            else {
               this.inPlay = false;
               if (this.stackToPlay.length > 0)
                 // Move(s) arrived in-between
@@ -590,15 +649,21 @@ export default {
     },
     // "light": if gotoMove() or gotoBegin()
     undo: function(move, light) {
-      // Freeze while choices are shown:
-      if (this.$refs["board"].choices.length > 0 || this.autoplay) return;
+      if (
+        this.autoplay ||
+        !!this.$refs["board"].selectedPiece ||
+        this.$refs["board"].choices.length > 0
+      ) {
+        return;
+      }
       this.$refs["board"].resetCurrentAttempt();
       if (this.inMultimove) {
         this.cancelCurrentMultimove();
         this.incheck = this.vr.getCheckSquares();
         if (this.cursor >= 0) this.lastMove = this.moves[this.cursor];
         else this.lastMove = null;
-      } else {
+      }
+      else {
         if (!move) {
           const minCursor =
             this.moves.length > 0 && this.moves[0].notation == "..."
@@ -618,7 +683,13 @@ export default {
       }
     },
     gotoMove: function(index) {
-      if (this.$refs["board"].choices.length > 0 || this.autoplay) return;
+      if (
+        this.autoplay ||
+        !!this.$refs["board"].selectedPiece ||
+        this.$refs["board"].choices.length > 0
+      ) {
+        return;
+      }
       this.$refs["board"].resetCurrentAttempt();
       if (this.inMultimove) this.cancelCurrentMultimove();
       if (index == this.cursor) return;
@@ -637,7 +708,13 @@ export default {
       this.emitFenIfAnalyze();
     },
     gotoBegin: function() {
-      if (this.$refs["board"].choices.length > 0 || this.autoplay) return;
+      if (
+        this.autoplay ||
+        !!this.$refs["board"].selectedPiece ||
+        this.$refs["board"].choices.length > 0
+      ) {
+        return;
+      }
       this.$refs["board"].resetCurrentAttempt();
       if (this.inMultimove) this.cancelCurrentMultimove();
       const minCursor =
@@ -650,11 +727,8 @@ export default {
       this.emitFenIfAnalyze();
     },
     gotoEnd: function() {
-      if (this.$refs["board"].choices.length > 0 || this.autoplay) return;
-      this.$refs["board"].resetCurrentAttempt();
       if (this.cursor == this.moves.length - 1) return;
       this.gotoMove(this.moves.length - 1);
-      this.emitFenIfAnalyze();
     },
     flip: function() {
       if (this.$refs["board"].choices.length > 0) return;