X-Git-Url: https://git.auder.net/images/pieces/%22%20%20V.getPpath%28board%5Bi%5D%5Bj%5D%29%20%20%20%22.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=e880de5f4abde0246dc8bc1cca8e3e11d880fc81;hb=603b8a8b4a854efb168953da70e7b43ae99b50d9;hp=1e7a83bbde1cf9adca2644ad1ab4b62525b01f49;hpb=13aa5a44fe3da4eac5ab04f0120ccbd5927f91c1;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 1e7a83bb..e880de5f 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,52 +1,52 @@
 <template lang="pug">
-.row
-  .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    input#modalEog.modal(type="checkbox")
-    div(role="dialog" aria-labelledby="eogMessage")
-      .card.smallpad.small-modal.text-center
-        label.modal-close(for="modalEog")
-        h3#eogMessage.section {{ endgameMessage }}
-    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="flip") Flip
-      button(@click="gotoBegin") GotoBegin
-      button(@click="gotoEnd") GotoEnd
-    #fenDiv.section-content(v-if="showFen && !!vr")
-      p#fenString.text-center {{ vr.getFen() }}
-    #pgnDiv.section-content
-      a#download(href="#")
+div
+  input#modalEog.modal(type="checkbox")
+  div(role="dialog" aria-labelledby="eogMessage")
+    .card.smallpad.small-modal.text-center
+      label.modal-close(for="modalEog")
+      h3#eogMessage.section {{ endgameMessage }}
+  .row
+    .col-sm-12.col-md-9.col-lg-8
+      Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
+        :user-color="game.mycolor" :orientation="orientation"
+        :vname="game.vname" @play-move="play")
       .button-group
-        button#downloadBtn(@click="download") {{ st.tr["Download PGN"] }}
-        button Import game
-    //MoveList(v-if="showMoves"
-      :moves="moves" :cursor="cursor" @goto-move="gotoMove")
+        button(@click="() => play()") Play
+        button(@click="() => undo()") Undo
+        button(@click="flip") Flip
+        button(@click="gotoBegin") GotoBegin
+        button(@click="gotoEnd") GotoEnd
+      #fenDiv(v-if="showFen && !!vr")
+        p(@click="gotoFenContent") {{ vr.getFen() }}
+      #pgnDiv
+        a#download(href="#")
+        button(@click="download") {{ st.tr["Download PGN"] }}
+    .col-sm-12.col-md-3.col-lg-4
+      MoveList(v-if="showMoves"
+        :moves="moves" :cursor="cursor" @goto-move="gotoMove")
 </template>
 
 <script>
 import Board from "@/components/Board.vue";
-//import MoveList from "@/components/MoveList.vue";
+import MoveList from "@/components/MoveList.vue";
 import { store } from "@/store";
 import { getSquareId } from "@/utils/squareId";
