X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fcomponents%2FComputerGame.vue;h=0d566a8131066f5a060a26f3fd8b99da40d0590a;hb=20620465247585ed4e845885c4d9fee8cd6920c1;hp=14c1b071f4514b9dd71760fb7517b320dc95255a;hpb=e6a5a8eae62d8af13435687c81d19a20b77f1de3;p=vchess.git

diff --git a/client/src/components/ComputerGame.vue b/client/src/components/ComputerGame.vue
index 14c1b071..0d566a81 100644
--- a/client/src/components/ComputerGame.vue
+++ b/client/src/components/ComputerGame.vue
@@ -1,17 +1,20 @@
 <template lang="pug">
-BaseGame(:game="game" :vr="vr" ref="basegame"
-  @newmove="processMove" @gameover="gameOver")
+BaseGame(
+  :game="game"
+  :vr="vr"
+  @newmove="processMove"
+  @gameover="gameOver"
+)
 </template>
 
 <script>
 import BaseGame from "@/components/BaseGame.vue";
 import { store } from "@/store";
 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)
@@ -24,7 +27,7 @@ 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: {
@@ -32,13 +35,11 @@ export default {
       this.launchGame();
     },
     "gameInfo.score": function(newScore) {
-      if (newScore != "*")
-      {
+      if (newScore != "*") {
         this.game.score = newScore; //user action
-        if (!this.compThink)
-          this.$emit("game-stopped"); //otherwise wait for comp
+        if (!this.compThink) this.$emit("game-stopped"); //otherwise wait for comp
       }
-    },
+    }
   },
   // Modal end of game, and then sub-components
   created: function() {
@@ -46,60 +47,51 @@ export default {
     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)
-          {
+          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();
+    };
+    if (this.gameInfo.fen) this.launchGame();
   },
   methods: {
     launchGame: function() {
-      this.compWorker.postMessage(["scripts",this.gameInfo.vname]);
-      this.compWorker.postMessage(["init",this.gameInfo.fen]);
+      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();
+      const mycolor = Math.random() < 0.5 ? "w" : "b";
+      let players = [{ name: "Myself" }, { name: "Computer" }];
+      if (mycolor == "b") players = players.reverse();
       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]);
+      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.playComputerMove();
     },
@@ -109,14 +101,14 @@ export default {
       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();
       }
     },
@@ -124,7 +116,7 @@ export default {
       this.game.score = score;
       this.game.scoreMsg = scoreMsg;
       this.$emit("game-over", score); //bubble up to Rules.vue
-    },
-  },
+    }
+  }
 };
 </script>