View difference between Paste ID: VE8JYLvy and hq8nrbbF

-_ms_h = 9
+clock = [
-_ms_w = 9
+	strreplace (concat (
-_ms_th = 9
+		zeropad (div $arg1 3600000)
-_ms_tw = 9
+	) (
-_ms_m = 5
+		zeropad (mod (div $arg1 60000) 60)
-_ms_switch = 0
+	) (
 		zeropad (mod (div $arg1 1000) 60)
-_ms_mf = ""
+	)) " " ":"
-_ms_nf = ""
+
 
-_make_ms_mf = [
+zeropad = [concatword (? (< $arg1 10) 0) $arg1]
 append = [$arg1 = (concat (getalias $arg1) $arg2)]
-	_ms_h = $_ms_th ; _ms_w = $_ms_tw
+precf = [substr $arg1 0 (+ (strstr $arg1 .) (+ $arg2 1))]
-	i = 0 ; n = (* $_ms_h $_ms_w)
+
-	_ms_mf = (loopconcat i $n [0])
+_ms_h  = 9  // board height
 _ms_w  = 9  // board width
-		r = (rnd $n)
+_ms_th = 9  // temp H
-		if (!= (at $_ms_mf $r) 1) [
+_ms_tw = 9  // temp W
 _ms_mt = 0  // board tiles (total)
 _ms_m  = 10 // board mines
 _ms_t  = 0  // timer start (ms)
 _ms_tt = 0  // timer toggle
 _ms_u  = 0  // undo counter
 _ms_um = 0  // undo max
-_make_ms_nf = [
+_ms_up = -1 // undo tile position
-	_ms_nf = ""
+_ms_pc = 0  // completion percentage
-	loop i (* $_ms_h $_ms_w) [
+
-		n = 0
+_ms_mf = "" // board containing mine placement
-		if (at $_ms_mf $i) [ append _ms_nf X ] [
+_ms_nf = "" // board containing tile numbers
-			looplist p [
+_ms_cf = "" // board of completion (displayed)
-				"(- %1 (+ %2 1))" "(- %1 %2)" "(- %1 (- %2 1))" "(- %1 1)"
+_ms_tf = "" // board used upon victory/fail
-				"(+ %1 1)" "(+ %1 (- %2 1))" "(+ %1 %2)" "(+ %1 (+ %2 1))"
+
-			] [
+_ms_tile_find = [
-				p = (do (format $p $i $_ms_w))
+	local n c1 c2 c3 c4 c5 c6 c7 c8
-				if (&& [
+	n = 0
-					1
+	c1 = (- $arg9 $_ms_w)       // UP
-					//> (mod $p $_ms_w) 0
+	c2 = (+ $arg9 $_ms_w)       // DN
-				] [
+	c3 = (- $arg9 1)            // LT
-					1
+	c4 = (+ $arg9 1)            // RT
-					//< (mod $p $_ms_w) $_ms_w
+	c5 = (- $arg9 (+ $_ms_w 1)) // UP-LT
-				] [
+	c6 = (- $arg9 (- $_ms_w 1)) // UP-RT
-					1
+	c7 = (+ $arg9 (- $_ms_w 1)) // DN-LT
-
+	c8 = (+ $arg9 (+ $_ms_w 1)) // DN-RT
-				] [
+	if (> $c1 -1)                                               $arg1 // UP
-					1
+	if (< $c2 $_ms_mt)                                          $arg2 // DN
-
+	if (> (mod $arg9 $_ms_w) 0)                                 $arg3 // LT
-				]) [
+	if (< (mod $arg9 $_ms_w) (- $_ms_w 1))                      $arg4 // RT
-					n = (+ (= (at $_ms_mf $p) 1) $n)
+	if (&& (> $c5 -1) (> (mod $arg9 $_ms_w) 0))                 $arg5 // UP-LT
 	if (&& (> $c6 -1) (< (mod $arg9 $_ms_w) (- $_ms_w 1)))      $arg6 // UP-RT
 	if (&& (< $c7 $_ms_mt) (> (mod $arg9 $_ms_w) 0))            $arg7 // DN-LT
-			append _ms_nf $n
+	if (&& (< $c8 $_ms_mt) (< (mod $arg9 $_ms_w) (- $_ms_w 1))) $arg8 // DN-RT
 	arg10
 ]
 
 _ms_tile_open = [
 	if (=s (at $_ms_cf $arg1) "C") [
 		local n
 		n = (at $_ms_nf $arg1) ; _ms_up = $arg1
 		_ms_cf = (listsplice $_ms_cf $n $arg1 1)
-				looplist i (breaklist $(? $_ms_switch _ms_mf _ms_nf) $_ms_w) [
+		cases $n "X" [
 			// Reserved for mines!
-						looplist p $i [
+
-							guiimage (format "packages/icons/minesweeper/%1.png" $p) [] 0.5 0
+		] "F" [
 			// Reserved for flags!
 
 		] "0" [
 			do [ _ms_tile_find @(
-			guibar
+				loopconcat i 8 [result [[
 					_ms_tile_open $c@@(+ $i 1)
-				guibutton "Generate FIELD" [
+				]]]
-					_make_ms_mf
+			) $arg1 ]
-					_make_ms_nf
+
 		_ms_pc = (+ $_ms_pc 1)
-				guibutton "Switch Display" [ _ms_switch = (! $_ms_switch) ]
+
 ]
 
-					guifield _ms_th 2 [ _ms_th = (max (min $_ms_th 24) 9) ]
+_ms_make_board = [
-					guifield _ms_tw 2 [ _ms_tw = (max (min $_ms_tw 30) 9) ]
+	// Initialise variables
 	local i n r
-					guifield _ms_m 3 [ _ms_m = (max (min $_ms_m (div (* $_ms_h $_ms_w) 3)) 10) ]
+	//_ms_th = $arg1 ; _ms_tw = $arg2 ; _ms_m = $arg3
 	_ms_h = $_ms_th ; _ms_w = $_ms_tw ; _ms_nf = ""
 	_ms_mt = (* $_ms_h $_ms_w) ; _ms_pc = 0; i = 0
 	_ms_um = (+ (div $_ms_m 20) 1); _ms_u = $_ms_um
 	_ms_up = -1 ; _ms_t = (getmillis) ; _ms_tt = 1
 	// Initialise boards
 	_ms_mf = (loopconcat i $_ms_mt [result "0"])
 	_ms_cf = (loopconcat i $_ms_mt [result "C"])
 	// Begin randomly placing mines
 	while [< $i $_ms_m] [
 		r = (rnd $_ms_mt)
 		if (! (at $_ms_mf $r)) [ // Make sure it's not writing to a previously picked spot
 			_ms_mf = (listsplice $_ms_mf "1" $r 1)
 			i = (+ $i 1)
 		]
 	]
 	// Generate complete board with numbers
 	loop y $_ms_mt [
 		if (at $_ms_mf $y) [ append _ms_nf "X" ] [
 			do [ _ms_tile_find @(
 				loopconcat i 8 [result [[
 					n = (+ (at $_ms_mf $c@@(+ $i 1)) $n)
 				]]]
 			) $y [ append _ms_nf $n ] ]
 		]
 	]
 ]
 
 newgui minesweeper [
 	guistayopen [
 		guititle (format "^f7Completed: %1%% ^f7-- Time: ^f2%2" (precf (*f (divf $_ms_pc $_ms_mt) 100) 2) (
 			clock (? $_ms_tt (- (getmillis) $_ms_t) 0)
 		))
 		guistrut 0.5
 		guilist [
 			guilist [
 				loop y $_ms_h [
 					guilist [
 						loop x $_ms_w [
 							n = (+ (* $x $_ms_h) $y)
 							guiimage (format "packages/icons/minesweeper/%1.png" (at $_ms_cf $n)) [
 								_ms_tile_open @n
 							] 0.5 0
 						]
 					]
 				]
 			]
 			if (!=s $_ms_cf "") [ guistrut 1.5 ]
 			guilist [
 				guibutton "New Minefield" [
 					_ms_make_board $_ms_th $_ms_tw $_ms_m
 					_ms_t = (getmillis)
 					_ms_tt = 1
 				] 0
 				guilist [
 					guibutton "Undo Move" [
 						if (&& [> $_ms_up -1] $_ms_u) [
 							_ms_cf = (listsplice $_ms_cf "C" $_ms_up 1)
 							_ms_u = (- $_ms_u 1) ; _ms_up = -1
 						]
 					] 0
 					guistrut 0.5
 					guitext (format "^f2(%1/%2)" $_ms_u $_ms_um) 0
 				]
 				guistrut 0.5
 				guilist [
 					guilist [
 						guialign 0 [ guitext "" "minesweeper/resize_h.png" ]
 						guifield _ms_th 2 [ _ms_th = (max (min $_ms_th 24) 9) ]
 					]
 					guilist [
 						guialign 0 [ guitext "" "minesweeper/resize_w.png" ]
 						guifield _ms_tw 2 [ _ms_tw = (max (min $_ms_tw 30) 9) ]
 					]
 					guistrut 0.5
 					guilist [
 						guialign 0 [ guitext "" "minesweeper/mine_raw.png" ]
 						guifield _ms_m 3 [ _ms_m = (max (min $_ms_m (div (* $_ms_th $_ms_tw) 3)) 10) ]
 					]
 				]
 				guistrut 1
 				guibutton "Beginner"     [ _ms_make_board 09 09 10 ] 0
 				guibutton "Intermediate" [ _ms_make_board 16 16 40 ] 0
 				guibutton "Expert"       [ _ms_make_board 20 20 80 ] 0
 				guistrut 1
 				guibutton "^f6Show Board" [ _ms_cf = $_ms_nf ] 0
 			]
 		]
 	]
 ] 0