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

diff --git a/client/src/components/ComputerGame.vue b/client/src/components/ComputerGame.vue
index 1181971b..83b4e023 100644
--- a/client/src/components/ComputerGame.vue
+++ b/client/src/components/ComputerGame.vue
@@ -2,9 +2,7 @@
 BaseGame(
   ref="basegame"
   :game="game"
-  :vr="vr"
   @newmove="processMove"
-  @gameover="gameOver"
 )
 </template>
 
@@ -12,6 +10,8 @@ BaseGame(
 import BaseGame from "@/components/BaseGame.vue";
 import { store } from "@/store";
 import { CompgameStorage } from "@/utils/compgameStorage";
+import { getScoreMessage } from "@/utils/scoring";
+import { playMove, getFilteredMove } from "@/utils/playUndo";
 import Worker from "worker-loader!@/playCompMove";
 export default {
   name: "my-computer-game",
@@ -37,31 +37,18 @@ export default {
     this.compWorker = new Worker();
     this.compWorker.onmessage = e => {
       let compMove = e.data;
-      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]; //potential multi-move
       // Small delay for the bot to appear "more human"
-      const delay = Math.max(500 - (Date.now() - this.timeStart), 0);
+      const minDelay = this.gameInfo.mode == "versus" ? 500 : 1000;
+      const delay = Math.max(minDelay - (Date.now() - this.timeStart), 0);
+      let self = this;
       setTimeout(() => {
         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() {
-          // 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
-              self.$emit("game-stopped");
-          } else setTimeout(executeMove, 500 + animDelay);
-        })();
+        // NOTE: BaseGame::play() will trigger processMove() here
+        self.$refs["basegame"].play(compMove, "received");
+        self.compThink = false;
+        if (self.game.score != "*")
+          // User action
+          self.$emit("game-stopped");
       }, delay);
     };
   },
@@ -71,7 +58,7 @@ export default {
       if (!game) {
         game = {
           vname: this.gameInfo.vname,
-          fenStart: V.GenRandInitFen(),
+          fenStart: V.GenRandInitFen(this.st.settings.randomness),
           moves: []
         };
         game.fen = game.fenStart;
@@ -98,36 +85,30 @@ export default {
       this.compThink = true;
       this.compWorker.postMessage(["askmove"]);
     },
-    processMove: function(move) {
-      if (this.game.score != "*") return;
+    processMove: function(move, scoreObj) {
+      playMove(move, this.vr);
+      // This move could have ended the game:
+      if (scoreObj.score != "*") {
+        this.gameOver(scoreObj.score);
+        return;
+      }
       // Send the move to web worker (including his own moves)
       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.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
+          move: getFilteredMove(move),
+          fen: this.vr.getFen()
         });
       }
     },
-    gameOver: function(score, scoreMsg) {
+    gameOver: function(score) {
       this.game.score = score;
-      this.game.scoreMsg = scoreMsg;
-      if (!this.compThink) this.$emit("game-stopped"); //otherwise wait for comp
+      this.game.scoreMsg = getScoreMessage(score);
+      // If comp is thinking, let him finish:
+      if (!this.compThink) this.$emit("game-stopped");
     }
   }
 };