Fixed unique mine placement

Signed-off-by: Aiden Woodruff <aiden.woodruff@gmail.com>

2 files changed, 24 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index ae3ea20..e8e18ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@
         Assigns click and contextmenu listeners at page load.
         Functions moved to show order of execution.
         Corrected typo.
+        Fixed mine placement.
         (reveal): Removed debug log at beginning of onclick handler.
         Changes behavior if argument is Event or HTML object.
         Removes right click action.
@@ -33,6 +34,7 @@
         No longer manually removes EventListeners, as editing innerHTML fixes it.
         (Coordinates): Class added for testing equality.
         Global variable declarations added to beginning
+        Added find and in_arr functions to find Coordinate object in an array.
 
 2018-04-13  Aiden Woodruff  <aiden.woodruff@gmail.com>
 
diff --git a/sweeper.js b/sweeper.js
index 4d63e72..04a6623 100644
--- a/sweeper.js
+++ b/sweeper.js
@@ -165,7 +165,7 @@ class Coordinates {
         this.x = x;
         this.y = y;
     }
-    equals(other) {
+    equals (other) {
         if (other instanceof Coordinates) {
             if (this.x === other.x && this.y === other.y) {
                 return true;
@@ -174,6 +174,23 @@ class Coordinates {
             return false;
         }
     }
+    in_arr (array) {
+        for (var i = 0; i < array.length; i++) {
+            if (array[i].equals(this)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    find (array) {
+        for (var i = 0; i < array.length; i++) {
+            if (array[i].equals(this)) {
+                return i;
+            }
+        }
+        return -1;
+    }
 }
 
 // Initialize Board array
@@ -188,17 +205,17 @@ for (var y = 0; y < dimensions["height"]; y++) {
 }
 
 // Filter method
-function onlyUnique(value, index, self) {
-    return self.indexOf(value) === index;
+function onlyUniqueCoord(value, index, self) {
+    return value.find(self) === index;
 }
 
 // Get random mine values
-while (mines.length < dimensions["mines"]) {
+while (mines.length < parseInt(dimensions["mines"],10)) {
     mines.push(new Coordinates(
         Math.floor(Math.random() * dimensions["width"]),
         Math.floor(Math.random() * dimensions["height"])
     ));
-    mines.filter(onlyUnique);
+    mines = mines.filter(onlyUniqueCoord);
 }
 
 unflagged = mines.length;