X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FComputerGame.vue;h=1181971bed97a23f618b5ade7365ab74d19eb9c9;hb=f446ee645526d617c8369add83de66888d2db6ce;hp=3bbdc0467fd0c9b7128fa8344835cfeec3f46d9a;hpb=604b951e4dc4647da9b251c5fff4ecb4c7b1b298;p=vchess.git

diff --git a/client/src/components/ComputerGame.vue b/client/src/components/ComputerGame.vue
index 3bbdc046..1181971b 100644
--- a/client/src/components/ComputerGame.vue
+++ b/client/src/components/ComputerGame.vue
@@ -1,15 +1,22 @@
 <template lang="pug">
-BaseGame(:game="game" :vr="vr" @newmove="processMove" @gameover="gameOver")
+BaseGame(
+  ref="basegame"
+  :game="game"
+  :vr="vr"
+  @newmove="processMove"
+  @gameover="gameOver"
+)
 </template>
 
 <script>
 import BaseGame from "@/components/BaseGame.vue";
 import { store } from "@/store";
+import { CompgameStorage } from "@/utils/compgameStorage";
 import Worker from "worker-loader!@/playCompMove";
 export default {
   name: "my-computer-game",
   components: {
-    BaseGame,
+    BaseGame
   },
   // gameInfo: fen + mode + vname
   // mode: "auto" (game comp vs comp) or "versus" (normal)
@@ -22,107 +29,106 @@ export default {
       // Web worker to play computer moves without freezing interface:
       timeStart: undefined, //time when computer starts thinking
       compThink: false, //avoid asking a new move while one is being searched
-      compWorker: null,
+      compWorker: null
     };
   },
