X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=67af3b9ff306d7ec4af666738b537035a97a2d7e;hb=3d55deea9a2011c38d8d0067bd57fc889958bec2;hp=52e97c53f2750054a0692b62916ce6d36b3c4917;hpb=c0b2760655298f07eb403da70307636e57b2813a;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 52e97c53..67af3b9f 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -79,6 +79,12 @@ export default {
       }
     },
     "game.clocks": function(newState) {
+      if (this.game.moves.length < 2)
+      {
+        // 1st move not completed yet: freeze time
+        this.virtualClocks = newState.map(s => ppt(s));
+        return;
+      }
       const currentTurn = this.vr.turn;
       const colorIdx = ["w","b"].indexOf(currentTurn);
       let countdown = newState[colorIdx] -
@@ -310,17 +316,31 @@ export default {
           //also using move.played fields
           game.clocks = [-1, -1];
           game.initime = [0, 0];
+          // TODO: compute clocks + initime
         }
         const tc = extractTime(game.timeControl);
+        // TODO: this is not really beautiful (uid on corr players...)
+        if (gtype == "corr" && game.players[0].color == "b")
+          [ game.players[0], game.players[1] ] = [ game.players[1], game.players[0] ];
+        const myIdx = game.players.findIndex(p => {
+          return p.sid == this.st.user.sid || p.uid == this.st.user.id;
+        });
         if (game.clocks[0] < 0) //game unstarted
         {
           game.clocks = [tc.mainTime, tc.mainTime];
           game.initime[0] = Date.now();
+          if (myIdx >= 0) //I play in this game
+          {
+            GameStorage.update(game.gameId,
+            {
+              clocks: game.clocks,
+              initime: game.initime,
+            });
+          }
         }
         const vModule = await import("@/variants/" + vname + ".js");
         window.V = vModule.VariantRules;
         this.vr = new V(game.fen);
-        const myIdx = game.players.findIndex(p => p.sid == this.st.user.sid);
         this.game = Object.assign({},
           game,
           // NOTE: assign mycolor here, since BaseGame could also bs VS computer
@@ -371,12 +391,15 @@ export default {
           return obj;
         }, {});
       // Send move ("newmove" event) to opponent(s) (if ours)
-      let addTime = undefined;
+      let addTime = 0;
       if (move.color == this.game.mycolor)
       {
-        const elapsed = Date.now() - this.game.initime[colorIdx];
-        // elapsed time is measured in milliseconds
-        addTime = this.game.increment - elapsed/1000;
+        if (this.game.moves.length >= 2) //after first move
+        {
+          const elapsed = Date.now() - this.game.initime[colorIdx];
+          // elapsed time is measured in milliseconds
+          addTime = this.game.increment - elapsed/1000;
+        }
         this.st.conn.send(JSON.stringify({
           code: "newmove",
           target: this.game.oppid,
@@ -388,11 +411,14 @@ export default {
       const nextIdx = ["w","b"].indexOf(this.vr.turn);
       GameStorage.update(this.gameRef.id,
       {
-        colorIdx: colorIdx,
-        nextIdx: nextIdx,
         move: filtered_move,
         fen: move.fen,
-        addTime: addTime,
+        clocks: this.game.clocks.map((t,i) => i==colorIdx
+          ? this.game.clocks[i] + addTime
+          : this.game.clocks[i]),
+        initime: this.game.initime.map((t,i) => i==nextIdx
+          ? Date.now()
+          : this.game.initime[i]),
       });
       // Also update current game object:
       this.game.moves.push(move);
@@ -404,10 +430,7 @@ export default {
     // TODO: this update function should also work for corr games
     gameOver: function(score) {
       this.game.mode = "analyze";
-      GameStorage.update(this.gameRef.id,
-      {
-        score: score,
-      });
+      GameStorage.update(this.gameRef.id, { score: score });
     },
   },
 };