From bcc904a9d3a4077a0e419cb5913923deaa8f8dec Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 2 Feb 2024 17:23:26 -0500
Subject: [PATCH 01/67] Added a text file

File represents all files we will put and use to fully implement the StarBattle puzzle later.
---
 .../rpi/legup/puzzle/starbattle/allfiles.txt  | 230 ++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt b/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
new file mode 100644
index 000000000..7f006191a
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
@@ -0,0 +1,230 @@
+//StarBattle.java
+
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.model.Puzzle;
+import edu.rpi.legup.model.gameboard.Board;
+
+public class StarBattle extends Puzzle {
+    public StarBattle() {
+        super();
+        this.name = "StarBattle";
+
+        this.importer = new StarBattleImporter(this);
+        this.exporter = new StarBattleExporter(this);
+
+        this.factory = new StarBattleCellFactory();
+    }
+
+    @Override
+    public void initializeView() {
+    }
+
+    @Override
+    public Board generatePuzzle(int difficulty) {
+        return null;
+    }
+
+    @Override
+    public boolean isBoardComplete(Board board) {
+        return true;
+    }
+
+    @Override
+    public void onBoardChange(Board board) {
+    }
+}
+
+//StarBattleBoard.java
+
+package edu.rpi.legup.puzzle.lightup;
+
+import edu.rpi.legup.model.gameboard.GridBoard;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+
+import java.awt.*;
+import java.util.HashSet;
+import java.util.Set;
+
+public class StarBattleBoard extends GridBoard {
+
+    private int size;
+    private vector<int> group_sizes;
+
+    /**
+     * StarBattleBoard Constructor - create a new Star Battle board
+     *
+     * @param size size of one side of the star battle board
+     */
+
+    public StarBattleBoard(int size) {
+        super(size, size);
+        group_sizes = vector<int>(size);
+    }
+
+    @Override
+    public StarBattleCell getCell(int x, int y) {
+        return (StarBattleCell) super.getCell(x, y);
+    }
+
+    
+}
+
+//StarBattleCell.java
+
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.model.gameboard.GridCell;
+
+import java.awt.*;
+import java.util.HashSet;
+import java.util.Set;
+
+public class StarBattleCell extends GridCell<Integer> {
+    private int groupIndex;
+    private int max;
+
+    /**
+     * SudokuCell Constructor - creates a new Sudoku cell to hold the puzzleElement
+     *
+     * @param valueInt   value of the star battle cell denoting its state
+     * @param location   location of the cell on the board
+     * @param size       size of the sudoku cell
+     */
+    public StarBattleCell(int value, Point location, int groupIndex, int size) {
+        super(value, location);
+        this.groupIndex = groupIndex;
+        this.max = size;
+    }
+
+    @Override
+    public void setType(Element e, MouseEvent m) {
+        switch (e.getElementID()) {
+            case "SBUP-PLAC-0001":
+                this.data = -4;
+                break;
+            case "SBUP-UNPL-0002":
+                this.data = -1;
+                break;
+            case "SBUP-UNPL-0003":
+                this.data = -2;
+                break;
+            case "SBUP-UNPL-0001"://Not sure how button events work
+                switch (m.getButton()){
+                    case MouseEvent.BUTTON1:
+                        if (this.data < 0 || this.data > 3) {
+                            this.data = 0;
+                        }
+                        else {
+                            this.data = this.data + 1;
+                        }
+                        break;
+                    case MouseEvent.BUTTON3:
+                        if (this.data > 0) {
+                            this.data = this.data - 1;
+                        }
+                        else {
+                            this.data = 3;//Unsure
+                        }
+                        break;
+                }
+                break;
+        }
+    }
+
+    public LightUpCellType getType() {
+        switch (data) {
+            case -3:
+                return LightUpCellType.UNKNOWN;
+            case -2:
+                return LightUpCellType.STAR;
+            case -1:
+                return LightUpCellType.BLACK;
+            default:
+                if (data >= 0) {
+                    return StarBattleCellType.WHITE;
+                }
+        }
+        return null;
+    }
+    
+    /**
+     * Gets the region index of the cell
+     *
+     * @return group index of the cell
+     */
+    public int getGroupIndex() {
+        return groupIndex;
+    }
+
+    /**
+     * Gets the size of the cell
+     *
+     * @return size of the cell
+     */
+
+    public int getMax() {
+        return max;
+    }
+
+}
+
+//StarBattleCellController.java
+
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.controller.ElementController;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+
+import java.awt.event.MouseEvent;
+
+public class StarBattleCellController extends ElementController {
+    @Override
+    public void changeCell(MouseEvent e, PuzzleElement data) {
+        StarBattleCell cell = (StarBattleCell) data;
+        if (e.getButton() == MouseEvent.BUTTON1) {
+            if (e.isControlDown()) {
+                this.boardView.getSelectionPopupMenu().show(boardView, this.boardView.getCanvas().getX() + e.getX(), this.boardView.getCanvas().getY() + e.getY());
+            }
+            else {
+                if (cell.getData() == 0) {
+                    data.setData(-3);
+                }
+                else {
+                    data.setData(cell.getData() + 1);
+                }
+            }
+        }
+        else {
+            if (e.getButton() == MouseEvent.BUTTON3) {
+                if (cell.getData() == -3) {
+                    data.setData(0);
+                }
+                else {
+                    data.setData(cell.getData() - 1);
+                }
+            }
+        }
+    }
+}
+
+//StarBattleCellFactory.java
+
+
+
+//StarBattleCellType.java
+package edu.rpi.legup.puzzle.starbattle;
+
+public enum StarBattleType {
+    UNKNOWN(-3), STAR(-2), BLACK(-1), WHITE(0);
+
+    public int value; 
+
+    StarBattleCell(int value) {
+        this.value = value;
+    }
+}
+
+//StarBattleExporter.java
+//StarBattleImporter.java
+//StarBattleView.java
\ No newline at end of file

From 9fa0e0205a7f744b9597135202290e1363339593 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:45:28 -0500
Subject: [PATCH 02/67] Imported the black and star tiles

