X-Git-Url: https://git.auder.net/assets/icon_infos.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FComputerGame.vue;h=21b1113580ed9b36d1de02d123d6784170217a2b;hb=834c202a003ca6285106133336701b340939ba12;hp=8c0ac3825cac644106e77ba0a9e0a0173310194c;hpb=37cdcbf303d3c2e57b388a1abc9f853ba68a55cd;p=vchess.git

diff --git a/client/src/components/ComputerGame.vue b/client/src/components/ComputerGame.vue
index 8c0ac382..21b11135 100644
--- a/client/src/components/ComputerGame.vue
+++ b/client/src/components/ComputerGame.vue
@@ -1,9 +1,8 @@
 <template lang="pug">
 .row
   .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    BaseGame(:vname="vname" :analyze="analyze"
-      :vr="vr" :fen-start="fenStart" :players="players" :mycolor="mycolor"
-      ref="basegame" @newmove="processMove")
+    BaseGame(:game="game" :vr="vr" ref="basegame"
+      @newmove="processMove" @gameover="gameOver")
 </template>
 
 <script>
@@ -16,34 +15,34 @@ export default {
   components: {
     BaseGame,
   },
+  // gameInfo: fen + mode + vname
   // mode: "auto" (game comp vs comp), "versus" (normal) or "analyze"
-  props: ["fen","mode","vname"],
+  props: ["gameInfo"],
   data: function() {
     return {
       st: store.state,
-      // variables passed to BaseGame:
-      fenStart: "",
+      game: { },
       vr: null,
-      players: ["Myself","Computer"], //always playing white for now
-      mycolor: "w",
       // 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,
     };
   },
-  computed: {
-    analyze: function() {
-      return this.mode == "analyze";
-    },
-  },
   watch: {
-    fen: function() {
+    "gameInfo.fen": function() {
       // (Security) No effect if a computer move is in progress:
       if (this.lockCompThink)
         return this.$emit("computer-think");
       this.launchGame();
     },
+    "gameInfo.userStop": function() {
+      if (this.gameInfo.userStop)
+      {
+        // User stopped the game: unknown result
+        this.game.mode = "analyze";
+      }
+    },
   },
   // Modal end of game, and then sub-components
   created: function() {
@@ -57,7 +56,7 @@ export default {
       // Small delay for the bot to appear "more human"
       const delay = Math.max(500-(Date.now()-this.timeStart), 0);
       setTimeout(() => {
-        const animate = (this.vname != "Dark");
+        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);
@@ -65,29 +64,32 @@ export default {
           setTimeout( () => this.lockCompThink = false, 250);
       }, delay);
     }
-    if (!!this.fen)
+    if (!!this.gameInfo.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.vname + ".js");
+      const vModule = await import("@/variants/" + this.gameInfo.vname + ".js");
       window.V = vModule.VariantRules;
-      this.compWorker.postMessage(["scripts",this.vname]);
-      this.compWorker.postMessage(["init",this.fen]);
-      this.newGameFromFen(this.fen);
-    },
-    newGameFromFen: function(fen) {
-      this.vr = new V(fen);
-      this.fenStart = fen;
-      this.mycolor = (Math.random() < 0.5 ? "w" : "b");
-      console.log(this.mycolor);
-      this.players = ["Myself","Computer"];
-      if (this.mycolor == "b")
-        this.players = this.players.reverse();
-      this.compWorker.postMessage(["init",fen]);
-      if (this.mycolor != "w" || this.mode == "auto")
+      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 = ["Myself","Computer"];
+      if (mycolor == "b")
+        players = players.reverse();
+      // NOTE: (TODO?) fen and fenStart are redundant in game object
+      this.game = Object.assign({},
+        this.gameInfo,
+        {
+          fenStart: this.gameInfo.fen,
+          players: players,
+          mycolor: mycolor,
+        });
+      this.compWorker.postMessage(["init",this.gameInfo.fen]);
+      if (mycolor != "w" || this.gameInfo.mode == "auto")
         this.playComputerMove();
     },
     playComputerMove: function() {
@@ -100,11 +102,15 @@ export default {
       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.gameInfo.mode == "auto" || this.vr.turn != this.game.mycolor))
       {
         this.playComputerMove();
       }
     },
+    // When game ends normally, just switch to analyze mode
+    gameOver: function() {
+      this.game.mode = "analyze";
+    },
   },
 };
 </script>