+import { getDate } from "@/utils/datetime";
 
 export default {
   name: 'my-base-game',
   components: {
     Board,
-    //MoveList,
+    MoveList,
   },
   // "vr": VariantRules object, describing the game state + rules
-  // fenStart, players, mycolor
-  props: ["vname","analyze","vr","gameInfo"],
+  props: ["vr","game"],
   data: function() {
     return {
       st: store.state,
       // NOTE: all following variables must be reset at the beginning of a game
       endgameMessage: "",
       orientation: "w",
-      // TODO: score and moves could be also in gameInfo (when resuming)
       score: "*", //'*' means 'unfinished'
       moves: [],
       cursor: -1, //index of the move just played
@@ -54,22 +54,17 @@ export default {
     };
   },
   watch: {
-    // fenStart changes when a new game starts
-    fenStart: function() {
-      // Reset all variables
-      this.endgameMessage = "";
-      this.orientation = this.gameInfo.mycolor || "w";
-      this.score = "*";
-      this.moves = [];
-      this.cursor = -1;
-      this.lastMove = null;
+    // game initial FEN changes when a new game starts
+    "game.fenStart": function() {
+      this.re_setVariables();
     },
-    analyze: function() {
-      if (this.analyze)
-      {
-        // Switched to analyze mode: game is over
-        this.endGame("*");
-      }
+    // Received a new move to play:
+    "game.moveToPlay": function() {
+      this.play(this.game.moveToPlay, "receive", this.game.vname=="Dark");
+    },
+    "game.score": function(score) {
+      if (score != "*")
+        this.endGame(score, this.game.scoreMsg);
     },
   },
   computed: {
@@ -78,28 +73,40 @@ export default {
       //return window.innerWidth >= 768;
     },
     showFen: function() {
-      return this.vname != "Dark" || this.score != "*";
+      return this.game.vname != "Dark" || this.score != "*";
+    },
+    analyze: function() {
+      return this.game.mode == "analyze" || this.score != "*";
     },
   },
+  created: function() {
+    if (!!this.game.fenStart)
+      this.re_setVariables();
+  },
   methods: {
-    setEndgameMessage: function(score) {
-      let eogMessage = "Undefined";
-      switch (score)
-      {
-        case "1-0":
-          eogMessage = translations["White win"];
-          break;
-        case "0-1":
-          eogMessage = translations["Black win"];
-          break;
-        case "1/2":
-          eogMessage = translations["Draw"];
-          break;
-        case "?":
-          eogMessage = "Unfinished";
-          break;
-      }
-      this.endgameMessage = eogMessage;
+    re_setVariables: function() {
+      this.endgameMessage = "";
+      this.orientation = this.game.mycolor || "w"; //default orientation for observed games
+      this.score = this.game.score || "*"; //mutable (if initially "*")
+      this.moves = JSON.parse(JSON.stringify(this.game.moves || []));
+      // Post-processing: decorate each move with color + current FEN:
+      // (to be able to jump to any position quickly)
+      let vr_tmp = new V(this.game.fenStart); //vr is already at end of game
+      this.moves.forEach(move => {
+        // NOTE: this is doing manually what play() function below achieve,
+        // but in a lighter "fast-forward" way
+        move.color = vr_tmp.turn;
+        move.notation = vr_tmp.getNotation(move);
+        vr_tmp.play(move);
+        move.fen = vr_tmp.getFen();
+      });
+      const L = this.moves.length;
+      this.cursor = L-1;
+      this.lastMove = (L > 0 ? this.moves[L-1]  : null);
+    },
+    gotoFenContent: function(event) {
+      this.$router.push("/analyze/" + this.game.vname +
+        "/?fen=" + event.target.innerText.replace(/ /g, "_"));
     },
     download: function() {
       const content = this.getPgn();
@@ -112,11 +119,11 @@ export default {
     getPgn: function() {
       let pgn = "";
       pgn += '[Site "vchess.club"]\n';
-      pgn += '[Variant "' + this.vname + '"]\n';
+      pgn += '[Variant "' + this.game.vname + '"]\n';
       pgn += '[Date "' + getDate(new Date()) + '"]\n';
-      pgn += '[White "' + this.game.players[0] + '"]\n';
-      pgn += '[Black "' + this.game.players[1] + '"]\n';
-      pgn += '[Fen "' + this.fenStart + '"]\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.score + '"]\n\n';
       let counter = 1;
       let i = 0;
@@ -127,23 +134,44 @@ export default {
         {
           let move = "";
           while (i < this.moves.length && this.moves[i].color == color)
-            move += this.moves[i++].notation[0] + ",";
+            move += this.moves[i++].notation + ",";
           move = move.slice(0,-1); //remove last comma
-          pgn += move + (i < this.moves.length-1 ? " " : "");
+          pgn += move + (i < this.moves.length ? " " : "");
         }
       }
       return pgn + "\n";
     },
-    showScoreMsg: function(score) {
-      this.setEndgameMessage(score);
+    getScoreMessage: function(score) {
+      let eogMessage = "Undefined";
+      switch (score)
+      {
+        case "1-0":
+          eogMessage = this.st.tr["White win"];
+          break;
+        case "0-1":
+          eogMessage = this.st.tr["Black win"];
+          break;
+        case "1/2":
+          eogMessage = this.st.tr["Draw"];
+          break;
+        case "?":
+          eogMessage = this.st.tr["Unfinished"];
+          break;
+      }
+      return eogMessage;
+    },
+    showEndgameMsg: function(message) {
+      this.endgameMessage = message;
       let modalBox = document.getElementById("modalEog");
       modalBox.checked = true;
       setTimeout(() => { modalBox.checked = false; }, 2000);
     },
-    endGame: function(score) {
+    endGame: function(score, message) {
       this.score = score;
-      this.showScoreMsg(score);
-      this.$emit("game-over");
+      if (!message)
+        message = this.getScoreMessage(score);
+      this.showEndgameMsg(score + " . " + message);
+      this.$emit("gameover", score);
     },
     animateMove: function(move) {
       let startSquare = document.getElementById(getSquareId(move.start));
@@ -173,11 +201,11 @@ export default {
         this.play(move);
       }, 250);
     },
-    play: function(move, programmatic) {
-      let navigate = !move;
+    play: function(move, receive, noanimate) {
+      const navigate = !move;
       // Forbid playing outside analyze mode when cursor isn't at moves.length-1
       // (except if we receive opponent's move, human or computer)
-      if (!navigate && !this.analyze && !programmatic
+      if (!navigate && !this.analyze && !receive
         && this.cursor < this.moves.length-1)
       {
         return;
@@ -188,32 +216,37 @@ export default {
           return; //no more moves
         move = this.moves[this.cursor+1];
       }
-      if (!!programmatic) //computer or (remote) human opponent
+      if (!!receive && !noanimate) //opponent move, variant != "Dark"
       {
         if (this.cursor < this.moves.length-1)
           this.gotoEnd(); //required to play the move
         return this.animateMove(move);
       }
-      // Not programmatic, or animation is over
-      if (!move.notation)
-        move.notation = this.vr.getNotation(move);
-      if (!move.color)
+      if (!navigate)
+      {
         move.color = this.vr.turn;
+        move.notation = this.vr.getNotation(move);
+      }
+      // Not programmatic, or animation is over
       this.vr.play(move);
       this.cursor++;
       this.lastMove = move;
-      if (!move.fen)
-        move.fen = this.vr.getFen();
       if (this.st.settings.sound == 2)
         new Audio("/sounds/move.mp3").play().catch(err => {});
-      if (!navigate && (this.score == "*" || this.analyze))
+      if (!navigate)
       {
-        // Stack move on movesList at current cursor
-        if (this.cursor == this.moves.length)
-          this.moves.push(move);
-        else
-          this.moves = this.moves.slice(0,this.cursor).concat([move]);
+        move.fen = this.vr.getFen();
+        if (this.score == "*" || this.analyze)
+        {
+          // Stack move on movesList at current cursor
+          if (this.cursor == this.moves.length)
+            this.moves.push(move);
+          else
+            this.moves = this.moves.slice(0,this.cursor).concat([move]);
+        }
       }
+      if (!this.analyze)
+        this.$emit("newmove", move); //post-processing (e.g. computer play)
       // Is opponent in check?
       this.incheck = this.vr.getCheckSquares(this.vr.turn);
       const score = this.vr.getCurrentScore();
@@ -221,14 +254,16 @@ export default {
       {
         if (!this.analyze)
           this.endGame(score);
-        else //just show score on screen (allow undo)
-          this.showScoreMsg(score);
+        else
+        {
+          // Just show score on screen (allow undo)
+          const message = this.getScoreMessage(score);
+          this.showEndgameMsg(score + " . " + message);
+        }
       }
-      if (!this.analyze)
-        this.$emit("newmove", move); //post-processing (e.g. computer play)
     },
     undo: function(move) {
-      let navigate = !move;
+      const navigate = !move;
       if (navigate)
       {
         if (this.cursor < 0)
@@ -250,7 +285,7 @@ export default {
       this.lastMove = this.moves[index];
     },
     gotoBegin: function() {
-      this.vr.re_init(this.fenStart);
+      this.vr.re_init(this.game.fenStart);
       this.cursor = -1;
       this.lastMove = null;
     },