KingOfDog/minesweeper.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the way of checking for victory

Browse Source
This commit is contained in:
Marcel
2018-05-11 10:51:25 +02:00
parent 2da8590fcf
commit 106a10a8da
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
minesweeper.js
View File

@@ -9,7 +9,6 @@ let tileSize;
const bombCount = 25; const bombCount = 25;
const field = []; const field = [];
let gameOver = false; let gameOver = false;
let victory = false;
const scaleFactor = .5; const scaleFactor = .5;
let isFirstClick = true; let isFirstClick = true;
@@ -387,7 +386,7 @@ function scaleCanvas() {
if (gameOver) { if (gameOver) {
gameOverEvent(); gameOverEvent();
} else if (victory) { } else if (victoryCheck()) {
victoryEvent(); victoryEvent();
} }
} }
@@ -469,18 +468,16 @@ function updateBombs() {
} }
function victoryCheck() { function victoryCheck() {
if (!victory && (countClickedTiles() === fieldSize.x * fieldSize.y - bombCount || (countTotalFlags() === bombCount && testFlagPositions()))) { return !play && (countClickedTiles() === fieldSize.x * fieldSize.y - bombCount || (countTotalFlags() === bombCount && testFlagPositions()));
victory = true;
victoryEvent();
}
} }
function victoryEvent() { function victoryEvent() {
if(victory) { if(victoryCheck()) {
animateVictory(); animateVictory();
play = false; play = false;
const fontSize = tileSize.y * 1.33; const fontSize = tileSize.y * 1.33;
animateBackground(0, 0, canvas.width, canvas.height, 0, .01, new Date().getTime(), 200, {r: 0, g: 0, b: 0, a: 0}); animateBackground(0, 0, canvas.width, canvas.height, 0, .01, new Date().getTime(), 300, {r: 0, g: 0, b: 0, a: 0});
animateText("Victory!", fieldSize.x / 2 - .5, fieldSize.y / 2 - .5, 0, fontSize, new Date().getTime(), 300, "green", "Roboto", overlay2Ctx); animateText("Victory!", fieldSize.x / 2 - .5, fieldSize.y / 2 - .5, 0, fontSize, new Date().getTime(), 300, "green", "Roboto", overlay2Ctx);
} }
} }
@@ -523,7 +520,7 @@ overlay2Canvas.addEventListener("click", (e) => {
tileClickEvent(pos.x, pos.y); tileClickEvent(pos.x, pos.y);
victoryCheck(); victoryEvent();
clicked(e); clicked(e);
}); });
@@ -536,7 +533,7 @@ overlay2Canvas.addEventListener("dblclick", (e) => {
tileDoubleClick(pos.x, pos.y); tileDoubleClick(pos.x, pos.y);
victoryCheck(); victoryEvent();
}); });
overlay2Canvas.addEventListener("contextmenu", (e) => { overlay2Canvas.addEventListener("contextmenu", (e) => {
@@ -551,7 +548,7 @@ overlay2Canvas.addEventListener("contextmenu", (e) => {
updateBombs(); updateBombs();
victoryCheck(); victoryEvent();
}); });
window.addEventListener("keyup", (e) => { window.addEventListener("keyup", (e) => {