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

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 5ab02fad..1e1a2149 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -205,13 +205,12 @@ export default {
       this.vr = new V(game.fenStart);
       const parsedFen = V.ParseFen(game.fenStart);
       const firstMoveColor = parsedFen.turn;
-      this.firstMoveNumber = Math.floor(parsedFen.movesCount / 2);
+      this.firstMoveNumber = Math.floor(parsedFen.movesCount / 2) + 1;
       let L = this.moves.length;
       this.moves.forEach(move => {
         // Strategy working also for multi-moves:
         if (!Array.isArray(move)) move = [move];
         move.forEach((m,idx) => {
-          m.index = this.vr.movesCount;
           m.notation = this.vr.getNotation(m);
           m.unambiguous = V.GetUnambiguousNotation(m);
           this.vr.play(m);
@@ -222,7 +221,6 @@ export default {
       if (firstMoveColor == "b") {
         // 'start' & 'end' is required for Board component
         this.moves.unshift({
-          index: parsedFen.movesCount,
           notation: "...",
           unambiguous: "...",
           start: { x: -1, y: -1 },
@@ -289,13 +287,13 @@ export default {
         // Adjust dots notation for a better display:
         let fullNotation = getFullNotation(this.moves[i]);
         if (fullNotation == "...") fullNotation = "..";
-        pgn += (this.moves[i].index / 2 + 1) + "." + fullNotation;
+        pgn += (i / 2 + this.firstMoveNumber) + "." + fullNotation;
         if (i+1 < this.moves.length)
           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;
+        const moveNumber = i / 2 + this.firstMoveNumber;
         // Skip "dots move", useless for machine reading:
         if (this.moves[i].notation != "...") {
           pgn += moveNumber + ".w " +
@@ -395,6 +393,8 @@ export default {
     play: function(move, received, light, noemit) {
       // Freeze while choices are shown:
       if (this.$refs["board"].choices.length > 0) return;
+      // The board may show some the possible moves: (TODO: bad solution)
+      this.$refs["board"].resetCurrentAttempt();
       if (!!noemit) {
         if (this.inPlay) {
           // Received moves in observed games can arrive too fast:
@@ -409,6 +409,8 @@ export default {
         smove.unambiguous = V.GetUnambiguousNotation(smove);
         this.vr.play(smove);
         this.lastMove = smove;
+        // Is opponent (or me) in check?
+        this.incheck = this.vr.getCheckSquares(this.vr.turn);
         if (!this.inMultimove) {
           // Condition is "!navigate" but we mean "!this.autoplay"
           if (!navigate) {
@@ -423,8 +425,7 @@ export default {
           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]));
+          else this.moves[L-1].push(smove);
         }
       };
       const playMove = () => {
@@ -438,7 +439,9 @@ export default {
         const initurn = this.vr.turn;
         (function executeMove() {
           const smove = move[moveIdx++];
-          if (animate) {
+          // NOTE: condition "smove.start.x >= 0" required for Dynamo,
+          // because second move may be empty.
+          if (animate && smove.start.x >= 0) {
             self.animateMove(smove, () => {
               playSubmove(smove);
               if (moveIdx < move.length)
@@ -471,8 +474,6 @@ export default {
           if (!smove.fen)
             // NOTE: only FEN of last sub-move is required (=> setting it here)
             smove.fen = this.vr.getFen();
-          // Is opponent in check?
-          this.incheck = this.vr.getCheckSquares(this.vr.turn);
           this.emitFenIfAnalyze();
           this.inMultimove = false;
           this.score = computeScore();
@@ -530,11 +531,9 @@ export default {
       const L = this.moves.length;
       let move = this.moves[L-1];
       if (!Array.isArray(move)) move = [move];
-      for (let i=move.length -1; i >= 0; i--) this.vr.undo(move[i]);
+      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() {
@@ -546,6 +545,7 @@ export default {
     undo: function(move, light) {
       // Freeze while choices are shown:
       if (this.$refs["board"].choices.length > 0) return;
+      this.$refs["board"].resetCurrentAttempt();
       if (this.inMultimove) {
         this.cancelCurrentMultimove();
         this.incheck = this.vr.getCheckSquares(this.vr.turn);
@@ -558,6 +558,7 @@ export default {
           if (this.cursor < minCursor) return; //no more moves
           move = this.moves[this.cursor];
         }
+        this.$refs["board"].resetCurrentAttempt();
         undoMove(move, this.vr);
         if (light) this.cursor--;
         else {
@@ -569,6 +570,7 @@ export default {
     },
     gotoMove: function(index) {
       if (this.$refs["board"].choices.length > 0) return;
+      this.$refs["board"].resetCurrentAttempt();
       if (this.inMultimove) this.cancelCurrentMultimove();
       if (index == this.cursor) return;
       if (index < this.cursor) {
@@ -587,6 +589,7 @@ export default {
     },
     gotoBegin: function() {
       if (this.$refs["board"].choices.length > 0) return;
+      this.$refs["board"].resetCurrentAttempt();
       if (this.inMultimove) this.cancelCurrentMultimove();
       const minCursor =
         this.moves.length > 0 && this.moves[0].notation == "..."
@@ -599,6 +602,7 @@ export default {
     },
     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();