X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=5ab02fad5b1ef5389eaa48a82d457b70b9f49c95;hb=e90bafa8fb5fb7641728231bf2398590d96c672a;hp=8c96e3940a2092a7b8d98979d09808273a8395cb;hpb=b1e46b33d78bdf144a5603f82a6907901763abb9;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 8c96e394..5ab02fad 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -11,6 +11,7 @@ div#baseGame
   #gameContainer
     #boardContainer
       Board(
+        ref="board"
         :vr="vr"
         :last-move="lastMove"
         :analyze="game.mode=='analyze'"
@@ -20,6 +21,7 @@ div#baseGame
         :vname="game.vname"
         :incheck="incheck"
         @play-move="play"
+        @click-square="clickSquare"
       )
       #turnIndicator(v-if="showTurn") {{ turn }}
       #controls.button-group
@@ -29,6 +31,11 @@ div#baseGame
           img.inline(src="/images/icons/play_rev.svg")
         button(v-if="canFlip" @click="flip()")
           img.inline(src="/images/icons/flip.svg")
+        button(
+          @click="runAutoplay()"
+          :class="{'in-autoplay': autoplay}"
+        )
+          img.inline(src="/images/icons/autoplay.svg")
         button(@click="play()")
           img.inline(src="/images/icons/play.svg")
         button(@click="gotoEnd()")
@@ -47,6 +54,7 @@ div#baseGame
         @showrules="showRules"
         @analyze="analyzePosition"
         @goto-move="gotoMove"
+        @reset-arrows="resetArrows"
       )
     .clearer
 </template>
@@ -54,6 +62,7 @@ div#baseGame
 <script>
 import Board from "@/components/Board.vue";
 import MoveList from "@/components/MoveList.vue";
+import params from "@/parameters";
 import { store } from "@/store";
 import { getSquareId } from "@/utils/squareId";
 import { getDate } from "@/utils/datetime";
@@ -82,41 +91,53 @@ export default {
       firstMoveNumber: 0, //for printing
       incheck: [], //for Board
       inMultimove: false,
+      autoplay: false,
+      autoplayLoop: null,
       inPlay: false,
       stackToPlay: []
     };
   },
   computed: {
+    turn: function() {
+      if (!this.vr) return "";
+      if (this.vr.showMoves != "all") {
+        return this.st.tr[
+          (this.vr.turn == 'w' ? "White" : "Black") + " to move"];
+      }
+      // Cannot flip: racing king or circular chess
+      return (
+        this.vr.movesCount == 0 && this.game.mycolor == "w"
+          ? this.st.tr["It's your turn!"]
+          : ""
+      );
+    },
+    // 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");
+        : (!!this.vr ? this.vr.showMoves : "none");
     },
     showTurn: function() {
       return (
         this.game.score == '*' &&
-        this.vr &&
-        (this.vr.showMoves != "all" || !this.vr.canFlip)
+        !!this.vr && (this.vr.showMoves != "all" || !this.vr.canFlip)
       );
     },
