Star battle new rule added (among other things)

puzzles files/starbattle/10x10 Star Battle 2 star Normal/10x10 Star Battle 2star Normal1.xml

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Legup version="2.0.0">
+    <puzzle name="StarBattle">
+        <board size="10" puzzle_num="2">
+            <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="1" 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="0" y="5"/>
+                    <cell value="0" x="0" y="6"/>
+                    <cell value="0" x="0" y="7"/>
+                    <cell value="0" x="0" y="8"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="2" y="0"/>
+                    <cell value="0" x="2" y="1"/>
+                    <cell value="0" x="1" y="2"/>
+                    <cell value="0" x="2" y="2"/>
+                    <cell value="0" x="1" y="3"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="3" y="0"/>
+                    <cell value="0" x="3" y="1"/>
+                    <cell value="0" x="3" y="2"/>
+                    <cell value="0" x="2" y="3"/>
+                    <cell value="0" x="3" y="3"/>
+                    <cell value="0" x="3" y="4"/>
+                    <cell value="0" x="3" y="5"/>
+                    <cell value="0" x="2" y="6"/>
+                    <cell value="0" x="3" y="6"/>
+                    <cell value="0" x="2" y="7"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <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="4" y="1"/>
+                    <cell value="0" x="5" y="1"/>
+                    <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="4" y="3"/>
+                    <cell value="0" x="5" y="3"/>
+                    <cell value="0" x="6" y="3"/>
+                    <cell value="0" x="6" y="4"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="7" y="0"/>
+                    <cell value="0" x="7" y="1"/>
+                    <cell value="0" x="7" y="2"/>
+                    <cell value="0" x="7" y="3"/>
+                    <cell value="0" x="7" y="4"/>
+                    <cell value="0" x="7" y="5"/>
+                    <cell value="0" x="7" y="6"/>
+                    <cell value="0" x="8" y="6"/>
+                    <cell value="0" x="7" y="7"/>
+                    <cell value="0" x="7" y="8"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="8" y="0"/>
+                    <cell value="0" x="9" y="0"/>
+                    <cell value="0" x="8" y="1"/>
+                    <cell value="0" x="9" y="1"/>
+                    <cell value="0" x="8" y="2"/>
+                    <cell value="0" x="9" y="2"/>
+                    <cell value="0" x="8" y="3"/>
+                    <cell value="0" x="9" y="3"/>
+                    <cell value="0" x="8" y="4"/>
+                    <cell value="0" x="9" y="4"/>
+                    <cell value="0" x="8" y="5"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="4"/>
+                    <cell value="0" x="2" y="4"/>
+                    <cell value="0" x="1" y="5"/>
+                    <cell value="0" x="2" 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="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="6" y="5"/>
+                    <cell value="0" x="4" y="6"/>
+                    <cell value="0" x="5" y="6"/>
+                    <cell value="0" x="6" y="6"/>
+                    <cell value="0" x="3" y="7"/>
+                    <cell value="0" x="4" y="7"/>
+                    <cell value="0" x="5" y="7"/>
+                    <cell value="0" x="6" y="7"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="9" y="5"/>
+                    <cell value="0" x="9" y="6"/>
+                    <cell value="0" x="8" y="7"/>
+                    <cell value="0" x="9" y="7"/>
+                    <cell value="0" x="8" y="8"/>
+                    <cell value="0" x="9" y="8"/>
+                </cells>
+            </region>
+            <region>
+                <cells>
+                    <cell value="0" x="1" y="8"/>
+                    <cell value="0" x="2" y="8"/>
+                    <cell value="0" x="3" y="8"/>
+                    <cell value="0" x="4" y="8"/>
+                    <cell value="0" x="5" y="8"/>
+                    <cell value="0" x="6" y="8"/>
+                    <cell value="0" x="0" y="9"/>
+                    <cell value="0" x="1" y="9"/>
+                    <cell value="0" x="2" y="9"/>
+                    <cell value="0" x="3" y="9"/>
+                    <cell value="0" x="4" y="9"/>
+                    <cell value="0" x="5" y="9"/>
+                    <cell value="0" x="6" y="9"/>
+                    <cell value="0" x="7" y="9"/>
+                    <cell value="0" x="8" y="9"/>
+                    <cell value="0" x="9" y="9"/>
+                </cells>
+            </region>
+        </board>
+    </puzzle>
+    <solved isSolved="false" lastSaved="--"/>
+</Legup>

src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java

