Merge pull request #2 from Tuggster/solver

Add guessless

Author: Tuggster

config.js

@@ -6,6 +6,9 @@ LOCAL_STORAGE_SHORTCUTS_REVEAL_KEY = "ms_shortcuts_reveal_enabled";
 LOCAL_STORAGE_SHORTCUTS_FLAG_KEY = "ms_shortcuts_flag_enabled";
 LOCAL_STORAGE_COLOR_KEY = "ms_color_enabled";
 LOCAL_STORAGE_MARKS_KEY = "ms_marks_enabled";
+LOCAL_STORAGE_GUESS_FREE_KEY = "ms_guess_free";
+
+LEADERBOARD_ENABLED = false;
 
 // name
 // onChange ==> (state) => ...
@@ -86,7 +89,6 @@ const preferences = [
     lsKey: LOCAL_STORAGE_SHORTCUTS_FLAG_KEY,
     value: false,
   },
-
   {
     name: "marks",
     onChange: (state) => {
@@ -112,6 +114,18 @@ const preferences = [
     lsKey: LOCAL_STORAGE_COLOR_KEY,
     value: true,
   },
+  {
+    name: "guessfree",
+    onChange: (state) => {
+      handleRadioUpdate("guessfree", state);
+      newGame();
+    },
+    onLsLoad: (value) => {
+      return value === "true";
+    },
+    lsKey: LOCAL_STORAGE_GUESS_FREE_KEY,
+    value: false,
+  },
 ];
 
 document.addEventListener("DOMContentLoaded", () => {

contextmenucontroller.js

@@ -28,6 +28,10 @@ window.addEventListener("load", function () {
             setPreferenceValue("marks", selected);
             break;
           }
+          case "guessfree": {
+            setPreferenceValue("guessfree", selected);
+            break;
+          }
         }
       };
 

game.js

@@ -13,16 +13,20 @@ let won = false;
 let buttonX, buttonY, buttonW;
 
 class MinesweeperRound {
-  constructor(width, height, mines) {
+  constructor(width, height, mines, guessFree) {
     this.mines = mines;
     this.flagged = 0;
     this.width = width;
     this.height = height;
     this.hasStart = false;
+    this.guessFree = guessFree;
     this.gameTimer = 0;
     gameOver = false;
     won = false;
 
+    this.startX = 0;
+    this.startY = 0;
+
     this.grid = Array();
     this.initGame();
   }
@@ -85,23 +89,57 @@ class MinesweeperRound {
   }
 
   reserveStart(sX, sY) {
-    for (let x = -startReserved; x <= startReserved; x++) {
-      for (let y = -startReserved; y <= startReserved; y++) {
-        let gX = sX + x;
-        let gY = sY + y;
-        if (gX < 0 || gX >= game.width || gY < 0 || gY >= game.height) {
-          continue;
-        }
-        this.grid[gX + gY * this.width].reserved = true;
-      }
-    }
+    clearStartingArea(this.grid, this.width, sX, sY);
     this.hasStart = true;
+    this.startX = sX;
+    this.startY = sY;
   }
 
-  revealCell(x, y) {
+  applyGame = (grid) => {
+    this.grid = grid.map((cell) => {
+      return new Cell(cell.x, cell.y, cell.mine);
+    });
+  };
+
+  startGame = (x, y) => {
+    clearStartingArea(this.grid, this.width, x, y);
+    seedBoard(this.mines, this.grid);
+    this.reserveStart(x, y);
+  };
+
+  startGameWithGuessless = async (x, y) => {
+    let success = false;
+
+    let testGrid = Array();
+    let attempts = 0;
+    while (!success) {
+      testGrid = Array(this.grid.length);
+      for (let i = 0; i < this.width * this.height; i++) {
+        testGrid[i] = new Cell(i % this.width, Math.floor(i / this.width), false);
+      }
+
+      clearStartingArea(testGrid, this.width, x, y);
+      seedBoard(this.mines, testGrid);
+      const results = await validateBoardFromStart(testGrid, this.width, this.height, this.startX, this.startY);
+      success = results.success;
+      attempts++;
+    }
+
+    console.log(`Found guess-free board after ${attempts} attempts`);
+    this.guessFree = true;
+
+    this.applyGame(testGrid);
+    this.reserveStart(x, y);
+    calculateNumbers(this.grid);
+  };
+
+  async revealCell(x, y) {
     if (!this.hasStart) {
-      this.reserveStart(x, y);
-      this.seedGame();
+      if (this.guessFree) {
+        await this.startGameWithGuessless(x, y);
+      } else {
+        this.startGame(x, y);
+      }
     }
     let gCell = this.grid[x + y * this.width];
     if (!gCell.flagged) {
@@ -322,27 +360,6 @@ class MinesweeperRound {
     }
   }
 
-  seedGame() {
-    let rejects = 0;
-    for (let i = 0; i < this.mines; 0) {
-      let mI = Math.floor(Math.random() * this.grid.length);
-
-      if (this.grid[mI].count >= 0 && !this.grid[mI].reserved && !this.grid[mI].mine) {
-        this.grid[mI].mine = true;
-        i++;
-      } else {
-        rejects++;
-        continue;
-      }
-
-      if (rejects >= this.mines * 5) break;
-    }
-
-    for (let i = 0; i < this.grid.length; i++) {
-      this.grid[i].calculateNearby();
-    }
-  }
-
   drawGame() {
     for (let x = 0; x < this.width; x++) {
       for (let y = 0; y < this.height; y++) {
@@ -361,3 +378,41 @@ function isMobile() {
     return false;
   }
 }
+
+const clearStartingArea = (board, width, sX, sY) => {
+  for (let x = -startReserved; x <= startReserved; x++) {
+    for (let y = -startReserved; y <= startReserved; y++) {
+      let gX = sX + x;
+      let gY = sY + y;
+      if (gX < 0 || gX >= game.width || gY < 0 || gY >= game.height) {
+        continue;
+      }
+      board[gX + gY * width].reserved = true;
+    }
+  }
+};
+
+const calculateNumbers = (grid) => {
+  for (let i = 0; i < grid.length; i++) {
+    grid[i].calculateNearby();
+  }
+};
+
+const seedBoard = (mines, grid) => {
+  let rejects = 0;
+  for (let i = 0; i < mines; 0) {
+    let mI = Math.floor(Math.random() * grid.length);
+
+    if (grid[mI].count >= 0 && !grid[mI].reserved && !grid[mI].mine) {
+      grid[mI].mine = true;
+      i++;
+    } else {
+      rejects++;
+      continue;
+    }
+
+    if (rejects >= mines * 5) break;
+  }
+
+  calculateNumbers(grid);
+};

index.html

@@ -85,6 +85,7 @@
     <script src="md5.js"></script>
     <script src="leaderboard.js"></script>
     <script src="config.js"></script>
+    <script src="solver.js"></script>
 
     <!-- <div class="btn-container" style="width:100%">
       <img src="../imgs/face1.png" alt="" id="resetButton" class="vertical-center play-button" onclick="newGame()">
@@ -199,6 +200,10 @@ <h2>Mines:</h2>
         <hr />
         <p onclick="getLeaderboardForDifficulty(true)">Best Times...</p>
         <hr />
+        <div class="cmenu-radio optional">
+          <p id="guessfree" class="selected">Ensure no guessing</p>
+        </div>
+        <hr />
         <p>Exit</p>
       </div>
 
@@ -262,6 +267,8 @@ <h2>Mines:</h2>
         canvasHTML = document.getElementById("defaultCanvas0"); //createCanvas(windowWidth - border*2, windowHeight - border*2);
         ellipseMode(CENTER);
 
+        const guessFree = localStorage.getItem("LOCAL_STORAGE_GUESS_FREE_KEY") === "true";
+
         let context = canvasElement.getContext("2d");
         context.mozImageSmoothingEnabled = false;
         context.webkitImageSmoothingEnabled = false;
@@ -278,7 +285,7 @@ <h2>Mines:</h2>
         bombColors.push(color(128, 128, 128));
         screenWidth = windowWidth - border * 2;
         screenHeight = windowHeight - border * 2 - headerSize;
-        game = new MinesweeperRound(rows, cols, mines);
+        game = new MinesweeperRound(rows, cols, mines, guessFree);
         setCanvasSize(cellSize * game.width + border * 2, cellSize * game.height + headerSize + border * 2);
         touch = isMobile();
       }
@@ -525,7 +532,10 @@ <h2>Mines:</h2>
         let windowGrabberHeight = document.querySelector(".window-header").getBoundingClientRect().height;
         screenWidth = windowWidth - border * 2;
         screenHeight = windowHeight - border * 2 - headerSize - 50;
-        game = new MinesweeperRound(rows, cols, mines);
+
+        const guessFree = getPreferenceValue("guessfree");
+
+        game = new MinesweeperRound(rows, cols, mines, guessFree);
         setCanvasSize(cellSize * game.width + border * 2, cellSize * game.height + headerSize + border * 2);
         getLeaderboardForDifficulty(false);
       }

leaderboard.js

@@ -10,7 +10,7 @@ const getCollapsed = () => {
   return this.localStorage.getItem(LOCAL_STORAGE_COLLAPSE_KEY) === "true";
 };
 
-const createDifficultyHash = () => MD5(`${game.width},${game.height},${game.mines}`);
+const createDifficultyHash = () => MD5(`${game.width},${game.height},${game.mines}${game.guessFree ? "noguess" : ""}`);
 
 const getLeaderboardForDifficulty = async (shouldShow) => {
   const difficultyHash = createDifficultyHash();
@@ -57,6 +57,10 @@ const getLeaderboardName = () => {
 };
 
 const uploadToLeaderboard = async () => {
+  if (!LEADERBOARD_ENABLED) {
+    throw new Error("leaderboard disabled");
+  }
+
   const username = getLeaderboardName();
   const difficultyHash = createDifficultyHash();
   const time = game.gameTimer / 1000;