Fix end of game + navigation after computer game ends

[vchess.git] / client / src / components / BaseGame.vue

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 8285c0c..aa19b47 100644 (file)
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -9,8 +9,8 @@
     Board(:vr="vr" :last-move="lastMove" :analyze="analyze" :user-color="mycolor"
       :orientation="orientation" :vname="vname" @play-move="play")
     .button-group
-      button(@click="play") Play
-      button(@click="undo") Undo
+      button(@click="() => play()") Play
+      button(@click="() => undo()") Undo
       button(@click="flip") Flip
       button(@click="gotoBegin") GotoBegin
       button(@click="gotoEnd") GotoEnd
@@ -51,6 +51,25 @@ export default {
       lastMove: null,
     };
   },
+  watch: {
+    // fenStart changes when a new game starts
+    fenStart: function() {
+      // Reset all variables
+      this.endgameMessage = "";
+      this.orientation = this.mycolor;
+      this.score = "*";
+      this.moves = [];
+      this.cursor = -1;
+      this.lastMove = null;
+    },
+    analyze: function() {
+      if (this.analyze)
+      {
+        // Switched to analyze mode: game is over
+        this.endGame("*");
+      }
+    },
+  },
   computed: {
     showMoves: function() {
       return true;
@@ -115,7 +134,7 @@ export default {
     },
     showScoreMsg: function(score) {
       this.setEndgameMessage(score);
-      let modalBox = document.getElementById("modal-eog");
+      let modalBox = document.getElementById("modalEog");
       modalBox.checked = true;
       setTimeout(() => { modalBox.checked = false; }, 2000);
     },
@@ -203,7 +222,8 @@ export default {
         else //just show score on screen (allow undo)
           this.showScoreMsg(score);
       }
-      this.$emit("newmove", move); //post-processing (e.g. computer play)
+      if (!this.analyze)
+        this.$emit("newmove", move); //post-processing (e.g. computer play)
     },
     undo: function(move) {
       let navigate = !move;
@@ -219,16 +239,16 @@ export default {
       if (this.st.settings.sound == 2)
         new Audio("/sounds/undo.mp3").play().catch(err => {});
       this.incheck = this.vr.getCheckSquares(this.vr.turn);
-      if (this.analyze) //TODO: can this happen?
+      if (!navigate)
         this.moves.pop();
     },
     gotoMove: function(index) {
-      this.vr = new V(this.moves[index].fen);
+      this.vr.re_init(this.moves[index].fen);
       this.cursor = index;
       this.lastMove = this.moves[index];
     },
     gotoBegin: function() {
-      this.vr = new V(this.fenStart);
+      this.vr.re_init(this.fenStart);
       this.cursor = -1;
       this.lastMove = null;
     },