prepare to merge part 2

more bug fixes
Bram-Hub · Dec 2, 2024 · 420a535 · 420a535
1 parent 28b12fe
commit 420a535
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/edu/rpi/legup/puzzle/minesweeper/MinesweeperController.java b/src/main/java/edu/rpi/legup/puzzle/minesweeper/MinesweeperController.java
@@ -24,15 +24,22 @@ public class MinesweeperController extends ElementController {
         final int numberData = current.data();
         switch (event.getButton()) { //git?
             case MouseEvent.BUTTON1:
-                if(numberData >= 0 && numberData <= 8) {
+
+                if(numberData >= 1 && numberData <= 8) {
                     return MinesweeperTileData.fromData(numberData);
                 }
+                if(numberData == 0) {
+                    return MinesweeperTileData.fromData(-2);
+                }
                 return MinesweeperTileData.fromData(numberData + 1);
 
             case MouseEvent.BUTTON2, MouseEvent.BUTTON3:
                 if(numberData >= 1 && numberData <= 8) {
                     return MinesweeperTileData.fromData(numberData);
                 }
+                if(numberData == -2) {
+                    return MinesweeperTileData.fromData(0);
+                }
                 return MinesweeperTileData.fromData(numberData - 1);
             default:
                 return MinesweeperTileData.empty();

diff --git a/src/main/java/edu/rpi/legup/puzzle/minesweeper/MinesweeperView.java b/src/main/java/edu/rpi/legup/puzzle/minesweeper/MinesweeperView.java
@@ -26,7 +26,7 @@ public class MinesweeperView extends GridBoardView {
                             Objects.requireNonNull(
                                     ClassLoader.getSystemClassLoader()
                                             .getResource(
-                                                    "edu/rpi/legup/images/minesweeper/tiles/Bomb.png")));
+                                                    "edu/rpi/legup/images/minesweeper/tiles/Mine.png")));
         } catch (IOException e) {
             LOGGER.error("Failed to open Minesweeper images");
         }

diff --git a/src/main/java/edu/rpi/legup/puzzle/minesweeper/elements/MineTile.java b/src/main/java/edu/rpi/legup/puzzle/minesweeper/elements/MineTile.java
@@ -8,6 +8,6 @@ public MineTile() {
                 "MINE-UNPL-0001",
                 "Mine",
                 "A mine",
-                "edu/rpi/legup/images/minesweeper/tiles/mine.png");
+                "edu/rpi/legup/images/minesweeper/tiles/Mine.png");
     }
 }
diff --git a/src/main/java/edu/rpi/legup/puzzle/minesweeper/elements/NumberTile.java b/src/main/java/edu/rpi/legup/puzzle/minesweeper/elements/NumberTile.java
@@ -8,6 +8,6 @@ public NumberTile() {
                 "MINE-PLAC-0001",
                 "Number",
                 "A number",
-                "edu/rpi/legup/images/nurikabe/tiles/BlackTile.png");
+                "edu/rpi/legup/images/minesweeper/tiles/Unset.png");
     }
 }
diff --git a/...i/legup/images/minesweeper/tiles/Bomb.png → ...i/legup/images/minesweeper/tiles/Mine.png b/...i/legup/images/minesweeper/tiles/Bomb.png → ...i/legup/images/minesweeper/tiles/Mine.png
diff --git a/src/main/resources/edu/rpi/legup/images/minesweeper/tiles/Unset.png b/src/main/resources/edu/rpi/legup/images/minesweeper/tiles/Unset.png