X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=f476064978a445c8ff82c84717c0eb8927c869f7;hb=ad030c7d24804fbfa06158e93d89a3f101d2c8b3;hp=1a7e30fa3b67ce06a42a66503f0f256622b7673b;hpb=b406466b0f0ce67451f1718053e5f5691d6507fb;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 1a7e30fa..f4760649 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -40,7 +40,7 @@ div#baseGame
           img.inline(src="/images/icons/play.svg")
         button(@click="gotoEnd()")
           img.inline(src="/images/icons/fast-forward.svg")
-      p(v-show="showFen") {{ (!!vr ? vr.getFen() : "") }}
+      p#fenAnalyze(v-show="showFen") {{ (!!vr ? vr.getFen() : "") }}
     #movesList
       MoveList(
         :show="showMoves"
@@ -55,19 +55,12 @@ div#baseGame
         @showrules="showRules"
         @analyze="toggleAnalyze"
         @goto-move="gotoMove"
-        @reset-arrows="resetArrows"
+        @redraw-board="redrawBoard"
       )
     .clearer
 </template>
 
 <script>
-
-// https://vchess.club/#/game/46
-// Bug 35eme coup blanc Rx(P)e2, d2 et aussi 18eme coup blanc Rd7, Pxe6
-// --> peut-être lié à prise, ou lié à getFen(), ou inMultimove pas changé car concatène à coup précédent...
-// TODO: also fix moves played on smartphone, annoying shift...
-// attention play undo pendant l'autoplay !!
-
 import Board from "@/components/Board.vue";
 import MoveList from "@/components/MoveList.vue";
 import params from "@/parameters";
@@ -112,7 +105,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!"]
@@ -135,7 +128,12 @@ export default {
     showTurn: function() {
       return (
         this.game.score == '*' &&
-        !!this.vr && (this.vr.showMoves != "all" || !this.vr.canFlip)
+        !!this.vr &&
+        (
+          this.vr.showMoves != "all" ||
+          !this.vr.canFlip ||
+          this.vr.showFirstTurn
+        )
       );
     },
     canAnalyze: function() {
@@ -202,9 +200,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:
@@ -219,32 +216,46 @@ export default {
       this.moves = JSON.parse(JSON.stringify(game.moves || []));
       // Post-processing: decorate each move with notation and FEN
       this.vr = new V(game.fenStart);
+      this.inMultimove = false; //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 = "*";
+        // Could be started on a random position in analysis mode:
+        this.incheck = this.vr.getCheckSquares();
+        this.score = this.vr.getCurrentScore();
+        if (this.score != '*') {
+          // Show score on screen
+          const message = getScoreMessage(this.score);
+          this.showEndgameMsg(this.score + " . " + this.st.tr[message]);
+        }
       }
-      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) => {
-          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 += "#";
-          }
+      else {
+        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) => {
+            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 += "#";
+            }
+          });
         });
-      });
+      }
       if (firstMoveColor == "b") {
         // 'start' & 'end' is required for Board component
         this.moves.unshift({
@@ -265,8 +276,11 @@ export default {
       else this.lastMove = null;
     },
     toggleAnalyze: function() {
+      // Freeze while choices are shown (and autoplay has priority)
+      if (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";
         this.gameCursor = this.cursor;
@@ -285,6 +299,8 @@ export default {
           fen = mv[mv.length-1].fen;
         }
         this.vr = new V(fen);
+        this.inMultimove = false; //in case of
+        this.$refs["board"].resetCurrentAttempt(); //also in case of
         this.incheck = this.vr.getCheckSquares();
         if (this.cursor >= 0) this.lastMove = this.moves[this.cursor];
         else this.lastMove = null;
@@ -352,7 +368,7 @@ export default {
       }
       else if (this.cursor < this.moves.length - 1) {
         this.autoplay = true;
-        this.play();
+        this.play(null, null, null, "autoplay");
       }
     },
     // Animate an elementary move
@@ -411,10 +427,17 @@ export default {
       if (!!move) this.play(move);
     },
     // "light": if gotoMove() or gotoEnd()
-    play: function(move, received, light) {
+    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;
       // Forbid playing outside analyze mode, except if move is received.
       // Sufficient condition because Board already knows which turn it is.
       if (
@@ -438,7 +461,7 @@ export default {
           // To play a received move, cursor must be at the end of the game:
           this.gotoEnd();
       }
-      // 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);
@@ -526,7 +549,7 @@ export default {
           this.score = computeScore();
           if (this.autoplay) {
             if (this.cursor < this.moves.length - 1)
-              setTimeout(this.play, 1000);
+              setTimeout(() => this.play(null, null, null, "autoplay"), 1000);
             else {
               this.autoplay = false;
               if (this.stackToPlay.length > 0)
@@ -586,12 +609,19 @@ 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.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 {
         if (!move) {
           const minCursor =
@@ -612,7 +642,13 @@ export default {
       }
     },
     gotoMove: function(index) {
-      if (this.$refs["board"].choices.length > 0) 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;
@@ -631,7 +667,13 @@ export default {
       this.emitFenIfAnalyze();
     },
     gotoBegin: function() {
-      if (this.$refs["board"].choices.length > 0) 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 =
@@ -644,11 +686,8 @@ export default {
       this.emitFenIfAnalyze();
     },
     gotoEnd: function() {
-      if (this.$refs["board"].choices.length > 0) 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;
@@ -683,6 +722,9 @@ export default {
     padding-top: 5px
     padding-bottom: 5px
 
+p#fenAnalyze
+  margin: 5px
+
 .in-autoplay
   background-color: #FACF8C