Merge pull request #891 from offline171/star-battle

Star battle

Author: offline171

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/BlackoutDirectRule.java

@@ -17,7 +17,7 @@ public BlackoutDirectRule() {
                 "STBL-BASC-0001",
                 "Blackout",
                 "If a row, column, or region has enough stars, its unknown spaces are black.",
-                "edu/rpi/legup/images/starbattle/rules/BlackOutDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/BlackOutDirectRule.png");
     }
 
     /**

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java

@@ -18,7 +18,7 @@ public ColumnsWithinRegionsDirectRule() {
                 "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.",
-                "edu/rpi/legup/images/starbattle/rules/ColumnsWithinRegionsDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/ColumnsWithinRegionsDirectRule.png");
     }
 
     private void generateSubsets(List<List<Integer>> subsets, int current, int skip, int size) {

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java

@@ -18,7 +18,7 @@ public ColumnsWithinRowsDirectRule() {
                 "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.",
-                "edu/rpi/legup/images/starbattle/rules/ColumnsWithinRowsDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/ColumnsWithinRowsDirectRule.png");
     }
 
     private void generateSubsets(List<List<Integer>> subsets, int current, int skip, int size) {

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/EmptyAdjacentDirectRule.java

@@ -6,8 +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.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;
@@ -19,7 +17,7 @@ public EmptyAdjacentDirectRule() {
                 "STBL-BASC-0010",
                 "Empty Adjacent",
                 "Tiles next to other tiles that need to contain a star to reach the puzzle number for their region/row/column need to be blacked out.",
-                "edu/rpi/legup/images/starbattle/rules/EmptyAdjacentDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/EmptyAdjacentDirectRule.png");
     }
 
     /**

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/FinishWithStarsDirectRule.java

@@ -17,7 +17,7 @@ public FinishWithStarsDirectRule() {
                 "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.",
-                "edu/rpi/legup/images/starbattle/rules/FinishWithStarDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/FinishWithStarDirectRule.png");
     }
 
     /**

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinColumnsDirectRule.java

@@ -12,7 +12,7 @@ public RegionsWithinColumnsDirectRule() {
                 "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.",
-                "edu/rpi/legup/images/starbattle/rules/RegionsWithinColumnsDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/RegionsWithinColumnsDirectRule.png");
     }
 
     /**

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RegionsWithinRowsDirectRule.java

@@ -12,7 +12,7 @@ public RegionsWithinRowsDirectRule() {
                 "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.",
-                "edu/rpi/legup/images/starbattle/rules/RegionsWithinRowsDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/RegionsWithinRowsDirectRule.png");
     }
 
     /**

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinColumnsDirectRule.java

@@ -13,7 +13,7 @@ public RowsWithinColumnsDirectRule() {
                 "STBL-BASC-0007",
                 "Rows Within 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.",
-                "edu/rpi/legup/images/starbattle/rules/RowsWithinColumnsDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/RowsWithinColumnsDirectRule.png");
     }
 
     /**

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java

@@ -17,7 +17,7 @@ public RowsWithinRegionsDirectRule() {
                 "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.",
-                "edu/rpi/legup/images/starbattle/rules/RowsWithinRegionsDirectRule.png");
+                "edu/rpi/legup/images/starbattle/empty/RowsWithinRegionsDirectRule.png");
     }
 
     private void generateSubsets(List<List<Integer>> subsets, int current, int skip, int size) {

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/SurroundStarDirectRule.java

@@ -17,7 +17,7 @@ public SurroundStarDirectRule() {
                 "STBL-BASC-0009",
                 "Surround Star",
                 "Any space adjacent to a star must be black.",
-                "edu/rpi/legup/images/starbattle/rules/SurroundStar.png");
+                "edu/rpi/legup/images/starbattle/empty/SurroundStar.png");
     }
 
     /**