ID probably needs to be changed in the future, and more assets on the way.
---
 .../puzzle/starbattle/elements/BlackTile.java     |   9 +++++++++
 .../puzzle/starbattle/elements/StarTile.java      |   9 +++++++++
 .../edu/rpi/legup/images/starbattle/black.gif     | Bin 0 -> 856 bytes
 .../edu/rpi/legup/images/starbattle/star.gif      | Bin 0 -> 545 bytes
 4 files changed, 18 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/elements/BlackTile.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/black.gif
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/star.gif

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/BlackTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/BlackTile.java
new file mode 100644
index 000000000..fd74774a7
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/BlackTile.java
@@ -0,0 +1,9 @@
+package edu.rpi.legup.puzzle.starbattle.elements;
+
+import edu.rpi.legup.model.elements.NonPlaceableElement;
+
+public class BlackTile extends NonPlaceableElement {
+    public BlackTile() {
+        super("STBL-PLAC-0002", "Black Tile", "The black tile", "edu/rpi/legup/images/lightup/black.gif");
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
new file mode 100644
index 000000000..2510869eb
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
@@ -0,0 +1,9 @@
+package edu.rpi.legup.puzzle.starbattle.elements;
+
+import edu.rpi.legup.model.elements.NonPlaceableElement;
+
+public class StarTile extends NonPlaceableElement {
+    public StarTile() {
+        super("LTUP-PLAC-0001", "Star Tile", "The star tile", "edu/rpi/legup/images/starbattle/star.gif");
+    }
+}
diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/black.gif b/src/main/resources/edu/rpi/legup/images/starbattle/black.gif
new file mode 100644
index 0000000000000000000000000000000000000000..13381a7179c2af7ad23ef064b743d3e479b56070
GIT binary patch
literal 856
zcmZ?wbhEHbRA5kG_|Cv^;=~DtQ7{?;BQ*pRf3kqRt^*=Ld4hq%l;J<8jK_ur2b(#B
zwPH?eSa`TyK-p`K$HqlRyCsaX?wr`T_;|m9bC-<grX?pQYXq-~IT@7Vz+epkY_}hY

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/star.gif b/src/main/resources/edu/rpi/legup/images/starbattle/star.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e289b287ae12d06741cf5d97a0413691752c4f49
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$+et)0R7gwB)k~;OQ4|O8-%S#Q6f(WuN(@LbxC6?>z|bQh@)#H)BSjf;3uWXn
zP!c6GWTuoTBMJi~86e~tQXYG0-#TsIx!*bRl~udbx7OP0zy9m7zdk*dz8=T--vKPZ
zNZe}5ye)&{8DLYd0Dk7cjT39^h^+_)Av<xT35zxW_c132eS{hR5?~>2;~qv~I+oyO
zH;_68qf-gSS5A~<6}DyFAzZ*gyu-&-wh#DP0#*UeVHPIj6985Df-zYUfr3d@-r_ah
z<1to;v1D)nd-JVpIkQjs`y%Q0XIp&7Vq88Gu{7JF`N8<NbShDGTCQRxzSYz^SX{=k
zY~O>ys&8EnBIreozzwXyvjSvlDruB;5x!$Xnyj<K^`NvZ#+h`cr65<*6s;&6E@j;l
zY)mD(-ic+mJ&26f<|R8>1X!07h$Pn6jcYf6SBM5q!d&djqZoq_nZLnHO!*stxbz$k
z^O6OVs+_<8W@9oUnLlJW2AgrJxN#Uiu)EO55S(udFjW7z7Y*E=w)sI0G84zJJpYbF
zwzLI!nx2AqGGew**VH(+^=R_>j2PR-CF)OWzawq%uDa$G`gogyQMoI%|H<=lr(y6R
jw|ThRX3<*4@9h2yt8`HryKo;Y00000NkvXXu0mjflb`cS

literal 0
HcmV?d00001


From 17d26d73444b353a1ea31abde928c754020f754d Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Sat, 10 Feb 2024 14:53:11 -0500
Subject: [PATCH 03/67] Added UnknownTile

Also fixed the descriptions of the black and star tile, not sure if we need another asset.
---
 .../puzzle/starbattle/elements/BlackTile.java     |   2 +-
 .../puzzle/starbattle/elements/StarTile.java      |   2 +-
 .../puzzle/starbattle/elements/UnknownTile.java   |   9 +++++++++
 .../edu/rpi/legup/images/starbattle/empty.gif     | Bin 0 -> 857 bytes
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/empty.gif

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/BlackTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/BlackTile.java
index fd74774a7..2601bd351 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/BlackTile.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/BlackTile.java
@@ -4,6 +4,6 @@
 
 public class BlackTile extends NonPlaceableElement {
     public BlackTile() {
-        super("STBL-PLAC-0002", "Black Tile", "The black tile", "edu/rpi/legup/images/lightup/black.gif");
+        super("STBL-PLAC-0002", "Black Tile", "The black tile that shows where you cannot place a star", "edu/rpi/legup/images/lightup/black.gif");
     }
 }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
index 2510869eb..19ba7baed 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
@@ -4,6 +4,6 @@
 
 public class StarTile extends NonPlaceableElement {
     public StarTile() {
-        super("LTUP-PLAC-0001", "Star Tile", "The star tile", "edu/rpi/legup/images/starbattle/star.gif");
+        super("LTUP-PLAC-0001", "Star Tile", "The star tile, the token of the game.", "edu/rpi/legup/images/starbattle/star.gif");
     }
 }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
new file mode 100644
index 000000000..192a95357
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
@@ -0,0 +1,9 @@
+package edu.rpi.legup.puzzle.starbattle.elements;
+
+import edu.rpi.legup.model.elements.NonPlaceableElement;
+
+public class UnknownTile extends NonPlaceableElement {
+    public UnknownTile() {
+        super("LTUP-PLAC-0001", "Unknown Tile", "An empty tile", "edu/rpi/legup/images/starbattle/star.gif");
+    }
+}
diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/empty.gif b/src/main/resources/edu/rpi/legup/images/starbattle/empty.gif
new file mode 100644
index 0000000000000000000000000000000000000000..38b91d0a2b9c6599eb19d14466db047a86d2ea97
GIT binary patch
literal 857
zcmZ?wbhEHbRA5kG_|Cxa|Nno6Q7{?;BQ*qcKpqF>1qKc~21X7Uj|~eBHggDT#hlo%
z@Nm0;vez7sjf;+UOBiR}IkEBaF$M+Z0v^pz$tNbN+pdZ^xoPR?=?2NC=6GICbzrat
E0QgHHq5uE@

literal 0
HcmV?d00001


From 8955343d8bbdac96fa80cb31480b1784a58c1db5 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 13 Feb 2024 16:32:48 -0500
Subject: [PATCH 04/67] Create StarBattleCellType.java

Created StarBattleCellType.java file
---
 .../legup/puzzle/starbattle/StarBattleCellType.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
new file mode 100644
index 000000000..0548a6b38
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
@@ -0,0 +1,12 @@
+//StarBattleCellType.java
+package edu.rpi.legup.puzzle.starbattle;
+
+public enum StarBattleType {
+    UNKNOWN(-3), STAR(-2), BLACK(-1);
+
+    public int value; 
+
+    StarBattleCell(int value) {
+        this.value = value;
+    }
+}
\ No newline at end of file

From 1ad2347247d53afe83646401416f5ee4e3ecd735 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 13 Feb 2024 16:37:59 -0500
Subject: [PATCH 05/67] Update StarBattleCellType.java

Fixed StarBattleCellType typos
---
 .../edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
index 0548a6b38..8fb3338f7 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
@@ -1,12 +1,12 @@
 //StarBattleCellType.java
 package edu.rpi.legup.puzzle.starbattle;
 
-public enum StarBattleType {
+public enum StarBattleCellType {
     UNKNOWN(-3), STAR(-2), BLACK(-1);
 
     public int value; 
 
-    StarBattleCell(int value) {
+    StarBattleCellType(int value) {
         this.value = value;
     }
 }
\ No newline at end of file

From 12b7a4358c042c863ea0a03792cd790207244d18 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:41:30 -0500
Subject: [PATCH 06/67] Added StarBattle.java

Also changed the IDs for our assets
---
 .../legup/puzzle/starbattle/StarBattle.java   | 33 +++++++++++++++++++
 .../puzzle/starbattle/StarBattleCell.java     |  0
 .../puzzle/starbattle/elements/StarTile.java  |  2 +-
 .../starbattle/elements/UnknownTile.java      |  2 +-
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
new file mode 100644
index 000000000..e9e18b92a
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
@@ -0,0 +1,33 @@
+package edu.rpi.legup.puzzle.starbattle;
+import edu.rpi.legup.model.Puzzle;
+import edu.rpi.legup.model.gameboard.Board;
+
+public class StarBattle extends Puzzle {
+    public StarBattle() {
+        super();
+        //this.name = "StarBattle";
+
+        //this.importer = new StarBattleImporter(this);
+        //this.exporter = new StarBattleExporter(this);
+
+        //this.factory = new StarBattleCellFactory();
+    }
+
+    @Override
+    public void initializeView() {
+    }
+
+    @Override
+    public Board generatePuzzle(int difficulty) {
+        return null;
+    }
+
+    @Override
+    public boolean isBoardComplete(Board board) {
+        return true;
+    }
+
+    @Override
+    public void onBoardChange(Board board) {
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
index 19ba7baed..d42cc0010 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/StarTile.java
@@ -4,6 +4,6 @@
 
 public class StarTile extends NonPlaceableElement {
     public StarTile() {
-        super("LTUP-PLAC-0001", "Star Tile", "The star tile, the token of the game.", "edu/rpi/legup/images/starbattle/star.gif");
+        super("STBL-PLAC-0001", "Star Tile", "The star tile, the token of the game.", "edu/rpi/legup/images/starbattle/star.gif");
     }
 }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
index 192a95357..3e1cbca26 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
@@ -4,6 +4,6 @@
 
 public class UnknownTile extends NonPlaceableElement {
     public UnknownTile() {
-        super("LTUP-PLAC-0001", "Unknown Tile", "An empty tile", "edu/rpi/legup/images/starbattle/star.gif");
+        super("STBL-PLAC-0001", "Unknown Tile", "An empty tile", "edu/rpi/legup/images/starbattle/star.gif");
     }
 }

From 24450fd99b358f5dfb06d76933c21ad49e13d0bd Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Wed, 14 Feb 2024 16:31:13 -0500
Subject: [PATCH 07/67] Added White Tile and finished starter code for Cell

Only Board needs to be added to get the basic puzzle running.
---
 .../puzzle/starbattle/StarBattleCell.java     |  85 ++++++++++++++++++
 .../puzzle/starbattle/StarBattleCellType.java |   2 +-
 .../starbattle/elements/UnknownTile.java      |   2 +-
 .../puzzle/starbattle/elements/WhiteTile.java |  10 +++
 .../edu/rpi/legup/images/starbattle/white.gif | Bin 0 -> 9700 bytes
 5 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/elements/WhiteTile.java
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/white.gif

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
index e69de29bb..22d74dd7f 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
@@ -0,0 +1,85 @@
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.model.elements.Element;
+import edu.rpi.legup.model.gameboard.GridCell;
+
+import java.awt.*;
+import java.awt.event.MouseEvent;
+
+public class StarBattleCell extends GridCell<Integer> {
+    private int groupIndex;
+    private int max;
+
+    /**
+     * StarBattleCell Constructor - creates a new StarBattle cell to hold the puzzleElement
+     *
+     * @param valueInt   value of the star battle cell denoting its state
+     * @param location   location of the cell on the board
+     * @param size       size of the star battle cell
+     */
+    public StarBattleCell(int value, Point location, int groupIndex, int size) {
+        super(value, location);
+        this.groupIndex = groupIndex;
+        this.max = size;
+    }
+
+    @Override
+    public void setType(Element e, MouseEvent m) {
+        switch (e.getElementID()) {
+            case "STBL-PLAC-0001":
+                this.data = -3;
+                break;
+            case "STBL-PLAC-0002":
+                this.data = -2;
+                break;
+            case "STBL-PLAC-0003":
+                this.data = -1;
+                break;
+            
+            case "STBL-UNPL-0001"://Not sure how button events work
+                switch (m.getButton()){
+                    case MouseEvent.BUTTON1:
+                        if (this.data > 0 || this.data < -3) {
+                            this.data = -3;
+                        }
+                        else {
+                            this.data = this.data + 1;
+                        }
+                        break;
+                    case MouseEvent.BUTTON3:
+                        if (this.data > -4) {
+                            this.data = this.data - 1;
+                        }
+                        else {
+                            this.data = -1;//Unsure
+                        }
+                        break;
+                }
+                break; 
+        }
+    }
+
+    public StarBattleCellType getType() {
+        switch (data) {
+            case -3:
+                return StarBattleCellType.UNKNOWN;
+            case -2:
+                return StarBattleCellType.STAR;
+            case -1:
+                return StarBattleCellType.BLACK;
+            default:
+                if (data >= 0) {
+                    return StarBattleCellType.UNKNOWN;
+                }
+        }
+        return null;
+    }
+
+    public StarBattleCell copy() {
+        StarBattleCell copy = new StarBattleCell(data, (Point) location.clone(), groupIndex, max);
+        copy.setIndex(index);
+        copy.setModifiable(isModifiable);
+        copy.setGiven(isGiven);
+        return copy;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
index 8fb3338f7..f3524034e 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
@@ -2,7 +2,7 @@
 package edu.rpi.legup.puzzle.starbattle;
 
 public enum StarBattleCellType {
-    UNKNOWN(-3), STAR(-2), BLACK(-1);
+    WHITE(-3), STAR(-2), BLACK(-1), UNKNOWN(0);
 
     public int value; 
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
index 3e1cbca26..c2459f642 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/UnknownTile.java
@@ -4,6 +4,6 @@
 
 public class UnknownTile extends NonPlaceableElement {
     public UnknownTile() {
-        super("STBL-PLAC-0001", "Unknown Tile", "An empty tile", "edu/rpi/legup/images/starbattle/star.gif");
+        super("STBL-UNPL-0001", "Unknown Tile", "An empty tile", "edu/rpi/legup/images/starbattle/star.gif");
     }
 }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/WhiteTile.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/WhiteTile.java
new file mode 100644
index 000000000..a064c1fad
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/elements/WhiteTile.java
@@ -0,0 +1,10 @@
+package edu.rpi.legup.puzzle.starbattle.elements;
+
+import edu.rpi.legup.model.elements.PlaceableElement;
+
+public class WhiteTile extends PlaceableElement {
+    public WhiteTile() {
+        super("STBL-PLAC-0001", "White Tile", "The white tile", "edu/rpi/legup/images/starbattle/white.gif");
+    }
+}
+
diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/white.gif b/src/main/resources/edu/rpi/legup/images/starbattle/white.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc2c683eb7860f47d4322fe0e73b0508099a89de
GIT binary patch
literal 9700
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

literal 0
HcmV?d00001


From c64481dbd4f964927f53fa0956c67eb3c83057c6 Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Fri, 16 Feb 2024 13:36:31 -0500
Subject: [PATCH 08/67] create StarBattleBoard.java

---
 .../puzzle/starbattle/StarBattleBoard.java    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
new file mode 100644
index 000000000..300695111
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -0,0 +1,21 @@
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.model.gameboard.GridBoard;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+
+public class StarBattleBoard extends GridBoard {
+    public StarBattleBoard(int width, int height) {
+        super(width, height);
+    }
+
+    public StarBattleBoard(int size) {
+        super(size, size);
+    }
+
+    @Override
+    public StarBattleCell getCell(int x, int y) {
+        return (StarBattleCell) super.getCell(x,y);
+    }
+}
+
+

From f3b23833821404742f88b8dd073e01b5fe25ab0d Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 16 Feb 2024 16:36:02 -0500
Subject: [PATCH 09/67] Added getRow, getCol, and potential group
 implementation for later.

All StarBattle boards should be square, so I deleted the width height constructor. I also added size for returning a row, col, for future rules.
---
 .../puzzle/starbattle/StarBattleBoard.java    | 34 +++++++++++++++++--
 .../rpi/legup/puzzle/starbattle/allfiles.txt  | 10 +++---
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
index 300695111..a32197fa7 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -1,21 +1,49 @@
 package edu.rpi.legup.puzzle.starbattle;
 
+import java.util.*;
+
 import edu.rpi.legup.model.gameboard.GridBoard;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
 
 public class StarBattleBoard extends GridBoard {
-    public StarBattleBoard(int width, int height) {
-        super(width, height);
-    }
+
+    private int size;
+    //private ArrayList<Integer> groupSizes;
 
     public StarBattleBoard(int size) {
         super(size, size);
+        this.size = size;
     }
 
     @Override
     public StarBattleCell getCell(int x, int y) {
         return (StarBattleCell) super.getCell(x,y);
     }
+
+    /* 
+    public StarBattleCell getCell(int groupIndex, int x, int y) {
+        return getCell(x + (groupIndex % groupSize) * groupSize, y + (groupIndex / groupSize) * groupSize);
+    }*/
+
+    public int getSize() {
+        return size;
+    }
+
+    public Set<StarBattleCell> getRow(int rowNum) {
+        Set<StarBattleCell> row = new HashSet<>();
+        for (int i = 0; i < size; i++) {
+            row.add(getCell(i, rowNum));
+        }
+        return row;
+    }
+
+    public Set<StarBattleCell> getCol(int colNum) {
+        Set<StarBattleCell> column = new HashSet<>();
+        for (int i = 0; i < size; i++) {
+            column.add(getCell(colNum, i));
+        }
+        return column;
+    }
 }
 
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt b/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
index 7f006191a..1b1824f21 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
@@ -101,14 +101,14 @@ public class StarBattleCell extends GridCell<Integer> {
     public void setType(Element e, MouseEvent m) {
         switch (e.getElementID()) {
             case "SBUP-PLAC-0001":
-                this.data = -4;
+                this.data = -3;
                 break;
-            case "SBUP-UNPL-0002":
-                this.data = -1;
-                break;
-            case "SBUP-UNPL-0003":
+            case "SBUP-PLAC-0002":
                 this.data = -2;
                 break;
+            case "SBUP-PLAC-0003":
+                this.data = -1;
+                break;
             case "SBUP-UNPL-0001"://Not sure how button events work
                 switch (m.getButton()){
                     case MouseEvent.BUTTON1:

From f6e11dcc1eed36b44a4bae8aead8da03f4e53496 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 23 Feb 2024 11:49:24 -0500
Subject: [PATCH 10/67] Update allfiles.txt

Fixed some temporary documentation to reference star battle instead of sudoku.
---
 src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt b/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
index 1b1824f21..7970eadbf 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
@@ -85,11 +85,11 @@ public class StarBattleCell extends GridCell<Integer> {
     private int max;
 
     /**
-     * SudokuCell Constructor - creates a new Sudoku cell to hold the puzzleElement
+     * StarBattleCell Constructor - creates a new StarBattle cell to hold the puzzleElement
      *
      * @param valueInt   value of the star battle cell denoting its state
      * @param location   location of the cell on the board
-     * @param size       size of the sudoku cell
+     * @param size       size of the star battle cell
      */
     public StarBattleCell(int value, Point location, int groupIndex, int size) {
         super(value, location);

From 9c3daa796877a9ade90c6a3cba0378ad09faca1f Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 23 Feb 2024 15:29:26 -0500
Subject: [PATCH 11/67] Direct Rule Classes

Created skeletons of classes for direct rules.
---
 .../starbattle/rules/BlackoutDirectRule.java  | 49 +++++++++++++++++++
 .../rules/FinishWithStarsDirectRule.java      | 47 ++++++++++++++++++
 .../RegionsWithinRowsColumnsDirectRule.java   | 46 +++++++++++++++++
 .../RowsColumnsWithinRegionsDirectRule.java   | 46 +++++++++++++++++
 .../rules/SurroundStarDirectRule.java         | 48 ++++++++++++++++++
 5 files changed, 236 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsColumnsDirectRule.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsColumnsWithinRegionsDirectRule.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
new file mode 100644
index 000000000..3c89b0800
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
@@ -0,0 +1,49 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+public class BlackoutDirectRule extends DirectRule {
+
+    public BlackoutDirectRule() {
+        super("STBL-BASC-0001",
+                "Blackout",
+                "If a row, column, or region has enough stars, its unknown spaces are black.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        return null;
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
+
+
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
new file mode 100644
index 000000000..d2711eced
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
@@ -0,0 +1,47 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+public class FinishWithStarsDirectRule extends DirectRule {
+
+    public FinishWithStarsDirectRule() {
+        super("STBL-BASC-0002",
+                "Finish With Stars",
+                "Unknown spaces must be stars if there are just enough in a row, column, or region to satisfy the puzzle number.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        return null;
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsColumnsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsColumnsDirectRule.java
new file mode 100644
index 000000000..81645a2ad
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsColumnsDirectRule.java
@@ -0,0 +1,46 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+public class RegionsWithinRowsColumnsDirectRule extends DirectRule {
+    public RegionsWithinRowsColumnsDirectRule() {
+        super("STBL-BASC-0003",
+                "Regions Within Rows/Columns",
+                "If a number of regions is fully contained by an equal number of rows or columns, spaces of other regions in those rows or columns must be black.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        return null;
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsColumnsWithinRegionsDirectRule.java
new file mode 100644
index 000000000..53a7b27ee
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsColumnsWithinRegionsDirectRule.java
@@ -0,0 +1,46 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+public class RowsColumnsWithinRegionsDirectRule extends DirectRule {
+    public RowsColumnsWithinRegionsDirectRule() {
+        super("STBL-BASC-0004",
+                "Rows/Columns Within Regions",
+                "If a number of rows or columns is fully contained by an equal number of regions, spaces of other rows or columns, respectively, in those regions must be black.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        return null;
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
new file mode 100644
index 000000000..932ef7ddd
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
@@ -0,0 +1,48 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+public class SurroundStarDirectRule extends DirectRule {
+
+    public SurroundStarDirectRule() {
+        super("STBL-BASC-0005",
+                "Surround Star",
+                "Any space adjacent to a star must be black.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        return null;
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
+

From cda9403b1f9bb82880db422e7e18128b3bd53ba4 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:01:39 -0500
Subject: [PATCH 12/67] Added javadoc to cell

---
 .../java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
index 22d74dd7f..2e89649e2 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
@@ -15,6 +15,7 @@ public class StarBattleCell extends GridCell<Integer> {
      *
      * @param valueInt   value of the star battle cell denoting its state
      * @param location   location of the cell on the board
+     * @param groupIndex indicates what group # the cell is in.
      * @param size       size of the star battle cell
      */
     public StarBattleCell(int value, Point location, int groupIndex, int size) {

From 0fb71deb5b70bd388e02b2eaa3b3658a81f19fb7 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:24:04 -0500
Subject: [PATCH 13/67] Adding barebones Contradiction Rules Files

Might have to separate the too few and too many rules into 3 files, for row, column, and region.
---
 .../rules/ClashingOrbitContradictionRule      | 33 +++++++++++++++++++
 .../rules/TooFewStarsContradictionRule        | 33 +++++++++++++++++++
 .../rules/TooManyStarsContradictionRule       | 33 +++++++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule
new file mode 100644
index 000000000..2eb584ea1
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule
@@ -0,0 +1,33 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.ContradictionRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+public class ClashingOrbitContradictionRule extends ContradictionRule {
+
+    public ClashingOrbitContradictionRule() {
+        super("STBL-CONT-0003",
+                "Clashing Orbit",
+                "No two stars can be adjacent to each other.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the transition has a contradiction at the specific puzzleElement index using this rule
+     *
+     * @param board         board to check contradiction
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the transition contains a contradiction at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
+        return super.getNoContradictionMessage();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule
new file mode 100644
index 000000000..a063b2b6b
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule
@@ -0,0 +1,33 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.ContradictionRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+public class TooFewStarsContradictionRule extends ContradictionRule {
+
+    public TooFewStarsContradictionRule() {
+        super("STBL-CONT-0002",
+                "Too Few Stars",
+                "There are too few stars in this region/row/column and there are not enough places to put the remaining stars.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the transition has a contradiction at the specific puzzleElement index using this rule
+     *
+     * @param board         board to check contradiction
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the transition contains a contradiction at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
+        return super.getNoContradictionMessage();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule
new file mode 100644
index 000000000..56cd71ba7
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule
@@ -0,0 +1,33 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.ContradictionRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+public class TooManyStarsContradictionRule extends ContradictionRule {
+
+    public TooManyStarsContradictionRule() {
+        super("STBL-CONT-0001",
+                "Too Many Stars",
+                "There are too many stars in this region/row/column.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the transition has a contradiction at the specific puzzleElement index using this rule
+     *
+     * @param board         board to check contradiction
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the transition contains a contradiction at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
+        return super.getNoContradictionMessage();
+    }
+}
\ No newline at end of file

From cef9d476d8ba74a82112c47b1186a5375a12fb02 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 23 Feb 2024 18:06:34 -0500
Subject: [PATCH 14/67] Added the Element and Board Controller

Hopefully we can upload puzzles now that regions are done.
---
 .../legup/puzzle/starbattle/StarBattle.java   |  2 +
 .../starbattle/StarBattleController.java      | 36 +++++++++++++++
 .../starbattle/StarBattleElementView.java     | 46 +++++++++++++++++++
 .../puzzle/starbattle/StarBattleView.java     |  0
 4 files changed, 84 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleElementView.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
index e9e18b92a..78800916e 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
@@ -15,6 +15,8 @@ public StarBattle() {
 
     @Override
     public void initializeView() {
+        boardView = new StarBattleView((StarBattleBoard) currentBoard);
+        addBoardListener(boardView);
     }
 
     @Override
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
new file mode 100644
index 000000000..f7a094397
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
@@ -0,0 +1,36 @@
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.controller.ElementController;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+
+import java.awt.event.MouseEvent;
+
+public class StarBattleController extends ElementController {
+    @Override
+    public void changeCell(MouseEvent e, PuzzleElement data) {
+        StarBattleCell cell = (StarBattleCell) data;
+        if (e.getButton() == MouseEvent.BUTTON1) {
+            if (e.isControlDown()) {
+                this.boardView.getSelectionPopupMenu().show(boardView, this.boardView.getCanvas().getX() + e.getX(), this.boardView.getCanvas().getY() + e.getY());
+            }
+            else {
+                if (cell.getData() == 0) {
+                    data.setData(-3);
+                }
+                else {
+                    data.setData(cell.getData() + 1);
+                }
+            }
+        }
+        else {
+            if (e.getButton() == MouseEvent.BUTTON3) {
+                if (cell.getData() == -3) {
+                    data.setData(0);
+                }
+                else {
+                    data.setData(cell.getData() - 1);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleElementView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleElementView.java
new file mode 100644
index 000000000..a88773a06
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleElementView.java
@@ -0,0 +1,46 @@
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.ui.boardview.GridElementView;
+
+import java.awt.*;
+
+public class StarBattleElementView extends GridElementView {
+
+    public StarBattleElementView(StarBattleCell cell) {
+        super(cell);
+    }
+
+    @Override
+    public StarBattleCell getPuzzleElement() {
+        return (StarBattleCell) super.getPuzzleElement();
+    }
+
+    @Override
+    public void drawElement(Graphics2D graphics2D) {
+        StarBattleCell cell = (StarBattleCell) puzzleElement;
+        StarBattleCellType type = cell.getType();
+        if (type == StarBattleCellType.STAR) {
+            graphics2D.setColor(Color.LIGHT_GRAY);
+            graphics2D.fillRect(location.x, location.y, size.width, size.height);
+            graphics2D.drawImage(StarBattleView.STAR, location.x, location.y, size.width, size.height, Color.WHITE, null);
+            graphics2D.setColor(Color.BLACK);
+            graphics2D.drawRect(location.x, location.y, size.width, size.height);
+        } else if (type == StarBattleCellType.BLACK) {
+            graphics2D.setStroke(new BasicStroke(1));
+            graphics2D.setColor(Color.BLACK);
+            graphics2D.fillRect(location.x, location.y, size.width, size.height);
+        } else if (type == StarBattleCellType.WHITE) {
+            graphics2D.setStroke(new BasicStroke(1));
+            graphics2D.setColor(Color.WHITE);
+            graphics2D.fillRect(location.x, location.y, size.width, size.height);
+            graphics2D.setColor(Color.BLACK);
+            graphics2D.drawRect(location.x, location.y, size.width, size.height);
+        } else if (type == StarBattleCellType.UNKNOWN) {
+            graphics2D.setStroke(new BasicStroke(1));
+            graphics2D.setColor(Color.LIGHT_GRAY);
+            graphics2D.fillRect(location.x, location.y, size.width, size.height);
+            graphics2D.setColor(Color.BLACK);
+            graphics2D.drawRect(location.x, location.y, size.width, size.height);
+        }
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
new file mode 100644
index 000000000..e69de29bb

From 973f041a5ec3fd67d40406a5d6c39c7be7655267 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 23 Feb 2024 20:19:39 -0500
Subject: [PATCH 15/67] Added View file

---
 .../puzzle/starbattle/StarBattleView.java     | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
index e69de29bb..b79b7743a 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
@@ -0,0 +1,55 @@
+package edu.rpi.legup.puzzle.starbattle;
+
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import edu.rpi.legup.puzzle.nurikabe.NurikabeBoard;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeView;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleController;
+import edu.rpi.legup.puzzle.starbattle.StarBattleElementView;
+import edu.rpi.legup.puzzle.starbattle.StarBattleView;
+import edu.rpi.legup.ui.boardview.GridBoardView;
+
+import edu.rpi.legup.controller.BoardController;
+import edu.rpi.legup.model.gameboard.CaseBoard;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.ui.boardview.ElementView;
+import java.awt.*;
+import java.util.ArrayList;
+
+public class StarBattleView extends GridBoardView {
+    private final static Logger LOGGER = LogManager.getLogger(StarBattleView.class.getName());
+
+    static Image STAR;
+
+    static {
+        try {
+            STAR = ImageIO.read(ClassLoader.getSystemResourceAsStream("edu/rpi/legup/images/starbattle/star.png"));
+        }
+        catch (IOException e) {
+            LOGGER.error("Failed to open StarBattle images");
+        }
+    }
+
+    public StarBattleView(StarBattleBoard board) {
+        super(new BoardController(), new StarBattleController(), board.getDimension());
+
+        for (PuzzleElement puzzleElement : board.getPuzzleElements()) {
+            StarBattleCell cell = (StarBattleCell) puzzleElement;
+            Point loc = cell.getLocation();
+            StarBattleElementView elementView = new StarBattleElementView(cell);
+            elementView.setIndex(cell.getIndex());
+            elementView.setSize(elementSize);
+            elementView.setLocation(new Point(loc.x * elementSize.width, loc.y * elementSize.height));
+            elementViews.add(elementView);
+        }
+    }
+
+    
+}

From 3fe6695c1ed01db14c2dcc7ef2a26d8aa3484ff8 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 27 Feb 2024 16:50:04 -0500
Subject: [PATCH 16/67] Create StarOrEmptyCaseRule.java

Created skeleton of class for Star or Empty case rule.
---
 .../starbattle/rules/StarOrEmptyCaseRule.java | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
new file mode 100644
index 000000000..a30823faa
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
@@ -0,0 +1,78 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.rules.CaseRule;
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.CaseBoard;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+import java.util.ArrayList;
+
+public class StarOrEmptyCaseRule extends CaseRule {
+
+    public StarOrEmptyCaseRule() {
+        super("STBL-CASE-0002",
+                "Star or Empty",
+                "Each unknown space is either a star or empty.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the {@link TreeTransition} logically follows from the parent node using this rule. This method is
+     * the one that should overridden in child classes.
+     *
+     * @param transition transition to check
+     * @return null if the child node logically follow from the parent node, otherwise error message
+     */
+    @Override
+    public String checkRuleRaw(TreeTransition transition) {
+        //TODO: implement this
+        return null;
+    }
+
+    @Override
+    public CaseBoard getCaseBoard(Board board) {
+        StarBattleBoard starBattleBoard = (StarBattleBoard) board.copy();
+        CaseBoard caseBoard = new CaseBoard(starBattleBoard, this);
+        starBattleBoard.setModifiable(false);
+        for (PuzzleElement element : starBattleBoard.getPuzzleElements()) {
+            if (((StarBattleCell) element).getType() == StarBattleCellType.UNKNOWN) {
+                caseBoard.addPickableElement(element);
+            }
+        }
+        return caseBoard;
+    }
+
+    /**
+     * Gets the possible cases at a specific location based on this case rule
+     *
+     * @param board         the current board state
+     * @param puzzleElement equivalent puzzleElement
+     * @return a list of elements the specified could be
+     */
+    @Override
+    public ArrayList<Board> getCases(Board board, PuzzleElement puzzleElement) {
+        ArrayList<Board> cases = new ArrayList<>();
+        Board case1 = board.copy();
+        PuzzleElement data1 = case1.getPuzzleElement(puzzleElement);
+        data1.setData(StarBattleCellType.STAR);
+        case1.addModifiedData(data1);
+        cases.add(case1);
+
+        Board case2 = board.copy();
+        PuzzleElement data2 = case2.getPuzzleElement(puzzleElement);
+        data2.setData(StarBattleCellType.BLACK);
+        case2.addModifiedData(data2);
+        cases.add(case2);
+
+        return cases;
+    }
+
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+        return null;
+    }
+}

From e677a6eec68aa48ebe8fe121923f979b227baf2f Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:50:36 -0500
Subject: [PATCH 17/67] Adding Region files

---
 .../rpi/legup/model/gameboard/GridRegion.java | 53 +++++++++++++++++++
 .../puzzle/starbattle/StarBattleRegion.java   |  9 ++++
 2 files changed, 62 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/model/gameboard/GridRegion.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java

diff --git a/src/main/java/edu/rpi/legup/model/gameboard/GridRegion.java b/src/main/java/edu/rpi/legup/model/gameboard/GridRegion.java
new file mode 100644
index 000000000..6718ab6f4
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/model/gameboard/GridRegion.java
@@ -0,0 +1,53 @@
+package edu.rpi.legup.model.gameboard;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class GridRegion<T> {
+    
+    protected List<T> regionCells;
+    
+    /**
+     * Region Constructor
+     */
+    public GridRegion() {
+        this.regionCells = new ArrayList<>();
+    }
+
+    /**
+     * Adds the cell to the region
+     * @param cell cell to be added to the region
+     */
+    public void addCell(T cell) {
+        regionCells.add(cell);
+    }
+
+    /**
+     * Removes the cell from the region
+     * @param cell cell to be remove from the region
+     */
+    public void removeCell(T cell) {
+        regionCells.remove(cell);
+    }
+
+    /**
+     * Returns the list of cells in the region
+     * @return list of cells in region
+     */
+    public List<T> getCells() {
+        return regionCells;
+    }
+
+    /**
+     * Returns the number of cells in the region
+     * @return number of cells in the region
+     */
+    public int getSize(){
+        return regionCells.size();
+    }
+
+    /*
+    public void colorRegion(){}
+     */
+    
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java
new file mode 100644
index 000000000..68a25bc3b
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java
@@ -0,0 +1,9 @@
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.model.gameboard.GridRegion;
+
+public class StarBattleRegion extends GridRegion<StarBattleCell>{
+    public StarBattleRegion() {
+        super();
+    }
+}

From 23df2a15c08736e4902b1093a9e6eb92084c2ef7 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Tue, 27 Feb 2024 17:26:50 -0500
Subject: [PATCH 18/67] Added the first XML puzzle file to be read later.

---
 .../6x6 Star Battle 1star Normal.xml          | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 puzzles files/starbattle/6x6 Star Battle 1star Normal.xml

diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal.xml
new file mode 100644
index 000000000..4d9f8b631
--- /dev/null
+++ b/puzzles files/starbattle/6x6 Star Battle 1star Normal.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board height="6" width="6">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="4" y="1"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="1" y="2"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="2"/>
+                    <cell value="0" x="4" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="3" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="5" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="5" y="4"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
+</Legup>
\ No newline at end of file

From 47337b7e5457b5991be30616b38e618ae0ffaa3e Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 27 Feb 2024 17:31:09 -0500
Subject: [PATCH 19/67] Implement Surround Star Direct Rule

Wrote an implementation for checkRuleRawAt for Surround Star Direct Rule.
---
 ...le => ClashingOrbitContradictionRule.java} |  0
 .../rules/SurroundStarDirectRule.java         | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+)
 rename src/main/java/edu/rpi/legup/puzzle/starbattle/rules/{ClashingOrbitContradictionRule => ClashingOrbitContradictionRule.java} (100%)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
similarity index 100%
rename from src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule
rename to src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
index 932ef7ddd..33f148e94 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
@@ -2,9 +2,13 @@
 
 import edu.rpi.legup.model.gameboard.Board;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.ContradictionRule;
 import edu.rpi.legup.model.rules.DirectRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeBoard;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeType;
+import edu.rpi.legup.puzzle.nurikabe.rules.NoNumberContradictionRule;
 import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
@@ -29,7 +33,22 @@ public SurroundStarDirectRule() {
      */
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+        StarBattleBoard board = (StarBattleBoard) transition.getBoard();
+        StarBattleBoard origBoard = (StarBattleBoard) transition.getParents().get(0).getBoard();
+        ContradictionRule contraRule = new ClashingOrbitContradictionRule();
 
+        StarBattleCell cell = (StarBattleCell) board.getPuzzleElement(puzzleElement);
+
+        if (cell.getType() != StarBattleCellType.BLACK) {
+            return "Only black cells are allowed for this rule!";
+        }
+
+        StarBattleBoard modified = (StarBattleBoard) origBoard.copy();
+        //TODO: please for the love of god make a copy method for star battle board because this isn't actually going to work otherwise
+        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.STAR);
+        if (contraRule.checkContradictionAt(modified, puzzleElement) != null) {
+            return "Black cells must be placed adjacent to a star!";
+        }
         return null;
     }
 

From 024aa4f94e6b083ed008f7369713e7259519fcdc Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 27 Feb 2024 17:32:33 -0500
Subject: [PATCH 20/67] Changed files to java instead of text.

---
 ...ewStarsContradictionRule => TooFewStarsContradictionRule.java} | 0
 ...yStarsContradictionRule => TooManyStarsContradictionRule.java} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/main/java/edu/rpi/legup/puzzle/starbattle/rules/{TooFewStarsContradictionRule => TooFewStarsContradictionRule.java} (100%)
 rename src/main/java/edu/rpi/legup/puzzle/starbattle/rules/{TooManyStarsContradictionRule => TooManyStarsContradictionRule.java} (100%)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java
similarity index 100%
rename from src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule
rename to src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
similarity index 100%
rename from src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule
rename to src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java

From 2d9dc038b9b14e029acf4e48a5d62bcc3ac7bb4b Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 27 Feb 2024 18:47:58 -0500
Subject: [PATCH 21/67] created add star case rule and reference sheet to keep
 track of the rules

---
 .../starbattle/rules/AddStarCaseRule.java     | 57 +++++++++++++++++++
 .../rules/starbattle_reference_sheet.txt      | 15 +++++
 2 files changed, 72 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/AddStarCaseRule.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/AddStarCaseRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/AddStarCaseRule.java
new file mode 100644
index 000000000..d945f5be9
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/AddStarCaseRule.java
@@ -0,0 +1,57 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.CaseBoard;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.CaseRule;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.lightup.LightUpBoard;
+import edu.rpi.legup.puzzle.lightup.LightUpCell;
+import edu.rpi.legup.puzzle.starbattle.*;
+
+import java.awt.*;
+import java.util.*;
+import java.util.List;
+
+public class AddStarCaseRule extends CaseRule {
+    public AddStarCaseRule() {
+        super("STBL-CASE-0001",
+                "Add Star",
+                "Different ways a region's star number can be satisfied",
+                "");
+    }
+
+    @Override
+    public CaseBoard getCaseBoard(Board board) {
+        StarBattleBoard starbattleBoard = (StarBattleBoard) board.copy();
+        CaseBoard caseBoard = new CaseBoard(starbattleBoard, this);
+
+        return caseBoard;
+    }
+
+    /**
+     * Gets the possible cases at a specific location based on this case rule
+     *
+     * @param board         the current board state
+     * @param puzzleElement the cell to determine the possible cases for
+     * @return a list of elements the specified spot could be
+     */
+    @Override
+    public List<Board> getCases(Board board, PuzzleElement puzzleElement) {
+        StarBattleBoard starbattleBoard = (StarBattleBoard) board;
+        // take selected spot, check if there are any stars in that row, column, and region
+
+        // do we want all possible cases, that seems like a lot
+        return null;
+    }
+
+    @Override
+    public String checkRuleRaw(TreeTransition transition) {
+        return null;
+    }
+
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt
new file mode 100644
index 000000000..70e81bb73
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt
@@ -0,0 +1,15 @@
+Case Rules:
+Add Star: STBL-CASE-0001
+Star or Empty: STBL-CASE-0002
+
+Basic Rules:
+Blackout: STBL-BASC-0001
+Finish With Stars: STBL-BASC-0002
+Regions Within Rows or Columns: STBL-BASC-0003
+Rows or Columns Within Regions: STBL-BASC-0004
+Surround Star: STBL-BASC-0005
+
+Contradiction Rules:
+Too Many Stars: STBL-CONT-0001
+Too Few Stars: STBL-CONT-0002
+Clashing Orbit: STBL-CONT-0003
\ No newline at end of file

From 7f2406c99d01075d5e25afe5279c08d874a0608b Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:34:56 -0400
Subject: [PATCH 22/67] New puzzle

---
 ....xml => 6x6 Star Battle 1star Normal1.xml} |  0
 .../6x6 Star Battle 1star Normal2.xml         | 68 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 rename puzzles files/starbattle/{6x6 Star Battle 1star Normal.xml => 6x6 Star Battle 1star Normal1.xml} (100%)
 create mode 100644 puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml

diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml
similarity index 100%
rename from puzzles files/starbattle/6x6 Star Battle 1star Normal.xml
rename to puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml
diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml
new file mode 100644
index 000000000..cd34805e5
--- /dev/null
+++ b/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board height="6" width="6">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="3" y="2"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="5" y="0"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="0" y="4"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="2"/>
+                    <cell value="0" x="5" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="4" y="3"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="3" y="5"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="5" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="1" y="5"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
+</Legup>
\ No newline at end of file

From 555890adc30f1f658be9a45e6ae4cc2a2cae362a Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 12 Mar 2024 17:02:07 -0400
Subject: [PATCH 23/67] Add Regions to StarBattleBoard

---
 .../puzzle/starbattle/StarBattleBoard.java    | 24 +++++++++++++++++++
 .../puzzle/starbattle/StarBattleRegion.java   |  8 +++++++
 .../rules/SurroundStarDirectRule.java         |  3 ---
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
index a32197fa7..143fbaca6 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -8,11 +8,13 @@
 public class StarBattleBoard extends GridBoard {
 
     private int size;
+    protected List<StarBattleRegion> regions;
     //private ArrayList<Integer> groupSizes;
 
     public StarBattleBoard(int size) {
         super(size, size);
         this.size = size;
+        this.regions = new ArrayList<>();
     }
 
     @Override
@@ -44,6 +46,28 @@ public Set<StarBattleCell> getCol(int colNum) {
         }
         return column;
     }
+
+    public StarBattleRegion getRegion(int index) {
+        if (index >= size) {
+            return null;
+        }
+        return regions.get(index);
+    }
+
+    public StarBattleBoard copy() {
+        StarBattleBoard copy = new StarBattleBoard(size);
+        for (int x = 0; x < this.dimension.width; x++) {
+            for (int y = 0; y < this.dimension.height; y++) {
+                copy.setCell(x, y, getCell(x, y).copy());
+            }
+            if (x < this.regions.size())
+                copy.regions.add(this.getRegion(x).copy());
+        }
+        for (PuzzleElement e : modifiedData) {
+            copy.getPuzzleElement(e).setModifiable(false);
+        }
+        return copy;
+    }
 }
 
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java
index 68a25bc3b..ebae5ce86 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java
@@ -6,4 +6,12 @@ public class StarBattleRegion extends GridRegion<StarBattleCell>{
     public StarBattleRegion() {
         super();
     }
+
+    public StarBattleRegion copy() {
+        StarBattleRegion copy = new StarBattleRegion();
+        for (StarBattleCell c: regionCells) {
+            copy.addCell(c.copy());
+        }
+        return copy;
+    }
 }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
index 33f148e94..1565bff9d 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
@@ -6,9 +6,6 @@
 import edu.rpi.legup.model.rules.DirectRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
-import edu.rpi.legup.puzzle.nurikabe.NurikabeBoard;
-import edu.rpi.legup.puzzle.nurikabe.NurikabeType;
-import edu.rpi.legup.puzzle.nurikabe.rules.NoNumberContradictionRule;
 import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;

From 1f72e6ab5d9a9532fc76cbf6fe74b44b5eaca8e1 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:03:49 -0400
Subject: [PATCH 24/67] Changed some elements in puzzles and added importer

---
 puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml      | 2 +-
 puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml      | 2 +-
 .../edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java     | 0
 .../java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java    | 2 --
 4 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java

diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml
index 4d9f8b631..ce1330437 100644
--- a/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml	
+++ b/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
-        <board height="6" width="6">
+        <board size="6">
             <region>
                 <cells>
                     <cell value="0" x="0" y="0"/>
diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml
index cd34805e5..10eb04aa3 100644
--- a/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml	
+++ b/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
-        <board height="6" width="6">
+        <board size="6">
             <region>
                 <cells>
                     <cell value="0" x="0" y="0"/>
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
index b79b7743a..fdf0df221 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
@@ -7,8 +7,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import edu.rpi.legup.puzzle.nurikabe.NurikabeBoard;
-import edu.rpi.legup.puzzle.nurikabe.NurikabeView;
 import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.puzzle.starbattle.StarBattleController;

From be30904d9a2e0b9a7b9dce1deb0b8ec65b29bca6 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 12 Mar 2024 17:10:49 -0400
Subject: [PATCH 25/67] Blackout rule check method

---
 .../starbattle/rules/BlackoutDirectRule.java     | 16 ++++++++++++++++
 .../starbattle/rules/SurroundStarDirectRule.java |  1 -
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
index 3c89b0800..57a5688f2 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
@@ -2,6 +2,7 @@
 
 import edu.rpi.legup.model.gameboard.Board;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.ContradictionRule;
 import edu.rpi.legup.model.rules.DirectRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
@@ -30,6 +31,21 @@ public BlackoutDirectRule() {
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
 
+        StarBattleBoard board = (StarBattleBoard) transition.getBoard();
+        StarBattleBoard origBoard = (StarBattleBoard) transition.getParents().get(0).getBoard();
+        ContradictionRule contraRule = new TooManyStarsContradictionRule();
+
+        StarBattleCell cell = (StarBattleCell) board.getPuzzleElement(puzzleElement);
+
+        if (cell.getType() != StarBattleCellType.BLACK) {
+            return "Only black cells are allowed for this rule!";
+        }
+
+        StarBattleBoard modified = (StarBattleBoard) origBoard.copy();
+        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.STAR);
+        if (contraRule.checkContradictionAt(modified, puzzleElement) != null) {
+            return "Black cells must be placed in a row, region, or column with enough stars!";
+        }
         return null;
     }
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
index 1565bff9d..0c46da09c 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
@@ -41,7 +41,6 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
         }
 
         StarBattleBoard modified = (StarBattleBoard) origBoard.copy();
-        //TODO: please for the love of god make a copy method for star battle board because this isn't actually going to work otherwise
         modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.STAR);
         if (contraRule.checkContradictionAt(modified, puzzleElement) != null) {
             return "Black cells must be placed adjacent to a star!";

From f37f4ef5d78a8e675272c351b11f899fea97b3db Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 12 Mar 2024 17:16:49 -0400
Subject: [PATCH 26/67] FinishWithStars rule check method

---
 .../rules/FinishWithStarsDirectRule.java         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
index d2711eced..53ab8d947 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
@@ -2,6 +2,7 @@
 
 import edu.rpi.legup.model.gameboard.Board;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.ContradictionRule;
 import edu.rpi.legup.model.rules.DirectRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
@@ -30,6 +31,21 @@ public FinishWithStarsDirectRule() {
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
 
+        StarBattleBoard board = (StarBattleBoard) transition.getBoard();
+        StarBattleBoard origBoard = (StarBattleBoard) transition.getParents().get(0).getBoard();
+        ContradictionRule contraRule = new TooFewStarsContradictionRule();
+
+        StarBattleCell cell = (StarBattleCell) board.getPuzzleElement(puzzleElement);
+
+        if (cell.getType() != StarBattleCellType.STAR) {
+            return "Only star cells are allowed for this rule!";
+        }
+
+        StarBattleBoard modified = (StarBattleBoard) origBoard.copy();
+        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.BLACK);
+        if (contraRule.checkContradictionAt(modified, puzzleElement) != null) {
+            return "Star cells must be placed in a row, region, or column without extra spaces!";
+        }
         return null;
     }
 

From 9fe76cbb915f25fd098e0a3533d068b26d3662d1 Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 12 Mar 2024 17:20:37 -0400
Subject: [PATCH 27/67] Deleted Add Star Case Rule, started on Clashing Orbit

---
 .../starbattle/rules/AddStarCaseRule.java     | 57 -------------------
 .../rules/ClashingOrbitContradictionRule.java | 25 ++++++++
 .../rules/TooManyStarsContradictionRule.java  |  5 ++
 3 files changed, 30 insertions(+), 57 deletions(-)
 delete mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/AddStarCaseRule.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/AddStarCaseRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/AddStarCaseRule.java
deleted file mode 100644
index d945f5be9..000000000
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/AddStarCaseRule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package edu.rpi.legup.puzzle.starbattle.rules;
-
-import edu.rpi.legup.model.gameboard.Board;
-import edu.rpi.legup.model.gameboard.CaseBoard;
-import edu.rpi.legup.model.gameboard.PuzzleElement;
-import edu.rpi.legup.model.rules.CaseRule;
-import edu.rpi.legup.model.tree.TreeTransition;
-import edu.rpi.legup.puzzle.lightup.LightUpBoard;
-import edu.rpi.legup.puzzle.lightup.LightUpCell;
-import edu.rpi.legup.puzzle.starbattle.*;
-
-import java.awt.*;
-import java.util.*;
-import java.util.List;
-
-public class AddStarCaseRule extends CaseRule {
-    public AddStarCaseRule() {
-        super("STBL-CASE-0001",
-                "Add Star",
-                "Different ways a region's star number can be satisfied",
-                "");
-    }
-
-    @Override
-    public CaseBoard getCaseBoard(Board board) {
-        StarBattleBoard starbattleBoard = (StarBattleBoard) board.copy();
-        CaseBoard caseBoard = new CaseBoard(starbattleBoard, this);
-
-        return caseBoard;
-    }
-
-    /**
-     * Gets the possible cases at a specific location based on this case rule
-     *
-     * @param board         the current board state
-     * @param puzzleElement the cell to determine the possible cases for
-     * @return a list of elements the specified spot could be
-     */
-    @Override
-    public List<Board> getCases(Board board, PuzzleElement puzzleElement) {
-        StarBattleBoard starbattleBoard = (StarBattleBoard) board;
-        // take selected spot, check if there are any stars in that row, column, and region
-
-        // do we want all possible cases, that seems like a lot
-        return null;
-    }
-
-    @Override
-    public String checkRuleRaw(TreeTransition transition) {
-        return null;
-    }
-
-    @Override
-    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
index 2eb584ea1..c15593796 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
@@ -9,6 +9,8 @@
 import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
 
+import java.awt.*;
+
 public class ClashingOrbitContradictionRule extends ContradictionRule {
 
     public ClashingOrbitContradictionRule() {
@@ -28,6 +30,29 @@ public ClashingOrbitContradictionRule() {
      */
     @Override
     public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
+        StarBattleBoard starbattleBoard = (StarBattleBoard) board;
+        StarBattleCell cell = (StarBattleCell) starbattleBoard.getPuzzleElement(puzzleElement);
+
+        if (cell.getType() != StarBattleCellType.STAR) {
+            return super.getNoContradictionMessage();
+        }
+
+        // check neighboring cells for a star
+        Point location = cell.getLocation();
+
+        int rowStart  = Math.max( location.x - 1, 0 );
+        int rowEnd = Math.min( location.x + 1, starbattleBoard.getSize() - 1 );
+        int colStart  = Math.max( location.y - 1, 0 );
+        int colEnd = Math.min( location.y + 1, starbattleBoard.getSize() - 1 );
+
+        for (int row = rowStart; rowStart <= rowEnd; row++) {
+            for (int col = colStart; colStart <= colEnd; col++) {
+                if (starbattleBoard.getCell(row, col).getType() == StarBattleCellType.STAR) {
+                    return null;
+                }
+            }
+        }
+
         return super.getNoContradictionMessage();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
index 56cd71ba7..09f6e8136 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
@@ -28,6 +28,11 @@ public TooManyStarsContradictionRule() {
      */
     @Override
     public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
+        // check row
+
+        // check column
+
+        // check region
         return super.getNoContradictionMessage();
     }
 }
\ No newline at end of file

From 78069d4600b81872eb365df557a1d0dac7d2d875 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:26:48 -0400
Subject: [PATCH 28/67] Added importer

---
 .../puzzle/starbattle/StarBattleImporter.java | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
index e69de29bb..161b03bf0 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
@@ -0,0 +1,110 @@
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.model.PuzzleImporter;
+import edu.rpi.legup.save.InvalidFileFormatException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import java.awt.*;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class StarBattleImporter  extends PuzzleImporter{
+    
+   
+    public StarBattleImporter(StarBattle starbattle) {
+        super(starbattle);
+    }
+
+    private Map<Point, StarBattleRegion> regionsMap;
+
+    /**
+     * Puzzle setting to support row and column inputs
+     */
+    @Override
+    public boolean acceptsRowsAndColumnsInput() {
+        return true;
+    }
+
+    /**
+     * Puzzle setting to disable support for text input
+     */
+    @Override
+    public boolean acceptsTextInput() {
+        return false;
+    }
+
+
+    /**
+     * Constructs empty StarBattle gameboard as per the provided dimensions
+     * @param rows number of rows and columns for the gameboard
+     */
+    @Override
+    public void initializeBoard(int rows, int columns) {
+        StarBattleBoard StarBattleBoard = new StarBattleBoard(rows);
+        puzzle.setCurrentBoard(StarBattleBoard);
+    }
+
+
+
+    /**
+     * Constructs StarBattle gameboard
+     * @param node xml document node
+     * @throws InvalidFileFormatException if file is invalid
+     */
+    @Override
+    public void initializeBoard(Node node) throws InvalidFileFormatException {
+        Element puzzleElement = (Element) node;
+
+        NodeList regionNodes = puzzleElement.getElementsByTagName("region");
+        if (regionNodes.getLength() == 0) {
+            throw new InvalidFileFormatException("No regions found for the StarBattle puzzle");
+        }
+
+        int size = Integer.parseInt(puzzleElement.getAttribute("size"));
+
+        StarBattleBoard StarBattleBoard = new StarBattleBoard(size); // Initialize the board with width and height from XML
+
+        for (int i = 0; i < regionNodes.getLength(); i++) {
+            Element regionElement = (Element) regionNodes.item(i);
+            NodeList cellNodes = regionElement.getElementsByTagName("cell");
+
+            for (int j = 0; j < cellNodes.getLength(); j++) {
+                Element cellElement = (Element) cellNodes.item(j);
+                int x = Integer.parseInt(cellElement.getAttribute("x"));
+                int y = Integer.parseInt(cellElement.getAttribute("y"));
+                int value = Integer.parseInt(cellElement.getAttribute("value"));
+
+                Point cellPoint = new Point(x, y);
+
+                // Create the StarBattleCell with the cell type and value
+                StarBattleCell cell = new StarBattleCell(value, cellPoint, i, size);
+                cell.setIndex(y * size + x); // Calculate the index based on size
+                cell.setModifiable(true);
+
+                // Add the cell to the board
+                StarBattleBoard.setCell(x, y, cell);
+            }
+        }
+
+        puzzle.setCurrentBoard(StarBattleBoard);
+    }
+
+
+
+    /**
+     * Initialize board via string of statements.
+     * @throws UnsupportedOperationException since StarBattle does not support text input
+     */
+    @Override
+    public void initializeBoard(String[] statements) throws UnsupportedOperationException {
+        throw new UnsupportedOperationException("Ripple Effect does not accept text input");
+    }
+}
+
+
+

From 4b75d469117c407b38fed10edcfc090618ecdc3b Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 15 Mar 2024 16:18:53 -0400
Subject: [PATCH 29/67] Fix clashing orbit bugs

---
 .../starbattle/rules/ClashingOrbitContradictionRule.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
index c15593796..79453803b 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
@@ -45,9 +45,10 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
         int colStart  = Math.max( location.y - 1, 0 );
         int colEnd = Math.min( location.y + 1, starbattleBoard.getSize() - 1 );
 
-        for (int row = rowStart; rowStart <= rowEnd; row++) {
-            for (int col = colStart; colStart <= colEnd; col++) {
-                if (starbattleBoard.getCell(row, col).getType() == StarBattleCellType.STAR) {
+        for (int row = rowStart; row <= rowEnd; row++) {
+            for (int col = colStart; col <= colEnd; col++) {
+                if (starbattleBoard.getCell(row, col).getType() == StarBattleCellType.STAR
+                && (row != location.x || col != location.y)) {
                     return null;
                 }
             }

From 900854f83aa48368507d4a569b21eb27376cb698 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 15 Mar 2024 16:31:01 -0400
Subject: [PATCH 30/67] Add puzzle number field to board

---
 .../edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
index 143fbaca6..dedcc0a58 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -8,12 +8,14 @@
 public class StarBattleBoard extends GridBoard {
 
     private int size;
+    private int puzzleNum;
     protected List<StarBattleRegion> regions;
     //private ArrayList<Integer> groupSizes;
 
-    public StarBattleBoard(int size) {
+    public StarBattleBoard(int size, int num) {
         super(size, size);
         this.size = size;
+        this.puzzleNum = num;
         this.regions = new ArrayList<>();
     }
 
@@ -39,6 +41,8 @@ public Set<StarBattleCell> getRow(int rowNum) {
         return row;
     }
 
+    public int getPuzzleNumber() { return puzzleNum; }
+
     public Set<StarBattleCell> getCol(int colNum) {
         Set<StarBattleCell> column = new HashSet<>();
         for (int i = 0; i < size; i++) {
@@ -55,7 +59,7 @@ public StarBattleRegion getRegion(int index) {
     }
 
     public StarBattleBoard copy() {
-        StarBattleBoard copy = new StarBattleBoard(size);
+        StarBattleBoard copy = new StarBattleBoard(size, puzzleNum);
         for (int x = 0; x < this.dimension.width; x++) {
             for (int y = 0; y < this.dimension.height; y++) {
                 copy.setCell(x, y, getCell(x, y).copy());

From e0db10322ebcd8bbb74678c972453db1e4578498 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 15 Mar 2024 16:57:22 -0400
Subject: [PATCH 31/67] Contradiction check function for too few stars

---
 .../puzzle/starbattle/StarBattleBoard.java    |  4 +++
 .../puzzle/starbattle/StarBattleCell.java     |  2 ++
 .../rules/TooFewStarsContradictionRule.java   | 31 +++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
index dedcc0a58..cebe7d2db 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -58,6 +58,10 @@ public StarBattleRegion getRegion(int index) {
         return regions.get(index);
     }
 
+    public StarBattleRegion getRegion(StarBattleCell cell) {
+        return getRegion(cell.getGroupIndex());
+    }
+
     public StarBattleBoard copy() {
         StarBattleBoard copy = new StarBattleBoard(size, puzzleNum);
         for (int x = 0; x < this.dimension.width; x++) {
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
index 2e89649e2..4296c8230 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
@@ -24,6 +24,8 @@ public StarBattleCell(int value, Point location, int groupIndex, int size) {
         this.max = size;
     }
 
+    public int getGroupIndex() { return groupIndex; }
+
     @Override
     public void setType(Element e, MouseEvent m) {
         switch (e.getElementID()) {
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java
index a063b2b6b..af30a5e18 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java
@@ -8,6 +8,9 @@
 import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+import edu.rpi.legup.puzzle.starbattle.StarBattleRegion;
+
+import java.awt.*;
 
 public class TooFewStarsContradictionRule extends ContradictionRule {
 
@@ -28,6 +31,34 @@ public TooFewStarsContradictionRule() {
      */
     @Override
     public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
+        StarBattleBoard sbBoard = (StarBattleBoard) board;
+        StarBattleCell cell = (StarBattleCell) puzzleElement;
+        Point location = cell.getLocation();
+        int column = location.x;
+        int row = location.y;
+        int rowCount = 0;
+        int columnCount = 0;
+        for (int i = 0; i < sbBoard.getSize(); ++i) {
+            if (sbBoard.getCell(row, i).getType() != StarBattleCellType.BLACK) {
+                ++rowCount;
+            }
+            if (sbBoard.getCell(i, column).getType() != StarBattleCellType.BLACK) {
+                ++columnCount;
+            }
+        }
+        if (rowCount < sbBoard.getPuzzleNumber() || columnCount < sbBoard.getPuzzleNumber()) {
+            return null;
+        }
+        StarBattleRegion region = sbBoard.getRegion(cell);
+        int regionCount = 0;
+        for (StarBattleCell c: region.getCells()) {
+            if (c.getType() != StarBattleCellType.BLACK) {
+                ++regionCount;
+            }
+        }
+        if (regionCount < sbBoard.getPuzzleNumber()) {
+            return null;
+        }
         return super.getNoContradictionMessage();
     }
 }
\ No newline at end of file

From e8375dbbe4531fc1589b38bdeb402f013969649b Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 15 Mar 2024 17:10:58 -0400
Subject: [PATCH 32/67] Changed importer and xml files to include puzzleNum

---
 .../6x6 Star Battle 1star Normal1.xml         |  1 +
 .../6x6 Star Battle 1star Normal2.xml         |  1 +
 .../puzzle/starbattle/StarBattleBoard.java    |  7 ++++++
 .../puzzle/starbattle/StarBattleImporter.java | 24 ++++++++++---------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml
index ce1330437..4163e15a9 100644
--- a/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml	
+++ b/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml	
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
+        <board puzzle_num="1">
         <board size="6">
             <region>
                 <cells>
diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml
index 10eb04aa3..29307fb58 100644
--- a/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml	
+++ b/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml	
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
+    <board puzzle_num="1">
         <board size="6">
             <region>
                 <cells>
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
index dedcc0a58..e80e49399 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -17,6 +17,9 @@ public StarBattleBoard(int size, int num) {
         this.size = size;
         this.puzzleNum = num;
         this.regions = new ArrayList<>();
+        for (int i = 0; i < size; i++) {
+            regions.add(new StarBattleRegion());
+        }
     }
 
     @Override
@@ -58,6 +61,10 @@ public StarBattleRegion getRegion(int index) {
         return regions.get(index);
     }
 
+    public void setRegion(int regionNum, StarBattleRegion region) {
+        regions.set(regionNum, region);
+    }
+
     public StarBattleBoard copy() {
         StarBattleBoard copy = new StarBattleBoard(size, puzzleNum);
         for (int x = 0; x < this.dimension.width; x++) {
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
index 161b03bf0..32090172e 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
@@ -13,7 +13,7 @@
 import java.util.Map;
 
 
-public class StarBattleImporter  extends PuzzleImporter{
+public class StarBattleImporter extends PuzzleImporter{
     
    
     public StarBattleImporter(StarBattle starbattle) {
@@ -38,14 +38,14 @@ public boolean acceptsTextInput() {
         return false;
     }
 
-
-    /**
+    /** 
      * Constructs empty StarBattle gameboard as per the provided dimensions
      * @param rows number of rows and columns for the gameboard
      */
     @Override
     public void initializeBoard(int rows, int columns) {
-        StarBattleBoard StarBattleBoard = new StarBattleBoard(rows);
+        int puzzle_num = 1;
+        StarBattleBoard StarBattleBoard = new StarBattleBoard(rows, puzzle_num);
         puzzle.setCurrentBoard(StarBattleBoard);
     }
 
@@ -59,19 +59,19 @@ public void initializeBoard(int rows, int columns) {
     @Override
     public void initializeBoard(Node node) throws InvalidFileFormatException {
         Element puzzleElement = (Element) node;
-
+        int puzzle_num = Integer.parseInt(puzzleElement.getAttribute("puzzle_num"));
         NodeList regionNodes = puzzleElement.getElementsByTagName("region");
-        if (regionNodes.getLength() == 0) {
-            throw new InvalidFileFormatException("No regions found for the StarBattle puzzle");
-        }
-
         int size = Integer.parseInt(puzzleElement.getAttribute("size"));
+        if (regionNodes.getLength() != size) {
+            throw new InvalidFileFormatException("Not the current amount of regions in the puzzle.");
+        }
 
-        StarBattleBoard StarBattleBoard = new StarBattleBoard(size); // Initialize the board with width and height from XML
+        StarBattleBoard StarBattleBoard = new StarBattleBoard(size, puzzle_num); // Initialize the board with width and height from XML
 
         for (int i = 0; i < regionNodes.getLength(); i++) {
             Element regionElement = (Element) regionNodes.item(i);
             NodeList cellNodes = regionElement.getElementsByTagName("cell");
+            StarBattleRegion region_i = new StarBattleRegion();
 
             for (int j = 0; j < cellNodes.getLength(); j++) {
                 Element cellElement = (Element) cellNodes.item(j);
@@ -88,7 +88,9 @@ public void initializeBoard(Node node) throws InvalidFileFormatException {
 
                 // Add the cell to the board
                 StarBattleBoard.setCell(x, y, cell);
+                region_i.addCell(cell);
             }
+            StarBattleBoard.setRegion(i, region_i);
         }
 
         puzzle.setCurrentBoard(StarBattleBoard);
@@ -102,7 +104,7 @@ public void initializeBoard(Node node) throws InvalidFileFormatException {
      */
     @Override
     public void initializeBoard(String[] statements) throws UnsupportedOperationException {
-        throw new UnsupportedOperationException("Ripple Effect does not accept text input");
+        throw new UnsupportedOperationException("Star Battle does not accept text input");
     }
 }
 

From 52c1aee25da3e80586cbdba537be411fa798fff9 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 15 Mar 2024 17:27:54 -0400
Subject: [PATCH 33/67] Rule check method for star or empty case rule

---
 .../starbattle/rules/StarOrEmptyCaseRule.java | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
index a30823faa..1bbbe3e92 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
@@ -5,11 +5,14 @@
 import edu.rpi.legup.model.gameboard.CaseBoard;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
 import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeCell;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeType;
 import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class StarOrEmptyCaseRule extends CaseRule {
 
@@ -29,7 +32,29 @@ public StarOrEmptyCaseRule() {
      */
     @Override
     public String checkRuleRaw(TreeTransition transition) {
-        //TODO: implement this
+        List<TreeTransition> childTransitions = transition.getParents().get(0).getChildren();
+        if (childTransitions.size() != 2) {
+            return super.getInvalidUseOfRuleMessage() + ": This case rule must have 2 children.";
+        }
+
+        TreeTransition case1 = childTransitions.get(0);
+        TreeTransition case2 = childTransitions.get(1);
+        if (case1.getBoard().getModifiedData().size() != 1 ||
+                case2.getBoard().getModifiedData().size() != 1) {
+            return super.getInvalidUseOfRuleMessage() + ": This case rule must have 1 modified cell for each case.";
+        }
+
+        StarBattleCell mod1 = (StarBattleCell) case1.getBoard().getModifiedData().iterator().next();
+        StarBattleCell mod2 = (StarBattleCell) case2.getBoard().getModifiedData().iterator().next();
+        if (!mod1.getLocation().equals(mod2.getLocation())) {
+            return super.getInvalidUseOfRuleMessage() + ": This case rule must modify the same cell for each case.";
+        }
+
+        if (!((mod1.getType() == StarBattleCellType.STAR && mod2.getType() == StarBattleCellType.BLACK) ||
+                (mod2.getType() == StarBattleCellType.STAR && mod1.getType() == StarBattleCellType.BLACK))) {
+            return super.getInvalidUseOfRuleMessage() + ": This case rule must create a star cell and a black cell.";
+        }
+
         return null;
     }
 

From 08492e146af252e83bc9737cba59ebae996df286 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 15 Mar 2024 17:40:46 -0400
Subject: [PATCH 34/67] Added exporter

---
 .../puzzle/starbattle/StarBattleExporter.java | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleExporter.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleExporter.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleExporter.java
new file mode 100644
index 000000000..dcf149d0f
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleExporter.java
@@ -0,0 +1,36 @@
+package edu.rpi.legup.puzzle.starbattle;
+
+import edu.rpi.legup.model.PuzzleExporter;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+
+import org.w3c.dom.Document;
+
+public class StarBattleExporter extends PuzzleExporter {
+    public StarBattleExporter(StarBattle starbattle) {
+        super(starbattle);
+    }
+
+    @Override
+    protected org.w3c.dom.Element createBoardElement(Document newDocument) {
+        StarBattleBoard board = (StarBattleBoard) puzzle.getTree().getRootNode().getBoard();
+        org.w3c.dom.Element boardElement = newDocument.createElement("board");
+        boardElement.setAttribute("size", String.valueOf(board.getSize()));
+        boardElement.setAttribute("puzzle_num", String.valueOf(board.getPuzzleNumber()));
+        for (PuzzleElement puzzleElement : board.getPuzzleElements()) {
+            org.w3c.dom.Element regionsElement = newDocument.createElement("region");
+            StarBattleRegion region = (StarBattleRegion) puzzleElement;
+            org.w3c.dom.Element cellsElement = newDocument.createElement("cells");
+            for (PuzzleElement puzzleElement : region.getPuzzleElements()) {
+                StarBattleCell cell = (StarBattleCell) puzzleElement;
+                if (cell.getData() != -2) {
+                    org.w3c.dom.Element cellElement = puzzle.getFactory().exportCell(newDocument, puzzleElement);
+                    cellsElement.appendChild(cellElement);
+                }
+                regionsElement.appendChild(cellsElement);
+            }
+            boardElement.appendChild(regionsElement);
+        }
+        
+        return boardElement;
+    }
+}

From cbe163513b4897bee86a96a209122199b65413be Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Fri, 15 Mar 2024 20:17:17 -0400
Subject: [PATCH 35/67] Updated TooManyStarsContradictionRule

---
 .../rules/ClashingOrbitContradictionRule.java |  1 +
 .../rules/TooManyStarsContradictionRule.java  | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
index 79453803b..28398143e 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
@@ -33,6 +33,7 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
         StarBattleBoard starbattleBoard = (StarBattleBoard) board;
         StarBattleCell cell = (StarBattleCell) starbattleBoard.getPuzzleElement(puzzleElement);
 
+        // Contradiction rule can only be applied to cells with a star in it
         if (cell.getType() != StarBattleCellType.STAR) {
             return super.getNoContradictionMessage();
         }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
index 09f6e8136..9165a2b1a 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
@@ -5,11 +5,17 @@
 import edu.rpi.legup.model.rules.ContradictionRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.lightup.LightUpCell;
 import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+import edu.rpi.legup.puzzle.starbattle.StarBattleRegion;
+
+import java.awt.*;
+import java.util.List;
 
 public class TooManyStarsContradictionRule extends ContradictionRule {
+    private final String INVALID_USE_MESSAGE = "Contradiction must be a cell containing a star.";
 
     public TooManyStarsContradictionRule() {
         super("STBL-CONT-0001",
@@ -28,11 +34,68 @@ public TooManyStarsContradictionRule() {
      */
     @Override
     public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
+        StarBattleBoard starbattleBoard = (StarBattleBoard) board;
+        StarBattleCell cell = (StarBattleCell) starbattleBoard.getPuzzleElement(puzzleElement);
+        Point location = cell.getLocation();
+        int starCount = 0;
+        int puzzleNum = starbattleBoard.getPuzzleNumber();
+
+        if (cell.getType() != StarBattleCellType.STAR) {
+            return super.getNoContradictionMessage();
+        }
+
         // check row
+        for (int i = location.x - 1; i >= 0; i--) { // to the left of selected cell
+            StarBattleCell check = starbattleBoard.getCell(i, location.y);
+            if (check.getType() == StarBattleCellType.STAR) {
+                starCount++;
+                if (starCount >= puzzleNum) {
+                    break;
+                }
+            }
+        }
+
+        for (int i = location.x + 1; i < starbattleBoard.getWidth(); i++) { // to the right of selected cell
+            StarBattleCell check = starbattleBoard.getCell(i, location.y);
+            if (check.getType() == StarBattleCellType.STAR) {
+                starCount++;
+                if (starCount >= puzzleNum) {
+                    break;
+                }
+            }
+        }
 
         // check column
+        starCount = 0;
+        for (int j = location.y - 1; j >= 0; j--) { // above selected cell
+            StarBattleCell check = starbattleBoard.getCell(location.x, j);
+            if (check.getType() == StarBattleCellType.STAR) {
+                starCount++;
+                if (starCount >= puzzleNum) {
+                    break;
+                }
+            }
+        }
+
+        for (int j = location.y + 1; j < starbattleBoard.getWidth(); j++) { // below selected cell
+            StarBattleCell check = starbattleBoard.getCell(location.x, j);
+            if (check.getType() == StarBattleCellType.STAR) {
+                starCount++;
+                if (starCount >= puzzleNum) {
+                    break;
+                }
+            }
+        }
 
         // check region
+        starCount = 0;
+        List<StarBattleRegion> reg;
+        /*
+        for (go through list of regions) {
+            check all spots in region
+        }
+        */
+
         return super.getNoContradictionMessage();
     }
 }
\ No newline at end of file

From dd8b3fef0047ce78fefb691bd5e87885ac47645b Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 19 Mar 2024 16:39:38 -0400
Subject: [PATCH 36/67] added region check to TooManyStarsContradictionRule

---
 .../rules/TooManyStarsContradictionRule.java  | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
index 9165a2b1a..a3044a8cb 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
@@ -15,7 +15,7 @@
 import java.util.List;
 
 public class TooManyStarsContradictionRule extends ContradictionRule {
-    private final String INVALID_USE_MESSAGE = "Contradiction must be a cell containing a star.";
+    private final String INVALID_USE_MESSAGE = "Contradiction must be applied to a cell containing a star.";
 
     public TooManyStarsContradictionRule() {
         super("STBL-CONT-0001",
@@ -39,9 +39,10 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
         Point location = cell.getLocation();
         int starCount = 0;
         int puzzleNum = starbattleBoard.getPuzzleNumber();
+        boolean valid = false;
 
         if (cell.getType() != StarBattleCellType.STAR) {
-            return super.getNoContradictionMessage();
+            return INVALID_USE_MESSAGE;
         }
 
         // check row
@@ -50,6 +51,7 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
             if (check.getType() == StarBattleCellType.STAR) {
                 starCount++;
                 if (starCount >= puzzleNum) {
+                    valid = true;
                     break;
                 }
             }
@@ -60,6 +62,7 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
             if (check.getType() == StarBattleCellType.STAR) {
                 starCount++;
                 if (starCount >= puzzleNum) {
+                    valid = true;
                     break;
                 }
             }
@@ -72,6 +75,7 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
             if (check.getType() == StarBattleCellType.STAR) {
                 starCount++;
                 if (starCount >= puzzleNum) {
+                    valid = true;
                     break;
                 }
             }
@@ -82,6 +86,7 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
             if (check.getType() == StarBattleCellType.STAR) {
                 starCount++;
                 if (starCount >= puzzleNum) {
+                    valid = true;
                     break;
                 }
             }
@@ -89,13 +94,20 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
 
         // check region
         starCount = 0;
-        List<StarBattleRegion> reg;
-        /*
-        for (go through list of regions) {
-            check all spots in region
+        StarBattleRegion reg = starbattleBoard.getRegion(cell);
+        List<StarBattleCell> cellList = reg.getCells(); // list of cells
+        for (int k = 0; k < cellList.size(); k++) {
+            if (cellList.get(k) == cell) {
+                continue;
+            } else if (cellList.get(k).getType() == StarBattleCellType.STAR) {
+                valid = true;
+                break;
+            }
         }
-        */
 
-        return super.getNoContradictionMessage();
+        if (valid == true) {
+            return super.getNoContradictionMessage();
+        }
+        return null;
     }
 }
\ No newline at end of file

From 2555896041d62b86b86656145cce6fde2106492a Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 19 Mar 2024 16:41:27 -0400
Subject: [PATCH 37/67] Split up row/column and region containment rules into
 separate rules for rows and columns

---
 .../puzzle/starbattle/StarBattleBoard.java    |  2 +-
 .../rules/ColumnsWithinRegionsDirectRule.java | 43 +++++++++++++++++++
 .../rules/FinishWithStarsDirectRule.java      |  2 +-
 ...va => RegionsWithinColumnsDirectRule.java} |  9 ++--
 .../rules/RegionsWithinRowsDirectRule.java    | 43 +++++++++++++++++++
 ....java => RowsWithinRegionsDirectRule.java} |  9 ++--
 .../rules/SurroundStarDirectRule.java         |  2 +-
 .../rules/starbattle_reference_sheet.txt      | 10 +++--
 8 files changed, 101 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
 rename src/main/java/edu/rpi/legup/puzzle/starbattle/rules/{RegionsWithinRowsColumnsDirectRule.java => RegionsWithinColumnsDirectRule.java} (81%)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
 rename src/main/java/edu/rpi/legup/puzzle/starbattle/rules/{RowsColumnsWithinRegionsDirectRule.java => RowsWithinRegionsDirectRule.java} (82%)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
index a2a93ff8e..7accc86e3 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -60,7 +60,7 @@ public StarBattleRegion getRegion(int index) {
         }
         return regions.get(index);
     }
-    
+
     public StarBattleRegion getRegion(StarBattleCell cell) {
         return getRegion(cell.getGroupIndex());
     }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
new file mode 100644
index 000000000..05c9a2868
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
@@ -0,0 +1,43 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+
+public class ColumnsWithinRegionsDirectRule extends DirectRule {
+    public ColumnsWithinRegionsDirectRule() {
+        super("STBL-BASC-0002",
+                "Columns Within Regions",
+                "If a number of columns is fully contained by an equal number of regions, spaces of other columns in those regions must be black.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        return null;
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
index 53ab8d947..13050a5ac 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
@@ -13,7 +13,7 @@
 public class FinishWithStarsDirectRule extends DirectRule {
 
     public FinishWithStarsDirectRule() {
-        super("STBL-BASC-0002",
+        super("STBL-BASC-0003",
                 "Finish With Stars",
                 "Unknown spaces must be stars if there are just enough in a row, column, or region to satisfy the puzzle number.",
                 "INSERT IMAGE NAME HERE");
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsColumnsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
similarity index 81%
rename from src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsColumnsDirectRule.java
rename to src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
index 81645a2ad..84787e704 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsColumnsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
@@ -5,13 +5,10 @@
 import edu.rpi.legup.model.rules.DirectRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
-import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
-import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
-import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
 
-public class RegionsWithinRowsColumnsDirectRule extends DirectRule {
-    public RegionsWithinRowsColumnsDirectRule() {
-        super("STBL-BASC-0003",
+public class RegionsWithinColumnsDirectRule extends DirectRule {
+    public RegionsWithinColumnsDirectRule() {
+        super("STBL-BASC-0004",
                 "Regions Within Rows/Columns",
                 "If a number of regions is fully contained by an equal number of rows or columns, spaces of other regions in those rows or columns must be black.",
                 "INSERT IMAGE NAME HERE");
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
new file mode 100644
index 000000000..e71c97df9
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
@@ -0,0 +1,43 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+
+public class RegionsWithinRowsDirectRule extends DirectRule {
+    public RegionsWithinRowsDirectRule() {
+        super("STBL-BASC-0005",
+                "Regions Within Rows/Columns",
+                "If a number of regions is fully contained by an equal number of rows or columns, spaces of other regions in those rows or columns must be black.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        return null;
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
similarity index 82%
rename from src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsColumnsWithinRegionsDirectRule.java
rename to src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
index 53a7b27ee..128c44095 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsColumnsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
@@ -5,13 +5,10 @@
 import edu.rpi.legup.model.rules.DirectRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
-import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
-import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
-import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
 
-public class RowsColumnsWithinRegionsDirectRule extends DirectRule {
-    public RowsColumnsWithinRegionsDirectRule() {
-        super("STBL-BASC-0004",
+public class RowsWithinRegionsDirectRule extends DirectRule {
+    public RowsWithinRegionsDirectRule() {
+        super("STBL-BASC-0006",
                 "Rows/Columns Within Regions",
                 "If a number of rows or columns is fully contained by an equal number of regions, spaces of other rows or columns, respectively, in those regions must be black.",
                 "INSERT IMAGE NAME HERE");
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
index 0c46da09c..a5533104c 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
@@ -13,7 +13,7 @@
 public class SurroundStarDirectRule extends DirectRule {
 
     public SurroundStarDirectRule() {
-        super("STBL-BASC-0005",
+        super("STBL-BASC-0007",
                 "Surround Star",
                 "Any space adjacent to a star must be black.",
                 "INSERT IMAGE NAME HERE");
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt
index 70e81bb73..958440a71 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt
@@ -4,10 +4,12 @@ Star or Empty: STBL-CASE-0002
 
 Basic Rules:
 Blackout: STBL-BASC-0001
-Finish With Stars: STBL-BASC-0002
-Regions Within Rows or Columns: STBL-BASC-0003
-Rows or Columns Within Regions: STBL-BASC-0004
-Surround Star: STBL-BASC-0005
+Columns Within Regions: STBL-BASC-0002
+Finish With Stars: STBL-BASC-0003
+Regions Within Columns: STBL-BASC-0004
+Regions Within Rows: STBL-BASC-0005
+Rows Within Regions: STBL-BASC-0006
+Surround Star: STBL-BASC-0007
 
 Contradiction Rules:
 Too Many Stars: STBL-CONT-0001

From 489f31d4c53180d2fe7e0d61396fb13d8e99df51 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Tue, 19 Mar 2024 17:09:49 -0400
Subject: [PATCH 38/67] Create StarBattleCellFactory.java

---
 .../edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
new file mode 100644
index 000000000..e69de29bb

From 7674f2225dc23ba409b56a76f5e7ec939dc6f3e8 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 19 Mar 2024 17:19:19 -0400
Subject: [PATCH 39/67] Start implementing columns within regions direct rule

---
 .../puzzle/starbattle/StarBattleBoard.java    | 11 +++++++
 .../puzzle/starbattle/StarBattleRegion.java   |  9 ++++++
 .../rules/ColumnsWithinRegionsDirectRule.java | 29 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
index 7accc86e3..764e952ea 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -69,6 +69,17 @@ public void setRegion(int regionNum, StarBattleRegion region) {
         regions.set(regionNum, region);
     }
 
+    public int columnStars(int columnIndex) {
+        int stars = 0;
+        if (columnIndex < size) {
+            for (StarBattleCell c: this.getCol(columnIndex)) {
+                if (c.getType() == StarBattleCellType.STAR)
+                    ++stars;
+            }
+        }
+        return stars;
+    }
+
     public StarBattleBoard copy() {
         StarBattleBoard copy = new StarBattleBoard(size, puzzleNum);
         for (int x = 0; x < this.dimension.width; x++) {
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java
index ebae5ce86..099cabfcd 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleRegion.java
@@ -14,4 +14,13 @@ public StarBattleRegion copy() {
         }
         return copy;
     }
+
+    public int numStars() {
+        int stars = 0;
+        for (StarBattleCell c: regionCells) {
+            if (c.getType() == StarBattleCellType.STAR)
+                ++stars;
+        }
+        return stars;
+    }
 }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
index 05c9a2868..efd8b47ca 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
@@ -1,10 +1,16 @@
 package edu.rpi.legup.puzzle.starbattle.rules;
 
 import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.GridRegion;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
 import edu.rpi.legup.model.rules.DirectRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+import java.util.HashSet;
 
 public class ColumnsWithinRegionsDirectRule extends DirectRule {
     public ColumnsWithinRegionsDirectRule() {
@@ -25,7 +31,28 @@ public ColumnsWithinRegionsDirectRule() {
      */
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
-
+        StarBattleBoard board = (StarBattleBoard) transition.getBoard();
+        StarBattleCell cell = (StarBattleCell) board.getPuzzleElement(puzzleElement);
+        if (cell.getType() != StarBattleCellType.BLACK) {
+            return "Only black cells are allowed for this rule!";
+        }
+        //which columns are within the region
+        HashSet<Integer> columns = new HashSet<Integer>();
+        int columnStars = 0;
+        for (PuzzleElement r: board.getRegion(cell).getCells()) {
+            columns.add(((StarBattleCell) r).getLocation().x);
+        }
+        //which regions are the columns within
+        HashSet<Integer> regions = new HashSet<Integer>();
+        int regionStars = 0;
+        for (Integer c: columns) {
+            for (int i = 0; i < board.getSize(); ++i) {
+                if (regions.add(board.getCell(c,i).getGroupIndex())) {
+                    regionStars += board.getRegion(board.getCell(c,i)).numStars();
+                }
+            }
+        }
+        // are the columns and regions missing an equal amount of stars
         return null;
     }
 

From 53a5004f00ab5e81a954c89223e98c412559bf87 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 19 Mar 2024 17:28:54 -0400
Subject: [PATCH 40/67] Continue columns within regions

---
 .../legup/puzzle/starbattle/StarBattleBoard.java   | 11 +++++++++++
 .../rules/ColumnsWithinRegionsDirectRule.java      | 14 +++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
index 764e952ea..ce04f31a6 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -80,6 +80,17 @@ public int columnStars(int columnIndex) {
         return stars;
     }
 
+    public int rowStars(int rowIndex) {
+        int stars = 0;
+        if (rowIndex < size) {
+            for (StarBattleCell c: this.getRow(rowIndex)) {
+                if (c.getType() == StarBattleCellType.STAR)
+                    ++stars;
+            }
+        }
+        return stars;
+    }
+
     public StarBattleBoard copy() {
         StarBattleBoard copy = new StarBattleBoard(size, puzzleNum);
         for (int x = 0; x < this.dimension.width; x++) {
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
index efd8b47ca..086a8f82e 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
@@ -11,6 +11,7 @@
 import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
 
 import java.util.HashSet;
+import java.util.Set;
 
 public class ColumnsWithinRegionsDirectRule extends DirectRule {
     public ColumnsWithinRegionsDirectRule() {
@@ -31,19 +32,23 @@ public ColumnsWithinRegionsDirectRule() {
      */
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+        //TODO: fix this
         StarBattleBoard board = (StarBattleBoard) transition.getBoard();
         StarBattleCell cell = (StarBattleCell) board.getPuzzleElement(puzzleElement);
         if (cell.getType() != StarBattleCellType.BLACK) {
             return "Only black cells are allowed for this rule!";
         }
         //which columns are within the region
-        HashSet<Integer> columns = new HashSet<Integer>();
+        Set<Integer> columns = new HashSet<Integer>();
         int columnStars = 0;
         for (PuzzleElement r: board.getRegion(cell).getCells()) {
-            columns.add(((StarBattleCell) r).getLocation().x);
+            int column = ((StarBattleCell) r).getLocation().x;
+            if (columns.add(column)) {
+                columnStars += board.columnStars(column);
+            }
         }
         //which regions are the columns within
-        HashSet<Integer> regions = new HashSet<Integer>();
+        Set<Integer> regions = new HashSet<Integer>();
         int regionStars = 0;
         for (Integer c: columns) {
             for (int i = 0; i < board.getSize(); ++i) {
@@ -53,6 +58,9 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
             }
         }
         // are the columns and regions missing an equal amount of stars
+        if (board.getPuzzleNumber() * columns.size() - columnStars != board.getPuzzleNumber() * regions.size() - regionStars) {
+            return "The number of missing stars in the ";
+        }
         return null;
     }
 

From eee926b4c51e049d07e8ba30618208979bb51b24 Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Wed, 20 Mar 2024 13:52:28 -0400
Subject: [PATCH 41/67] reworked TooManyStars logic

---
 .../8x8 Star Battle 1star Normal1.xml         | 10 ++++++
 .../rules/TooManyStarsContradictionRule.java  | 33 ++++++++++---------
 2 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml

diff --git a/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml b/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml
new file mode 100644
index 000000000..ba237102f
--- /dev/null
+++ b/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board width="8" height="8" puzzle_num="1">
+            <region>
+
+            </region>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
index a3044a8cb..7777ff5a4 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
@@ -39,30 +39,30 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
         Point location = cell.getLocation();
         int starCount = 0;
         int puzzleNum = starbattleBoard.getPuzzleNumber();
-        boolean valid = false;
+        boolean valid = true;
 
         if (cell.getType() != StarBattleCellType.STAR) {
-            return INVALID_USE_MESSAGE;
+            return this.INVALID_USE_MESSAGE;
         }
 
         // check row
-        for (int i = location.x - 1; i >= 0; i--) { // to the left of selected cell
+        for (int i = location.x - 1; i >= 0; i--) {
             StarBattleCell check = starbattleBoard.getCell(i, location.y);
             if (check.getType() == StarBattleCellType.STAR) {
                 starCount++;
                 if (starCount >= puzzleNum) {
-                    valid = true;
+                    valid = false;
                     break;
                 }
             }
         }
 
-        for (int i = location.x + 1; i < starbattleBoard.getWidth(); i++) { // to the right of selected cell
+        for (int i = location.x + 1; i < starbattleBoard.getWidth(); i++) {
             StarBattleCell check = starbattleBoard.getCell(i, location.y);
             if (check.getType() == StarBattleCellType.STAR) {
                 starCount++;
                 if (starCount >= puzzleNum) {
-                    valid = true;
+                    valid = false;
                     break;
                 }
             }
@@ -70,23 +70,23 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
 
         // check column
         starCount = 0;
-        for (int j = location.y - 1; j >= 0; j--) { // above selected cell
+        for (int j = location.y - 1; j >= 0; j--) {
             StarBattleCell check = starbattleBoard.getCell(location.x, j);
             if (check.getType() == StarBattleCellType.STAR) {
                 starCount++;
                 if (starCount >= puzzleNum) {
-                    valid = true;
+                    valid = false;
                     break;
                 }
             }
         }
 
-        for (int j = location.y + 1; j < starbattleBoard.getWidth(); j++) { // below selected cell
+        for (int j = location.y + 1; j < starbattleBoard.getWidth(); j++) {
             StarBattleCell check = starbattleBoard.getCell(location.x, j);
             if (check.getType() == StarBattleCellType.STAR) {
                 starCount++;
                 if (starCount >= puzzleNum) {
-                    valid = true;
+                    valid = false;
                     break;
                 }
             }
@@ -97,15 +97,16 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
         StarBattleRegion reg = starbattleBoard.getRegion(cell);
         List<StarBattleCell> cellList = reg.getCells(); // list of cells
         for (int k = 0; k < cellList.size(); k++) {
-            if (cellList.get(k) == cell) {
-                continue;
-            } else if (cellList.get(k).getType() == StarBattleCellType.STAR) {
-                valid = true;
-                break;
+            if (cellList.get(k).getType() == StarBattleCellType.STAR) {
+                starCount++;
+                if (starCount >= puzzleNum) {
+                    valid = false;
+                    break;
+                }
             }
         }
 
-        if (valid == true) {
+        if (valid == false) {
             return super.getNoContradictionMessage();
         }
         return null;

From 59c8d6f9563caff709e20e84a4bc15f8d04a5600 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:10:18 -0400
Subject: [PATCH 42/67] Exporter and Cell Factory started

---
 .../starbattle/StarBattleCellFactory.java     | 66 +++++++++++++++++++
 .../puzzle/starbattle/StarBattleExporter.java | 11 ++--
 2 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
index e69de29bb..06c879836 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
@@ -0,0 +1,66 @@
+package edu.rpi.legup.puzzle.starbattle;
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.ElementFactory;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeCell;
+import edu.rpi.legup.puzzle.starbattle.starbattleBoard;
+import edu.rpi.legup.puzzle.starbattle.starbattleCell;
+import edu.rpi.legup.save.InvalidFileFormatException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.awt.*;
+
+public class StarBattleCellFactory extends ElementFactory {
+    @Override
+    public StarBattleCell importCell(Node node, Board board) throws InvalidFileFormatException {
+        try {
+            if (!node.getNodeName().equalsIgnoreCase("cell")) {
+                throw new InvalidFileFormatException("starbattle Factory: unknown puzzleElement puzzleElement");
+            }
+
+            StarBattleBoard starbattleBoard = (StarBattleBoard) board;
+            int size = starbattleBoard.getSize();
+
+            NamedNodeMap attributeList = node.getAttributes();
+            int value = Integer.valueOf(attributeList.getNamedItem("value").getNodeValue());
+            int x = Integer.valueOf(attributeList.getNamedItem("x").getNodeValue());
+            int y = Integer.valueOf(attributeList.getNamedItem("y").getNodeValue());
+            int groupIndex = Integer.valueOf(attributeList.getNamedItem("groupIndex").getNodeValue());
+            if (x >= size || y >= size) {
+                throw new InvalidFileFormatException("starbattle Factory: cell location out of bounds");
+            }
+            if (groupIndex >= size || groupIndex < 0) {
+                throw new InvalidFileFormatException("starbattle Factory: not in a valid region");
+            }
+            if (value != 0) { //ALL INITIAL PUZZLES ARE BLANK, SUBJECT TO CHANGE
+                throw new InvalidFileFormatException("starbattle Factory: cell unknown value");
+            }
+
+            StarBattleCell cell = new StarBattleCell(value, new Point(x, y), groupIndex, size);
+            cell.setIndex(y * size + x);
+            return cell;
+        }
+        catch (NumberFormatException e1) {
+            throw new InvalidFileFormatException("starbattle Factory: unknown value where integer expected");
+        } catch (NullPointerException e2) {
+            throw new InvalidFileFormatException("starbattle Factory: could not find attribute(s)");
+        }
+    }
+
+    public org.w3c.dom.Element exportCell(Document document, PuzzleElement puzzleElement) {
+        org.w3c.dom.Element cellElement = document.createElement("cell");
+
+        NurikabeCell cell = (NurikabeCell) puzzleElement;
+        Point loc = cell.getLocation();
+
+        cellElement.setAttribute("value", String.valueOf(cell.getData()));
+        cellElement.setAttribute("x", String.valueOf(loc.x));
+        cellElement.setAttribute("y", String.valueOf(loc.y));
+
+        return cellElement;
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleExporter.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleExporter.java
index dcf149d0f..58fb41e63 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleExporter.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleExporter.java
@@ -1,7 +1,6 @@
 package edu.rpi.legup.puzzle.starbattle;
 
 import edu.rpi.legup.model.PuzzleExporter;
-import edu.rpi.legup.model.gameboard.PuzzleElement;
 
 import org.w3c.dom.Document;
 
@@ -16,14 +15,12 @@ protected org.w3c.dom.Element createBoardElement(Document newDocument) {
         org.w3c.dom.Element boardElement = newDocument.createElement("board");
         boardElement.setAttribute("size", String.valueOf(board.getSize()));
         boardElement.setAttribute("puzzle_num", String.valueOf(board.getPuzzleNumber()));
-        for (PuzzleElement puzzleElement : board.getPuzzleElements()) {
+        for (StarBattleRegion sb_region : board.regions) {
             org.w3c.dom.Element regionsElement = newDocument.createElement("region");
-            StarBattleRegion region = (StarBattleRegion) puzzleElement;
             org.w3c.dom.Element cellsElement = newDocument.createElement("cells");
-            for (PuzzleElement puzzleElement : region.getPuzzleElements()) {
-                StarBattleCell cell = (StarBattleCell) puzzleElement;
-                if (cell.getData() != -2) {
-                    org.w3c.dom.Element cellElement = puzzle.getFactory().exportCell(newDocument, puzzleElement);
+            for (StarBattleCell cell : sb_region.getCells()) {
+                if (cell.getData() == 0) {
+                    org.w3c.dom.Element cellElement = puzzle.getFactory().exportCell(newDocument, cell);
                     cellsElement.appendChild(cellElement);
                 }
                 regionsElement.appendChild(cellsElement);

From 9d5362b94680e212e7c0521e48de106e12ab021b Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:12:50 -0400
Subject: [PATCH 43/67] Update StarBattleCellFactory.java

---
 .../rpi/legup/puzzle/starbattle/StarBattleCellFactory.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
index 06c879836..827934111 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
@@ -2,9 +2,8 @@
 import edu.rpi.legup.model.gameboard.Board;
 import edu.rpi.legup.model.gameboard.ElementFactory;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
-import edu.rpi.legup.puzzle.nurikabe.NurikabeCell;
-import edu.rpi.legup.puzzle.starbattle.starbattleBoard;
-import edu.rpi.legup.puzzle.starbattle.starbattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.save.InvalidFileFormatException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -54,7 +53,7 @@ public StarBattleCell importCell(Node node, Board board) throws InvalidFileForma
     public org.w3c.dom.Element exportCell(Document document, PuzzleElement puzzleElement) {
         org.w3c.dom.Element cellElement = document.createElement("cell");
 
-        NurikabeCell cell = (NurikabeCell) puzzleElement;
+        StarBattleCell cell = (StarBattleCell) puzzleElement;
         Point loc = cell.getLocation();
 
         cellElement.setAttribute("value", String.valueOf(cell.getData()));

From 0deae52edcb4cc5315db11626dc46f4d0d6697fe Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:26:53 -0400
Subject: [PATCH 44/67] Deleted extraneous libraries, and finished going thru
 guide of implementing puzzles

Hopefully we get puzzles up soon.
---
 .../java/edu/rpi/legup/puzzle/starbattle/StarBattle.java | 8 ++++----
 .../legup/puzzle/starbattle/StarBattleCellFactory.java   | 4 ----
 .../rpi/legup/puzzle/starbattle/StarBattleImporter.java  | 9 ---------
 .../edu/rpi/legup/puzzle/starbattle/StarBattleView.java  | 2 +-
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
index 78800916e..760fa88b2 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattle.java
@@ -5,12 +5,12 @@
 public class StarBattle extends Puzzle {
     public StarBattle() {
         super();
-        //this.name = "StarBattle";
+        this.name = "StarBattle";
 
-        //this.importer = new StarBattleImporter(this);
-        //this.exporter = new StarBattleExporter(this);
+        this.importer = new StarBattleImporter(this);
+        this.exporter = new StarBattleExporter(this);
 
-        //this.factory = new StarBattleCellFactory();
+        this.factory = new StarBattleCellFactory();
     }
 
     @Override
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
index 827934111..92ea8abf6 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
@@ -2,14 +2,10 @@
 import edu.rpi.legup.model.gameboard.Board;
 import edu.rpi.legup.model.gameboard.ElementFactory;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
-import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
-import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
 import edu.rpi.legup.save.InvalidFileFormatException;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 import java.awt.*;
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
index 32090172e..fa0e065ee 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleImporter.java
@@ -5,12 +5,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import java.awt.*;
 import java.awt.Point;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 public class StarBattleImporter extends PuzzleImporter{
@@ -20,8 +15,6 @@ public StarBattleImporter(StarBattle starbattle) {
         super(starbattle);
     }
 
-    private Map<Point, StarBattleRegion> regionsMap;
-
     /**
      * Puzzle setting to support row and column inputs
      */
@@ -49,8 +42,6 @@ public void initializeBoard(int rows, int columns) {
         puzzle.setCurrentBoard(StarBattleBoard);
     }
 
-
-
     /**
      * Constructs StarBattle gameboard
      * @param node xml document node
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
index fdf0df221..a39770d85 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
@@ -31,7 +31,7 @@ public class StarBattleView extends GridBoardView {
             STAR = ImageIO.read(ClassLoader.getSystemResourceAsStream("edu/rpi/legup/images/starbattle/star.png"));
         }
         catch (IOException e) {
-            LOGGER.error("Failed to open StarBattle images");
+            LOGGER.error("Failed to open starbattle image.");
         }
     }
 

From 2ba4382b9243a73a7bf1b58d91c8d1d79349bc07 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 22 Mar 2024 17:12:02 -0400
Subject: [PATCH 45/67] Implemented rule check function for region/row/column
 overlap rules

---
 .../rules/ColumnsWithinRegionsDirectRule.java | 46 ++++++---
 .../rules/ColumnsWithinRowsDirectRule.java    | 97 +++++++++++++++++++
 .../rules/RegionsWithinColumnsDirectRule.java |  8 +-
 .../rules/RegionsWithinRowsDirectRule.java    |  7 +-
 .../rules/RowsWithinColumnsDirectRule.java    | 51 ++++++++++
 .../rules/RowsWithinRegionsDirectRule.java    | 55 ++++++++++-
 6 files changed, 240 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
 create mode 100644 src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
index 086a8f82e..980f6db19 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
@@ -32,34 +32,50 @@ public ColumnsWithinRegionsDirectRule() {
      */
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
-        //TODO: fix this
+        //assumption: the rule has been applied to its fullest extent and the rows and regions
+        //are now mutually encompassing
         StarBattleBoard board = (StarBattleBoard) transition.getBoard();
         StarBattleCell cell = (StarBattleCell) board.getPuzzleElement(puzzleElement);
         if (cell.getType() != StarBattleCellType.BLACK) {
             return "Only black cells are allowed for this rule!";
         }
-        //which columns are within the region
+        //the columns that are contained
         Set<Integer> columns = new HashSet<Integer>();
-        int columnStars = 0;
-        for (PuzzleElement r: board.getRegion(cell).getCells()) {
-            int column = ((StarBattleCell) r).getLocation().x;
-            if (columns.add(column)) {
-                columnStars += board.columnStars(column);
-            }
-        }
-        //which regions are the columns within
+        //the regions that contain them
         Set<Integer> regions = new HashSet<Integer>();
+        //columns and regions to process
+        Set<Integer> columnsToCheck = new HashSet<Integer>();
+        Set<Integer> regionsToCheck = new HashSet<Integer>();
+        int columnStars = 0;
         int regionStars = 0;
-        for (Integer c: columns) {
-            for (int i = 0; i < board.getSize(); ++i) {
-                if (regions.add(board.getCell(c,i).getGroupIndex())) {
-                    regionStars += board.getRegion(board.getCell(c,i)).numStars();
+        regions.add(cell.getGroupIndex());
+        regionsToCheck.add(cell.getGroupIndex());
+
+        while (!columnsToCheck.isEmpty() || !regionsToCheck.isEmpty()) {
+            for (int r: regionsToCheck) {
+                regionStars += board.getRegion(r).numStars();
+                for (PuzzleElement c: board.getRegion(r).getCells()) {
+                    int column = ((StarBattleCell) c).getLocation().x;
+                    if (columns.add(column)) {
+                        columnsToCheck.add(column);
+                    }
+                }
+                regionsToCheck.remove(r);
+            }
+            for (int c: columnsToCheck) {
+                columnStars += board.columnStars(c);
+                for (int i = 0; i < board.getSize(); ++i) {
+                    int region = board.getCell(c,i).getGroupIndex();
+                    if (regions.add(region)) {
+                        regionsToCheck.add(region);
+                    }
                 }
+                columnsToCheck.remove(c);
             }
         }
         // are the columns and regions missing an equal amount of stars
         if (board.getPuzzleNumber() * columns.size() - columnStars != board.getPuzzleNumber() * regions.size() - regionStars) {
-            return "The number of missing stars in the ";
+            return "The number of missing stars in the columns and regions must be equal and every extraneous cell must be black!";
         }
         return null;
     }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
new file mode 100644
index 000000000..4c8eb6915
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
@@ -0,0 +1,97 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class ColumnsWithinRowsDirectRule extends DirectRule {
+
+    public ColumnsWithinRowsDirectRule() {
+        super("STBL-BASC-XXXX",
+                "Columns Within Rows",
+                "If a number of columns is fully contained by an equal number of rows, spaces of other columns in those rows must be black.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        //assumption: the rule has been applied to its fullest extent and the rows and columns
+        //are now mutually encompassing
+        StarBattleBoard board = (StarBattleBoard) transition.getBoard();
+        StarBattleCell cell = (StarBattleCell) board.getPuzzleElement(puzzleElement);
+        if (cell.getType() != StarBattleCellType.BLACK) {
+            return "Only black cells are allowed for this rule!";
+        }
+
+        //the columns that are contained
+        Set<Integer> columns = new HashSet<Integer>();
+        //the rows that contain them
+        Set<Integer> rows = new HashSet<Integer>();
+        //columns and rows to process
+        Set<Integer> columnsToCheck = new HashSet<Integer>();
+        Set<Integer> rowsToCheck = new HashSet<Integer>();
+        int columnStars = 0;
+        int rowStars = 0;
+        int firstRow = cell.getLocation().y;
+        rows.add(firstRow);
+        rowsToCheck.add(firstRow);
+
+        while (!columnsToCheck.isEmpty() || !rowsToCheck.isEmpty()) {
+            for (int r: rowsToCheck) {
+                rowStars += board.rowStars(r);
+                for (PuzzleElement c: board.getRow(r)) {
+                    int column = ((StarBattleCell) c).getLocation().x;
+                    if (columns.add(column)) {
+                        columnsToCheck.add(column);
+                    }
+                }
+                rowsToCheck.remove(r);
+            }
+            for (int c: columnsToCheck) {
+                columnStars += board.columnStars(c);
+                for (PuzzleElement r: board.getCol(c)) {
+                    int row = ((StarBattleCell) r).getLocation().y;
+                    if (rows.add(row)) {
+                        rowsToCheck.add(row);
+                    }
+                }
+                columnsToCheck.remove(c);
+            }
+        }
+        // are the columns and regions missing an equal amount of stars
+        if (board.getPuzzleNumber() * columns.size() - columnStars != board.getPuzzleNumber() * rows.size() - rowStars) {
+            return "The number of missing stars in the columns and rows must be equal and every extraneous cell must be black!";
+        }
+        return null;
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
index 84787e704..74e296522 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
@@ -9,8 +9,8 @@
 public class RegionsWithinColumnsDirectRule extends DirectRule {
     public RegionsWithinColumnsDirectRule() {
         super("STBL-BASC-0004",
-                "Regions Within Rows/Columns",
-                "If a number of regions is fully contained by an equal number of rows or columns, spaces of other regions in those rows or columns must be black.",
+                "Regions Within Columns",
+                "If a number of regions is fully contained by an equal number of columns, spaces of other regions in those columns must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
@@ -25,8 +25,8 @@ public RegionsWithinColumnsDirectRule() {
      */
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
-
-        return null;
+        ColumnsWithinRegionsDirectRule correspondingRule = new ColumnsWithinRegionsDirectRule();
+        return correspondingRule.checkRuleRawAt(transition, puzzleElement);
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
index e71c97df9..f89e0d63f 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
@@ -9,8 +9,8 @@
 public class RegionsWithinRowsDirectRule extends DirectRule {
     public RegionsWithinRowsDirectRule() {
         super("STBL-BASC-0005",
-                "Regions Within Rows/Columns",
-                "If a number of regions is fully contained by an equal number of rows or columns, spaces of other regions in those rows or columns must be black.",
+                "Regions Within Rows",
+                "If a number of regions is fully contained by an equal number of rows, spaces of other regions in those rows must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
@@ -26,7 +26,8 @@ public RegionsWithinRowsDirectRule() {
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
 
-        return null;
+        RowsWithinRegionsDirectRule correspondingRule = new RowsWithinRegionsDirectRule();
+        return correspondingRule.checkRuleRawAt(transition, puzzleElement);
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java
new file mode 100644
index 000000000..48fb1cd81
--- /dev/null
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java
@@ -0,0 +1,51 @@
+package edu.rpi.legup.puzzle.starbattle.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.DirectRule;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class RowsWithinColumnsDirectRule extends DirectRule {
+
+    public RowsWithinColumnsDirectRule() {
+        super("STBL-BASC-XXXX",
+                "Rows Withing Columns",
+                "If a number of rows is fully contained by an equal number of columns, spaces of other rows in those columns must be black.",
+                "INSERT IMAGE NAME HERE");
+    }
+
+    /**
+     * Checks whether the child node logically follows from the parent node
+     * at the specific puzzleElement index using this rule
+     *
+     * @param transition    transition to check
+     * @param puzzleElement equivalent puzzleElement
+     * @return null if the child node logically follow from the parent node at the specified puzzleElement,
+     * otherwise error message
+     */
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+
+        ColumnsWithinRowsDirectRule correspondingRule = new ColumnsWithinRowsDirectRule();
+        return correspondingRule.checkRuleRawAt(transition, puzzleElement);
+    }
+
+    /**
+     * Creates a transition {@link Board} that has this rule applied to it using the {@link TreeNode}.
+     *
+     * @param node tree node used to create default transition board
+     * @return default board or null if this rule cannot be applied to this tree node
+     */
+    @Override
+    public Board getDefaultBoard(TreeNode node) {
+
+        return null;
+    }
+}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
index 128c44095..8cc68d292 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
@@ -5,12 +5,18 @@
 import edu.rpi.legup.model.rules.DirectRule;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+
+import java.util.HashSet;
+import java.util.Set;
 
 public class RowsWithinRegionsDirectRule extends DirectRule {
     public RowsWithinRegionsDirectRule() {
         super("STBL-BASC-0006",
-                "Rows/Columns Within Regions",
-                "If a number of rows or columns is fully contained by an equal number of regions, spaces of other rows or columns, respectively, in those regions must be black.",
+                "Rows Within Regions",
+                "If a number of rows is fully contained by an equal number of regions, spaces of other rows in those regions must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
@@ -26,6 +32,51 @@ public RowsWithinRegionsDirectRule() {
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
 
+        //assumption: the rule has been applied to its fullest extent and the rows and regions
+        //are now mutually encompassing
+        StarBattleBoard board = (StarBattleBoard) transition.getBoard();
+        StarBattleCell cell = (StarBattleCell) board.getPuzzleElement(puzzleElement);
+        if (cell.getType() != StarBattleCellType.BLACK) {
+            return "Only black cells are allowed for this rule!";
+        }
+        //the rows that are contained
+        Set<Integer> rows = new HashSet<Integer>();
+        //the regions that contain them
+        Set<Integer> regions = new HashSet<Integer>();
+        //rows and regions to process
+        Set<Integer> rowsToCheck = new HashSet<Integer>();
+        Set<Integer> regionsToCheck = new HashSet<Integer>();
+        int rowStars = 0;
+        int regionStars = 0;
+        regions.add(cell.getGroupIndex());
+        regionsToCheck.add(cell.getGroupIndex());
+
+        while (!rowsToCheck.isEmpty() || !regionsToCheck.isEmpty()) {
+            for (int r: regionsToCheck) {
+                regionStars += board.getRegion(r).numStars();
+                for (PuzzleElement ro: board.getRegion(r).getCells()) {
+                    int row = ((StarBattleCell) ro).getLocation().y;
+                    if (rows.add(row)) {
+                        rowsToCheck.add(row);
+                    }
+                }
+                regionsToCheck.remove(r);
+            }
+            for (int r: rowsToCheck) {
+                rowStars += board.rowStars(r);
+                for (int i = 0; i < board.getSize(); ++i) {
+                    int region = board.getCell(i,r).getGroupIndex();
+                    if (regions.add(region)) {
+                        regionsToCheck.add(region);
+                    }
+                }
+                rowsToCheck.remove(r);
+            }
+        }
+        // are the columns and regions missing an equal amount of stars
+        if (board.getPuzzleNumber() * rows.size() - rowStars != board.getPuzzleNumber() * regions.size() - regionStars) {
+            return "The number of missing stars in the rows and regions must be equal and every extraneous cell must be black!";
+        }
         return null;
     }
 

From 49cd17e88546c0f43a14c9c5a4101c6e5a9bb84c Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 22 Mar 2024 17:17:56 -0400
Subject: [PATCH 46/67] Minor changes to direct rules

---
 .../rules/ColumnsWithinRegionsDirectRule.java        |  2 +-
 .../rules/ColumnsWithinRowsDirectRule.java           |  4 ++--
 .../starbattle/rules/FinishWithStarsDirectRule.java  |  2 +-
 .../rules/RegionsWithinColumnsDirectRule.java        |  4 ++--
 .../rules/RegionsWithinRowsDirectRule.java           |  4 ++--
 .../rules/RowsWithinColumnsDirectRule.java           |  4 ++--
 .../rules/RowsWithinRegionsDirectRule.java           |  4 ++--
 .../starbattle/rules/SurroundStarDirectRule.java     |  2 +-
 .../starbattle/rules/starbattle_reference_sheet.txt  | 12 +++++++-----
 9 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
index 980f6db19..93fb86dc5 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
@@ -17,7 +17,7 @@ public class ColumnsWithinRegionsDirectRule extends DirectRule {
     public ColumnsWithinRegionsDirectRule() {
         super("STBL-BASC-0002",
                 "Columns Within Regions",
-                "If a number of columns is fully contained by an equal number of regions, spaces of other columns in those regions must be black.",
+                "If a number of columns is fully contained by a number of regions with an equal number of missing stars, spaces of other columns in those regions must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
index 4c8eb6915..389ba02c2 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
@@ -15,9 +15,9 @@
 public class ColumnsWithinRowsDirectRule extends DirectRule {
 
     public ColumnsWithinRowsDirectRule() {
-        super("STBL-BASC-XXXX",
+        super("STBL-BASC-0003",
                 "Columns Within Rows",
-                "If a number of columns is fully contained by an equal number of rows, spaces of other columns in those rows must be black.",
+                "If a number of columns is fully contained by a number of rows with an equal number of missing stars, spaces of other columns in those rows must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
index 13050a5ac..ed6a8a986 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
@@ -13,7 +13,7 @@
 public class FinishWithStarsDirectRule extends DirectRule {
 
     public FinishWithStarsDirectRule() {
-        super("STBL-BASC-0003",
+        super("STBL-BASC-0004",
                 "Finish With Stars",
                 "Unknown spaces must be stars if there are just enough in a row, column, or region to satisfy the puzzle number.",
                 "INSERT IMAGE NAME HERE");
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
index 74e296522..d2fa4fbe3 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
@@ -8,9 +8,9 @@
 
 public class RegionsWithinColumnsDirectRule extends DirectRule {
     public RegionsWithinColumnsDirectRule() {
-        super("STBL-BASC-0004",
+        super("STBL-BASC-0005",
                 "Regions Within Columns",
-                "If a number of regions is fully contained by an equal number of columns, spaces of other regions in those columns must be black.",
+                "If a number of regions is fully contained by a number of columns with an equal number of missing stars, spaces of other regions in those columns must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
index f89e0d63f..15993b85d 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
@@ -8,9 +8,9 @@
 
 public class RegionsWithinRowsDirectRule extends DirectRule {
     public RegionsWithinRowsDirectRule() {
-        super("STBL-BASC-0005",
+        super("STBL-BASC-0006",
                 "Regions Within Rows",
-                "If a number of regions is fully contained by an equal number of rows, spaces of other regions in those rows must be black.",
+                "If a number of regions is fully contained by a number of rows with an equal number of missing stars, spaces of other regions in those rows must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java
index 48fb1cd81..2d6c148d0 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java
@@ -15,9 +15,9 @@
 public class RowsWithinColumnsDirectRule extends DirectRule {
 
     public RowsWithinColumnsDirectRule() {
-        super("STBL-BASC-XXXX",
+        super("STBL-BASC-0007",
                 "Rows Withing Columns",
-                "If a number of rows is fully contained by an equal number of columns, spaces of other rows in those columns must be black.",
+                "If a number of rows is fully contained by a number of columns with an equal number of missing stars, spaces of other rows in those columns must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
index 8cc68d292..7dfaae59f 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
@@ -14,9 +14,9 @@
 
 public class RowsWithinRegionsDirectRule extends DirectRule {
     public RowsWithinRegionsDirectRule() {
-        super("STBL-BASC-0006",
+        super("STBL-BASC-0008",
                 "Rows Within Regions",
-                "If a number of rows is fully contained by an equal number of regions, spaces of other rows in those regions must be black.",
+                "If a number of rows is fully contained by a number of regions with an equal number of missing stars, spaces of other rows in those regions must be black.",
                 "INSERT IMAGE NAME HERE");
     }
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
index a5533104c..0608d388f 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
@@ -13,7 +13,7 @@
 public class SurroundStarDirectRule extends DirectRule {
 
     public SurroundStarDirectRule() {
-        super("STBL-BASC-0007",
+        super("STBL-BASC-0009",
                 "Surround Star",
                 "Any space adjacent to a star must be black.",
                 "INSERT IMAGE NAME HERE");
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt
index 958440a71..f18965fd6 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt
@@ -5,11 +5,13 @@ Star or Empty: STBL-CASE-0002
 Basic Rules:
 Blackout: STBL-BASC-0001
 Columns Within Regions: STBL-BASC-0002
-Finish With Stars: STBL-BASC-0003
-Regions Within Columns: STBL-BASC-0004
-Regions Within Rows: STBL-BASC-0005
-Rows Within Regions: STBL-BASC-0006
-Surround Star: STBL-BASC-0007
+Columns Within Rows: STBL-BASC-0003
+Finish With Stars: STBL-BASC-0004
+Regions Within Columns: STBL-BASC-0005
+Regions Within Rows: STBL-BASC-0006
+Rows Within Columns: STBL-BASC-0007
+Rows Within Regions: STBL-BASC-0008
+Surround Star: STBL-BASC-0009
 
 Contradiction Rules:
 Too Many Stars: STBL-CONT-0001

From 096f070b8482cef0942aad5258f9e94f6ee1e238 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:33:28 -0400
Subject: [PATCH 47/67] Added StarBattle to config

Showed how to run in allfiles
Changed puzzles to be more standardized with each other
---
 bin/main/edu/rpi/legup/legup/config           |  6 ++++-
 .../6x6 Star Battle 1star Normal1.xml         |  3 +--
 .../6x6 Star Battle 1star Normal2.xml         |  3 +--
 .../8x8 Star Battle 1star Normal1.xml         | 23 ++++++++++++++++++-
 .../starbattle/StarBattleCellFactory.java     |  7 +++++-
 .../puzzle/starbattle/StarBattleView.java     |  2 +-
 .../rpi/legup/puzzle/starbattle/allfiles.txt  |  7 +++++-
 src/main/resources/edu/rpi/legup/legup/config |  6 ++++-
 8 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/bin/main/edu/rpi/legup/legup/config b/bin/main/edu/rpi/legup/legup/config
index 19e63a2a3..05f4e9e40 100644
--- a/bin/main/edu/rpi/legup/legup/config
+++ b/bin/main/edu/rpi/legup/legup/config
@@ -31,6 +31,10 @@
         <puzzle name="Sudoku" qualifiedClassName="edu.rpi.legup.puzzle.sudoku.Sudoku"
             fileType=".xml"
             fileCreationDisabled="true"/>
+        <puzzle name="StarBattle" 
+            qualifiedClassName="edu.rpi.legup.puzzle.starbattle.StarBattle" 
+            fileType=".xml"
+            fileCreationDisabled="true"/>
         <puzzle name="TreeTent"
             qualifiedClassName="edu.rpi.legup.puzzle.treetent.TreeTent"
             fileType=".xml"
@@ -39,5 +43,5 @@
 	        qualifiedClassName="edu.rpi.legup.puzzle.skyscrapers.Skyscrapers"
 	        fileType=".xml"
 	        fileCreationDisabled="true"/>
-    </puzzles>
+        </puzzles>
 </Legup>
diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml
index 4163e15a9..110dd9abe 100644
--- a/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml	
+++ b/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml	
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
-        <board puzzle_num="1">
-        <board size="6">
+        <board size="6" puzzle_num="1">
             <region>
                 <cells>
                     <cell value="0" x="0" y="0"/>
diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml b/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml
index 29307fb58..49efeba59 100644
--- a/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml	
+++ b/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml	
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
-    <board puzzle_num="1">
-        <board size="6">
+        <board size="6" puzzle_num="1">
             <region>
                 <cells>
                     <cell value="0" x="0" y="0"/>
diff --git a/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml b/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml
index ba237102f..e429c3ad1 100644
--- a/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml	
+++ b/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml	
@@ -1,7 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
-        <board width="8" height="8" puzzle_num="1">
+        <board size="8" puzzle_num="1">
+            <region>
+
+            </region>
+            <region>
+
+            </region>
+            <region>
+
+            </region>
+            <region>
+
+            </region>
+            <region>
+
+            </region>
+            <region>
+
+            </region>
+            <region>
+
+            </region>
             <region>
 
             </region>
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
index 92ea8abf6..9f7fd0fee 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellFactory.java
@@ -39,9 +39,14 @@ public StarBattleCell importCell(Node node, Board board) throws InvalidFileForma
             cell.setIndex(y * size + x);
             return cell;
         }
+
         catch (NumberFormatException e1) {
+            e1.printStackTrace();
             throw new InvalidFileFormatException("starbattle Factory: unknown value where integer expected");
-        } catch (NullPointerException e2) {
+        } 
+        
+        catch (NullPointerException e2) {
+            e2.printStackTrace();
             throw new InvalidFileFormatException("starbattle Factory: could not find attribute(s)");
         }
     }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
index a39770d85..cc6d39677 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
@@ -22,7 +22,7 @@
 import java.util.ArrayList;
 
 public class StarBattleView extends GridBoardView {
-    private final static Logger LOGGER = LogManager.getLogger(StarBattleView.class.getName());
+    private static final Logger LOGGER = LogManager.getLogger(StarBattleView.class.getName());
 
     static Image STAR;
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt b/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
index 7970eadbf..5a9ec0f0a 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/allfiles.txt
@@ -227,4 +227,9 @@ public enum StarBattleType {
 
 //StarBattleExporter.java
 //StarBattleImporter.java
-//StarBattleView.java
\ No newline at end of file
+//StarBattleView.java
+
+How to run Legup:
+
+./gradlew build
+Java -jar build/libs/Legup.jar 
\ No newline at end of file
diff --git a/src/main/resources/edu/rpi/legup/legup/config b/src/main/resources/edu/rpi/legup/legup/config
index 19e63a2a3..05f4e9e40 100644
--- a/src/main/resources/edu/rpi/legup/legup/config
+++ b/src/main/resources/edu/rpi/legup/legup/config
@@ -31,6 +31,10 @@
         <puzzle name="Sudoku" qualifiedClassName="edu.rpi.legup.puzzle.sudoku.Sudoku"
             fileType=".xml"
             fileCreationDisabled="true"/>
+        <puzzle name="StarBattle" 
+            qualifiedClassName="edu.rpi.legup.puzzle.starbattle.StarBattle" 
+            fileType=".xml"
+            fileCreationDisabled="true"/>
         <puzzle name="TreeTent"
             qualifiedClassName="edu.rpi.legup.puzzle.treetent.TreeTent"
             fileType=".xml"
@@ -39,5 +43,5 @@
 	        qualifiedClassName="edu.rpi.legup.puzzle.skyscrapers.Skyscrapers"
 	        fileType=".xml"
 	        fileCreationDisabled="true"/>
-    </puzzles>
+        </puzzles>
 </Legup>

From b713212c73cdb07adcf209fcd8c773ba9b856455 Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 26 Mar 2024 16:46:20 -0400
Subject: [PATCH 48/67] Reorganized puzzle files (put in subdirectories)

---
 .../6x6 Star Battle 1star Normal1.xml                            | 0
 .../6x6 Star Battle 1star Normal2.xml                            | 0
 .../rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java    | 1 -
 3 files changed, 1 deletion(-)
 rename puzzles files/starbattle/{ => 6x6 Star Battle Normal}/6x6 Star Battle 1star Normal1.xml (100%)
 rename puzzles files/starbattle/{ => 6x6 Star Battle Normal}/6x6 Star Battle 1star Normal2.xml (100%)

diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml b/puzzles files/starbattle/6x6 Star Battle Normal/6x6 Star Battle 1star Normal1.xml
similarity index 100%
rename from puzzles files/starbattle/6x6 Star Battle 1star Normal1.xml
rename to puzzles files/starbattle/6x6 Star Battle Normal/6x6 Star Battle 1star Normal1.xml
diff --git a/puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml b/puzzles files/starbattle/6x6 Star Battle Normal/6x6 Star Battle 1star Normal2.xml
similarity index 100%
rename from puzzles files/starbattle/6x6 Star Battle 1star Normal2.xml
rename to puzzles files/starbattle/6x6 Star Battle Normal/6x6 Star Battle 1star Normal2.xml
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
index 57a5688f2..ceea86164 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
@@ -57,7 +57,6 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
      */
     @Override
     public Board getDefaultBoard(TreeNode node) {
-
         return null;
     }
 }

From 52220ca56382cc0552b8660137a20f5f756151bf Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 26 Mar 2024 16:47:05 -0400
Subject: [PATCH 49/67] Created 8x8 1 star puzzle

---
 .../8x8 Star Battle 1star Normal1.xml         |  31 ------
 .../8x8 Star Battle 1star Normal1.xml         | 104 ++++++++++++++++++
 2 files changed, 104 insertions(+), 31 deletions(-)
 delete mode 100644 puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml
 create mode 100644 puzzles files/starbattle/8x8 Star Battle Normal/8x8 Star Battle 1star Normal1.xml

diff --git a/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml b/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml
deleted file mode 100644
index e429c3ad1..000000000
--- a/puzzles files/starbattle/8x8 Star Battle 1star Normal1.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Legup version="2.0.0">
-    <puzzle name="StarBattle">
-        <board size="8" puzzle_num="1">
-            <region>
-
-            </region>
-            <region>
-
-            </region>
-            <region>
-
-            </region>
-            <region>
-
-            </region>
-            <region>
-
-            </region>
-            <region>
-
-            </region>
-            <region>
-
-            </region>
-            <region>
-
-            </region>
-        </board>
-    </puzzle>
-</Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/8x8 Star Battle Normal/8x8 Star Battle 1star Normal1.xml b/puzzles files/starbattle/8x8 Star Battle Normal/8x8 Star Battle 1star Normal1.xml
new file mode 100644
index 000000000..977a62e1f
--- /dev/null
+++ b/puzzles files/starbattle/8x8 Star Battle Normal/8x8 Star Battle 1star Normal1.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="8" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="2" y="1"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="6" y="0"/>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="6" y="1"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="3" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="3" y="4"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="0" y="6"/>
+                    <cell value="0" x="0" y="7"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="1" y="6"/>
+                    <cell value="0" x="1" y="7"/>
+                </cells>
+            </region>
+
+            <region>
+                <cells>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="4" y="3"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="3" y="5"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="2" y="6"/>
+                    <cell value="0" x="3" y="6"/>
+                    <cell value="0" x="4" y="6"/>
+                    <cell value="0" x="2" y="7"/>
+                    <cell value="0" x="3" y="7"/>
+                    <cell value="0" x="4" y="7"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="7" y="0"/>
+                    <cell value="0" x="7" y="1"/>
+                    <cell value="0" x="6" y="2"/>
+                    <cell value="0" x="7" y="2"/>
+                    <cell value="0" x="6" y="3"/>
+                    <cell value="0" x="7" y="3"/>
+                    <cell value="0" x="6" y="4"/>
+                    <cell value="0" x="7" y="4"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="2"/>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="5" y="5"/>
+                    <cell value="0" x="6" y="5"/>
+                    <cell value="0" x="7" y="5"/>
+                    <cell value="0" x="5" y="6"/>
+                    <cell value="0" x="6" y="6"/>
+                    <cell value="0" x="7" y="6"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="7"/>
+                    <cell value="0" x="6" y="7"/>
+                    <cell value="0" x="7" y="7"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file

From e2db3f2ff2f11c8ed7e3872473d6a11b406647c5 Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 26 Mar 2024 17:44:35 -0400
Subject: [PATCH 50/67] Created more puzzles

---
 .../6x6 Star Battle 1star Normal1.xml         |   0
 .../6x6 Star Battle 1star Normal2.xml         |   0
 .../6x6 StarBattle 1star Normal3.xml          |  67 ++++++++++++
 .../7x7 puzzle1.xml                           |  42 +++++++
 .../8x8 Star Battle 1star Normal1.xml         |   0
 .../8x8 Star Battle 1star Normal2.xml         | 103 ++++++++++++++++++
 .../8x8 Star Battle 1star Normal3.xml         | 103 ++++++++++++++++++
 7 files changed, 315 insertions(+)
 rename puzzles files/starbattle/{6x6 Star Battle Normal => 6x6 Star Battle 1 star Normal}/6x6 Star Battle 1star Normal1.xml (100%)
 rename puzzles files/starbattle/{6x6 Star Battle Normal => 6x6 Star Battle 1 star Normal}/6x6 Star Battle 1star Normal2.xml (100%)
 create mode 100644 puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml
 create mode 100644 puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 puzzle1.xml
 rename puzzles files/starbattle/{8x8 Star Battle Normal => 8x8 Star Battle 1 star Normal}/8x8 Star Battle 1star Normal1.xml (100%)
 create mode 100644 puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal2.xml
 create mode 100644 puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal3.xml

diff --git a/puzzles files/starbattle/6x6 Star Battle Normal/6x6 Star Battle 1star Normal1.xml b/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 Star Battle 1star Normal1.xml
similarity index 100%
rename from puzzles files/starbattle/6x6 Star Battle Normal/6x6 Star Battle 1star Normal1.xml
rename to puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 Star Battle 1star Normal1.xml
diff --git a/puzzles files/starbattle/6x6 Star Battle Normal/6x6 Star Battle 1star Normal2.xml b/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 Star Battle 1star Normal2.xml
similarity index 100%
rename from puzzles files/starbattle/6x6 Star Battle Normal/6x6 Star Battle 1star Normal2.xml
rename to puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 Star Battle 1star Normal2.xml
diff --git a/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml b/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml
new file mode 100644
index 000000000..80f8658d3
--- /dev/null
+++ b/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="6" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="2" y="2"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="4" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="1" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="3" y="5"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="5" y="5"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 puzzle1.xml b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 puzzle1.xml
new file mode 100644
index 000000000..b4c56807a
--- /dev/null
+++ b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 puzzle1.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="7" puzzle_num="1">
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/8x8 Star Battle Normal/8x8 Star Battle 1star Normal1.xml b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal1.xml
similarity index 100%
rename from puzzles files/starbattle/8x8 Star Battle Normal/8x8 Star Battle 1star Normal1.xml
rename to puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal1.xml
diff --git a/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal2.xml b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal2.xml
new file mode 100644
index 000000000..e9c734546
--- /dev/null
+++ b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal2.xml	
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="8" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="3" y="1"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="2"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="6" y="0"/>
+                    <cell value="0" x="7" y="0"/>
+                    <cell value="0" x="6" y="1"/>
+                    <cell value="0" x="7" y="1"/>
+                    <cell value="0" x="6" y="2"/>
+                    <cell value="0" x="6" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="3" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="4" y="3"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="3" y="6"/>
+                    <cell value="0" x="4" y="6"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="7" y="2"/>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="7" y="3"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="6" y="4"/>
+                    <cell value="0" x="7" y="4"/>
+                    <cell value="0" x="5" y="5"/>
+                    <cell value="0" x="6" y="5"/>
+                    <cell value="0" x="7" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="6"/>
+                    <cell value="0" x="1" y="6"/>
+                    <cell value="0" x="2" y="6"/>
+                    <cell value="0" x="0" y="7"/>
+                    <cell value="0" x="1" y="7"/>
+                    <cell value="0" x="2" y="7"/>
+                    <cell value="0" x="3" y="7"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="6"/>
+                    <cell value="0" x="6" y="6"/>
+                    <cell value="0" x="7" y="6"/>
+                    <cell value="0" x="4" y="7"/>
+                    <cell value="0" x="5" y="7"/>
+                    <cell value="0" x="6" y="7"/>
+                    <cell value="0" x="7" y="7"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal3.xml b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal3.xml
new file mode 100644
index 000000000..1f050440b
--- /dev/null
+++ b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal3.xml	
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="8" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="4" y="0"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="6" y="0"/>
+                    <cell value="0" x="7" y="0"/>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="6" y="1"/>
+                    <cell value="0" x="7" y="1"/>
+                    <cell value="0" x="6" y="2"/>
+                    <cell value="0" x="7" y="2"/>
+                    <cell value="0" x="6" y="3"/>
+                    <cell value="0" x="7" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="0" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="3" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="6"/>
+                    <cell value="0" x="1" y="6"/>
+                    <cell value="0" x="2" y="6"/>
+                    <cell value="0" x="0" y="7"/>
+                    <cell value="0" x="1" y="7"/>
+                    <cell value="0" x="2" y="7"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="4" y="3"/>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="5" y="5"/>
+                    <cell value="0" x="3" y="6"/>
+                    <cell value="0" x="4" y="6"/>
+                    <cell value="0" x="5" y="6"/>
+                    <cell value="0" x="3" y="7"/>
+                    <cell value="0" x="4" y="7"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="6" y="4"/>
+                    <cell value="0" x="7" y="4"/>
+                    <cell value="0" x="6" y="5"/>
+                    <cell value="0" x="7" y="5"/>
+                    <cell value="0" x="6" y="6"/>
+                    <cell value="0" x="7" y="6"/>
+                    <cell value="0" x="5" y="7"/>
+                    <cell value="0" x="6" y="7"/>
+                    <cell value="0" x="7" y="7"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file

From f747aa8ac836f3a0bba4a4587a3d6ffbe76f381b Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 29 Mar 2024 16:01:43 -0400
Subject: [PATCH 51/67] Update StarBattleView.java

---
 .../edu/rpi/legup/puzzle/starbattle/StarBattleView.java   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
index cc6d39677..e0914215a 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
@@ -6,20 +6,12 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
-import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
-import edu.rpi.legup.puzzle.starbattle.StarBattleController;
-import edu.rpi.legup.puzzle.starbattle.StarBattleElementView;
 import edu.rpi.legup.puzzle.starbattle.StarBattleView;
 import edu.rpi.legup.ui.boardview.GridBoardView;
 
 import edu.rpi.legup.controller.BoardController;
-import edu.rpi.legup.model.gameboard.CaseBoard;
 import edu.rpi.legup.model.gameboard.PuzzleElement;
-import edu.rpi.legup.ui.boardview.ElementView;
 import java.awt.*;
-import java.util.ArrayList;
 
 public class StarBattleView extends GridBoardView {
     private static final Logger LOGGER = LogManager.getLogger(StarBattleView.class.getName());

From 23c3d92a9d7ccc7538234f8e80ed856f268df73b Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 29 Mar 2024 16:47:14 -0400
Subject: [PATCH 52/67] Wrote 5x5 puzzle file 1

---
 .../5x5 Star Battle 1 star Normal 1.xml       | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml

diff --git a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml
new file mode 100644
index 000000000..8cd026437
--- /dev/null
+++ b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UFT-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="6" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="1" y="1"/>
+                </cells>
+            </region>
+                <cells>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="4" y="4"/>
+                </cells>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="4" y="1"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="4" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="1" y="4"/>
+                </cells>
+            </region>
+            <region>
+
+            </region>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file

From 99e431fd3d452b0edb04f980976b188895264f5d Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 29 Mar 2024 16:51:07 -0400
Subject: [PATCH 53/67] StarBattle Runs

---
 .../legup/puzzle/starbattle/StarBattleController.java    | 6 ++----
 .../edu/rpi/legup/puzzle/starbattle/StarBattleView.java  | 6 ++----
 src/main/java/edu/rpi/legup/utility/LegupUtils.java      | 9 ++++++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
index f7a094397..6b2a9352d 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
@@ -14,12 +14,10 @@ public void changeCell(MouseEvent e, PuzzleElement data) {
                 this.boardView.getSelectionPopupMenu().show(boardView, this.boardView.getCanvas().getX() + e.getX(), this.boardView.getCanvas().getY() + e.getY());
             }
             else {
-                if (cell.getData() == 0) {
+                data.setData(cell.getData() + 1);
+                if (cell.getData() >= 0) {
                     data.setData(-3);
                 }
-                else {
-                    data.setData(cell.getData() + 1);
-                }
             }
         }
         else {
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
index e0914215a..ceb0eec19 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
@@ -14,16 +14,14 @@
 import java.awt.*;
 
 public class StarBattleView extends GridBoardView {
-    private static final Logger LOGGER = LogManager.getLogger(StarBattleView.class.getName());
-
     static Image STAR;
 
     static {
         try {
-            STAR = ImageIO.read(ClassLoader.getSystemResourceAsStream("edu/rpi/legup/images/starbattle/star.png"));
+            STAR = ImageIO.read(ClassLoader.getSystemClassLoader().getResource("edu/rpi/legup/images/starbattle/star.gif"));
         }
         catch (IOException e) {
-            LOGGER.error("Failed to open starbattle image.");
+            // pass
         }
     }
 
diff --git a/src/main/java/edu/rpi/legup/utility/LegupUtils.java b/src/main/java/edu/rpi/legup/utility/LegupUtils.java
index dbdd24e7f..317fb787e 100644
--- a/src/main/java/edu/rpi/legup/utility/LegupUtils.java
+++ b/src/main/java/edu/rpi/legup/utility/LegupUtils.java
@@ -85,7 +85,14 @@ private static List<Class> findClassesZip(String path, String packageName) throw
         for (ZipEntry entry = zip.getNextEntry(); entry != null; entry = zip.getNextEntry()) {
             if (!entry.isDirectory() && entry.getName().endsWith(".class") && entry.getName().startsWith(packageName)) {
                 String className = entry.getName().replace('/', '.');
-                classes.add(Class.forName(className.substring(0, className.length() - ".class".length())));
+                String substr = className.substring(0, className.length() - ".class".length());
+                try {
+                    Class<?> c = Class.forName(substr);
+                    classes.add(c);
+                }
+                catch (LinkageError | ClassNotFoundException e) {
+                    System.out.println("Failed on " + substr);
+                }
             }
         }
         return classes;

From 63ea4911079b43136c3ea1f272d3663e85cc6d44 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 29 Mar 2024 17:27:36 -0400
Subject: [PATCH 54/67] Fix spelling error

---
 .../5x5 Star Battle 1 star Normal 1.xml                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml
index 8cd026437..5fefc844f 100644
--- a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml	
+++ b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UFT-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
         <board size="6" puzzle_num="1">

From 617b0acabfb25b7a3abf4dc0300c56e6c74e4221 Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Fri, 29 Mar 2024 17:35:39 -0400
Subject: [PATCH 55/67] Update StarBattleController.java

Fixed the right click issue.
---
 .../edu/rpi/legup/puzzle/starbattle/StarBattleController.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
index 6b2a9352d..9566a3f52 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
@@ -22,12 +22,10 @@ public void changeCell(MouseEvent e, PuzzleElement data) {
         }
         else {
             if (e.getButton() == MouseEvent.BUTTON3) {
+                data.setData(cell.getData() - 1);
                 if (cell.getData() == -3) {
                     data.setData(0);
                 }
-                else {
-                    data.setData(cell.getData() - 1);
-                }
             }
         }
     }

From b3452a8262338a721c84ab3fb0058359b1e50d0b Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Fri, 29 Mar 2024 18:03:45 -0400
Subject: [PATCH 56/67] Created more puzzles

---
 .../6x6 StarBattle 1star Normal3.xml          |  1 +
 .../7x7 Star Battle 1star Hard1.xml           | 60 +++++++++++++
 .../7x7 Star Battle 1star Normal1.xml         | 85 +++++++++++++++++++
 .../7x7 Star Battle 1star Normal2.xml         | 85 +++++++++++++++++++
 .../7x7 puzzle1.xml                           | 42 ---------
 .../8x8 Star Battle 1star Normal1.xml         |  1 +
 .../8x8 Star Battle 1star Normal2.xml         |  1 +
 .../8x8 Star Battle 1star Normal3.xml         |  1 +
 8 files changed, 234 insertions(+), 42 deletions(-)
 create mode 100644 puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml
 create mode 100644 puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal1.xml
 create mode 100644 puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal2.xml
 delete mode 100644 puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 puzzle1.xml

diff --git a/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml b/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml
index 80f8658d3..855943612 100644
--- a/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml	
+++ b/puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml	
@@ -64,4 +64,5 @@
             </region>
         </board>
     </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml b/puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml
new file mode 100644
index 000000000..bacc00b11
--- /dev/null
+++ b/puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="7" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="1" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="6" y="0"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="6" y="1"/>
+                    <cell value="0" x="6" y="2"/>
+                    <cell value="0" x="6" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+            <region>
+                <cells>
+
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
+</Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal1.xml b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal1.xml
new file mode 100644
index 000000000..70b81e376
--- /dev/null
+++ b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal1.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="7" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="1" y="4"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="2" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="3" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="0" y="6"/>
+                    <cell value="0" x="1" y="6"/>
+                    <cell value="0" x="2" y="6"/>
+                    <cell value="0" x="3" y="6"/>
+                    <cell value="0" x="4" y="6"/>
+                    <cell value="0" x="4" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="3" y="2"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="6" y="0"/>
+                    <cell value="0" x="6" y="1"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="2"/>
+                    <cell value="0" x="6" y="2"/>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="6" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="4" y="3"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="6" y="4"/>
+                    <cell value="0" x="5" y="5"/>
+                    <cell value="0" x="6" y="5"/>
+                    <cell value="0" x="5" y="6"/>
+                    <cell value="0" x="6" y="6"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
+</Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal2.xml b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal2.xml
new file mode 100644
index 000000000..c541ece06
--- /dev/null
+++ b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal2.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="7" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="4" y="0"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="6" y="0"/>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="6" y="1"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="1" y="1"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="2"/>
+                    <cell value="0" x="6" y="2"/>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="4" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="0" y="6"/>
+                    <cell value="0" x="1" y="6"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="3"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="2" y="6"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="6" y="3"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="6" y="4"/>
+                    <cell value="0" x="5" y="5"/>
+                    <cell value="0" x="6" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="5"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="3" y="6"/>
+                    <cell value="0" x="4" y="6"/>
+                    <cell value="0" x="5" y="6"/>
+                    <cell value="0" x="6" y="6"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
+</Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 puzzle1.xml b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 puzzle1.xml
deleted file mode 100644
index b4c56807a..000000000
--- a/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 puzzle1.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Legup version="2.0.0">
-    <puzzle name="StarBattle">
-        <board size="7" puzzle_num="1">
-            <region>
-                <cells>
-
-                </cells>
-            </region>
-            <region>
-                <cells>
-
-                </cells>
-            </region>
-            <region>
-                <cells>
-
-                </cells>
-            </region>
-            <region>
-                <cells>
-
-                </cells>
-            </region>
-            <region>
-                <cells>
-
-                </cells>
-            </region>
-            <region>
-                <cells>
-
-                </cells>
-            </region>
-            <region>
-                <cells>
-
-                </cells>
-            </region>
-        </board>
-    </puzzle>
-</Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal1.xml b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal1.xml
index 977a62e1f..02dd5d6c0 100644
--- a/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal1.xml	
+++ b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal1.xml	
@@ -101,4 +101,5 @@
             </region>
         </board>
     </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal2.xml b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal2.xml
index e9c734546..0df84ef62 100644
--- a/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal2.xml	
+++ b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal2.xml	
@@ -100,4 +100,5 @@
             </region>
         </board>
     </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
\ No newline at end of file
diff --git a/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal3.xml b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal3.xml
index 1f050440b..725c91d7f 100644
--- a/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal3.xml	
+++ b/puzzles files/starbattle/8x8 Star Battle 1 star Normal/8x8 Star Battle 1star Normal3.xml	
@@ -100,4 +100,5 @@
             </region>
         </board>
     </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
\ No newline at end of file

From 85c9b7c9d3e84b9d6e3eeb3374e72103073407f1 Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 2 Apr 2024 16:40:19 -0400
Subject: [PATCH 57/67] created image for star or empty case rule

---
 .../rpi/legup/images/starbattle/UnknownTile.png  | Bin 0 -> 9733 bytes
 .../starbattle/cases/StarOrEmptyCaseRule.png     | Bin 0 -> 4437 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/UnknownTile.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/cases/StarOrEmptyCaseRule.png

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/UnknownTile.png b/src/main/resources/edu/rpi/legup/images/starbattle/UnknownTile.png
new file mode 100644
index 0000000000000000000000000000000000000000..850fbf127f04020fe83c6a4f6db75078967916ea
GIT binary patch
literal 9733
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
QTOg2`(SBUvUiYy70dQO53jhEB

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/cases/StarOrEmptyCaseRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/cases/StarOrEmptyCaseRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..0383711bb7fb4d881c78c0d5c61227ac7c05cb49
GIT binary patch
literal 4437
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
M%FeRF{CM2I0R5_}>Hq)$

literal 0
HcmV?d00001


From 84827707929cb2992d9cbdedd30ec7cac52903fc Mon Sep 17 00:00:00 2001
From: EmilioBejasa <69165764+EmilioBejasa@users.noreply.github.com>
Date: Tue, 2 Apr 2024 17:10:42 -0400
Subject: [PATCH 58/67] Deleted WHITE element

It was unnecessary, we were switching between unknown star and blank anyways.
---
 .../legup/puzzle/starbattle/StarBattleCellType.java  |  2 +-
 .../puzzle/starbattle/StarBattleController.java      | 12 ++++++++----
 .../puzzle/starbattle/StarBattleElementView.java     |  7 +------
 .../puzzle/starbattle/rules/StarOrEmptyCaseRule.java |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
index f3524034e..565f608d7 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCellType.java
@@ -2,7 +2,7 @@
 package edu.rpi.legup.puzzle.starbattle;
 
 public enum StarBattleCellType {
-    WHITE(-3), STAR(-2), BLACK(-1), UNKNOWN(0);
+    STAR(-2), BLACK(-1), UNKNOWN(0);
 
     public int value; 
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
index 9566a3f52..4ebeb39ba 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
@@ -14,18 +14,22 @@ public void changeCell(MouseEvent e, PuzzleElement data) {
                 this.boardView.getSelectionPopupMenu().show(boardView, this.boardView.getCanvas().getX() + e.getX(), this.boardView.getCanvas().getY() + e.getY());
             }
             else {
-                data.setData(cell.getData() + 1);
                 if (cell.getData() >= 0) {
-                    data.setData(-3);
+                    data.setData(-2);
+                }
+                else { 
+                    data.setData(cell.getData() + 1);
                 }
             }
         }
         else {
             if (e.getButton() == MouseEvent.BUTTON3) {
-                data.setData(cell.getData() - 1);
-                if (cell.getData() == -3) {
+                if (cell.getData() == -2) {
                     data.setData(0);
                 }
+                else {
+                    data.setData(cell.getData() - 1);
+                }
             }
         }
     }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleElementView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleElementView.java
index a88773a06..ff5d54d1c 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleElementView.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleElementView.java
@@ -29,12 +29,6 @@ public void drawElement(Graphics2D graphics2D) {
             graphics2D.setStroke(new BasicStroke(1));
             graphics2D.setColor(Color.BLACK);
             graphics2D.fillRect(location.x, location.y, size.width, size.height);
-        } else if (type == StarBattleCellType.WHITE) {
-            graphics2D.setStroke(new BasicStroke(1));
-            graphics2D.setColor(Color.WHITE);
-            graphics2D.fillRect(location.x, location.y, size.width, size.height);
-            graphics2D.setColor(Color.BLACK);
-            graphics2D.drawRect(location.x, location.y, size.width, size.height);
         } else if (type == StarBattleCellType.UNKNOWN) {
             graphics2D.setStroke(new BasicStroke(1));
             graphics2D.setColor(Color.LIGHT_GRAY);
@@ -42,5 +36,6 @@ public void drawElement(Graphics2D graphics2D) {
             graphics2D.setColor(Color.BLACK);
             graphics2D.drawRect(location.x, location.y, size.width, size.height);
         }
+        
     }
 }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
index 1bbbe3e92..035e55073 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
@@ -20,7 +20,7 @@ public StarOrEmptyCaseRule() {
         super("STBL-CASE-0002",
                 "Star or Empty",
                 "Each unknown space is either a star or empty.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/cases/StarOrEmptyCaseRule.png");
     }
 
     /**
@@ -98,6 +98,6 @@ public ArrayList<Board> getCases(Board board, PuzzleElement puzzleElement) {
 
     @Override
     public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
-        return null;
+        return checkRuleRaw(transition);
     }
 }

From 09263e681d8e316deea41a3ce920783caad9dead Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 2 Apr 2024 17:35:17 -0400
Subject: [PATCH 59/67] More rule images

---
 .../ClashingOrbitContradictionRule.png           | Bin 0 -> 5397 bytes
 .../TooFewStarsContradictionRule.png             | Bin 0 -> 3571 bytes
 .../TooManyStarsContradictionRule.png            | Bin 0 -> 5815 bytes
 .../starbattle/rules/BlackOutDirectRule.png      | Bin 0 -> 5209 bytes
 .../rules/FinishWithStarDirectRule.png           | Bin 0 -> 4399 bytes
 .../images/starbattle/rules/SurroundStar.png     | Bin 0 -> 5102 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/contradictions/ClashingOrbitContradictionRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooFewStarsContradictionRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooManyStarsContradictionRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/BlackOutDirectRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/FinishWithStarDirectRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/SurroundStar.png

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/ClashingOrbitContradictionRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/ClashingOrbitContradictionRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cdbfd4e1ebb0dc820f59cfd90297d35795e93df
GIT binary patch
literal 5397
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooFewStarsContradictionRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooFewStarsContradictionRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d4c7bf3520f49394a88c0a5922779aa589b1674
GIT binary patch
literal 3571
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
Wa{k=8Y32$D_&C}V?XKD$i2e@+u;#@8

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooManyStarsContradictionRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooManyStarsContradictionRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..724f8aa64d9733c30ca7fe5d1d52fe92cb539e8d
GIT binary patch
literal 5815
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/BlackOutDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/BlackOutDirectRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..53fac213291591a0318f46e049ad083a25315527
GIT binary patch
literal 5209
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/FinishWithStarDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/FinishWithStarDirectRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..24eddc3b058a4a390b9e9344d4aa012c85f415be
GIT binary patch
literal 4399
zcmbtY2{hDe{~yLOM1&UN8j1;x8Oy|s-Pkj3mRqP~%uGy8Gh+;c2q{}+iB!tIM9EsV
z!lh(4Ew)?8QVp_3S;G6H{@r`u^PY46=Y7wandkR?p3nF5eAnmsoryeRV=gQxB?tn6
zge@&h?0}KD`GxQSzx0tL2VfAOTR3@vK--^gez}rVw(kXjc>Kr?j!Z|KHHJVtr-~=i
z+(@dv=jZ?$1kyF|rQ-=_Nld64$(>BqgU!^`!JuTK9_$zjhs4pbBoDHMKZ9iNZ{tAl
zKTALpVFvnwy1p2I;2epGhx(qQP`xm|dax~C4Dh@;jer3l2Jtk;&cy5o1d#M#9!w@3
zgFvuYELE0<DvjZeP(!292&6hfT^$Y};9h=ICf*lL_1Xt82tv0wOh{e?2AR$z)2Pr*
zPP`k<o2dtb2||BR8!?#-vfEE~s+TH$YsPz1MHO%wfhT$))Krn1W<jC4-|-kDqSvPQ
zeG_|<=a%qYqL8<CqT?A}BnLk_Ne^a6@}hY&2&65BO{E_sSOy8tBoX!1k?NXoB=Aw!
zMf}^+<{p14nEEm;iTbCB8mHCKC^TGC9q$I$)Ku4kYZFl<I2wgV;)x^;H8oArPonQC
zf2T2X16WY%DD^`qw3?=x78<3E{Hd_D_;<Vm&70t{>5BfJ2L3s>h1ErDMwdeV9+WNN
zM^t_ie-GJr;9t`6|4$W>@H0(xZw6(n1c(F#i9$L@qB1v=r1m38L;{9MW>QFhrpSoG
z{CkRk+QU%rRChg?FPum^jrXQ7VftodD%s297@6r|&%`rK$P5yJY3EHLLE%uf|KQ;d
zQeDJf_WK|FqyMGKH|ub#*)}T>SOA>U_~9HNVT`<)9yEr&J)VL0fa1th-A&B@%>t#r
zm4N>$$UtxYjPl=%@Ws>r(gpwwvsJz{h69a8(Z}McK6qWkzfb>1Q@&dVbT`oFh@Ync
zApAT}NL1huVF0HEE+kA21QI%7X=3Eydwc4R00s9(>iJhmhmUsU5UQ|cj9RbtFNJbp
z5Y+zG!h)Ob7VR2yVrnW4*rz85m6al~*&qB4L`fai6C0^&n&hC@2G@h~CbbKPU1&uo
zix6k00?_U=WnC3LE_F}Bp7d1I7Rnf0xJ?~=YzgKQN^iKl?NtfkIp<S<8FS*bQX^x2
z%o4+zmX^UVBQ$YYz|zab$zB1^R(8<HQ-Pk|+Q9S5#~w)MtuBnedinCg_)7)n3aU(A
z;EPOC=KI#2SM9?tKo)u*oJ^5IoiRy9ocf^sFv~pF&e>UNab_qjBs)8M)>O_-lJTKk
z5<`CnI`#U78i6y>eNX6Q7?l&E&&4y|WZJ@xN%;U6R_-(9Y_keHpuwaZ8SXXE%VIpX
z+ILR=d47oX>C=kBdk;ki1O}q*Kn<6rl3u@dsP-HUOL=_3);`ZBCtO5!egKL!nC^>?
z7MgflrD1Af!hU$Rcj<<Zk^b9i?<<d}1Fhs!RSboJ8dhx3wIr<y+EA|l;)Lz1T-^Bd
zKuv)4+5S=mK;x>i!(GFp_mYZbWn^%L&JPph+1;6@+iLH&CaKuJd2|lFU9viZf5j?E
z*)$|1<aNG1Y@)9uOJbaz0S*PijLwr`F(!Koa{w0tO`{|-+@3|vv7}!WIOH3n&b&?+
zQ?QDA<|g;)SfO*00SUr1H8Yzxl^ZQMR-}s4;#o1qVx8)4UQ{k|et5?2)%L*k_4NP^
zfdMHgV~J<Khw^(RUB<}%CODy$#aRF5r#j-1Ot%$>*^IeGX_GkS;auHTU#AD0>SAL>
zk{M2JW&KOy)yeSVP2Gr*#3U_F9AIs@loqwU+S3|~y(lx|vMXI8(Ph`f=!26rr5A|l
zP71`ik!N=2otpP*j-@S@*7ETfC_@b(&Aq8uc8sPxdsvwGw$f9GXSV|OYb>|?zA3*n
zZ2EC7TSEy^UXy<uyn;c&6_TRu7iVE6(c;k%CTJS)X*m;V#M>tNl<c6z<L{a;7c8Od
zU@;+~%HzYw7Opu+gi>84$z5mpcm}j{hqu=TZPdEk$Vft*Z*-_DM~F)DHCNuXyr%f#
zjt;Bxbu&8_%~@DrPQ1tpCo5o^=ij$gDH`1_o#*4tpbk{O&bAcqi6Q(ECcM{UX7I`D
z!sA+p#2o7`=qbQpKpmubeE!f8#)EO~E%#qMQ+xNq+RBSmz4H)Hsczx^O3!^$gHKXA
z+%E};TVEv#EXXy+eGw2>WCO9&wvi;84}R(^35Da%bQe6^j4v_MF>0pt*{Y5BYUx7M
zuQdamUvTO<zH=iIVqyshztLrV*7S)-t)V5-6Rw{cDL_7#%Uyrx#&XMe2)TEqcEo2$
zJa8<z_@N`k-4O`Pk)-<hu20Hm+37|U!Tl;z%_-U0`wJXP<dYL}4kyp62`}~oo#(+}
zXS@wd|3zH!=G~1L2s1r(tjVhGu9AH&JCt9fl1rmtFSlN?(qw;G-uRP)Z!J7Fh}kD^
z+-u0SzLC)2B77Z2p~O76TT$|mW7mpwTu&%LjU<vNG213z=3E&!B<?-FkH$7KT#aw*
zbJh$07ONM204f;4of-U(gPWk}Lz}hL;AV?emd^ILo#a|jq&K*v51#F$S>@K@4jrtu
z0rBvw6<r-Q<8|FJ9>33gDYGe7wyS%e*nX@*RL~zWno(2IZ7ZP<T?N_P*-^1aZ+OGt
zIJe{Ar%Ea`WZm{tu;RA)CCuCxzDx3_>MjJHVW)GMnwnbf;D|lK&60V|RZ5xWsEEv_
zMJap7C&*IOay!nWBZB=>^WkE*rN8BMD%BQhU#4w`9VW%dx0%~zDaMTDoZQ`>!_Pmd
zWouXuqZu}QbjYzvvc4CDOXjQQ91je<(o<2#Io?)8St@*38#!}I2WB=@U@u&HEva=8
zjz6=~*x0C~sMs`x*yg>vJ=iQp>Y2eUysXLz>EHKQ7r4|UQEtVA^cnOib=)*dG#%On
zv-LlNLA#(MP7LXPjT;r+*%O}_yN$(?670{;mGu*Ta_*0E{58if2l%f^zmD<1wom6<
z?4HaMbMxxwMAh0Jntz)gG&Xpmzd10ox9F6;_2i!E$58E)D^>kfT^-!QC%cL|gW^Q`
z56JUJJX6$K8!<C&F<c#117B2o6DNmV4+<uJB$g%<(Pew;5$A)3H-t7OXWtq=?&|0S
zXICs6vX@)Br!K#DGvZGupm9e)1|?&l_odse!w<*G8hjwACad(KzXkD{sK%XO1zfLT
zzC&kvyvP&+Z-kzMH$0D({Y^j(3_0fH?}90nPOTZ#sZZSbapp}$Y|RRt9r^h&czu+P
zaqL>Ze`;skhE&8Wvtx^JTK&KbUAqrK9e<gV?^Jd=AfWR$`rE1dFF=W3XNH3KX49BA
z7WDJD=LZZkHP>vuWF#glY0`Rhtt_n5U7q-tbh+wMk`6k(EL-PJE!cs?goLY0V^Lw@
zM}_cDo0{wb>U?kMx~X^I?i}VCGdEaN&Ik@bh}s$-`W6`aktM{-CD@bW8pz+{^VoN;
z!JfM~LEx7sCHuEex3(oJjV{m3F5%1Ho2oBQkjC;Vk-TFy!D9|iZ|_bHFZ93ql)v}z
z!aHjN+U&G#WH5i(E!0_tBHZz@;crf1ArUS;<}5yfXUraKihdyGYdQO9gqgG<yB6v?
zE3R5MHx|8^G%e1)J98|i8V~KCcG=bN`D0gqkWQzho_{(2rB~w%%*#Lkx+Fs%AkE;F
z``)cIH!2srQ4xr6*{&<OKGq^mE%$uE4dG6Q9&{?b<n8KR$VtloDB5B;>w2I-QK&B?
z9Chvw&0o)lWMl#t;XKPa%lP?yr!rqzX!o^h0YejkdN<td&<P0m3g;YN0Of)W>9@XA
zT#THKi4@DWir7SqzseKg<>h_Rep6#PNn9RG7aD^7n%Yh;R$c49cWl~j#Lh4qY-ITG
zk`vlfe~`dkv=ibOc2FuHA}uY=-6A#IMnZJd@ae41(6H~L$~&EPgtfI#bsf2^nV~t)
znK>2ENWT4=uCBIxK=Vp^a5ISEG!z#vds|kUaIHeYo|)oN?KA4!nRWU6J5dG5$>Y<5
z6T__MGn&k$BUaLJ996mgX|d9-WpFB1a3wm!v}~3gsn=%1Dx0a!BY6qd*W}IU4lReg
zcz@yD=ZGu1A_)-M`l4B0d|B4U^#t$4Ji0;09_Q@bjVl^q&`_<s7-_V6uO+YXL3Elh
z>JWpIP7_$^IX<+)*;_lRVKcN6Kxkan&P%IZyHD$T&f25X*J8ZGAl#1%x;efZoO;7P
zJVn^2Q0{iuyF%j94n)539Tj_IGyedGnmL!4`(`Nlo2Ef&Pq|%uyQuPf?t$gHg}nM9
zZYORRzT(-hL)_~}W={n~ZSZaATvA3WA2I1o@Lwq$lRcm|RShkQN6?ExTGV~?M{$A|
zxzIPc_bf>mKCQK0JDQU8>4J}-P>&H$%eCNi(7f=x_oSA}l*=x3JG2O_5q*`~UwS!Q
z?A?*J2t$6p$)knN&*ByK?=Nmt)3yXIii_oqbGs?G+8_KfTu=Gfc}F@gx_lq)5p8I_
z3S5S$S`shnxb}XeYxSX@`pIubB4HiR&VHu&w8)6zhwj}R9TD;AOsiT_;n*PYm2t8?
zGs_=%><dMfy)t)w`p4U1>q4>kotGQL+pQ<Q;9Hl|L4n?|L=Ef}l@AtZtq%c9LcYXD
zLIsd!JQ$>k&(bXZR{^d76N*DcB^e2h^bR=<{=Jm9-u!f{h0Z*mD32(oNiFt$=8Xn;
z+<Ga)3KFdeGQD2^(!{V+E6B-ro8+!?$Qz|k1ixhK9W+cRZr4ac{u`aC(^jso=?eiN
zAdJb_m9Y1Xk&%&<sEajRtH|NlD_61xpPb(-#tBxP8!=z%Y^V|15pFwRY_Kqla}T~c
zSzjv@(jr#iiI)@c>Z%P~wQAWN|7B^(*Qevs;%DQEFy*oSGIve4r;tP727PO9_Jch;
z7Y2)6)AVx2ccTbRLjEfYO2?~!_nCrSE3<aRz>CahG4RvK(IriJi+zI!_|Ge42X@>-
vCEmQ*QcZe~Gc)7UiEdnxsBCU1*#LdKM9g_RH=MNjmxiUOjmZOJ*NguGqH>uU

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/SurroundStar.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/SurroundStar.png
new file mode 100644
index 0000000000000000000000000000000000000000..13287f779e74d6c70489f32013ec3675b07dfe4c
GIT binary patch
literal 5102
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

literal 0
HcmV?d00001


From 999fa1780ad12f8ecbe0912d3da285b7b7c902ee Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 5 Apr 2024 16:42:27 -0400
Subject: [PATCH 60/67] Made small test board

---
 .../rules/BlackoutDirectRuleTest.java         | 19 ++++++++++
 .../BlackoutDirectRule/ColumnBlackout         | 36 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 src/test/java/puzzles/starbattle/rules/BlackoutDirectRuleTest.java
 create mode 100644 src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/ColumnBlackout

diff --git a/src/test/java/puzzles/starbattle/rules/BlackoutDirectRuleTest.java b/src/test/java/puzzles/starbattle/rules/BlackoutDirectRuleTest.java
new file mode 100644
index 000000000..b87b88de5
--- /dev/null
+++ b/src/test/java/puzzles/starbattle/rules/BlackoutDirectRuleTest.java
@@ -0,0 +1,19 @@
+package puzzles.starbattle.rules;
+
+import legup.MockGameBoardFacade;
+import legup.TestUtilities;
+import edu.rpi.legup.model.tree.TreeNode;
+import edu.rpi.legup.model.tree.TreeTransition;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import edu.rpi.legup.puzzle.starbattle.StarBattle;
+import edu.rpi.legup.puzzle.starbattle.StarBattleBoard;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCell;
+import edu.rpi.legup.puzzle.starbattle.StarBattleCellType;
+import edu.rpi.legup.puzzle.starbattle.rules.BlackoutDirectRule;
+import edu.rpi.legup.save.InvalidFileFormatException;
+
+public class BlackoutDirectRuleTest {
+}
diff --git a/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/ColumnBlackout b/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/ColumnBlackout
new file mode 100644
index 000000000..f2a5b42d9
--- /dev/null
+++ b/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/ColumnBlackout
@@ -0,0 +1,36 @@
+<Legup>
+    <puzzle name="Star Battle">
+        <board size="4" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="2">
+                    <cell value="0" x="1" y="2">
+                    <cell value="0" x="0" y="3">
+                    <cell value="0" x="1" y="3">
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="2">
+                    <cell value="0" x="3" y="2">
+                    <cell value="0" x="2" y="3">
+                    <cell value="0" x="3" y="3">
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0">
+                    <cell value="-2" x="1" y="0">
+                    <cell value="0" x="0" y="1">
+                    <cell value="0" x="1" y="1">
+                </cells>
+            </region>
+                <cells>
+                    <cell value="0" x="2" y="0">
+                    <cell value="0" x="3" y="0">
+                    <cell value="0" x="2" y="1">
+                    <cell value="0" x="3" y="1">
+                </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file

From 15e19d39a03c41b0807233927bac1b7eb63d454b Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 5 Apr 2024 16:52:31 -0400
Subject: [PATCH 61/67] Add image paths to rule constructors

---
 .../rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java   | 2 +-
 .../puzzle/starbattle/rules/ClashingOrbitContradictionRule.java | 2 +-
 .../puzzle/starbattle/rules/FinishWithStarsDirectRule.java      | 2 +-
 .../legup/puzzle/starbattle/rules/SurroundStarDirectRule.java   | 2 +-
 .../puzzle/starbattle/rules/TooFewStarsContradictionRule.java   | 2 +-
 .../puzzle/starbattle/rules/TooManyStarsContradictionRule.java  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
index ceea86164..45c550bde 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
@@ -16,7 +16,7 @@ public BlackoutDirectRule() {
         super("STBL-BASC-0001",
                 "Blackout",
                 "If a row, column, or region has enough stars, its unknown spaces are black.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/BlackOutDirectRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
index 28398143e..0ca27ab4a 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ClashingOrbitContradictionRule.java
@@ -17,7 +17,7 @@ public ClashingOrbitContradictionRule() {
         super("STBL-CONT-0003",
                 "Clashing Orbit",
                 "No two stars can be adjacent to each other.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/contradictions/ClashingOrbitContradictionRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
index ed6a8a986..f6b7eef86 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
@@ -16,7 +16,7 @@ public FinishWithStarsDirectRule() {
         super("STBL-BASC-0004",
                 "Finish With Stars",
                 "Unknown spaces must be stars if there are just enough in a row, column, or region to satisfy the puzzle number.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/FinishWithStarDirectRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
index 0608d388f..5d42e895e 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
@@ -16,7 +16,7 @@ public SurroundStarDirectRule() {
         super("STBL-BASC-0009",
                 "Surround Star",
                 "Any space adjacent to a star must be black.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/SurroundStar.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java
index af30a5e18..d1ed62107 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooFewStarsContradictionRule.java
@@ -18,7 +18,7 @@ public TooFewStarsContradictionRule() {
         super("STBL-CONT-0002",
                 "Too Few Stars",
                 "There are too few stars in this region/row/column and there are not enough places to put the remaining stars.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/contradictions/TooFewStarsContradictionRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
index 7777ff5a4..880e3b8ac 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
@@ -21,7 +21,7 @@ public TooManyStarsContradictionRule() {
         super("STBL-CONT-0001",
                 "Too Many Stars",
                 "There are too many stars in this region/row/column.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/contradictions/TooManyStarsContradictionRule.png");
     }
 
     /**

From 729d6b7fe2908851f8cd9915be63883b9de88fcd Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 5 Apr 2024 17:18:02 -0400
Subject: [PATCH 62/67] Write first test for blackout direct rule

---
 .../rules/BlackoutDirectRuleTest.java         | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/test/java/puzzles/starbattle/rules/BlackoutDirectRuleTest.java b/src/test/java/puzzles/starbattle/rules/BlackoutDirectRuleTest.java
index b87b88de5..d42f40c87 100644
--- a/src/test/java/puzzles/starbattle/rules/BlackoutDirectRuleTest.java
+++ b/src/test/java/puzzles/starbattle/rules/BlackoutDirectRuleTest.java
@@ -1,5 +1,9 @@
 package puzzles.starbattle.rules;
 
+import edu.rpi.legup.puzzle.nurikabe.Nurikabe;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeBoard;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeCell;
+import edu.rpi.legup.puzzle.nurikabe.NurikabeType;
 import legup.MockGameBoardFacade;
 import legup.TestUtilities;
 import edu.rpi.legup.model.tree.TreeNode;
@@ -15,5 +19,51 @@
 import edu.rpi.legup.puzzle.starbattle.rules.BlackoutDirectRule;
 import edu.rpi.legup.save.InvalidFileFormatException;
 
+import java.awt.*;
+
 public class BlackoutDirectRuleTest {
+
+    private static final BlackoutDirectRule RULE = new BlackoutDirectRule();
+    private static StarBattle starbattle;
+
+    @BeforeClass
+    public static void setUp() {
+        MockGameBoardFacade.getInstance();
+        starbattle = new StarBattle();
+    }
+
+    @Test
+    public void BlackoutDirectRuleTest_ColumnBlackout() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/starbattle/rules/BlackoutDirectRule/ColumnBlackout", starbattle);
+        TreeNode rootNode = starbattle.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        StarBattleBoard board = (StarBattleBoard) transition.getBoard();
+
+        StarBattleCell cell1 = board.getCell(1, 1);
+        cell1.setData(StarBattleCellType.BLACK.value);
+        StarBattleCell cell2 = board.getCell(1, 2);
+        cell2.setData(StarBattleCellType.BLACK.value);
+        StarBattleCell cell3 = board.getCell(1, 3);
+        cell3.setData(StarBattleCellType.BLACK.value);
+
+        board.addModifiedData(cell1);
+        board.addModifiedData(cell2);
+        board.addModifiedData(cell3);
+
+        Assert.assertNull(RULE.checkRule(transition));
+
+        for (int i = 0; i < board.getHeight(); i++) {
+            for (int k = 0; k < board.getWidth(); k++) {
+                Point point = new Point(k, i);
+                if (point.equals(cell1.getLocation()) || point.equals(cell2.getLocation()) || point.equals(cell3.getLocation())) {
+                    Assert.assertNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
+                }
+                else {
+                    Assert.assertNotNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
+                }
+            }
+        }
+    }
 }

From ee074b1b63917e8cfea295d72ddb6a87731a2713 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Fri, 5 Apr 2024 17:24:06 -0400
Subject: [PATCH 63/67] Test puzzle files

---
 .../BlackoutDirectRule/RegionBlackout         | 36 +++++++++++++++++++
 .../BlackoutDirectRule/RowBlackout            | 36 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/RegionBlackout
 create mode 100644 src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/RowBlackout

diff --git a/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/RegionBlackout b/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/RegionBlackout
new file mode 100644
index 000000000..f2a5b42d9
--- /dev/null
+++ b/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/RegionBlackout
@@ -0,0 +1,36 @@
+<Legup>
+    <puzzle name="Star Battle">
+        <board size="4" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="2">
+                    <cell value="0" x="1" y="2">
+                    <cell value="0" x="0" y="3">
+                    <cell value="0" x="1" y="3">
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="2">
+                    <cell value="0" x="3" y="2">
+                    <cell value="0" x="2" y="3">
+                    <cell value="0" x="3" y="3">
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0">
+                    <cell value="-2" x="1" y="0">
+                    <cell value="0" x="0" y="1">
+                    <cell value="0" x="1" y="1">
+                </cells>
+            </region>
+                <cells>
+                    <cell value="0" x="2" y="0">
+                    <cell value="0" x="3" y="0">
+                    <cell value="0" x="2" y="1">
+                    <cell value="0" x="3" y="1">
+                </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/RowBlackout b/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/RowBlackout
new file mode 100644
index 000000000..f2a5b42d9
--- /dev/null
+++ b/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/RowBlackout
@@ -0,0 +1,36 @@
+<Legup>
+    <puzzle name="Star Battle">
+        <board size="4" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="2">
+                    <cell value="0" x="1" y="2">
+                    <cell value="0" x="0" y="3">
+                    <cell value="0" x="1" y="3">
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="2">
+                    <cell value="0" x="3" y="2">
+                    <cell value="0" x="2" y="3">
+                    <cell value="0" x="3" y="3">
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0">
+                    <cell value="-2" x="1" y="0">
+                    <cell value="0" x="0" y="1">
+                    <cell value="0" x="1" y="1">
+                </cells>
+            </region>
+                <cells>
+                    <cell value="0" x="2" y="0">
+                    <cell value="0" x="3" y="0">
+                    <cell value="0" x="2" y="1">
+                    <cell value="0" x="3" y="1">
+                </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file

From c789e5b049b31dc793de92016a594cb8d1969f86 Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Fri, 5 Apr 2024 17:44:05 -0400
Subject: [PATCH 64/67] remade images to be 3x3

---
 .../7x7 Star Battle 1star Hard1.xml           |  33 ++++++-
 .../7x7 Star Battle 1star Normal.xml          |  85 ++++++++++++++++++
 .../ClashingOrbitContradictionRule.png        | Bin 5397 -> 5135 bytes
 .../TooFewStarsContradictionRule.png          | Bin 3571 -> 3218 bytes
 .../TooManyStarsContradictionRule.png         | Bin 5815 -> 6199 bytes
 .../starbattle/rules/BlackOutDirectRule.png   | Bin 5209 -> 4717 bytes
 .../rules/ColumnsWithinRegionsDirectRule.png  | Bin 0 -> 3781 bytes
 .../rules/FinishWithStarDirectRule.png        | Bin 4399 -> 4326 bytes
 .../rules/RowsWithinRegionsDirectRule.png     | Bin 0 -> 3761 bytes
 9 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal.xml
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/ColumnsWithinRegionsDirectRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/RowsWithinRegionsDirectRule.png

diff --git a/puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml b/puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml
index bacc00b11..c1d7770f6 100644
--- a/puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml	
+++ b/puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml	
@@ -36,22 +36,47 @@
             </region>
             <region>
                 <cells>
-
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="2"/>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="5" y="5"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="3" y="5"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="2" y="4"/>
                 </cells>
             </region>
             <region>
                 <cells>
-
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="4" y="3"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="4" y="4"/>
                 </cells>
             </region>
             <region>
                 <cells>
-
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="0" y="6"/>
+                    <cell value="0" x="1" y="6"/>
+                    <cell value="0" x="2" y="6"/>
+                    <cell value="0" x="3" y="6"/>
+                    <cell value="0" x="4" y="6"/>
                 </cells>
             </region>
             <region>
                 <cells>
-
+                    <cell value="0" x="6" y="4"/>
+                    <cell value="0" x="6" y="5"/>
+                    <cell value="0" x="5" y="6"/>
+                    <cell value="0" x="6" y="6"/>
                 </cells>
             </region>
         </board>
diff --git a/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal.xml b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal.xml
new file mode 100644
index 000000000..cab0a0a5e
--- /dev/null
+++ b/puzzles files/starbattle/7x7 Star Battle 1 star Normal/7x7 Star Battle 1star Normal.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="7" puzzle_num="1">
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="0"/>
+                    <cell value="0" x="1" y="0"/>
+                    <cell value="0" x="0" y="1"/>
+                    <cell value="0" x="0" y="2"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="0" y="3"/>
+                    <cell value="0" x="1" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="1"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="3" y="1"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="4" y="0"/>
+                    <cell value="0" x="5" y="0"/>
+                    <cell value="0" x="4" y="1"/>
+                    <cell value="0" x="5" y="1"/>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="4" y="2"/>
+                    <cell value="0" x="5" y="2"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="3" y="4"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="0" y="4"/>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="0" y="5"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="2" y="5"/>
+                    <cell value="0" x="0" y="6"/>
+                    <cell value="0" x="1" y="6"/>
+                    <cell value="0" x="2" y="6"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="6" y="0"/>
+                    <cell value="0" x="6" y="1"/>
+                    <cell value="0" x="6" y="2"/>
+                    <cell value="0" x="4" y="3"/>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="6" y="3"/>
+                    <cell value="0" x="4" y="4"/>
+                    <cell value="0" x="5" y="4"/>
+                    <cell value="0" x="6" y="4"/>
+                    <cell value="0" x="3" y="5"/>
+                    <cell value="0" x="4" y="5"/>
+                    <cell value="0" x="5" y="5"/>
+                    <cell value="0" x="6" y="5"/>
+                    <cell value="0" x="3" y="6"/>
+                    <cell value="0" x="4" y="6"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="5" y="6"/>
+                    <cell value="0" x="6" y="6"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
+</Legup>
\ No newline at end of file
diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/ClashingOrbitContradictionRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/ClashingOrbitContradictionRule.png
index 3cdbfd4e1ebb0dc820f59cfd90297d35795e93df..d25340b407edf02eebfdbc35764b0527ecea59b7 100644
GIT binary patch
delta 4008
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
H!|4A3=DL=1

delta 4272
zcmai1Ralf^w`D+J5S0;-0YpMVx|tzmXe6YhrD3Q6q)Yga5D<_~3CR%<LDCsYx>G`0
za)wqUq!0gpbMDT0@AmUvtY@#i_j=Zf=S=0UDgl9nlhGh{Hkh!LsI`Q(2%n(1ttg+U
zh=d@YxUG#ipOC1Hm7Nt5DTEZWs`(8XA_N9izvmJVK%}23%DwQ*-pwIPpjM)JYx?|w
zHVNoWs)9s{C*oe)y0#*zcW0M=2YHjYZK^TZ{Ra=4EXBl;5{mbwAvy@{`(o78ayp1x
zw}@XLbR?8gJl|$+<~E!*@1f`&q7wQuA3Ww+(L8!#*g6;h*tMjeUX|S$%8@c`Io$vr
zV)n4xMW~tTgH3c^zkOa%$@%GD9BGo)(^EwnJ`=VdC7Q|FoNV#Z2T{DH^%@&PAD~9?
zBZcenV)bH|xq977a~Zyv)h}BuwtbXzVooVjK|4Rc9;~NZY`H_d?OR_h%a`hxr+MK=
zSzOac4K0G$Kfqj)OkFWby1Kg5+4?}aLEp3mP>~k~mTbAc3e1!VtT&%XU{P2@=LILN
z52TY$#eFvVDj$6DM+Ji~h$+%3R5nQ?Z#FogkiB3QXg*Aux|}q$NcG;H+H^OxdwsIt
z>v23|KVX+`R^lV)i(d@fPwin0)G(=aV0n`Fx_aJsDahmc@}%cP?$#rUr~iPDhg*~C
z0%dyW=fbakAvUKg^Qac^bb^*46Qz18WiLt#?A+&-7RD}rcTf!6h0lNV-k+^2zuGU`
z+c`hk7kI#9Ffrw_OIaW&0I+0=Iwm!pECwd!=JKPnJ>E4P&pHd+^;0is<w{E=d?dOS
z3OID&<7H)4SPVXQ$=85lH<bb8U<S+32l#Z0-`U}2z<;4OKDarN7wyH%UVXb7`45ZN
zXWNzPM_ZHY7k@_#8$U{gvldnEj2Fk8K^W-XQ<8S$m_zSf^fvCdltab*ep~LsTmP-Z
ze8(ns#XtudmV$Yp=6?C24x@+xkNoK^^X7m$>63X+lM^y3j!%Hw`nPi7-*jFLj*gB_
zP_M`+dQSWe+%#tlc>C{&>@;V{$PH7pc~a>y0f%EMllgi`?FASmn<PtrnMG@hdBV*s
z;P4Wc1%j~qF4SA{4tHvIVgy=@c0>0dz&EN_<^+Va;Wj%^UL%MqXNrNm9<Bh)_>G5v
z`;+TdWH3KaWY*|&8~k6AOIh#Ze`v{8cr(ccH-&0t@^202KK$gfJ9`^k@j+OInGr$}
zMcPTU0{Ro;hmih1%5S9Mw)aDR-b$63;V26QOL88@!575|Ag-YwvG<*86%j8d=C()(
z$a}xJ1FND|UGC7c`$@hukif#X{}j$f>mlEnle==$C>2NL(snBv7T@8D^II)zKVn^Y
zHioN1ECrzf6|S*|gCZji3wgkmKk?Erv)pcb?n5wwAG1bTM~+=JGq5KA`oLpMp7Zb*
z&B_+PLi}#^)?@`w4Bm;kS|UMfV>ne{=#jJs&>2PO%o1&8&=ip!uvMz&%4u9(l>Mrm
z?Djk7H$&}8ZRZ8N>DV#DCL<v(lY;ORZVPj@3>$U~<FN|Q#tEKFKR+~u%kcTOIo4~F
z@T=xnfl{&GpB4AUaMz|k%A1SLjY)L`#K&YFKQ!T8vP=~pS8tXpt^5mCO`uHk1I%L%
zaA_d3BbjtLS_;^%&@Du2av={b{JZH6DmR9T16RAp3!f!-s5MMXu;zC7HfM<?59^ny
zuG3m<jjIdj`=H4ijoM%YH#d3rrfG#kv$=YgA4Kbe3j`G;Y8>Yu<qg4I4#U|J0XiL#
z6zOpf;r;!oJURGCzM5rRUa<oD`8Y6$huSze&JC;1{d^i-E3{PS2K?LKmDuHnIL>P1
zYDCv3Z0e!87m|g|CLX=X3K*8a_1=ifm;c=MYP_sLk3-*7n#SNFWqQ29=o{HkNVk%4
zwb-rwn?d*XscXv4&x&`^C<6wCFZxc`p?wQ=>K?$gnaA}%*3!>H!xHB}!xEcY&-*nT
z>Rhw>FYDtl(t+d>b+QLsk5_x%r*?ItwM)nwt9md@^7T(QdRR8(XT5efhvKewIB;rg
zJn9GQqeF~y7~e`S4XyOa5~yVin-pBuqWyL6V9Is2wj#)XELP#wR<Pwidyr5C(JD^m
zv6B(ca+9>!@n?#sQT0>68=|A@ruliIVLhQ9>IAC}Y34VenP#cms=>h*t}2fc9ZW;I
zo|`#kAuJ;|t7}s`zsFo64(|HtAl?QdUe-c1n8+g8QEVf$@F!1HTr>$3ei1@5AbDSj
zO?`aob9+uhsD${~Mu=7j61p`NW8=l=k4F_K`l6rYeoC|`i|(}qa+uuzni&WpJceDk
z8yirGamrH_X5~0-nBt~f7|Evic9!!O9n(3kM5+BIJ=woe1Y=CgcoM2b*Fy4#dpT!1
zMD5~i^Gy+-&01cXWP&)?g$PN)t&wb61LE7CYr+NdT+WYo$FbhdGUlDM*`D`<4KdbA
znRZ)zg~|h#BySmkghFQ)<I=b;@jIuBcfMV@Vp;oby_%6j^p7SkUAsA^#%gw9pzmi#
z+v`vfA38~|Pq`z7?w-hz_ddoO8Ez~ff*JelfW_e)rvaJnpBfpudsJG|_kGD>v+q>&
zk%71z-y)4n;Vnaa^-qsxJ&Jo^9fKCoV}Uk-lf4Dg0b~on|CA$I$r1%ydJ}ft5j#F}
zpfR!DVXhML(>>}DxcbkbTQnv6%If>hilFmj-F$iCyFm}`{FRcu$3=jkRN0a~7(!Jn
zWWZ+|-134qgrvp^HLBiS=8$&EFee(Ncg7G$75PySU4@kbTON!4xY8Px^x=)?d3&a+
za)j26ybLhF%55Z9=7=Ro8DB)ttzSlc!slgwqt5Z9MS=t@?bQ_PtLmJ2ar|Xkc~5WC
zEG16Yk4<0oDN#g;AW%jzKQ@*xGDYmWgH+8!J0efpBnI6R*~UkI#@b0U^AkAED?aA%
zn*91UaS6E8@0L0LjGAkb2srV?J+vP-k7M-QNrD1t(E=@;Jh5#v?SUuC3OE*|rBP7=
zNP=JZt)t`ZUPh9)w4xl*tBKh^ub0EZS7FZ{JQG*JMdmTGhT-?#(eO3JvgnPsW=WA%
z6AYzI5o*OW$7I9(Z9eER!B82f`6@YsEa6rq0AXC`QH(NbHJ`O`kEnf&UgXqoq!XE?
zq65U#a0RxVs)>oLg?SWDScfpI$~)J2OM+s69+b`)>m`jI7LAF?#@6l5);Ux3mUf7N
z6RR+*@1;^4l>K_=DSlN^a944=wqE*R&bG>r3TDk;z43zEd5fL7!Fs~f45|3M;bVG}
zSz^T`A?TvsWaPel#tR1T@jj0Tx<c&}fG2hg>%Cnvz19wkVo%HV-^d&<RH2xBbk^GX
zzBd)2EC_!QB{dt7B1A~b!Nxza{qM#Iq(1iFt(z{RXhV;te??bPJoeHTZ!1lHqTU;x
zt}tMju#;71t5Doujqylj?WZ|bksNv5P~5*{tG+9#+w)R2tVGkUrSva@r%Z1T09r3J
zuCdK84cz#>?DR><ru&oZT2|<6*DQ^NCU+)$W%*Z~bI+=XwcRap=HCIQNir-}kY&PG
z1|s%@qf#!mrMiy|FZDc1G}Eg<T+;sU!qE(ziClW@_T%MAGVTSZukk0`7sp4AltPIk
zi`b(zlugwOkpuI3+vuq|{RJ`~AXiL>KBVb)J2^dzhx8{`Q`rL8z-||Od5yxVb*^fd
z{rpnXeB?!Sku8k?zlWAZoNbbhH>y@-Iz*f|ZT~&P#>+>}wsw8PZ{unsM1@0mVNfTF
zptVr=OYI$B)7GM$lXlw3CgPb{f&+^mYDK=v)DS%UtK)5+Wm>v?t^Gw^pj4iCrprq_
zHZg2u9q>ZUvPnG@ouDCPPAJ?}BCR-gzx@83Az_6iAr?>pJ^Q%GHtv-%&J61TQ)xEX
zsZ9B780@&sxGijf+;4+ZK4ch`-Gkm^W$2dP*PU=3c+G^ycLw7??qF4Mr**bmxs-^J
zK-6yIy=dus-poRk)+Dt6V*+!?F9l)Yf*+K~f!RjG`m9EVTx!+;2J~*31KFJ{NuQlh
z_rW!!vB+mN8$I9exGnNF#_FAfFt9Ucc4?$cHdHo=dY9FTlAtEbQtQF}5nnnY^xF7L
z>p!(I`TYXPC_}q><tNMZ#m=V(V<iF>z0-FDm(Ox1y8mzv5FOY9AeNox#(301vnlrX
zt9O`DT_oyYLQiWm5asV%VHZ?2M(?L7!3HzAORXKOH$)(^6#lI`sB!1h()WghLgLQ1
z%|5Fv+5<U~qe^Q`h#yw0d2&2XGu6eYYJc({Nlg@FgsOw3xb6a8*mjeUXmF>pJ`Hs*
zm_{6_<lF6MNM8#0qxVQ41)o(3;r%VA^m%Q{U{vcWmuZWQQ;(~al;ELN<wL}QwN<5<
z<hp{WrDIeW+(RsZ%19@K4=Q*eexq}zWFez2a$X#thx+@I8Z~ZpQ8ixV#<@SMK@J_C
zLn&0-2<7GPASL68vxCnz=~oQO4K(k%-`I3#>nPkNA26A`H%zobpFm6NC5P+D*aBlf
z7u{dX8dLNg93^{In1ZN}SO#7E5%YwUeKCacwq1Ye?wlFPuKtR{dhg8}$F-M<-Y#%I
zV}w9M*fd&kUA;q08Q^lmc*bfzn52DKj-y}D@W{B=Z;=wI?c~J#wvchZHSwHafr(rC
zUmZf<0rggqL5)-<3e}zZE0{oA**X=|D3Ev0pR|uFG3{#0@43uO)|hhG2fQ>f0<F9f
z%I(P<&xXU(?UusHHhy*%wfoO-ux-rGM^hbLF#MHp8x%>>t8B^k%r1I0_Q?86lmN2?
zq)%``lai6N|35Yz+u8TI!ZzFUI)&OeNLfD<uz)Gil%(hxTRs(tx@=|k;mzc&!f{-<
z>R^7@x*yT2ft(!LSF~_L<S*@c5@hjQ!XhFMASSor0zGD_a{IUXK-@gc`KFEt!FCt6
z4*O}{4AHF6&w+BY99I~(r53e6Y*N1C&z@|W1o*^#|JY6+tr3anEUbENXwF5XVSH%>
zIFB+=a9?Unh*|zZm>HFOtoNIw#RSY@YxoO-o+lbU`6K%upov~y#RaUlcbwu)LO4yX
zINY>mA1LAp`eLz<EY>PK|CRdmPejj!T3#^UeCtn>Z#@^Q;GQ{W>;KoZ1OMykscD&s
zF(mrJh?kqP49s%uba$h!%_bi`!;(BO=3bPy0evMV8G1J}Nb3b%wC`1tySx6yGts-|
zOekrHR`(_n!faGw9*6ib6JPMMEyT>0wIX4;mQKMr9TIVXv~Ogj^ko=|4ARbrm@J*|
zw^l;C3Z2(V0ign(%QZ~?m?-L}HdCZ$J~aRR8h+VE=fu$5U+EN-vMDdiN4Q5Q;k}sQ
zbd&QiMQHSP`wQtpkRuNtpXLdFINAXdhT)6?OA{+)emPWtgkV7E*y@*?by%xaZQn)f
zcgrug&@D|mAD|xA(DxC~rFKPw5(TN5zsX(f>-PJl3smyO$5?MlT=`byJtRweEr+jH
zzXJKm;c;X(TW;Pw4e2Gxv2zb!;Ga;Xn|DQyzT~Uvin!`5Hsl(JFdx85Ff>f-(?!pl
yJEz+OZ|a||-29l`#G7u_rYA92=+t=mHPH&|n}o^6(jJ1F_e|-z;um?#(EkDBN<(1)

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooFewStarsContradictionRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooFewStarsContradictionRule.png
index 8d4c7bf3520f49394a88c0a5922779aa589b1674..cc019752f8531a366fd784d6772182e185a8d8df 100644
GIT binary patch
delta 2078
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
Y3Bivfk1-i>7Dy6q$IiGkIGwxv7v_`4;{X5v

delta 2434
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

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooManyStarsContradictionRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/contradictions/TooManyStarsContradictionRule.png
index 724f8aa64d9733c30ca7fe5d1d52fe92cb539e8d..b468ae6f6fb70271fd594e8cb6b5148dbd9153c5 100644
GIT binary patch
delta 5082
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

delta 4695
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
DTjK6*

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/BlackOutDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/BlackOutDirectRule.png
index 53fac213291591a0318f46e049ad083a25315527..f72fd7d7f82687cfae12872a76855ab94d80fdcb 100644
GIT binary patch
delta 3599
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
YfPTG|sWX}iqkzlMxo@adbI&2>Kgw3Y`v3p{

delta 4095
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
Jt$bo1{eO3p=0E@d

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/ColumnsWithinRegionsDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/ColumnsWithinRegionsDirectRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..3493810b78122654a0f7091cf605ef0cf9dc9c84
GIT binary patch
literal 3781
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/FinishWithStarDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/FinishWithStarDirectRule.png
index 24eddc3b058a4a390b9e9344d4aa012c85f415be..11cfbf89965d94b114cf32be6944f2703f4ee90f 100644
GIT binary patch
delta 3199
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

delta 3273
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
K(yGw33;Q3hI6epf

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/RowsWithinRegionsDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/RowsWithinRegionsDirectRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9f22f16f5042b5bd5b9294f9fb465b15f1eeb0a
GIT binary patch
literal 3761
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
Z!+YOdeXZ_|#|8fe9c=g66z}$m{ulFo{AK_E

literal 0
HcmV?d00001


From c63f882e00fe53048133743c4f8ab6f7564362a4 Mon Sep 17 00:00:00 2001
From: Sarah <sarah.yankun@gmail.com>
Date: Tue, 9 Apr 2024 16:38:38 -0400
Subject: [PATCH 65/67] Added direct rule images, updated image locations

---
 .../rules/ColumnsWithinRegionsDirectRule.java |   2 +-
 .../rules/ColumnsWithinRowsDirectRule.java    |   2 +-
 .../rules/RegionsWithinColumnsDirectRule.java |   2 +-
 .../rules/RegionsWithinRowsDirectRule.java    |   2 +-
 .../rules/RowsWithinColumnsDirectRule.java    |   2 +-
 .../rules/RowsWithinRegionsDirectRule.java    |   2 +-
 .../rules/ColumnsWithinRegionsDirectRule.png  | Bin 3781 -> 6456 bytes
 .../rules/ColumnsWithinRowsDirectRule.png     | Bin 0 -> 5331 bytes
 .../rules/RegionsWithinColumnsDirectRule.png  | Bin 0 -> 6402 bytes
 .../rules/RegionsWithinRowsDirectRule.png     | Bin 0 -> 6269 bytes
 .../rules/RowsWithinColumnsDirectRule.png     | Bin 0 -> 5117 bytes
 .../rules/RowsWithinRegionsDirectRule.png     | Bin 3761 -> 6477 bytes
 12 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/ColumnsWithinRowsDirectRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/RegionsWithinColumnsDirectRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/RegionsWithinRowsDirectRule.png
 create mode 100644 src/main/resources/edu/rpi/legup/images/starbattle/rules/RowsWithinColumnsDirectRule.png

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
index 93fb86dc5..b42bfd1c0 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
@@ -18,7 +18,7 @@ public ColumnsWithinRegionsDirectRule() {
         super("STBL-BASC-0002",
                 "Columns Within Regions",
                 "If a number of columns is fully contained by a number of regions with an equal number of missing stars, spaces of other columns in those regions must be black.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/ColumnsWithinRegionsDirectRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
index 389ba02c2..0a78c8868 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
@@ -18,7 +18,7 @@ public ColumnsWithinRowsDirectRule() {
         super("STBL-BASC-0003",
                 "Columns Within Rows",
                 "If a number of columns is fully contained by a number of rows with an equal number of missing stars, spaces of other columns in those rows must be black.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/ColumnsWithinRowsDirectRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
index d2fa4fbe3..16951fb2a 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java
@@ -11,7 +11,7 @@ public RegionsWithinColumnsDirectRule() {
         super("STBL-BASC-0005",
                 "Regions Within Columns",
                 "If a number of regions is fully contained by a number of columns with an equal number of missing stars, spaces of other regions in those columns must be black.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/RegionsWithinColumnsDirectRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
index 15993b85d..27dc001a0 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java
@@ -11,7 +11,7 @@ public RegionsWithinRowsDirectRule() {
         super("STBL-BASC-0006",
                 "Regions Within Rows",
                 "If a number of regions is fully contained by a number of rows with an equal number of missing stars, spaces of other regions in those rows must be black.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/RegionsWithinRowsDirectRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java
index 2d6c148d0..4054ec017 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java
@@ -18,7 +18,7 @@ public RowsWithinColumnsDirectRule() {
         super("STBL-BASC-0007",
                 "Rows Withing Columns",
                 "If a number of rows is fully contained by a number of columns with an equal number of missing stars, spaces of other rows in those columns must be black.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/RowsWithinColumnsDirectRule.png");
     }
 
     /**
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
index 7dfaae59f..7af2c79ed 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
@@ -17,7 +17,7 @@ public RowsWithinRegionsDirectRule() {
         super("STBL-BASC-0008",
                 "Rows Within Regions",
                 "If a number of rows is fully contained by a number of regions with an equal number of missing stars, spaces of other rows in those regions must be black.",
-                "INSERT IMAGE NAME HERE");
+                "edu/rpi/legup/images/starbattle/rules/RowsWithinRegionsDirectRule.png");
     }
 
     /**
diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/ColumnsWithinRegionsDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/ColumnsWithinRegionsDirectRule.png
index 3493810b78122654a0f7091cf605ef0cf9dc9c84..1a88e9d07c6a0e4a1425d9725be9d1fc130058ee 100644
GIT binary patch
delta 5806
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

delta 2978
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

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/ColumnsWithinRowsDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/ColumnsWithinRowsDirectRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..24fb0d48a84c46608fc3ab3335ab0df053898bba
GIT binary patch
literal 5331
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/RegionsWithinColumnsDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/RegionsWithinColumnsDirectRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..fde683dcde26e2d717999fe759d97d3f3f524dee
GIT binary patch
literal 6402
zcmbtZcTkgGm!@ctCcPs>1nGnpYUovZZz>RyP(zV~Dg+SeQl+Xik={EZMXG>`^dcZ2
zARtHw>1<Hf@ArMPf9&ke<jtFN?{l7WPn|oH2t6G&QX)no92^|dJL<{?*f;$0xdy;~
zyM0YE!oCRI)Xh;iIM+KbAKWC~>r6N}R{|W2%+O}qT2e4qX8|bO)dnHp?d*m{<KRH#
zyxpKMCj=U3gRpaOk>T8Y)5-~SfXi^2g0%&;-INga4(h({2t!{TBbcufOcKs1CrbqJ
zmckM^BhXNww=>cOCFL!{`HNQy`}=Yk#EAvD!)>JulvV#gu#ya?JsRyM1p;|_c?o!l
z2)Mf2frKO_B|(D1AYoyCEP@~9<AR2I^ShvKVHt>kzc`c;D44s08`{Cu1$fB`wQ==8
z%W!fM0sl}dpwaFQHh<Y&Py*0jD;}3B0$8U(P&f)CBp`TsEFci_8!x2*M_r1)jTj;x
z{1SdkNQYmR+@S6#gprRMLWa`-fpYb5harA3Tq^w`QF2E>(FnM#u%NIgzaaJ_2?71b
z)}@VqDX4g(@4#hk;9zkfIMkM394u_hFDi}@<(GsCO7IIxKn2BZ1cebI!lHkPeyjXD
zjj9cn1uP5}76VHPi3*8Jf+Yn1D*W2~cf66S2h9G`6<OiGuz#)n!a_io(M3A^4$3d#
zPgMSD{0`Y~;6KvxzfTn$_BTy#9`49rB>;zk5J-eG!UcVqB%wb^g2SZH4rnCeUnx>R
zqW?Wb*xHjqLS5`+IKBDd2wSKJ63r=VfURR!7nG?3+TOuM$rb70?1EBua7Vz<1|CQR
zkRK@YKlu5F8Up%<)&GZ=ZvUwD%WC}9a+h_8-N3pi^2bH2B&Fbiws&=xHH5lD?Sa}3
zE|5#if3IR2;8z;{Poc(k=-*iX+abK6ZvSWoEKKTG5xcq@xw;}{m7p%3PzdNhm;cA3
z{5~DF$FbcG`a2V_!r!TaaKVleckIjv)bfbL!J+29qpV=${o+SDff3Dk<2$l&Ayw2<
z?-bWUkWHV(rx@$5a~mx!Heafz&&>v}RB%Rq;~|<bC`&g>;L6h1*VCtd65=_xr$az&
zJd)~e=whRN(t7rzgPA~rV5?M|dbXtc+^K(EWY=HhMEv2V>t@=d8dQ)zYt%9R>C@mJ
zQ}s&Ode%FOy<A*ebF041EH%;8Y*Xw}U5~Pr!rW&G2?;AKN(WZa2}d09XY1=oWi>Ta
zE7ff+c^4O#oEOz|Cn0o}b1g6%o4BN;u3?&*ARPEqowFy<F#o1_D~@CIb&F;N_cT5e
zk{hy*PGpna@NA1o8PhEdG962=kCh;mRW>W}(<I`TgK(5J;>qxU0GsMb@5Xkd7|Pv<
z&2wYAO*~b~0k1F89XgC)dsh&zH3<NlW`7LNmi2Gg6d_d8gNxkMEKe8_pKMKqbp`c&
zT9@x`ee$SXF@x^*Q^G`$K{%2rT6J-02|C^IVA>0b<O8KAmg(^%scUL35L7wr(n1z@
ziB3&apegf2bvz(8wjBCQ^;h9M&Za4CUK?R6g59i6x)zm6hW$gJJKs`jjC}|*9eFGG
zOrq;L^5<&JcdZAC;*&G3_fc^t_511FVGyw;Ay6E>ZEV`9F#qivK-|mgyrUyMBWQC~
zPDp}uONw+)dP-tP3jfd+?^aFVPstNs*wH?8S+b7=ol%px9Q0hxX$#_TC0<S;rUn-u
zVEy)O5dGpp$d{aVu(^mS`s1Z??{hbfZef|(Ym5&Ui2!~XQL>q-+tb<ZEdsBtzQK_9
zuBx(}Tvsw8`S4YDe)!CRgn6AfgOk!}AWLCoAR9kyu-FvTqO;mWDpciL3gjft>}1b!
zJq6LD4#Z0!rjNE3DIbF$ndBxzw-P=LtVS=H`9TPZhx;ge%ghWivwL&RQv4`}KViZ$
zN?!3nY?SH*g0Iqx^?oK(@Tj}lG-|hR8Z-KY|0Jf3_Z*NR_fxt((X>)(fyd+y|2Mnn
z@4Sbh>k28{#g*)<cw<Fnx9<6<7_`najBi0zIc#5@hG&!<Tf7Z4Gb$Wl&`MA<AF-5(
zs@e!?)(L!^XIk~4NZGq_&*G^MY0LYZK_7RCWOmwZk3#>@T&p&MJ|ZpM^Z1mwqX)^i
z3EDd>zX-vF<Or&)j1-yWCz6U1Rrhh@`!{I_;tG4^vN@e5mT!!76zK%_+dF=a$tF<-
zu;IrC^~hUXiSr=oNn8xbSx$L7?ayNdUKNhZyXt<#64$H&P+kqMf&;bhD<0TRXoi!#
zO2au)1Pr~BZ!az?>Ft%vS?0Fx&p^NKb94kcF~rp;1SouBw?5cFRXB>!ljo4UGRKKX
z#2SGEh2w0=7C$C3t)yMM;_pc$#-Kioe<Y1R6pTwa?UR7pn;0a@1kAkMcL^n5me&ym
zO6zPb4`6LygOlR#`1Wb<No*5*iI8XyEPw+)UR4hydG#7sk_X>GNB+wsBPYItJ8(5c
zh<l0Fm;E%fUYsRRyWGVW$QTXasbw_DVR?SQGB4l#;)Imfke58!lObCRY7lXB4e?To
zv5GGe-`uY%t~|`-C`AKpS#0or+oI}5PYLM>)POg8$X>yRE!T*LCV<m+eWH@Nr^Wx|
zkSaQ{Od{YMLKGFLXKwOn=3W2G%|R<cu_H3Sf)iTSwbl+bEmqBf*woDZ?oA<Nm*sW1
ziaUc?DrRmq;TU02enA_c+Zwg;Zo_7y?iQC^X6(ydI(e)aB4T2Fef^;Ag?A`mL_`D^
z2(-K!85oGuL`5DhiR%h$x`6D-`4DvIehHlY#;!H-g6s8Z>TQ=hise3c2N8WdPfjFQ
zsOmGmt_~gBF4uG8Uicp}`t{>=;3-lp%F*B|RAYUq{q`X(*e=sQ89z<bfzm1;9da1&
z-DTCdHBNE-&OfZRh2_!p@^kzfmUqXvUJh+9)_@P!UM)p0q9ij?8?H3VeeAeKGcb12
z<ycN2n&!Da5#&7O1>C7lH>+^OZ;G95F92-<f!&X@f>p1uh~6otzh%oRygQCt@K`IV
zuXEjuSU2Ufm);ZHg#?V^Y^R){>><pr#hJKnbD9u4QdBnGH@-Aaogd={SJ-qBt$(h4
ze;&ixY?{(#ajLmYTp=P5(HgVmx3g)M(-=c0I$o*6-(1j4&sY_fl7O&_Jo1Gdp6Q*@
zSZczY)gf<i#QlPZUyH$)7k9i!bE#F#=s=d8??J5}f;!*5TWAj<h71`DP>nm%n#0qg
zCr-Qc)e=?o)x8@ZQzWbJeGVo+0912DjphD)-~PRZ=#+m+%(p^y<|2p7tR`*1-s6-T
z&8-qo+w8#ixS8NO^PE0i?nUcHScxs&^sK>#Aka&2w_~P)L9~R`CQdq38}D(82rHH0
z#!IzR{=@Rg2)<xisph|Z2nTxLXQOTbG2E>$-wi%brC<r-%h3T0?a5=5VsD8H%AlkE
zU`4%v3s-@>;=S_E7_S|9b1ZqG<xWNN_)qA~Z~v2z6tH9PoppufCsiJw`TIb6Y%dYA
zYvE9y+{(LBu9$2N7}5%?prmZF_%#Ve@Pq~SbuAIvmeiJ4l|lFp8bDAU-VB+4Y&~r#
za0>amjrpn6?TtgP>DsH`l8zf??qNC4y65)Q=Q=xIvw_9z`n2L?)g<nGb%Nt0z=W!9
zJ<1Dbo*}m;C1KQnd#21I&2;_^A7%RNy@=e15abzSfO3Ae=U8|$={N!t10s(LzG#1r
zO4+g-whuKawBslZ5XR&X9!ZKRGfTv@s0Dl@>kFwUw&NHk8Wip<EOX~CS9||rh1Hm-
zw;|?cvCa0P^z#bfDqC{({?Fm{*5*u1Y2#3lQEiK8sSE#umvco+Uq_t0GjNZ}@n`2g
zO1Aa9uiLqk`y4Hdc}6b_=D*?Var>O%20`ZIDS8Yo{Wiz&>IHuK>->2Sd#<Um6o<pr
z#(Gp?HMnIw2WmVOYb)=|dVcjO-fXZ=QXA)jZi<=cs;sf@*WSZI^j7bo3<NSa*a)_$
zWc}=kp*<t>4^b$TgURp2(x;xfh5-h5m^GzO@BuGw`dj4&K!L-7!>=|4=QM}v+5CfX
z^IH@y46UY;_P_x4`*xZ`rYo6;G=2$XFE6&8Rs!}Io1T`vU0$TYPJ$%R(NC&Z8Um~a
z?MpnyZ<iag+z**=CAB?|04?0f)#BKa<tdoR#)N_1uB}|%i};}UJSGD|#s%`u5PkHR
z@aS%><C3}|`p0J)_D?PuD~HNz4Hs(CHOKS%4HuIvk+Uq1zW(GH{AqQ!I+yB<rzgi{
z#@YC8J!CGX&h6qQ|1@pw(kzX5TKSuepXhg`8XIh{N6V)oA2#L|wCEgr@qQ~OrRJR;
z)EQ*S_~fhDLsq!7x*DOz;`11Pb)=B$a`0?LCh@-y{kSHsG?;v2<<q)G5EH~zHX`4}
zQ$@UvT?Unp6;C-EXTJMh6jj}-+aBT9MZX>-BsyNV^NkJYfYnbeq&?T&c3z>+uswlz
zObufoNY=L7{^h2At!2hyjgzs#xiY9V2MA^j<T<NJy~XsE;BH3ra>z(|P2uQw$MTvV
zv#pu+pv1DQ(8m_%O{WlLWMtsW^c&&J_jS3V83w-B4$y-K()J~ux&!j~M1(!ovq<@7
zvK-<@j5Vts2*{*O^$Z}|Uy0Ahfs@-@KL&X>t+k2twA$R>5j|2L=Y>`<#^-4)%kI<S
z8%gc^ADL91ksw>qwUlY19sp@TmF5AyX7IW^EwA8%73D>mrR}CHNW8&fu%)K=w#td7
zA^{o8B2+MU_Jpixni)CMP|HYOYe||j7Jk~~$Cp}<6DxNh@zPT*8`z3t5lySwTxrRG
z<~tbsuAgcZuCgi64vUoy?YSR+3QGRKBNAf~D-2{A4Q#r<Ek-0l1hvU-;86;ZZ9aMH
zRRPihQ1RIk*N>CWO40UD@rl_RG45?lKA*}uBelhk6pj+ihsWUeJkF+yGaMi}503OA
zNymNN5lBA**<A*uZh9{jo#p(Xpt%t;-E`0LbPv$1xw<DsJMMH;x5@AO37T{N#B<_C
zGZURV2sp-kmpD8iO-|!uu6nP!f>n7-%$aI5OP903in{08PU)bdb*06j6^W0Jk0kO5
zGnkSmn5Zk%<_ax=3GYqGke`8~&bl*K$xH7<O$Jrp;8YsK;m6*<-z$M5a|t8o)Z-?E
zy2hjEKxK%9>@Zfvz5GFmcrU!t2{jV-ISm|9&I#k0@_HC6w3XtPsvD4*NZQ4&g**NG
z%9AG~du!w6$<ff9u$$uibSRDG8X&Nw&tTPf>tN@b^mg16{+Z(Q@}m21Jj0(nQN~~}
zU@n{dD_SH<%-;ruy)6ZGXwq%sV;+KmyDb@E6F({ielm$6>3=GbX46N~1Hk?M$9si!
znQrT)EG{7<6GnUm_XgYp(apn2;FrE!!-*?X_2t7<PO~k|!wGC}&1&rROSNc{MNaL2
zvk9>s$sM)DB?bXTX1o=cUEeSeR1WIDw=y`L((q~^!IFl`)DRq-rugwwj-1--T;`w@
z3xlLC4fWemkC7%!!XhGrZ@gUdIl0POxR59l?a@a<FhEsRwe|2Mxm`r@Rk%qP-=f{(
zt$Hpx?2+Bf4LV0t$Th}F@*LZ<>aD7YtMuc{11CAE@6wVxj&Q#ey8Gd@2<7q8$bT@x
zU|(ha-hIJ5-OPTnP)56`u}2+apE=+rM|{+UQQoN<V)e+$uatdT^Bp(naNFFBwFg6}
zXlS}XFG!pL^|Ne2dWY&1#Ku=euP+oGvvEEAxzRP0tGUL<pxC5+#>8{e19#q^(1eCE
zF`7xdv82Ubi;J6^@XMDk0-AtYFU3)fvm#p3$L;Fb7*7*_LI!rxQya-(g%}UOjS?xR
zW_kOEeag=WI?eYv_@-(c7O0c;v?GGas;0gMU7OOE;V)}(w5;uCH!^H*iz@}-3$5JH
zyJu`wmi*OGgBcAWm+ypf?DIGjm=%<#w~-I!X+Jk123%lR<(V1GuOiNl_jNRLCdvoO
zB-eOl$c>X57C1gA%U5Dj1nxU3P-u|O1ZJ;>_q5P=pW#uQ+|I-<w?6|redkLP&A)b(
z_oEAQv@ORa-wEI@BD{Xx6W$`?u|6@lWbE52?`V>?H(Tj}>$CBC`S1WN9ZRM~NWoM*
zxk_b92VQ$nB=y3RWiv;gE~e5p|C4zkb-wf(L{?D#UbMF48^w?h55|0`vqY)G8{iUa
zdy*$i$nDMk?iLHb9G&!r#_qf;+UZg>N}(hVCUq%d{lV9+y-8pa7TfQn(zR}Tbk%;Q
zvDT0a{I10UO_+VcAUbk?c7j^P5FHyV6<a2(13AbYD_HwMKQy4N)SYL)Q=X7O$>I-&
zuSdC9q?=~C`pDbYq=f3MU{w8KhKuqI&zOV{RK&C$pBe(u!I9n1NKBN1yYmW0;&n~a
z-#r^m=`X2{MI_a+1C7NCB8eg^>?_w2Zf@)mdUZH@vZTlOtNiHBZPL_n)%(czJi@?`
zJCPBA)n}I3l9G!3`d!m$WQWN}p-X|E_}Wa?GdV9zGl$ajD%JX^^uaz?REwwTt(&0i
zG18*9yg_=L1%vO4Q{E@sWO+`RiB#%t35{k1+^r%-z5iCn44lFI=q}f5q|=rrlv!xB
z9%*t~c3ju2s1<a(nGl)q;!D=&dLOG=;_R}@!e?GQ_oMwKU$%;ENHkxF(wYb$CFMKC
z3!09NUG>tVwIf72&DC@YTCUJP&DT+F0na)xu}x=v-s{bCjDJyF$z8emj6>y~f4n`p
z`*_CvX-w1`h1?PDqXuIQ3nJg2wN^_aw*B%ZI<#bW9j>J(d)z5C?y#u_f@Ns@o7R7{
zjjS3%d+Xj7)w7KmydlkIGV)3D=@IzQ9jbj$+@w7v)-;oC9mrO5d`i@U+C|+ETalHW
ztXP_AILjKM9SKFhnIct9r!c9dxjKgTDnmnM;sn|QUSiYCyjncg*D)5_QzC|9>J!l@
zxmQIg+08sb!e=<*qb|rff=8*x5;*k1U}e;odYKM((*0wi`6J7ffgB~$ecr>{OcWPS
z=EPQ{Cpk`bqn5?xfbCDCOrDRPFS6kt=?C@KOD_ce!1-G8AiT13&g}sD0un$ORua}=
z<6J2LuLi9pRD4u;ui$cP)rNBRB5NP`m4AEU#hb}51p#eEogt;(fM(w#WA?NJa#)nY
z6G;GJ2%&_f+lzqmPnjZv7|uu?31la{Yc6q>`U}^?j_dGvJWLCw;+qB2Qg7EW=Yk!n
z^-_|CGKQ8=<)LR_K$U8oKUWT<NOrH;_VXF$#pIme3Mz5c|2$fJr`@#%U4DG(dgi-D
z0Gn}~q#2@qPvZ?6VJc{{?A?8NhjW39h)B`e8W=#okxOUw=qnU(3ww9r_RQimKVa7=
zp(2rgCf%w*gZbda_&)E7`0APP>l=1-YPa72Ese7tE^nk>Z1`o+C2|@>`h9pV{z-`8
zVy(Qjf1LZiKFWGPd;Yk8Hn=DcvTPAtJwHExjg+*DfYtBqyBw|uTXAh>Z(R73!}#7s
zCh@Wx_w<oJ4hfSiqva{AVX0zMwrKruUNl-Ph#J${7=Jevwv4-^VrE9qW%Y`D@^<On
z`hFoIg#hD9&mR^UWm&iij0PZH-UT69=ef<z*uFju7M~@$#a#s@Zsoeda(SxZSZ2wD
z6P-JE+PXC9j)o5nj+T}`v@a(NQFeAuX2!j`*vf)rHD$pP)?cJKe^(o{Ug0foYWL@4
zXU}SANX_5vJv=(OS<*^DLD44ey;fR(7(_@BmiTn&=?aCvm6g@T$wVbAhG6#93-ZkM
yVRbyxwm2&}IXM<zv2ID?mafe(y%81c{hMc(-D!jpj(_<t#T^wL<uXO<NB;%aJb8Wq

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/RegionsWithinRowsDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/RegionsWithinRowsDirectRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..30170df40c77d324c2891e8ab495ea3fb0dfc97a
GIT binary patch
literal 6269
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
E0_Y@20RR91

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/RowsWithinColumnsDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/RowsWithinColumnsDirectRule.png
new file mode 100644
index 0000000000000000000000000000000000000000..bac64a87c9ae9df53b8be031c17306773ccfba7d
GIT binary patch
literal 5117
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/edu/rpi/legup/images/starbattle/rules/RowsWithinRegionsDirectRule.png b/src/main/resources/edu/rpi/legup/images/starbattle/rules/RowsWithinRegionsDirectRule.png
index a9f22f16f5042b5bd5b9294f9fb465b15f1eeb0a..8907e047521d5310676821ddb141672f2b5e4d7c 100644
GIT binary patch
delta 5692
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
E9~7y-K>z>%

delta 2945
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
HkNAH9jyVC~


From 41d8f1e27d243730f9cc5d593428823e7a9e23a9 Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 9 Apr 2024 16:47:58 -0400
Subject: [PATCH 66/67] Fix a puzzle file

---
 .../5x5 Star Battle 1 star Normal 1.xml                    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml
index 5fefc844f..cccf07c95 100644
--- a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml	
+++ b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Legup version="2.0.0">
     <puzzle name="StarBattle">
-        <board size="6" puzzle_num="1">
+        <board size="5" puzzle_num="1">
             <region>
                 <cells>
                     <cell value="0" x="0" y="0"/>
@@ -9,6 +9,7 @@
                     <cell value="0" x="1" y="1"/>
                 </cells>
             </region>
+            <region>
                 <cells>
                     <cell value="0" x="1" y="0"/>
                     <cell value="0" x="2" y="0"/>
@@ -26,6 +27,7 @@
                     <cell value="0" x="3" y="4"/>
                     <cell value="0" x="4" y="4"/>
                 </cells>
+            </region>
             <region>
                 <cells>
                     <cell value="0" x="3" y="0"/>
@@ -45,9 +47,6 @@
                     <cell value="0" x="1" y="4"/>
                 </cells>
             </region>
-            <region>
-
-            </region>
         </board>
     </puzzle>
 </Legup>
\ No newline at end of file

From 1db4a7a426a50b7b7b6947435be2c458d8af778e Mon Sep 17 00:00:00 2001
From: summerhenson <summerh@gmail.com>
Date: Tue, 9 Apr 2024 17:46:10 -0400
Subject: [PATCH 67/67] Fixed some bugs with the rules

---
 .../5x5 Star Battle 1 star Normal 1.xml                   | 1 +
 .../edu/rpi/legup/puzzle/starbattle/StarBattleCell.java   | 2 +-
 .../legup/puzzle/starbattle/rules/BlackoutDirectRule.java | 2 +-
 .../starbattle/rules/FinishWithStarsDirectRule.java       | 2 +-
 .../puzzle/starbattle/rules/StarOrEmptyCaseRule.java      | 4 ++--
 .../puzzle/starbattle/rules/SurroundStarDirectRule.java   | 2 +-
 .../starbattle/rules/TooManyStarsContradictionRule.java   | 4 ++--
 .../starbattle.rules/BlackoutDirectRule/ColumnBlackout    | 8 ++++++--
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml
index cccf07c95..b86e16ff2 100644
--- a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml	
+++ b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml	
@@ -49,4 +49,5 @@
             </region>
         </board>
     </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
index 4296c8230..a316872d9 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleCell.java
@@ -13,7 +13,7 @@ public class StarBattleCell extends GridCell<Integer> {
     /**
      * StarBattleCell Constructor - creates a new StarBattle cell to hold the puzzleElement
      *
-     * @param valueInt   value of the star battle cell denoting its state
+     * @param value   value of the star battle cell denoting its state
      * @param location   location of the cell on the board
      * @param groupIndex indicates what group # the cell is in.
      * @param size       size of the star battle cell
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
index 45c550bde..75fbaadb6 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java
@@ -42,7 +42,7 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
         }
 
         StarBattleBoard modified = (StarBattleBoard) origBoard.copy();
-        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.STAR);
+        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.STAR.value);
         if (contraRule.checkContradictionAt(modified, puzzleElement) != null) {
             return "Black cells must be placed in a row, region, or column with enough stars!";
         }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
index f6b7eef86..36e691e74 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java
@@ -42,7 +42,7 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
         }
 
         StarBattleBoard modified = (StarBattleBoard) origBoard.copy();
-        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.BLACK);
+        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.BLACK.value);
         if (contraRule.checkContradictionAt(modified, puzzleElement) != null) {
             return "Star cells must be placed in a row, region, or column without extra spaces!";
         }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
index 035e55073..0aa147c6f 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/StarOrEmptyCaseRule.java
@@ -83,13 +83,13 @@ public ArrayList<Board> getCases(Board board, PuzzleElement puzzleElement) {
         ArrayList<Board> cases = new ArrayList<>();
         Board case1 = board.copy();
         PuzzleElement data1 = case1.getPuzzleElement(puzzleElement);
-        data1.setData(StarBattleCellType.STAR);
+        data1.setData(StarBattleCellType.STAR.value);
         case1.addModifiedData(data1);
         cases.add(case1);
 
         Board case2 = board.copy();
         PuzzleElement data2 = case2.getPuzzleElement(puzzleElement);
-        data2.setData(StarBattleCellType.BLACK);
+        data2.setData(StarBattleCellType.BLACK.value);
         case2.addModifiedData(data2);
         cases.add(case2);
 
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
index 5d42e895e..e1c6f3084 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java
@@ -41,7 +41,7 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
         }
 
         StarBattleBoard modified = (StarBattleBoard) origBoard.copy();
-        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.STAR);
+        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.STAR.value);
         if (contraRule.checkContradictionAt(modified, puzzleElement) != null) {
             return "Black cells must be placed adjacent to a star!";
         }
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
index 880e3b8ac..2ae424d45 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/TooManyStarsContradictionRule.java
@@ -99,14 +99,14 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
         for (int k = 0; k < cellList.size(); k++) {
             if (cellList.get(k).getType() == StarBattleCellType.STAR) {
                 starCount++;
-                if (starCount >= puzzleNum) {
+                if (starCount > puzzleNum) {
                     valid = false;
                     break;
                 }
             }
         }
 
-        if (valid == false) {
+        if (valid) {
             return super.getNoContradictionMessage();
         }
         return null;
diff --git a/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/ColumnBlackout b/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/ColumnBlackout
index f2a5b42d9..ddcc4dc9a 100644
--- a/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/ColumnBlackout
+++ b/src/test/resources/puzzles/starbattle.rules/BlackoutDirectRule/ColumnBlackout
@@ -1,5 +1,6 @@
-<Legup>
-    <puzzle name="Star Battle">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
         <board size="4" puzzle_num="1">
             <region>
                 <cells>
@@ -25,12 +26,15 @@
                     <cell value="0" x="1" y="1">
                 </cells>
             </region>
+            <region>
                 <cells>
                     <cell value="0" x="2" y="0">
                     <cell value="0" x="3" y="0">
                     <cell value="0" x="2" y="1">
                     <cell value="0" x="3" y="1">
                 </cells>
+            </region>
         </board>
     </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
\ No newline at end of file