fwd

fedeghe · Apr 7, 2024 · 9f318e3 · 9f318e3
1 parent 1036627
commit 9f318e3
Show file tree

Hide file tree

Showing 16 changed files with 205 additions and 1,422 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/source/demo/index.html b/source/demo/index.html
@@ -48,6 +48,7 @@ <h1>Leonardo demos</h1>
         <li><a href="monalisa/">mona lisa</a></li>
         <li><a href="vitruvian/">vitruvian</a></li>
         <li><a href="minefield/">minefield</a></li>
+        <li><a href="minefield2/">minefield 2</a></li>
         <li><a href="import.html">import from string svg</a></li>
     </ul>
 </body>

diff --git a/source/demo/minfield.json → source/demo/minefield.json b/source/demo/minfield.json → source/demo/minefield.json
@@ -3,7 +3,6 @@
         "mkdir -p demo/minefield/js demo/minefield/css"
     ],
     "source/demo/minefield/index.js": "demo/minefield/js -vars=source/vars.json",
-    "source/demo/minefield/minefield.js": "demo/minefield/js -vars=source/vars.json -options=placeholderMode:'func'",
     "source/demo/minefield/index.less": "demo/minefield/css -plugins=malta-less -vars=source/vars.json",
     "source/demo/minefield/index.html": "demo/minefield -plugins=malta-browser-refresh -vars=source/vars.json"
 }
diff --git a/source/demo/minefield/index.html b/source/demo/minefield/index.html
@@ -3,8 +3,7 @@
 <head>
     $$../_commonHead.html$$
 	<title>$DEMO.MINEFIELD.TITLE$</title>
