observer/libremines
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win condition, flagging underflow fix

Browse Source
This commit is contained in:
Tyler 2024-07-23 18:54:23 +01:00
parent 367ad5921a
commit 2827d79556
Signed by: observer
GPG Key ID: 934A62C2C469FFAF
1 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/com/shr4pnel/minesweeper/Controller.java
View File

@ -120,6 +120,33 @@ public class Controller {
return null; return null;
} }
private String getButtonURL(Button button) {
ImageView graphic = (ImageView) button.getGraphic();
Image image = graphic.getImage();
return image.getUrl();
}
private int numberOfUnrevealedTiles() {
int unrevealedTiles = 0;
int column, row;
for (column = 0; column < 30; ++column) {
for (row = 0; row < 16; ++row) {
Button current = (Button) getNodeByRowColumnIndex(row, column);
assert current != null;
String currentURL = getButtonURL(current);
if (currentURL.contains("blank.png") || currentURL.contains("flag.png")) {
unrevealedTiles++;
}
}
}
return unrevealedTiles;
}
private boolean checkWinCondition() {
int unrevealedTiles = numberOfUnrevealedTiles();
return unrevealedTiles == 99;
}
private void handlePrimaryClick(Button clicked, int column, int row) { private void handlePrimaryClick(Button clicked, int column, int row) {
if (wrapper.atColumn(column).atRow(row).isBomb() && !isFirstClick) { if (wrapper.atColumn(column).atRow(row).isBomb() && !isFirstClick) {
gameOver(clicked); gameOver(clicked);
@ -141,6 +168,10 @@ public class Controller {
if (adjacentBombs == 0) { if (adjacentBombs == 0) {
recursiveExpandTiles(column, row); recursiveExpandTiles(column, row);
} }
boolean win = checkWinCondition();
if (win) {
win();
}
} }
private void recursiveExpandTiles(int column, int row) { private void recursiveExpandTiles(int column, int row) {
@ -224,6 +255,28 @@ public class Controller {
showAllBombs(GridPane.getColumnIndex(tileClicked), GridPane.getRowIndex(tileClicked)); showAllBombs(GridPane.getColumnIndex(tileClicked), GridPane.getRowIndex(tileClicked));
} }
private void win() {
gameOver = true;
timer.cancel();
setImage(smiley, "img/face_win.png");
flagAllRemaining();
}
private void flagAllRemaining() {
int column, row;
for (column = 0; column < 30; ++column) {
for (row = 0; row < 16; ++row) {
Button current = (Button) getNodeByRowColumnIndex(row, column);
assert current != null;
String currentURL = getButtonURL(current);
boolean tileIsBomb = wrapper.atColumn(column).atRow(row).isBomb();
if (currentURL.contains("blank.png") && tileIsBomb) {
setImage(current, "img/bomb_flagged.png");
}
}
}
}
private void flag(Node tileClicked) { private void flag(Node tileClicked) {
Button tileAsButton = (Button) tileClicked; Button tileAsButton = (Button) tileClicked;
ImageView tileGraphic = (ImageView) tileAsButton.getGraphic(); ImageView tileGraphic = (ImageView) tileAsButton.getGraphic();
@ -240,7 +293,8 @@ public class Controller {
return; return;
} }
bombCount--; bombCount--;
updateBombCounter(); if (bombCount > 0)
updateBombCounter();
setImage((Button) tileClicked, "img/bomb_flagged.png"); setImage((Button) tileClicked, "img/bomb_flagged.png");
} }
@ -291,8 +345,8 @@ public class Controller {
String buttonURL = ((ImageView) b.getGraphic()).getImage().getUrl(); String buttonURL = ((ImageView) b.getGraphic()).getImage().getUrl();
int column = GridPane.getColumnIndex(node); int column = GridPane.getColumnIndex(node);
int row = GridPane.getRowIndex(node); int row = GridPane.getRowIndex(node);
if (!(column == clickedColumn && row == clickedRow) && // if the tile isn't the one that was clicked AND the tile is a bomb
wrapper.atColumn(column).atRow(row).isBomb()) { if (!(column == clickedColumn && row == clickedRow) && wrapper.atColumn(column).atRow(row).isBomb()) {
setImage((Button) node, "img/bomb_revealed.png"); setImage((Button) node, "img/bomb_revealed.png");
} }
if (buttonURL.contains("flagged.png") && !wrapper.atColumn(column).atRow(row).isBomb()) { if (buttonURL.contains("flagged.png") && !wrapper.atColumn(column).atRow(row).isBomb()) {