X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FComputerGame.vue;h=2070cd09e076722917776200046e66ea1d13b851;hb=1c9f093dad69e4c7b6d2b42cb5e0bd3bc7224ec9;hp=a15686fd5687aefcd5f30f63803c65fbaca72142;hpb=a6088c906bbe6fae95707dc7028e45023fe39981;p=vchess.git

diff --git a/client/src/components/ComputerGame.vue b/client/src/components/ComputerGame.vue
index a15686fd..2070cd09 100644
--- a/client/src/components/ComputerGame.vue
+++ b/client/src/components/ComputerGame.vue
@@ -1,7 +1,9 @@
 <template lang="pug">
 .row
   .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    BaseGame(:variant="variant.name" :analyze="analyze" : players="players")
+    BaseGame(:vname="vname" :analyze="analyze"
+      :vr="vr" :fen-start="fenStart" :players="players" :mycolor="mycolor"
+      ref="basegame" @newmove="processMove")
 </template>
 
 <script>
@@ -15,18 +17,19 @@ export default {
     BaseGame,
   },
   // mode: "auto" (game comp vs comp), "versus" (normal) or "analyze"
-  props: ["fen","mode","variant"],
+  props: ["fen","mode","vname"],
   data: function() {
     return {
       st: store.state,
+      // variables passed to BaseGame:
+      fenStart: "",
+      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
-      fenStart: "",
       compWorker: null,
-
-//TODO: players ? Computed?
-
     };
   },
   computed: {
@@ -44,8 +47,6 @@ export default {
   },
   // Modal end of game, and then sub-components
   created: function() {
-    if (!!this.fen)
-      this.launchGame();
     // Computer moves web worker logic: (TODO: also for observers in HH games ?)
     this.compWorker = new Worker(); //'/javascripts/playCompMove.js'),
     this.compWorker.onmessage = e => {
@@ -56,22 +57,25 @@ 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.variant.name != "Dark";
-        this.play(compMove[0], animate);
+        const animate = (this.vname != "Dark");
+        this.$refs.basegame.play(compMove[0], animate);
         if (compMove.length == 2)
-          setTimeout( () => { this.play(compMove[1], animate); }, 750);
+          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);
       }, 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.variant.name + ".js");
+      const vModule = await import("@/variants/" + this.vname + ".js");
       window.V = vModule.VariantRules;
-      this.compWorker.postMessage(["scripts",this.variant.name]);
+      this.compWorker.postMessage(["scripts",this.vname]);
+      this.compWorker.postMessage(["init",this.fen]);
       this.newGameFromFen(this.fen);
     },
     newGameFromFen: function(fen) {
@@ -90,7 +94,7 @@ export default {
         this.mycolor = (Math.random() < 0.5 ? "w" : "b");
         this.orientation = this.mycolor;
         this.compWorker.postMessage(["init",fen]);
-        if (this.mycolor != "w" || this.subMode == "auto")
+        if (this.mycolor != "w" || this.mode == "auto")
           this.playComputerMove();
       }
     },
@@ -98,6 +102,17 @@ export default {
       this.timeStart = Date.now();
       this.compWorker.postMessage(["askmove"]);
     },
+    // TODO: do not process if game is over (check score ?)
+    processMove: function(move) {
+      // 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.playComputerMove();
+      }
+    },
   },
 };
 </script>