Merge branch 'dev'

Author: legenlee

README.md

@@ -0,0 +1,14 @@
+# Minesweeper
+
+Minesweeper. Made with GameMaker.
+
+## Features
+
+- Basic 3 presets.
+- Mine counter.
+- No sound effects.
+- No hints.
+
+## How to build
+
+Open `minesweeper.yyp` with GameMaker, Click `build` tab and select `build executable`.

objects/obj_minesweeper/Create_0.gml

@@ -26,3 +26,6 @@ mouseLeftReleased = 0;
 clickable = false;
 
 field = noone;
+
+startedAt = noone;
+current = noone;

objects/obj_minesweeper/Draw_0.gml

@@ -1,12 +1,14 @@
 if (width != noone && height != noone) {
 	var horizontalCenter = room_width / 2;
-	
+	var calculatedTimespan = round(date_second_span(startedAt, current));
+
 	hoveredBoxX = noone;
-	hoveredBoxY = noone;
+	hoveredBoxY = noone;	
 
 	draw_set_align(fa_center, fa_middle);
 	draw_set_color(COLOR_YELLOW);
-	draw_text(horizontalCenter, fieldRectTop - 32, string(mines - flags));
+	draw_text(horizontalCenter - 64, fieldRectTop - 32, string(mines - flags));
+	draw_text(horizontalCenter + 64, fieldRectTop - 32, string(calculatedTimespan));
 
 	for (var i = 0; i < width; i += 1) {
 		for (var j = 0; j < height; j += 1) {

objects/obj_minesweeper/Step_0.gml

@@ -1,5 +1,11 @@
 if (width != noone && height != noone) {
-	if (!dunked || !completed) {
+	if (dunked || completed) {
+		mouseLeftInput = 0;
+		mouseLeftReleased = 0;
+		clickable = false;
+	} else {
+		current = date_current_datetime();
+		
 		var hovered = hoveredBoxX != noone && hoveredBoxY != noone
 
 		mouseLeftInput = mouse_check_button(mb_left);
@@ -18,8 +24,5 @@ if (width != noone && height != noone) {
 		if (openedBoxs + mines = size) {
 			completed = true;
 		}
-	} else {
-		mouseLeftInput = 0;
-		mouseLeftReleased = 0;
 	}
 }

scripts/scr_create_minesweeper/scr_create_minesweeper.gml

@@ -91,6 +91,8 @@ function scr_create_minesweeper(width, height, mines) {
 		self.fieldRectBottom = verticalCenter + fieldHeight / 2;
 		self.fieldRectLeft = horizontalCenter - fieldWidth / 2;
 		self.fieldRectRight = horizontalCenter + fieldWidth / 2;
+	
+		self.startedAt = date_current_datetime();
 	};
 
 	return minesweeper;