-  watch: {
-    "gameInfo.fen": function() {
-      this.launchGame();
-    },
-    "gameInfo.score": function(newScore) {
-      if (newScore != "*")
-      {
-        this.game.score = newScore; //user action
-        if (!this.compThink)
-          this.$emit("game-stopped"); //otherwise wait for comp
-      }
-    },
-  },
-  // Modal end of game, and then sub-components
   created: function() {
     // Computer moves web worker logic:
     this.compWorker = new Worker();
     this.compWorker.onmessage = e => {
       let compMove = e.data;
-      if (!compMove)
-      {
+      if (!compMove) {
         this.compThink = false;
         this.$emit("game-stopped"); //no more moves: mate or stalemate
         return; //after game ends, no more moves, nothing to do
       }
-      if (!Array.isArray(compMove))
-        compMove = [compMove]; //to deal with MarseilleRules
+      if (!Array.isArray(compMove)) compMove = [compMove]; //potential multi-move
       // Small delay for the bot to appear "more human"
-      const delay = Math.max(500-(Date.now()-this.timeStart), 0);
+      const delay = Math.max(500 - (Date.now() - this.timeStart), 0);
       setTimeout(() => {
-        if (this.currentUrl != document.location.href)
-          return; //page change
-        // NOTE: Dark and 2-moves are incompatible
-        const animate = (this.gameInfo.vname != "Dark");
-        const animDelay = (animate ? 250 : 0);
+        if (this.currentUrl != document.location.href) return; //page change
+        // NOTE: do not animate move if special display (ShowMoves != "all")
+        const animate = V.ShowMoves == "all";
+        const animDelay = animate ? 250 : 0;
         let moveIdx = 0;
         let self = this;
         (function executeMove() {
-          self.$set(self.game, "moveToPlay", compMove[moveIdx++]);
-          if (moveIdx >= compMove.length)
-          {
+          // NOTE: BaseGame::play() will trigger processMove() here
+          self.$refs["basegame"].play(compMove[moveIdx++], "received");
+          if (moveIdx >= compMove.length) {
             self.compThink = false;
-            if (self.game.score != "*") //user action
+            if (self.game.score != "*")
+              // User action
               self.$emit("game-stopped");
-          }
-          else
-            setTimeout(executeMove, 500 + animDelay);
+          } else setTimeout(executeMove, 500 + animDelay);
         })();
       }, delay);
-    }
-    if (!!this.gameInfo.fen)
-      this.launchGame();
+    };
   },
   methods: {
-    launchGame: function() {
-      this.compWorker.postMessage(["scripts",this.gameInfo.vname]);
-      this.compWorker.postMessage(["init",this.gameInfo.fen]);
-      this.vr = new V(this.gameInfo.fen);
-      const mycolor = (Math.random() < 0.5 ? "w" : "b");
-      let players = [{name:"Myself"},{name:"Computer"}];
-      if (mycolor == "b")
-        players = players.reverse();
+    launchGame: function(game) {
+      this.compWorker.postMessage(["scripts", this.gameInfo.vname]);
+      if (!game) {
+        game = {
+          vname: this.gameInfo.vname,
+          fenStart: V.GenRandInitFen(),
+          moves: []
+        };
+        game.fen = game.fenStart;
+        if (this.gameInfo.mode == "versus")
+          CompgameStorage.add(game);
+      }
+      if (this.gameInfo.mode == "versus" && !game.mycolor)
+        game.mycolor = Math.random() < 0.5 ? "w" : "b";
+      this.compWorker.postMessage(["init", game.fen]);
+      this.vr = new V(game.fen);
+      game.players = [{ name: "Myself" }, { name: "Computer" }];
+      if (game.myColor == "b") game.players = game.players.reverse();
+      game.score = "*"; //finished games are removed
       this.currentUrl = document.location.href; //to avoid playing outside page
-      // NOTE: fen and fenStart are redundant in game object
-      this.game = Object.assign({},
-        this.gameInfo,
-        {
-          fenStart: this.gameInfo.fen,
-          players: players,
-          mycolor: mycolor,
-          score: "*",
-        });
-      this.compWorker.postMessage(["init",this.gameInfo.fen]);
-      if (mycolor != "w" || this.gameInfo.mode == "auto")
+      this.game = game;
+      this.compWorker.postMessage(["init", game.fen]);
+      if (this.gameInfo.mode == "auto" || game.mycolor != this.vr.turn)
         this.playComputerMove();
     },
+    // NOTE: a "goto" action could lead to an error when comp is thinking,
+    // but it's OK because from the user viewpoint the game just stops.
     playComputerMove: function() {
       this.timeStart = Date.now();
       this.compThink = true;
       this.compWorker.postMessage(["askmove"]);
     },
     processMove: function(move) {
-      if (this.game.score != "*")
-        return;
+      if (this.game.score != "*") return;
       // Send the move to web worker (including his own moves)
-      this.compWorker.postMessage(["newmove",move]);
+      this.compWorker.postMessage(["newmove", move]);
       // subTurn condition for Marseille (and Avalanche) rules
-      if ((!this.vr.subTurn || this.vr.subTurn <= 1)
-        && (this.gameInfo.mode == "auto" || this.vr.turn != this.game.mycolor))
-      {
+      if (
+        (!this.vr.subTurn || this.vr.subTurn <= 1) &&
+        (this.gameInfo.mode == "auto" || this.vr.turn != this.game.mycolor)
+      ) {
         this.playComputerMove();
       }
+      // Finally, update storage:
+      if (this.gameInfo.mode == "versus") {
+        const allowed_fields = ["appear", "vanish", "start", "end"];
+        const filtered_move = Object.keys(move)
+          .filter(key => allowed_fields.includes(key))
+          .reduce((obj, key) => {
+            obj[key] = move[key];
+            return obj;
+          }, {});
+        CompgameStorage.update(this.gameInfo.vname, {
+          move: filtered_move,
+          fen: move.fen
+        });
+      }
     },
     gameOver: function(score, scoreMsg) {
       this.game.score = score;
       this.game.scoreMsg = scoreMsg;
-      this.$emit("game-over", score); //bubble up to Rules.vue
-    },
-  },
+      if (!this.compThink) this.$emit("game-stopped"); //otherwise wait for comp
+    }
+  }
 };
 </script>