Revert "Merge branch 'star-battle'"

This reverts commit a89e85b, reversing changes made to 7b45547.
jadeandtea · Aug 19, 2024 · e51bcd3 · e51bcd3
1 parent 76aa2e7
commit e51bcd3
Show file tree

Hide file tree

Showing 86 changed files with 169 additions and 5,161 deletions.
diff --git a/puzzles files/starbattle/10x10 Star Battle 2 star Normal/10x10 Star Battle 2star Normal1.xml b/puzzles files/starbattle/10x10 Star Battle 2 star Normal/10x10 Star Battle 2star Normal1.xml
diff --git a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/050101 b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/050101
diff --git a/...e/5x5 Star Battle 1 star Normal/050101 visualized (DO NOT OPEN AS A PUZZLE).png b/...e/5x5 Star Battle 1 star Normal/050101 visualized (DO NOT OPEN AS A PUZZLE).png
diff --git a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/050102 b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/050102
diff --git a/... 1 star Normal/6x6 Star Battle Normal1 visualized (DO NOT OPEN AS A PUZZLE).png b/... 1 star Normal/6x6 Star Battle Normal1 visualized (DO NOT OPEN AS A PUZZLE).png
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleBoard.java
@@ -97,25 +97,14 @@ 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);
         }