X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FRules.vue;h=e709e50a54e9dfed2e7d5f1b9ea4c5fe3b44eaf2;hb=af32cf62c4e117a49a76aef24146555a724dd463;hp=738e25fa3572630e4f4ea5c90a94d03be66353dd;hpb=13aa5a44fe3da4eac5ab04f0120ccbd5927f91c1;p=vchess.git

diff --git a/client/src/views/Rules.vue b/client/src/views/Rules.vue
index 738e25fa..e709e50a 100644
--- a/client/src/views/Rules.vue
+++ b/client/src/views/Rules.vue
@@ -2,17 +2,16 @@
 .row
   .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
     .button-group
-      button(@click="display='rules'") Read the rules
-      button(v-show="!gameInProgress" @click="watchComputerGame")
+      button(@click="clickReadRules") Read the rules
+      button(v-show="!gameInProgress" @click="() => startGame('auto')")
         | Observe a sample game
-      button(v-show="!gameInProgress" @click="playAgainstComputer")
+      button(v-show="!gameInProgress" @click="() => startGame('versus')")
         | Beat the computer!
-      button(v-show="gameInProgress" @click="stopGame")
+      button(v-show="gameInProgress" @click="() => stopGame()")
         | Stop game
     .section-content(v-show="display=='rules'" v-html="content")
-    ComputerGame(v-show="display=='computer'"
-      :fen="fen" :mode="mode" :vname="variant.name"
-      @computer-think="gameInProgress=false" @game-over="stopGame")
+    ComputerGame(v-show="display=='computer'" :game-info="gameInfo"
+      @game-over="stopGame" @game-stopped="gameStopped")
 </template>
 
 <script>
@@ -28,12 +27,16 @@ export default {
   data: function() {
     return {
       st: store.state,
-      variant: {id: 0, name: "_unknown"}, //...yet
       content: "",
       display: "rules",
-      mode: "versus",
       gameInProgress: false,
-      fen: "",
+      // variables passed to ComputerGame:
+      gameInfo: {
+        vname: "_unknown",
+        mode: "versus",
+        fen: "",
+        score: "*",
+      }
     };
   },
   watch: {
@@ -46,6 +49,12 @@ export default {
     this.tryChangeVariant(this.$route.params["vname"]);
   },
   methods: {
+    clickReadRules: function() {
+      if (this.display != "rules")
+        this.display = "rules";
+      else if (this.gameInProgress)
+        this.display = "computer";
+    },
     parseFen(fen) {
       const fenParts = fen.split(" ");
       return {
@@ -58,13 +67,7 @@ export default {
     tryChangeVariant: async function(vname) {
       if (!vname || vname == "_unknown")
         return;
-      if (this.st.variants.length > 0)
-      {
-        const idxOfVar = this.st.variants.findIndex(e => e.name == vname);
-        this.variant = this.st.variants[idxOfVar];
-      }
-      else
-        this.variant.name = vname;
+      this.gameInfo.vname = vname;
       const vModule = await import("@/variants/" + vname + ".js");
       window.V = vModule.VariantRules;
       // Method to replace diagrams in loaded HTML
@@ -75,26 +78,28 @@ export default {
       // (AJAX) Request to get rules content (plain text, HTML)
       this.content =
         require("raw-loader!@/rules/" + vname + "/" + this.st.lang + ".pug")
+        // Next two lines fix a weird issue after last update (2019-11)
+        .replace(/\\[n"]/g, " ")
+        .replace('module.exports = "', '').replace(/"$/, "")
         .replace(/(fen:)([^:]*):/g, replaceByDiag);
     },
-    startGame: function() {
+    startGame: function(mode) {
       if (this.gameInProgress)
         return;
       this.gameInProgress = true;
       this.display = "computer";
-      this.fen = V.GenRandInitFen();
+      this.gameInfo.mode = mode;
+      this.gameInfo.score = "*";
+      this.gameInfo.fen = V.GenRandInitFen();
     },
-    stopGame: function() {
-      this.gameInProgress = false;
-      this.mode = "analyze";
-    },
-    playAgainstComputer: function() {
-      this.mode = "versus";
-      this.startGame();
+    // user is willing to stop the game:
+    stopGame: function(score) {
+      this.gameInfo.score = score || "?";
+      this.gameInfo.mode = "analyze";
     },
-    watchComputerGame: function() {
-      this.mode = "auto";
-      this.startGame();
+    // The game is effectively stopped:
+    gameStopped: function() {
+      this.gameInProgress = false;
     },
   },
 };
@@ -137,34 +142,34 @@ figure.diagram-container
     padding-top: 5px
     font-size: 0.8em
 
-  p.boxed
-    background-color: #FFCC66
-    padding: 5px
+p.boxed
+  background-color: #FFCC66
+  padding: 5px
 
-  .stageDelimiter
-    color: purple
+.stageDelimiter
+  color: purple
 
-  // To show (new) pieces, and/or there values...
-  figure.showPieces > img
-    width: 50px
+// To show (new) pieces, and/or there values...
+figure.showPieces > img
+  width: 50px
 
-  figure.showPieces > figcaption
-    color: #6C6C6C
+figure.showPieces > figcaption
+  color: #6C6C6C
 
-  .section-title
-    padding: 0
+.section-title
+  padding: 0
 
-  .section-title > h4
-    padding: 5px
+.section-title > h4
+  padding: 5px
 
-  ol, ul:not(.browser-default)
-    padding-left: 20px
+ol, ul:not(.browser-default)
+  padding-left: 20px
 
-  ul:not(.browser-default)
-    margin-top: 5px
+ul:not(.browser-default)
+  margin-top: 5px
 
-  ul:not(.browser-default) > li
-    list-style-type: disc
+ul:not(.browser-default) > li
+  list-style-type: disc
 
 .light-square-diag
   background-color: #e5e5ca