X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=22cf5bf7faac48605d10dac8d4bc56fcbe9ba5dd;hb=4b0384faf03d3842ba2f80ccd6d104c5e34a355e;hp=3a2f03a51f18e82537e924591aaebfd24e06855c;hpb=d6c1bf3726afae94867854dda76df2848770068c;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 3a2f03a5..22cf5bf7 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -16,14 +16,13 @@ pareil quand quelqu'un reco.
 <template lang="pug">
 .row
   .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    BaseGame(:vname="game.vname" :game="game" :analyze="analyze" :vr="vr"
-      ref="basegame" @newmove="processMove")
-    .button-group(v-if="mode!='analyze'")
+    BaseGame(:game="game" :vr="vr" ref="basegame" @newmove="processMove")
+    .button-group(v-if="game.mode!='analyze'")
       button(@click="offerDraw") Draw
       button(@click="abortGame") Abort
       button(@click="resign") Resign
-    div(v-if="mode=='corr'")
-      textarea(v-show="score=='*' && vr.turn==mycolor" v-model="corrMsg")
+    div(v-if="game.mode=='corr'")
+      textarea(v-show="score=='*' && vr.turn==game.mycolor" v-model="corrMsg")
       div(v-show="cursor>=0") {{ moves[cursor].message }}
 </template>
 
@@ -40,23 +39,19 @@ export default {
     BaseGame,
   },
   // gameRef: to find the game in (potentially remote) storage
-  // mode: "live" or "corr" (correspondance game), or "analyze"
   data: function() {
     return {
       st: store.state,
-      gameRef: {id: "", rid: ""}, //given in URL (rid = remote ID)
-      game: {}, //passed to BaseGame
-      vr: null, //TODO
-      mode: "analyze", //mutable
+      gameRef: { //given in URL (rid = remote ID)
+        id: "",
+        rid: ""
+      },
+      game: { }, //passed to BaseGame
+      vr: null, //"variant rules" object initialized from FEN
       drawOfferSent: false, //did I just ask for draw? (TODO: draw variables?)
-      people: [], //potential observers (TODO)
+      people: [ ], //potential observers (TODO)
     };
   },
-  computed: {
-    analyze: function() {
-      return this.mode == "analyze";
-    },
-  },
   watch: {
     '$route' (to, from) {
       if (!!to.params["id"])
@@ -109,7 +104,7 @@ export default {
           // Send our "last state" informations to opponent(s)
           L = this.vr.moves.length;
           Object.keys(this.opponents).forEach(oid => {
-            this.conn.send(JSON.stringify({
+            this.st.conn.send(JSON.stringify({
               code: "lastate",
               oppid: oid,
               gameId: this.gameRef.id,
@@ -127,7 +122,7 @@ export default {
           if (this.score != "*")
           {
             // We finished the game (any result possible)
-            this.conn.send(JSON.stringify({
+            this.st.conn.send(JSON.stringify({
               code: "lastate",
               oppid: data.oppid,
               gameId: this.gameRef.id,
@@ -139,7 +134,7 @@ export default {
           else if (data.movesCount < L)
           {
             // We must tell last move to opponent
-            this.conn.send(JSON.stringify({
+            this.st.conn.send(JSON.stringify({
               code: "lastate",
               oppid: this.opponent.id,
               gameId: this.gameRef.id,
@@ -151,7 +146,7 @@ export default {
             this.play(data.lastMove, "animate");
           break;
         case "resign": //..you won!
-          this.endGame(this.mycolor=="w"?"1-0":"0-1");
+          this.endGame(this.game.mycolor=="w"?"1-0":"0-1");
           break;
         // TODO: also use (dis)connect info to count online players?
         case "gameconnect":
@@ -175,14 +170,11 @@ export default {
       }
     };
     const socketCloseListener = () => {
-      this.conn.addEventListener('message', socketMessageListener);
-      this.conn.addEventListener('close', socketCloseListener);
+      this.st.conn.addEventListener('message', socketMessageListener);
+      this.st.conn.addEventListener('close', socketCloseListener);
     };
-    if (!!this.conn)
-    {
-      this.conn.onmessage = socketMessageListener;
-      this.conn.onclose = socketCloseListener;
-    }
+    this.st.conn.onmessage = socketMessageListener;
+    this.st.conn.onclose = socketCloseListener;
   },
   // 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.
@@ -202,7 +194,7 @@ export default {
           if (!!o.online)
           {
             try {
-              this.conn.send(JSON.stringify({code: "draw", oppid: o.id}));
+              this.st.conn.send(JSON.stringify({code: "draw", oppid: o.id}));
             } catch (INVALID_STATE_ERR) {
               return;
             }
@@ -221,6 +213,7 @@ export default {
         return;
       //+ bouton "abort" avec score == "?" + demander confirmation pour toutes ces actions,
       //send message: "gameOver" avec score "?"
+      // ==> BaseGame must listen to game.score change, and call "endgame(score)" in this case
     },
     resign: function(e) {
       if (!confirm("Resign the game?"))
@@ -228,7 +221,7 @@ export default {
       if (this.mode == "human" && this.oppConnected(this.oppid))
       {
         try {
-          this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid}));
+          this.st.conn.send(JSON.stringify({code: "resign", oppid: this.oppid}));
         } catch (INVALID_STATE_ERR) {
           return;
         }
@@ -240,14 +233,16 @@ export default {
     //  - from indexedDB (one completed live game)
     //  - from server (one correspondance game I play[ed] or not)
     //  - from remote peer (one live game I don't play, finished or not)
-    loadGame: async function() {
-      GameStorage.get(this.gameRef, (game) => {
-        this.gameInfo = 
-        this.vname = game.vname;
-        this.mode = game.mode;
-        const vModule = await import("@/variants/" + this.vname + ".js");
+    loadGame: function() {
+      GameStorage.get(this.gameRef, async (game) => {
+        this.game = Object.assign({},
+          game,
+          // NOTE: assign mycolor here, since BaseGame could also bs VS computer
+          {mycolor: ["w","b"][game.players.findIndex(p => p.sid == this.st.user.sid)]},
+        );
+        const vModule = await import("@/variants/" + game.vname + ".js");
         window.V = vModule.VariantRules;
-        this.vr = new V(this.gameInfo.fen);
+        this.vr = new V(game.fen);
       });
 //    // Poll all players except me (if I'm playing) to know online status.
 //    // --> Send ping to server (answer pong if players[s] are connected)