-    turn: function() {
-      if (!this.vr)
-        return "";
-      if (this.vr.showMoves != "all")
-        return this.st.tr[(this.vr.turn == 'w' ? "White" : "Black") + " to move"]
-      // Cannot flip: racing king or circular chess
-      return this.vr.movesCount == 0 && this.game.mycolor == "w"
-        ? this.st.tr["It's your turn!"]
-        : "";
-    },
     canAnalyze: function() {
-      return this.game.mode != "analyze" && this.vr && this.vr.canAnalyze;
+      return (
+        this.game.mode != "analyze" &&
+        !!this.vr && this.vr.canAnalyze
+      );
     },
     canFlip: function() {
-      return this.vr && this.vr.canFlip;
+      return !!this.vr && this.vr.canFlip;
     },
     allowDownloadPGN: function() {
-      return this.game.score != "*" || (this.vr && this.vr.showMoves == "all");
+      return (
+        this.game.score != "*" ||
+        (!!this.vr && this.vr.showMoves == "all")
+      );
     }
   },
   created: function() {
@@ -134,6 +155,9 @@ export default {
     document.getElementById("eogDiv")
       .addEventListener("click", processModalClick);
   },
+  beforeDestroy: function() {
+    if (!!this.autoplayLoop) clearInterval(this.autoplayLoop);
+  },
   methods: {
     focusBg: function() {
       document.getElementById("baseGame").focus();
@@ -163,6 +187,10 @@ 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();
+    },
     showRules: function() {
       //this.$router.push("/variants/" + this.game.vname);
       window.open("#/variants/" + this.game.vname, "_blank"); //better
@@ -178,24 +206,38 @@ export default {
       const parsedFen = V.ParseFen(game.fenStart);
       const firstMoveColor = parsedFen.turn;
       this.firstMoveNumber = Math.floor(parsedFen.movesCount / 2);
+      let L = this.moves.length;
       this.moves.forEach(move => {
         // Strategy working also for multi-moves:
         if (!Array.isArray(move)) move = [move];
-        move.forEach(m => {
+        move.forEach((m,idx) => {
+          m.index = this.vr.movesCount;
           m.notation = this.vr.getNotation(m);
+          m.unambiguous = V.GetUnambiguousNotation(m);
           this.vr.play(m);
+          if (idx < L - 1 && this.vr.getCheckSquares(this.vr.turn).length > 0)
+            m.notation += "+";
         });
       });
       if (firstMoveColor == "b") {
         // 'start' & 'end' is required for Board component
         this.moves.unshift({
+          index: parsedFen.movesCount,
           notation: "...",
+          unambiguous: "...",
           start: { x: -1, y: -1 },
-          end: { x: -1, y: -1 }
+          end: { x: -1, y: -1 },
+          fen: game.fenStart
         });
+        L++;
       }
       this.positionCursorTo(this.moves.length - 1);
       this.incheck = this.vr.getCheckSquares(this.vr.turn);
+      const score = this.vr.getCurrentScore();
+      if (L > 0 && this.moves[L - 1].notation != "...") {
+        if (["1-0","0-1"].includes(score)) this.moves[L - 1].notation += "#";
+        else if (this.incheck.length > 0) this.moves[L - 1].notation += "+";
+      }
     },
     positionCursorTo: function(index) {
       this.cursor = index;
@@ -207,9 +249,7 @@ export default {
         } else {
           this.lastMove = this.moves[index];
         }
-      }
-      else
-        this.lastMove = null;
+      } else this.lastMove = null;
     },
     analyzePosition: function() {
       let newUrl =
@@ -217,11 +257,8 @@ export default {
         this.game.vname +
         "/?fen=" +
         this.vr.getFen().replace(/ /g, "_");
-      if (this.game.mycolor)
-        newUrl += "&side=" + this.game.mycolor;
-      // Open in same tab in live games (against cheating)
-      if (this.game.type == "live") this.$router.push(newUrl);
-      else window.open("#" + newUrl);
+      if (!!this.game.mycolor) newUrl += "&side=" + this.game.mycolor;
+      window.open("#" + newUrl);
     },
     download: function() {
       const content = this.getPgn();
@@ -236,22 +273,74 @@ export default {
       let pgn = "";
       pgn += '[Site "vchess.club"]\n';
       pgn += '[Variant "' + this.game.vname + '"]\n';
-      pgn += '[Date "' + getDate(new Date()) + '"]\n';
+      const gdt = getDate(new Date(this.game.created || Date.now()));
+      pgn += '[Date "' + gdt + '"]\n';
       pgn += '[White "' + this.game.players[0].name + '"]\n';
       pgn += '[Black "' + this.game.players[1].name + '"]\n';
       pgn += '[Fen "' + this.game.fenStart + '"]\n';
-      pgn += '[Result "' + this.game.score + '"]\n\n';
+      pgn += '[Result "' + this.game.score + '"]\n';
+      if (!!this.game.id) {
+        pgn += '[Cadence "' + this.game.cadence + '"]\n';
+        pgn += '[Url "' + params.serverUrl + '/game/' + this.game.id + '"]\n';
+      }
+      pgn += '\n';
       for (let i = 0; i < this.moves.length; i += 2) {
-        pgn += (i/2+1) + "." + getFullNotation(this.moves[i]) + " ";
+        if (i > 0) pgn += " ";
+        // Adjust dots notation for a better display:
+        let fullNotation = getFullNotation(this.moves[i]);
+        if (fullNotation == "...") fullNotation = "..";
+        pgn += (this.moves[i].index / 2 + 1) + "." + fullNotation;
         if (i+1 < this.moves.length)
-          pgn += getFullNotation(this.moves[i+1]) + " ";
+          pgn += " " + getFullNotation(this.moves[i+1]);
+      }
+      pgn += "\n\n";
+      for (let i = 0; i < this.moves.length; i += 2) {
+        const moveNumber = this.moves[i].index / 2 + 1;
+        // Skip "dots move", useless for machine reading:
+        if (this.moves[i].notation != "...") {
+          pgn += moveNumber + ".w " +
+            getFullNotation(this.moves[i], "unambiguous") + "\n";
+        }
+        if (i+1 < this.moves.length) {
+          pgn += moveNumber + ".b " +
+            getFullNotation(this.moves[i+1], "unambiguous") + "\n";
+        }
       }
-      return pgn + "\n";
+      return pgn;
     },
     showEndgameMsg: function(message) {
       this.endgameMessage = message;
       document.getElementById("modalEog").checked = true;
     },
+    runAutoplay: function() {
+      const infinitePlay = () => {
+        if (this.cursor == this.moves.length - 1) {
+          clearInterval(this.autoplayLoop);
+          this.autoplayLoop = null;
+          this.autoplay = false;
+          return;
+        }
+        if (this.inPlay || this.inMultimove)
+          // Wait next tick
+          return;
+        this.play();
+      };
+      if (this.autoplay) {
+        this.autoplay = false;
+        clearInterval(this.autoplayLoop);
+        this.autoplayLoop = null;
+      } else {
+        this.autoplay = true;
+        setTimeout(
+          () => {
+            infinitePlay();
+            this.autoplayLoop = setInterval(infinitePlay, 1500);
+          },
+          // Small delay otherwise the first move is played too fast
+          500
+        );
+      }
+    },
     // Animate an elementary move
     animateMove: function(move, callback) {
       let startSquare = document.getElementById(getSquareId(move.start));
@@ -267,14 +356,15 @@ export default {
         "#" + getSquareId(move.start) + " > img.piece"
       );
       // For some unknown reasons Opera get "movingPiece == null" error
-      // TOOO: is it calling 'animate()' twice ? One extra time ?
+      // TODO: is it calling 'animate()' twice ? One extra time ?
       if (!movingPiece) return;
-      // HACK for animation (with positive translate, image slides "under background")
-      // Possible improvement: just alter squares on the piece's way...
       const squares = document.getElementsByClassName("board");
       for (let i = 0; i < squares.length; i++) {
         let square = squares.item(i);
-        if (square.id != getSquareId(move.start)) square.style.zIndex = "-1";
+        if (square.id != getSquareId(move.start))
+          // HACK for animation:
+          // (with positive translate, image slides "under background")
+          square.style.zIndex = "-1";
       }
       movingPiece.style.transform =
         "translate(" + translation.x + "px," + translation.y + "px)";
@@ -292,12 +382,19 @@ export default {
       if (this.game.mode == "analyze") {
         this.$emit(
           "fenchange",
-          this.lastMove ? this.lastMove.fen : this.game.fenStart
+          !!this.lastMove ? this.lastMove.fen : this.game.fenStart
         );
       }
     },
+    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);
+    },
     // "light": if gotoMove() or gotoEnd()
     play: function(move, received, light, noemit) {
+      // Freeze while choices are shown:
+      if (this.$refs["board"].choices.length > 0) return;
       if (!!noemit) {
         if (this.inPlay) {
           // Received moves in observed games can arrive too fast:
@@ -308,30 +405,33 @@ export default {
       }
       const navigate = !move;
       const playSubmove = (smove) => {
-        if (!navigate) smove.notation = this.vr.getNotation(smove);
+        smove.notation = this.vr.getNotation(smove);
+        smove.unambiguous = V.GetUnambiguousNotation(smove);
         this.vr.play(smove);
         this.lastMove = smove;
-        // Is opponent in check?
-        this.incheck = this.vr.getCheckSquares(this.vr.turn);
-        if (!navigate) {
-          if (!this.inMultimove) {
+        if (!this.inMultimove) {
+          // Condition is "!navigate" but we mean "!this.autoplay"
+          if (!navigate) {
             if (this.cursor < this.moves.length - 1)
               this.moves = this.moves.slice(0, this.cursor + 1);
             this.moves.push(smove);
-            this.inMultimove = true; //potentially
-            this.cursor++;
-          } else {
-            // Already in the middle of a multi-move
-            const L = this.moves.length;
-            if (!Array.isArray(this.moves[L-1]))
-              this.$set(this.moves, L-1, [this.moves[L-1], smove]);
-            else
-              this.$set(this.moves, L-1, this.moves.concat([smove]));
           }
+          this.inMultimove = true; //potentially
+          this.cursor++;
+        } else if (!navigate) {
+          // Already in the middle of a multi-move
+          const L = this.moves.length;
+          if (!Array.isArray(this.moves[L-1]))
+            this.$set(this.moves, L-1, [this.moves[L-1], smove]);
+          else
+            this.$set(this.moves, L-1, this.moves.concat([smove]));
         }
       };
       const playMove = () => {
-        const animate = V.ShowMoves == "all" && (received || navigate);
+        const animate = (
+          ["all", "highlight"].includes(V.ShowMoves) &&
+          (this.autoplay || !!received)
+        );
         if (!Array.isArray(move)) move = [move];
         let moveIdx = 0;
         let self = this;
@@ -352,31 +452,38 @@ export default {
           }
         })();
       };
+      const computeScore = () => {
+        const score = this.vr.getCurrentScore();
+        if (!navigate) {
+          if (["1-0","0-1"].includes(score)) this.lastMove.notation += "#";
+          else if (this.incheck.length > 0) this.lastMove.notation += "+";
+        }
+        if (score != "*" && this.game.mode == "analyze") {
+          const message = getScoreMessage(score);
+          // Just show score on screen (allow undo)
+          this.showEndgameMsg(score + " . " + this.st.tr[message]);
+        }
+        return score;
+      };
       const afterMove = (smove, initurn) => {
         if (this.vr.turn != initurn) {
           // Turn has changed: move is complete
-          if (!smove.fen) {
-            // NOTE: only FEN of last sub-move is required (thus setting it here)
+          if (!smove.fen)
+            // NOTE: only FEN of last sub-move is required (=> setting it here)
             smove.fen = this.vr.getFen();
-            this.emitFenIfAnalyze();
-          }
+          // Is opponent in check?
+          this.incheck = this.vr.getCheckSquares(this.vr.turn);
+          this.emitFenIfAnalyze();
           this.inMultimove = false;
-          if (!noemit) {
-            var score = this.vr.getCurrentScore();
-            if (score != "*" && this.game.mode == "analyze") {
-              const message = getScoreMessage(score);
-              // Just show score on screen (allow undo)
-              this.showEndgameMsg(score + " . " + this.st.tr[message]);
-            }
-          }
-          if (!navigate && this.game.mode != "analyze") {
-            const L = this.moves.length;
-            if (!noemit)
+          this.score = computeScore();
+          if (this.game.mode != "analyze" && !navigate) {
+            if (!noemit) {
               // Post-processing (e.g. computer play).
+              const L = this.moves.length;
               // NOTE: always emit the score, even in unfinished,
               // to tell Game::processMove() that it's not a received move.
-              this.$emit("newmove", this.moves[L-1], { score: score });
-            else {
+              this.$emit("newmove", this.moves[L-1], { score: this.score });
+            } else {
               this.inPlay = false;
               if (this.stackToPlay.length > 0)
                 // Move(s) arrived in-between
@@ -390,22 +497,25 @@ export default {
         // The move to navigate to is necessarily full:
         if (this.cursor == this.moves.length - 1) return; //no more moves
         move = this.moves[this.cursor + 1];
-        if (light) {
-          // Just play the move, nothing else:
+        if (!this.autoplay) {
+          // Just play the move:
           if (!Array.isArray(move)) move = [move];
           for (let i=0; i < move.length; i++) this.vr.play(move[i]);
+          if (!light) {
+            this.lastMove = move[move.length-1];
+            this.incheck = this.vr.getCheckSquares(this.vr.turn);
+            this.score = computeScore();
+            this.emitFenIfAnalyze();
+          }
+          this.cursor++;
+          return;
         }
-        else {
-          playMove();
-          this.emitFenIfAnalyze();
-        }
-        this.cursor++;
-        return;
       }
       // Forbid playing outside analyze mode, except if move is received.
       // Sufficient condition because Board already knows which turn it is.
       if (
         this.game.mode != "analyze" &&
+        !navigate &&
         !received &&
         (this.game.score != "*" || this.cursor < this.moves.length - 1)
       ) {
@@ -423,6 +533,8 @@ export default {
       for (let i=move.length -1; i >= 0; i--) this.vr.undo(move[i]);
       this.moves.pop();
       this.cursor--;
+      // The board may still show the possible moves: (TODO: bad solution)
+      this.$refs["board"].resetCurrentAttempt();
       this.inMultimove = false;
     },
     cancelLastMove: function() {
@@ -432,15 +544,20 @@ export default {
     },
     // "light": if gotoMove() or gotoBegin()
     undo: function(move, light) {
+      // Freeze while choices are shown:
+      if (this.$refs["board"].choices.length > 0) return;
       if (this.inMultimove) {
         this.cancelCurrentMultimove();
         this.incheck = this.vr.getCheckSquares(this.vr.turn);
       } else {
         if (!move) {
-          if (this.cursor < 0) return; //no more moves
+          const minCursor =
+            this.moves.length > 0 && this.moves[0].notation == "..."
+              ? 1
+              : 0;
+          if (this.cursor < minCursor) return; //no more moves
           move = this.moves[this.cursor];
         }
-        // Caution; if multi-move, undo all submoves from last to first
         undoMove(move, this.vr);
         if (light) this.cursor--;
         else {
@@ -451,6 +568,7 @@ export default {
       }
     },
     gotoMove: function(index) {
+      if (this.$refs["board"].choices.length > 0) return;
       if (this.inMultimove) this.cancelCurrentMultimove();
       if (index == this.cursor) return;
       if (index < this.cursor) {
@@ -468,24 +586,25 @@ export default {
       this.emitFenIfAnalyze();
     },
     gotoBegin: function() {
+      if (this.$refs["board"].choices.length > 0) return;
       if (this.inMultimove) this.cancelCurrentMultimove();
-      while (this.cursor >= 0)
-        this.undo(null, null, "light");
-      if (this.moves.length > 0 && this.moves[0].notation == "...") {
-        this.cursor = 0;
-        this.lastMove = this.moves[0];
-      } else {
-        this.lastMove = null;
-      }
-      this.incheck = [];
+      const minCursor =
+        this.moves.length > 0 && this.moves[0].notation == "..."
+          ? 1
+          : 0;
+      while (this.cursor >= minCursor) this.undo(null, null, "light");
+      this.lastMove = (minCursor == 1 ? this.moves[0] : null);
+      this.incheck = this.vr.getCheckSquares(this.vr.turn);
       this.emitFenIfAnalyze();
     },
     gotoEnd: function() {
+      if (this.$refs["board"].choices.length > 0) return;
       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;
       this.orientation = V.GetOppCol(this.orientation);
     }
   }
@@ -516,8 +635,11 @@ export default {
     padding-top: 5px
     padding-bottom: 5px
 
+.in-autoplay
+  background-color: #FACF8C
+
 img.inline
-  height: 24px
+  height: 22px
   padding-top: 5px
   @media screen and (max-width: 767px)
     height: 18px