@@ -97,14 +97,25 @@ public int rowStars(int rowIndex) {
 
     public StarBattleBoard copy() {
         StarBattleBoard copy = new StarBattleBoard(size, puzzleNum);
+        for (int r = 0; r < this.regions.size(); ++r) {
+            StarBattleRegion regionCopy = this.regions.get(r).copy();
+            for (StarBattleCell cell: regionCopy.getCells()) {
+                copy.setCell(cell.getLocation().x, cell.getLocation().y, cell);
+            }
+            copy.setRegion(r, regionCopy);
+        }
+        /*
         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);
         }

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

@@ -0,0 +1,95 @@
+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.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;
+
+public class EmptyAdjacentDirectRule extends DirectRule {
+
+    public EmptyAdjacentDirectRule() {
+        super(
+                "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");
+    }
+
+    /**
+     * 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) {
+        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.BLACK) {
+            return super.getInvalidUseOfRuleMessage()
+                    + ": Only black cells are allowed for this rule!";
+        }
+
+        int x = cell.getLocation().x;
+        int y = cell.getLocation().y;
+
+        StarBattleCell northWest = board.getCell(x - 1, y - 1);
+        StarBattleCell north = board.getCell(x, y - 1);
+        StarBattleCell northEast = board.getCell(x + 1, y - 1);
+        StarBattleCell west = board.getCell(x - 1, y);
+        StarBattleCell east = board.getCell(x + 1, y);
+        StarBattleCell southWest = board.getCell(x - 1, y + 1);
+        StarBattleCell south = board.getCell(x, y + 1);
+        StarBattleCell southEast = board.getCell(x + 1, y + 1);
+
+        StarBattleCell[] adjacent = {northWest, north, northEast, west, east, southWest, south, southEast};
+
+        StarBattleBoard modified = (StarBattleBoard) origBoard.copy();
+        modified.getPuzzleElement(puzzleElement).setData(StarBattleCellType.STAR.value);
+        for(int i = 0; i < 8; i++){                 //sets each spot to a black square if not filled
+            StarBattleCell temp = adjacent[i];
+
+            if (temp != null && temp.getType() == StarBattleCellType.UNKNOWN) {
+                temp.setData(StarBattleCellType.BLACK.value);
+                int X = temp.getLocation().x;
+                int Y = temp.getLocation().y;
+                modified.getCell(X,Y).setData(StarBattleCellType.BLACK.value);
+                System.out.println("covering square " + X + " " + Y + " type " + modified.getCell(X,Y).getType() + " i = " + i + "\n");
+                if(contraRule.checkContradictionAt(modified, temp) == null){
+                    System.out.println("Good job!");
+                    return null;        //used correctly if even one space causes a toofewstars issue
+                }
+            }
+        }
+        System.out.println("Wait why did this exit?\n");
+
+        return "Black cells must be placed adjacent to a tile(s) where a star is needed!";
+    }
+
+    /**
+     * 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;
+    }
+}

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

@@ -38,14 +38,16 @@ public String checkContradictionAt(Board board, PuzzleElement puzzleElement) {
         int rowCount = 0;
         int columnCount = 0;
         for (int i = 0; i < sbBoard.getSize(); ++i) {
-            if (sbBoard.getCell(row, i).getType() != StarBattleCellType.BLACK) {
+            if (sbBoard.getCell(i, row).getType() != StarBattleCellType.BLACK) {
                 ++rowCount;
             }
-            if (sbBoard.getCell(i, column).getType() != StarBattleCellType.BLACK) {
+            if (sbBoard.getCell(column, i).getType() != StarBattleCellType.BLACK) {
                 ++columnCount;
             }
         }
+        System.out.println("rowCount = " + rowCount + " columnCount = " + columnCount + " at " + column + "," + row + "\n");
         if (rowCount < sbBoard.getPuzzleNumber() || columnCount < sbBoard.getPuzzleNumber()) {
+            System.out.println("Returning Null\n");
             return null;
         }
         StarBattleRegion region = sbBoard.getRegion(cell);

src/main/java/edu/rpi/legup/puzzle/starbattle/rules/starbattle_reference_sheet.txt

@@ -12,6 +12,7 @@ Regions Within Rows: STBL-BASC-0006
 Rows Within Columns: STBL-BASC-0007
 Rows Within Regions: STBL-BASC-0008
 Surround Star: STBL-BASC-0009
+Empty Adjacent: STBL-BASC-0010
 
 Contradiction Rules:
 Too Many Stars: STBL-CONT-0001