X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=470488f66288a7e136293b0a483091480bb15835;hb=7e355d68b5962aad106e28a9d669a47f3cbec43a;hp=2cfa12454238a6ac54ffc176e94ac485f0e61805;hpb=93d1d7a7e07e7bad94318d3cb4cbe906d85bd811;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 2cfa1245..470488f6 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,13 +1,12 @@
 <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 }}
-    // TODO: or "BoardHex" if this.game.vname in "Hexagonal..."
-    Board(:vr="vr" :last-move="lastMove" :analyze="game.mode=='analyze'"
+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 }}
+  .float70 //TODO: use mini-css predefined styles
+    Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
       :user-color="game.mycolor" :orientation="orientation"
       :vname="game.vname" @play-move="play")
     .button-group
@@ -16,28 +15,28 @@
       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
+    #fenDiv(v-if="showFen && !!vr")
+      p {{ vr.getFen() }}
+    #pgnDiv
       a#download(href="#")
-      .button-group
-        button#downloadBtn(@click="download") {{ st.tr["Download PGN"] }}
-        button Import game
-    //MoveList(v-if="showMoves"
+      button(@click="download") {{ st.tr["Download PGN"] }}
+  .float30 //TODO: should be optional (adjust widths dynamically)
+    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
   props: ["vr","game"],
@@ -58,6 +57,13 @@ export default {
     "game.fenStart": function() {
       this.re_setVariables();
     },
+    // Received a new move to play:
+    "game.moveToPlay": function() {
+      this.play(this.game.moveToPlay, "receive", this.game.vname=="Dark");
+    },
+    "game.score": function() {
+      this.endGame(this.game.score, this.game.scoreMsg);
+    },
   },
   computed: {
     showMoves: function() {
@@ -68,7 +74,7 @@ export default {
       return this.game.vname != "Dark" || this.score != "*";
     },
     analyze: function() {
-      return this.game.mode == "analyze";
+      return this.game.mode == "analyze" || this.score != "*";
     },
   },
   created: function() {
@@ -81,29 +87,21 @@ export default {
       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);
     },
-    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;
-    },
     download: function() {
       const content = this.getPgn();
       // Prepare and trigger download link
@@ -117,8 +115,8 @@ export default {
       pgn += '[Site "vchess.club"]\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 += '[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;
@@ -130,25 +128,43 @@ 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);
     },
-
-// TODO: second arg == message
-
-    endGame: function(score) {
+    endGame: function(score, message) {
       this.score = score;
-      this.showScoreMsg(score);
+      if (!message)
+        message = this.getScoreMessage(score);
+      this.showEndgameMsg(score + " . " + message);
       this.$emit("gameover", score);
     },
     animateMove: function(move) {
@@ -223,18 +239,22 @@ export default {
             this.moves = this.moves.slice(0,this.cursor).concat([move]);
         }
       }
-      // Is opponent in check? (TODO: generalize, find all check squares)
+      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();
-      if (score != "*") //TODO: generalize score for 3 or 4 players
+      if (score != "*")
       {
         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) {
       const navigate = !move;