From 961a592f3b1f3ee9615bf3e526f189a5271a09ec Mon Sep 17 00:00:00 2001
From: Ole Morud <olekmo@stud.ntnu.no>
Date: Mon, 25 Jan 2021 15:37:05 +0100
Subject: [PATCH] renaming main to index and minor changes

---
 main.html => index.html |  0
 main.js                 | 12 +++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename main.html => index.html (100%)

diff --git a/main.html b/index.html
similarity index 100%
rename from main.html
rename to index.html
diff --git a/main.js b/main.js
index 6ffd874..a471306 100644
--- a/main.js
+++ b/main.js
@@ -1,6 +1,6 @@
 
 //Game options
-var framerate 	= 10;
+var framerate 	= 150;
 var gColumns 	= 60;
 var gRows 		= 140;
 var tileWidth 	= 12;
@@ -24,12 +24,9 @@ var tiles = {
 		//Create temporary 2D array of new values
 		for(var x=0; x<gRows; x++)
 			for(var y=0; y<gColumns; y++){
-				if(![2,3].includes(this.getNeighbors(x,y))
-					this.tempTiles[x][y] = 0; 				//cell dies if number of neighbors are not 2 or 3
-				else if(this.getNeighbors(x,y) == 3)
-					this.tempTiles[x][y] = 1; 				//cell is born if there are exactly 3 neighbors
-				else 
-					this.tempTiles[x][y] = this.tiles[x][y];//cell remains unchanged otherwise
+				if(![2,3].includes(this.getNeighbors(x,y))){ this.tempTiles[x][y] = 0; 	}				//cell dies if number of neighbors are not 2 or 3
+				else if(this.getNeighbors(x,y) == 3)	   { this.tempTiles[x][y] = 1; 	}				//cell is born if there are exactly 3 neighbors
+				else 									   { this.tempTiles[x][y] = this.tiles[x][y]; }	//cell remains unchanged otherwise
 																						   
 				//Draw new graphics
 				if(this.tempTiles[x][y] == 1){
@@ -69,6 +66,7 @@ var tiles = {
 	}
 }
 
+
 //Initializes canvas and event listeners (starts when HTML has loaded)
 function startGame() {
     myGameArea.start();