Fix treetent puzzle editor (#692)

* fix treetent puzzle editor (add breaks for switch) (exporter exports same data that importer expects) * allow for treetent clue to go up/down * comply with checkstyles --------- Co-authored-by: Jacob Long <[email protected]> Co-authored-by: Charles Tian <[email protected]>
Bram-Hub · Dec 1, 2023 · ca9fef9 · ca9fef9
1 parent e858844
commit ca9fef9
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 7 deletions.
diff --git a/src/main/java/edu/rpi/legup/model/gameboard/GridBoard.java b/src/main/java/edu/rpi/legup/model/gameboard/GridBoard.java
@@ -71,15 +71,40 @@ public void setCell(int x, int y, Element e, MouseEvent m) {
         if (this instanceof TreeTentBoard && ((y == dimension.height && 0 <= x && x < dimension.width) || (x == dimension.width && 0 <= y && y < dimension.height))) {
             TreeTentBoard treeTentBoard = ((TreeTentBoard) this);
             TreeTentClue clue = treeTentBoard.getClue(x, y);
-            if (y == dimension.height && clue.getData() < dimension.width) {
-                clue.setData(clue.getData() + 1);
+            if (y == dimension.height) {
+                if (m.getButton() == MouseEvent.BUTTON1) {
+                    if (clue.getData() < dimension.height) {
+                        clue.setData(clue.getData() + 1);
+                    }
+                    else {
+                        clue.setData(0);
+                    }
+                }
+                else {
+                    if (clue.getData() > 0) {
+                        clue.setData(clue.getData() - 1);
+                    }
+                    else {
+                        clue.setData(dimension.height);
+                    }
+                }
             }
-            else {
-                if (x == dimension.width && clue.getData() < dimension.height) {
-                    clue.setData(clue.getData() + 1);
+            else { //x == dimension.width
+                if (m.getButton() == MouseEvent.BUTTON1) {
+                    if (clue.getData() < dimension.width) {
+                        clue.setData(clue.getData() + 1);
+                    }
+                    else {
+                        clue.setData(0);
+                    }
                 }
                 else {
-                    clue.setData(0);
+                    if (clue.getData() > 0) {
+                        clue.setData(clue.getData() - 1);
+                    }
+                    else {
+                        clue.setData(dimension.width);
+                    }
                 }
             }
         }

diff --git a/src/main/java/edu/rpi/legup/puzzle/treetent/TreeTentCell.java b/src/main/java/edu/rpi/legup/puzzle/treetent/TreeTentCell.java
@@ -16,15 +16,31 @@ public TreeTentType getType() {
         return data;
     }
 
+    public int getValue() {
+        switch (data) {
+            case TREE:
+                return 1;
+            case GRASS:
+                return 2;
+            case TENT:
+                return 3;
+            default:
+                return 0;
+        }
+    }
+
     @Override
     public void setType(Element e, MouseEvent m) {
         switch (e.getElementName()) {
             case "Unknown Tile":
                 this.data = TreeTentType.UNKNOWN;
+                break;
             case "Tree Tile":
                 this.data = TreeTentType.TREE;
+                break;
             case "Grass Tile":
                 this.data = TreeTentType.GRASS;
+                break;
             case "Tent Tile":
                 this.data = TreeTentType.TENT;
         }

diff --git a/src/main/java/edu/rpi/legup/puzzle/treetent/TreeTentCellFactory.java b/src/main/java/edu/rpi/legup/puzzle/treetent/TreeTentCellFactory.java
@@ -83,7 +83,7 @@ public org.w3c.dom.Element exportCell(Document document, PuzzleElement puzzleEle
             TreeTentCell cell = (TreeTentCell) puzzleElement;
             Point loc = cell.getLocation();
 
-            cellElement.setAttribute("value", String.valueOf(cell.getData()));
+            cellElement.setAttribute("value", String.valueOf(cell.getValue()));
             cellElement.setAttribute("x", String.valueOf(loc.x));
             cellElement.setAttribute("y", String.valueOf(loc.y));