X-Git-Url: https://git.auder.net/doc/screen_pairings_scoring.png?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fcomponents%2FComputerGame.vue;h=5fe29e6f63495afb923bc08e54af1561cbd74a28;hb=374c5c13fb8d952c73ad3eb6cd8253282e3baf98;hp=debaeac8764a03d14dcb178668017b5a65477505;hpb=6dd02928259482332d639bb71d2c44ff684fcfb5;p=vchess.git

diff --git a/client/src/components/ComputerGame.vue b/client/src/components/ComputerGame.vue
index debaeac8..5fe29e6f 100644
--- a/client/src/components/ComputerGame.vue
+++ b/client/src/components/ComputerGame.vue
@@ -1,113 +1,119 @@
 <template lang="pug">
-.row
-  .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    BaseGame(:game="game" :vr="vr" ref="basegame" @newmove="processMove")
+BaseGame(
+  ref="basegame"
+  :game="game"
+  @newmove="processMove"
+)
 </template>
 
 <script>
 import BaseGame from "@/components/BaseGame.vue";
 import { store } from "@/store";
-import Worker from 'worker-loader!@/playCompMove';
-
+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',
+  name: "my-computer-game",
   components: {
-    BaseGame,
+    BaseGame
   },
   // gameInfo: fen + mode + vname
-  // mode: "auto" (game comp vs comp), "versus" (normal) or "analyze"
+  // mode: "auto" (game comp vs comp) or "versus" (normal)
   props: ["gameInfo"],
   data: function() {
     return {
       st: store.state,
-      // variables passed to BaseGame:
-      fenStart: "",
-      players: ["Myself","Computer"], //playing as white
-      mycolor: "w",
+      game: {},
       vr: null,
       // Web worker to play computer moves without freezing interface:
       timeStart: undefined, //time when computer starts thinking
-      lockCompThink: false, //to avoid some ghost moves
-      compWorker: null,
+      compThink: false, //avoid asking a new move while one is being searched
+      compWorker: null
     };
   },
-  computed: {
-    game: function() {
-      return Object.assign({},
-        this.gameInfo,
-        {
-          fenStart: this.fenStart,
-          players: this.players,
-          mycolor: this.mycolor,
-        });
-    },
-  },
-  watch: {
-    gameInfo: function() {
-      // (Security) No effect if a computer move is in progress:
-      if (this.lockCompThink)
-        return this.$emit("computer-think");
-      this.launchGame();
-    },
-  },
-  // Modal end of game, and then sub-components
   created: function() {
-    // Computer moves web worker logic: (TODO: also for observers in HH games ?)
-    this.compWorker = new Worker(); //'/javascripts/playCompMove.js'),
+    // Computer moves web worker logic:
+    this.compWorker = new Worker();
     this.compWorker.onmessage = e => {
-      this.lockCompThink = true; //to avoid some ghost moves
       let compMove = e.data;
-      if (!Array.isArray(compMove))
-        compMove = [compMove]; //to deal with MarseilleRules
       // 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(() => {
-        const animate = (this.gameInfo.vname != "Dark");
-        this.$refs.basegame.play(compMove[0], animate);
-        if (compMove.length == 2)
-          setTimeout( () => { this.$refs.basegame.play(compMove[1], animate); }, 750);
-        else //250 == length of animation (TODO: should be a constant somewhere)
-          setTimeout( () => this.lockCompThink = false, 250);
+        if (this.currentUrl != document.location.href) return; //page change
+        // 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);
-    }
-    if (!!this.fen)
-      this.launchGame();
+    };
   },
-  // dans variant.js (plutôt room.js) conn gère aussi les challenges
-  // et les chats dans chat.js. Puis en webRTC, repenser tout ça.
   methods: {
-    launchGame: async function() {
-      const vModule = await import("@/variants/" + this.gameInfo.vname + ".js");
-      window.V = vModule.VariantRules;
-      this.compWorker.postMessage(["scripts",this.gameInfo.vname]);
-      this.compWorker.postMessage(["init",this.gameInfo.fenStart]);
-      this.newGameFromFen(this.gameInfo.fenStart);
-    },
-    newGameFromFen: function(fen) {
-      this.vr = new V(fen);
-      this.mycolor = (Math.random() < 0.5 ? "w" : "b");
-      this.players = ["Myself","Computer"];
-      if (this.mycolor == "b")
-        this.players = this.players.reverse();
-      this.compWorker.postMessage(["init",fen]);
-      if (this.mycolor != "w" || this.gameInfo.mode == "auto")
+    launchGame: function(game) {
+      this.compWorker.postMessage(["scripts", this.gameInfo.vname]);
+      if (!game) {
+        game = {
+          vname: this.gameInfo.vname,
+          fenStart: V.GenRandInitFen(this.st.settings.randomness),
+          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
+      this.game = game;
+      this.$refs["basegame"].re_setVariables(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"]);
     },
-    // TODO: do not process if game is over (check score ?)
-    processMove: function(move) {
+    processMove: function(move, scoreObj) {
+      playMove(move, this.vr);
+      // This move could have ended the game:
+      if (scoreObj.score != "*") {
+        this.gameOver(scoreObj.score);
+        return;
+      }
+      if (this.game.score != "*")
+        // The game already ended, probably because of a user action
+        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.mode == "auto" || this.vr.turn != this.mycolor))
-      {
+      this.compWorker.postMessage(["newmove", move]);
+      if (this.gameInfo.mode == "auto" || this.vr.turn != this.game.mycolor)
         this.playComputerMove();
+      // Finally, update storage:
+      if (this.gameInfo.mode == "versus") {
+        CompgameStorage.update(this.gameInfo.vname, {
+          move: getFilteredMove(move),
+          fen: this.vr.getFen()
+        });
       }
     },
-  },
+    gameOver: function(score) {
+      this.game.score = score;
+      this.game.scoreMsg = getScoreMessage(score);
+      // If comp is thinking, let him finish:
+      if (!this.compThink) this.$emit("game-stopped");
+    }
+  }
 };
 </script>