-    <script src="./js/minefield.js"></script>
-    <!-- <script src="./js/index.js"></script> -->
+    <script src="./js/index.js"></script>
     <style>
         svg{
             outline: 1px solid #777 !important;

diff --git a/source/demo/minefield/index.js b/source/demo/minefield/index.js
@@ -2,7 +2,7 @@ window.onload = function () {
 	var target = document.getElementById('root'),
 		startTime = false,
 		endTime = false,
-		levelCut = 0.8,
+		levelCut = 0.2,
 		width = 1200,
 		height = 1000,
 		tileSize = 25,
@@ -31,13 +31,13 @@ window.onload = function () {
 			return neighbours;
 		};
 
-	function Tile(i, j) {
+	function Tile(i, j, isBomb) {
 		var self = this;
 		this.i = i;
 		this.j = j;
 		this.solved = false;
 		this.flagged = false;
-		this.bomb = Math.random() > levelCut;
+		this.bomb = isBomb;//Math.random() > levelCut;
 		this.tag = L.group().setAttributes({
 			// fill: this.bomb ? 'gray' : color1,
 			fill: color1,
@@ -60,6 +60,7 @@ window.onload = function () {
 			'font-weight': 'bold',
 			'font-size': 2*tileSize/3,
 		});
+		if (this.bomb)this.txt.move(-5,0);
 		this.tag.append(this.tile, this.txt);
 		this.tag.on('contextmenu', e => {
 			if (self.solved) {
@@ -127,6 +128,8 @@ window.onload = function () {
 		this.tag.setAttributes({
 			fill: 'red'
 		})
+		this.txt.tag.innerHTML = '💥'
+		this.txt.move(-5,0)
 	};
 
 	Tile.prototype.solveNeighbours = function(){
@@ -167,7 +170,6 @@ window.onload = function () {
 		});
 		stats.tot = nr*nc
 
-
 		if (stats.flaggedBombs === stats.bombs){
 			endTime = +new Date;
 			alert(`you won in ${((endTime - startTime) / 1e3).toFixed(1)} seconds`)
@@ -193,14 +195,28 @@ window.onload = function () {
 		}
 	};
 
+	function scramble(a, n) {
+		var out = a
+		do {
+			out = out.sort(() => Math.random() > .5 ? 1 : -1);
+		} while (n--)
+		return out;
+	}
 	function start(){
 		startTime = false;
 		outG.clear();
-		// console.log({bb: outG.getBbox()});
+		// prerandomize bombs
+
+		var nrBombs = parseInt(nr * nc * levelCut, 10),
+			tls = scramble(
+				Array.from({length: nr*nc}, (_, i) => i < nrBombs),
+				3
+			);
+		console.log({nrBombs, tls});
 		for (var i = 0, j; i < nr; i++) {
 			tiles[i] = [];
 			for (j = 0; j < nc; j++) {
-				var t = new Tile(i, j);
+				var t = new Tile(i, j, tls[i*nc +j]);
 				tiles[i].push(t);
 			}
 			outG.append(tiles[i].map(t => t.tag));

diff --git a/source/demo/minefield2.json b/source/demo/minefield2.json
@@ -0,0 +1,8 @@
+{
+    "EXE": [
+        "mkdir -p demo/minefield2/js demo/minefield2/css"
+    ],
+    "source/demo/minefield2/index.js": "demo/minefield2/js -vars=source/vars.json -options=placeholderMode:'func'",
+    "source/demo/minefield2/index.less": "demo/minefield2/css -plugins=malta-less -vars=source/vars.json",
+    "source/demo/minefield2/index.html": "demo/minefield2 -plugins=malta-browser-refresh -vars=source/vars.json"
+}
diff --git a/source/demo/minefield/Board.js → source/demo/minefield2/Board.js b/source/demo/minefield/Board.js → source/demo/minefield2/Board.js
diff --git a/source/demo/minefield/Game.js → source/demo/minefield2/Game.js b/source/demo/minefield/Game.js → source/demo/minefield2/Game.js
diff --git a/source/demo/minefield/Panel.js → source/demo/minefield2/Panel.js b/source/demo/minefield/Panel.js → source/demo/minefield2/Panel.js
diff --git a/source/demo/minefield/Tile.js → source/demo/minefield2/Tile.js b/source/demo/minefield/Tile.js → source/demo/minefield2/Tile.js
diff --git a/source/demo/minefield/dom.js → source/demo/minefield2/dom.js b/source/demo/minefield/dom.js → source/demo/minefield2/dom.js
diff --git a/source/demo/minefield2/index.html b/source/demo/minefield2/index.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+    $$../_commonHead.html$$
+	<title>$DEMO.MINEFIELD2.TITLE$</title>
+    <script src="./js/index.js"></script>
+    <style>
+        svg{
+            outline: 1px solid #777 !important;
+            border-radius: 5px;
+            box-shadow: 2px 2px 5px #999;
+            display: flex;
+            text {
+                user-select: none
+            }
+        }
+        #root{
+            width:100vw;
+            height:100vh;
+            display:flex;
+            justify-content: center;
+            align-items: center;
+        }
+    </style>
+</head>
+<body>
+    <div id="root"/>
+</body>
+</html>
diff --git a/source/demo/minefield/minefield.js → source/demo/minefield2/index.js b/source/demo/minefield/minefield.js → source/demo/minefield2/index.js
diff --git a/source/demo/minefield2/index.less b/source/demo/minefield2/index.less
@@ -0,0 +1,52 @@
+@panelHeight: 80px;
+
+body{
+	margin:0;
+	padding: 0;
+	font-family: verdana;
+	background-color: blue;
+	svg{
+		outline:1px solid white;
+		text {
+			user-select: none
+		}
+	}
+	.root{
+		// background-color: red;
+	}
+	.panel{
+		display:flex;
+		justify-content: space-between;
+		height: @panelHeight;
+		background-color: gray;
+		.mines{
+			display:flex;
+			background-color: aqua;
+			width: 100px;
+			display:flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.facey{
+			display:flex;
+			background-color:brown;
+			width: 100px;
+			display:flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.time{
+			display:flex;
+			background-color: coral;
+			width: 100px;
+			display:flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+	.board{
+		height: calc(100vh - @panelHeight);
+		background-color: green;
+
+	}
+}
diff --git a/source/demo/require.json b/source/demo/require.json
@@ -31,6 +31,7 @@
     "source/demo/god.json": true,
     "source/demo/monalisa.json": true,
     "source/demo/vitruvian.json": true,
-    "source/demo/minfield.json": true,
+    "source/demo/minefield.json": true,
+    "source/demo/minefield2.json": true,
     "source/demo/svg/*.svg": "source/demo/png -plugins=malta-svg2png"
 }
diff --git a/source/vars.json b/source/vars.json
@@ -69,6 +69,9 @@
         },
         "MINEFIELD": {
             "TITLE": "Minefield"
+        },
+        "MINEFIELD2": {
+            "TITLE": "Minefield 2"
         }
     },
     "SERVER": {