diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerBoard.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerBoard.java index f008ea781..3340bd7da 100644 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerBoard.java +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerBoard.java @@ -4,8 +4,6 @@ import java.util.ArrayList; -import static edu.rpi.legup.puzzle.thermometer.ThermometerVial.verifyVial; - public class ThermometerBoard extends GridBoard{ //an array containing all of our vials on the board @@ -87,9 +85,15 @@ public int getColNumber(int col){ public ArrayList getColNumbers() { return colNumbers; } + //we all suck at programming so instead of using provided array list + //instead just trusting vials to store the cells for us @Override - public ThermometerCell getCell(int x, int y){ - if(x < 0 || y < 0 || x > dimension.height || y > dimension.width) return null; - return (ThermometerCell) super.getCell(x, y); + public ThermometerCell getCell(int x, int y) { + for(ThermometerVial vial: this.thermometerVials) { + for(ThermometerCell cell: vial.getCells()){ + if(cell.getLocation().x == x && cell.getLocation().y == y) return cell; + } + } + return null; } } diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerCell.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerCell.java index 16a5a1001..2148db3b3 100644 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerCell.java +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerCell.java @@ -8,23 +8,19 @@ public class ThermometerCell extends GridCell { private ThermometerType type; private ThermometerFill fill; private int rotation; - public ThermometerCell(Point location) { + public ThermometerCell(Point location, ThermometerType t, ThermometerFill f, int r) { //since we do not use get/set data value int can be any value super(0, location); - type = ThermometerType.UNKNOWN; - fill = ThermometerFill.UNKNOWN; - rotation = 0; + type = t; + fill = f; + rotation = r; } - - - //Note: setdata does not work for our purposes public void setType(ThermometerType t){ type = t; } - public ThermometerType getType() { return switch (type.ordinal()) { case 0 -> ThermometerType.UNKNOWN; @@ -54,7 +50,7 @@ public ThermometerFill getFill() { @Override public ThermometerCell copy() { - ThermometerCell copy = new ThermometerCell((Point) location.clone()); + ThermometerCell copy = new ThermometerCell((Point) location.clone(), this.type, this.fill, this.rotation); copy.setIndex(index); copy.setModifiable(isModifiable); copy.setGiven(isGiven); diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerElementView.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerElementView.java index f85e8abcb..39bd1716b 100644 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerElementView.java +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerElementView.java @@ -27,150 +27,248 @@ public void drawElement(Graphics2D graphics2D) { ThermometerType type = cell.getType(); ThermometerFill fill = cell.getFill(); int rotation = cell.getRotation(); - if (type == ThermometerType.HEAD) { - if(fill == ThermometerFill.FILLED){ - graphics2D.drawImage( - ThermometerView.FILLEDHEAD, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); - } - else if (fill == ThermometerFill.EMPTY) { - graphics2D.drawImage( - ThermometerView.EMPTYHEAD, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); - } - else if (fill == ThermometerFill.BLOCKED){ - graphics2D.drawImage( - ThermometerView.BLOCKEDHEAD, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); - } - else{ - System.out.println("missing fill type"); - } - } - else if (type == ThermometerType.SHAFT) { - if(fill == ThermometerFill.FILLED){ - graphics2D.drawImage( - ThermometerView.FILLEDSHAFT, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); - } - else if (fill == ThermometerFill.EMPTY) { - graphics2D.drawImage( - ThermometerView.EMPTYSHAFT, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); - } - else if (fill == ThermometerFill.BLOCKED){ - graphics2D.drawImage( - ThermometerView.BLOCKEDSHAFT, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); - } - else{ - System.out.println("missing fill type"); + graphics2D.drawImage( + imageSrc(type, fill, rotation), + location.x, + location.y, + size.width, + size.height, + null, + null); + + graphics2D.setColor(Color.BLACK); + graphics2D.drawRect(location.x, location.y, size.width, size.height); + } + + private Image imageSrc(ThermometerType t, ThermometerFill f, int r) { + + //will have a 36 switch case at end to determine which image gets opened + int result = 0; + + //100 = NORTH, 200 = WEST, 300 = SOUTH, 400 = EAST + switch (r) { + case 0 -> result += 100; + case 90 -> result += 400; + case 180 -> result += 300; + case 270 -> result += 200; + default -> { + System.out.println("ThermometerElementView: Invalid Rotation"); + return null; } } - else if (type == ThermometerType.TIP) { - if(fill == ThermometerFill.FILLED){ - graphics2D.drawImage( - ThermometerView.FILLEDTIP, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); - } - else if (fill == ThermometerFill.EMPTY) { - graphics2D.drawImage( - ThermometerView.EMPTYTIP, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); + + //10 = EMPTY, 20 = FILLED, 30 = BLOCKED + switch (f) { + case ThermometerFill.EMPTY -> result += 10; + case ThermometerFill.FILLED -> result += 20; + case ThermometerFill.BLOCKED -> result += 30; + default -> { + System.out.println("ThermometerElementView: Invalid Fill"); + return null; } - else if (fill == ThermometerFill.BLOCKED){ - graphics2D.drawImage( - ThermometerView.BLOCKEDTIP, - location.x, - location.y, - size.width, - size.height, - null, - null); - System.out.println(cell.getLocation().toString()); - //graphics2D.rotate(Math.toRadians(rotation), location.x + .5, location.y + .5); - graphics2D.setColor(Color.BLACK); - graphics2D.drawRect(location.x, location.y, size.width, size.height); + } + + //1 = HEAD, 2 = SHAFT, 3 = TIP + switch (t) { + case ThermometerType.HEAD -> result += 1; + case ThermometerType.SHAFT -> result += 2; + case ThermometerType.TIP -> result += 3; + default -> { + System.out.println("ThermometerElementView: Invalid Type"); + return null; } - else{ - System.out.println("missing fill type"); + } + + try{ + switch(result) { + + case 111 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadEmpN.png")); + } + + case 112 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftEmpN.png")); + } + + case 113 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipEmpN.png")); + } + + case 121 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadFillN.png")); + } + + case 122 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftFillN.png")); + } + + case 123 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipFillN.png")); + } + + case 131 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadBlockN.png")); + } + + case 132 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftBlockN.png")); + } + + case 133 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipBlockN.png")); + } + + case 211 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadEmpE.png")); + } + + case 212 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftEmpE.png")); + } + + case 213 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipEmpE.png")); + } + + case 221 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadFillE.png")); + } + + case 222 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftFillE.png")); + } + + case 223 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipFillE.png")); + } + + case 231 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadBlockE.png")); + } + + case 232 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftBlockE.png")); + } + + case 233 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipBlockE.png")); + } + + case 311 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadEmpS.png")); + } + + case 312 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftEmpS.png")); + } + + case 313 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipEmpS.png")); + } + + case 321 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadFillS.png")); + } + + case 322 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftFillS.png")); + } + + case 323 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipFillS.png")); + } + + case 331 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadBlockS.png")); + } + + case 332 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftBlockS.png")); + } + + case 333 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipBlockS.png")); + } + + case 411 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadEmpW.png")); + } + + case 412 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftEmpW.png")); + } + + case 413 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipEmpW.png")); + } + + case 421 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadFillW.png")); + } + + case 422 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftFillW.png")); + } + + case 423 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipFillW.png")); + } + + case 431 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/HeadBlockW.png")); + } + + case 432 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/ShaftBlockW.png")); + } + + case 433 -> { + return ImageIO.read(ClassLoader.getSystemResourceAsStream( + "edu/rpi/legup/images/thermometer/Elements/TipBlockW.png")); + } } } - else{ - System.out.println("missing type type"); + catch(IOException e) { + System.out.println("ThermometerElementView: Unexpected Issue"); + return null; } + + return null; } } diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerImporter.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerImporter.java index 132bf4ec7..af77106c4 100644 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerImporter.java +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerImporter.java @@ -78,7 +78,7 @@ public void initializeBoard(Node node) throws InvalidFileFormatException { for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { if (thermometerBoard.getCell(x, y) == null) { - throw new InvalidFileFormatException("Undefined tile at (" + x + "," + y + ")"); + throw new InvalidFileFormatException("Thermometer importer Undefined tile at (" + x + "," + y + ")"); } } } diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVial.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVial.java index d79b8f01a..2fa6c1c08 100644 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVial.java +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVial.java @@ -9,7 +9,7 @@ public class ThermometerVial { private ArrayList cells; public ThermometerVial(int headX, int headY, int tipX, int tipY, ThermometerBoard board) { - cells = new ArrayList<>(); + cells = new ArrayList(); fillData(headX, headY, tipX, tipY, board); } @@ -53,16 +53,18 @@ else if (headX < tipX){ //helper function for adding a single cell private void addCell(int x, int y, ThermometerType t, int rotation, ThermometerBoard board){ - ThermometerCell cell = new ThermometerCell(new Point(x, y)); + ThermometerCell cell = new ThermometerCell(new Point(x, y), t, ThermometerFill.EMPTY, rotation); cell.setIndex(y * board.getHeight() + x); - cell.setModifiable(true); + this.cells.add(cell); + //still important for element view stuff board.setCell(x, y, cell); - board.getCell(x, y).setType(t); - board.getCell(x, y).setFill(ThermometerFill.EMPTY); - board.getCell(x,y).setRotation(rotation); - cells.add(board.getCell(x, y)); } + + //TODO DOES NOT WORK AS INTENDED + // BECAUSE MOST RULES GET A PUZZLE ELEMENT PASSED IN AND WEIRD + // TYPE CASTING STUFF, PAY ATTENTION TO THIS WHEN WE START + // DEBUGGING RULES //a basic accessor to check if a cell is contained in vial public boolean containsCell(ThermometerCell cell){ for (ThermometerCell c : cells) { @@ -73,8 +75,9 @@ public boolean containsCell(ThermometerCell cell){ return false; } - public ThermometerCell getHead(){return cells.get(0);} - public ThermometerCell getTail(){return cells.get(cells.size());} + public ThermometerCell getHead(){return cells.getFirst();} + public ThermometerCell getTail(){return cells.getLast();} + public ArrayList getCells(){return cells;} //checking for discontinuous flow inside of vial public boolean continuousFlow(){ @@ -91,41 +94,4 @@ public boolean continuousFlow(){ return true; } - - //used before calling the constructor to make sure the vial we are attempting to add is valid - public static boolean verifyVial(ThermometerCell headCell, ThermometerCell tipCell, ThermometerBoard board) { - //shorthand for useful variables - int headX = (int) headCell.getLocation().getX(); - int headY = (int) headCell.getLocation().getY(); - int tipX = (int) tipCell.getLocation().getX(); - int tipY = (int) tipCell.getLocation().getY(); - - - //figuring out which axis the thermometer travels along - if(headX == tipX) { - //finding start and end of Vial - int top = min(headY, tipY); - int bottom = max(headY, tipY); - - //verifying that every cell along path is currently unclaimed - for (int i = top; i < bottom; i++) { - if(board.getCell(headX, i) != null || board.getCell(headX, i).getType() != ThermometerType.UNKNOWN) return false; - } - } - else if (headY == tipY) { - //finding start and end of Vial - int top = min(headX, tipX); - int bottom = max(headX, tipX); - - //verifying that every cell along path is currently unclaimed - for (int i = top; i < bottom; i++) { - if(board.getCell(i, headY).getType() != ThermometerType.UNKNOWN) return false; - } - } - else{ - //thermometer does not line up along a single axis - return false; - } - return true; - } } diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVialFactory.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVialFactory.java index 7a440e2f7..0d3ff2beb 100644 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVialFactory.java +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVialFactory.java @@ -10,7 +10,6 @@ import java.awt.*; -import static edu.rpi.legup.puzzle.thermometer.ThermometerVial.verifyVial; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerView.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerView.java index 4568d3c32..6bdb6d8c2 100644 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerView.java +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerView.java @@ -9,54 +9,19 @@ import java.io.IOException; public class ThermometerView extends GridBoardView { - static Image EMPTYHEAD, BLOCKEDHEAD, FILLEDHEAD, - EMPTYSHAFT, BLOCKEDSHAFT, FILLEDSHAFT, - EMPTYTIP, BLOCKEDTIP, FILLEDTIP; - static { - try { - EMPTYHEAD = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/HeadEmp.png")); - BLOCKEDHEAD = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/HeadBlock.png")); - FILLEDHEAD = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/HeadFill.png")); - EMPTYSHAFT = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/ShaftEmp.png")); - BLOCKEDSHAFT = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/ShaftBlock.png")); - FILLEDSHAFT = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/ShaftFill.png")); - EMPTYTIP = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/TipEmp.png")); - BLOCKEDTIP = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/TipBlock.png")); - FILLEDTIP = - ImageIO.read(ClassLoader.getSystemResourceAsStream( - "edu/rpi/legup/images/thermometer/TipFill.png")); - } catch (IOException e) { - System.out.println("Twagedy :(((("); - } - } public ThermometerView(ThermometerBoard board) { super(new BoardController(), new ThermometerController(), board.getDimension()); - for (PuzzleElement puzzleElement : board.getPuzzleElements()) { - ThermometerCell cell = (ThermometerCell) puzzleElement; - Point loc = cell.getLocation(); - ThermometerElementView elementView = new ThermometerElementView(cell); - elementView.setIndex(cell.getIndex()); - elementView.setSize(elementSize); - elementView.setLocation(new Point(loc.x * elementSize.width, loc.y * elementSize.height)); - elementViews.add(elementView); + for(ThermometerVial vial : board.getVials()) { + for(ThermometerCell cell : vial.getCells()) { + Point loc = cell.getLocation(); + ThermometerElementView elementView = new ThermometerElementView(cell); + elementView.setIndex(cell.getIndex()); + elementView.setSize(elementSize); + elementView.setLocation(new Point(loc.x * elementSize.width, loc.y * elementSize.height)); + elementViews.add(elementView); + } } } } diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlck.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlck.java deleted file mode 100644 index 39516323c..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlck.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class HeadTileBlck extends PlaceableElement { - public HeadTileBlck(){ - super("Therm-PLAC-0003", - "Head Tile Block", - "The tile corresponding to the blocked head of a thermometer", - "edu/rpi/legup/images/thermometer/HeadBlock.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckE.java new file mode 100644 index 000000000..69cf5ce3f --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileBlckE extends PlaceableElement { + public HeadTileBlckE(){ + super("Therm-PLAC-0001", + "Head Tile Block East", + "The tile corresponding to the blocked head of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadBlockE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckN.java new file mode 100644 index 000000000..114941b64 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileBlckN extends PlaceableElement { + public HeadTileBlckN(){ + super("Therm-PLAC-0002", + "Head Tile Block North", + "The tile corresponding to the blocked head of a north thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadBlockN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckS.java new file mode 100644 index 000000000..6a163aabd --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileBlckS extends PlaceableElement { + public HeadTileBlckS(){ + super("Therm-PLAC-0003", + "Head Tile Block South", + "The tile corresponding to the blocked head of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadBlockS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckW.java new file mode 100644 index 000000000..fa0d7ce94 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileBlckW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileBlckW extends PlaceableElement { + public HeadTileBlckW(){ + super("Therm-PLAC-0004", + "Head Tile Block West", + "The tile corresponding to the blocked head of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadBlockW.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmp.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmp.java deleted file mode 100644 index 8fb7045a4..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmp.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class HeadTileEmp extends PlaceableElement { - public HeadTileEmp(){ - super("Therm-PLAC-0001", - "Head Tile Empty", - "The tile corresponding to the empty head of a thermometer", - "edu/rpi/legup/images/thermometer/HeadEmp.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpE.java new file mode 100644 index 000000000..8e6cda74c --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileEmpE extends PlaceableElement { + public HeadTileEmpE(){ + super("Therm-PLAC-0005", + "Head Tile Empty East", + "The tile corresponding to the empty head of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadEmpE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpN.java new file mode 100644 index 000000000..6798eb820 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileEmpN extends PlaceableElement { + public HeadTileEmpN(){ + super("Therm-PLAC-0006", + "Head Tile Empty North", + "The tile corresponding to the empty head of a North thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadEmpN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpS.java new file mode 100644 index 000000000..738584b69 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileEmpS extends PlaceableElement { + public HeadTileEmpS(){ + super("Therm-PLAC-0007", + "Head Tile Empty South", + "The tile corresponding to the empty head of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadEmpS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpW.java new file mode 100644 index 000000000..343082667 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileEmpW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileEmpW extends PlaceableElement { + public HeadTileEmpW(){ + super("Therm-PLAC-0008", + "Head Tile Empty West", + "The tile corresponding to the empty head of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadEmpW.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFill.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFill.java deleted file mode 100644 index 4c536fba8..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFill.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class HeadTileFill extends PlaceableElement { - public HeadTileFill(){ - super("Therm-PLAC-0002", - "Head Tile Filled", - "The tile corresponding to the filled head of a thermometer", - "edu/rpi/legup/images/thermometer/HeadFill.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillE.java new file mode 100644 index 000000000..e0b166875 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileFillE extends PlaceableElement { + public HeadTileFillE(){ + super("Therm-PLAC-0009", + "Head Tile Filled East", + "The tile corresponding to the filled head of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadFillE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillN.java new file mode 100644 index 000000000..48ac84e4f --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileFillN extends PlaceableElement { + public HeadTileFillN(){ + super("Therm-PLAC-0010", + "Head Tile Filled North", + "The tile corresponding to the filled head of a north thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadFillN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillS.java new file mode 100644 index 000000000..95e763589 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileFillS extends PlaceableElement { + public HeadTileFillS(){ + super("Therm-PLAC-0011", + "Head Tile Filled South", + "The tile corresponding to the filled head of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadFillS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillW.java new file mode 100644 index 000000000..fd1258af3 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/HeadTileFillW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class HeadTileFillW extends PlaceableElement { + public HeadTileFillW(){ + super("Therm-PLAC-0012", + "Head Tile Filled West", + "The tile corresponding to the filled head of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/HeadFillW.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlck.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlck.java deleted file mode 100644 index e2220e048..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlck.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class ShaftTileBlck extends PlaceableElement { - public ShaftTileBlck(){ - super("Therm-PLAC-0006", - "Shaft Tile Blocked", - "The tile corresponding to a Blocked middle segment of a thermometer", - "edu/rpi/legup/images/thermometer/ShaftBlock.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckE.java new file mode 100644 index 000000000..6e4d26f74 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileBlckE extends PlaceableElement { + public ShaftTileBlckE(){ + super("Therm-PLAC-0013", + "Shaft Tile Blocked East", + "The tile corresponding to a Blocked middle segment of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftBlockE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckN.java new file mode 100644 index 000000000..d08db3f4e --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileBlckN extends PlaceableElement { + public ShaftTileBlckN(){ + super("Therm-PLAC-0014", + "Shaft Tile Blocked North", + "The tile corresponding to a Blocked middle segment of a north thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftBlockN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckS.java new file mode 100644 index 000000000..84fa4fc0b --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileBlckS extends PlaceableElement { + public ShaftTileBlckS(){ + super("Therm-PLAC-0015", + "Shaft Tile Blocked South", + "The tile corresponding to a Blocked middle segment of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftBlockS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckW.java new file mode 100644 index 000000000..e9e782269 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileBlckW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileBlckW extends PlaceableElement { + public ShaftTileBlckW(){ + super("Therm-PLAC-0016", + "Shaft Tile Blocked West", + "The tile corresponding to a Blocked middle segment of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftBlockW.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmp.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmp.java deleted file mode 100644 index da8d6e1aa..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmp.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class ShaftTileEmp extends PlaceableElement { - public ShaftTileEmp(){ - super("Therm-PLAC-0004", - "Shaft Tile Empty", - "The tile corresponding to an empty middle segment of a thermometer", - "edu/rpi/legup/images/thermometer/ShaftEmp.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpE.java new file mode 100644 index 000000000..eb55a2d83 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileEmpE extends PlaceableElement { + public ShaftTileEmpE(){ + super("Therm-PLAC-0017", + "Shaft Tile Empty East", + "The tile corresponding to an empty middle segment of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftEmpE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpN.java new file mode 100644 index 000000000..46cf25845 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileEmpN extends PlaceableElement { + public ShaftTileEmpN(){ + super("Therm-PLAC-0018", + "Shaft Tile Empty North", + "The tile corresponding to an empty middle segment of a north thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftEmpN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpS.java new file mode 100644 index 000000000..6ee5fb472 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileEmpS extends PlaceableElement { + public ShaftTileEmpS(){ + super("Therm-PLAC-0019", + "Shaft Tile Empty South", + "The tile corresponding to an empty middle segment of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftEmpS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpW.java new file mode 100644 index 000000000..11c9bc0ba --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileEmpW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileEmpW extends PlaceableElement { + public ShaftTileEmpW(){ + super("Therm-PLAC-0020", + "Shaft Tile Empty West", + "The tile corresponding to an empty middle segment of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftEmpW.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFill.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFill.java deleted file mode 100644 index ca9487427..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFill.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class ShaftTileFill extends PlaceableElement { - public ShaftTileFill(){ - super("Therm-PLAC-0005", - "Shaft Tile Filled", - "The tile corresponding to a filled middle segment of a thermometer", - "edu/rpi/legup/images/thermometer/ShaftFill.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillE.java new file mode 100644 index 000000000..792b294cf --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileFillE extends PlaceableElement { + public ShaftTileFillE(){ + super("Therm-PLAC-0021", + "Shaft Tile Filled East", + "The tile corresponding to a filled middle segment of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftFillE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillN.java new file mode 100644 index 000000000..d0ba24eb3 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileFillN extends PlaceableElement { + public ShaftTileFillN(){ + super("Therm-PLAC-0022", + "Shaft Tile Filled North", + "The tile corresponding to a filled middle segment of a north thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftFillN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillS.java new file mode 100644 index 000000000..86f6ad09d --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileFillS extends PlaceableElement { + public ShaftTileFillS(){ + super("Therm-PLAC-0023", + "Shaft Tile Filled South", + "The tile corresponding to a filled middle segment of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftFillS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillW.java new file mode 100644 index 000000000..e3c3f6c5e --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/ShaftTileFillW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class ShaftTileFillW extends PlaceableElement { + public ShaftTileFillW(){ + super("Therm-PLAC-0024", + "Shaft Tile Filled West", + "The tile corresponding to a filled middle segment of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/ShaftFillS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlck.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlck.java deleted file mode 100644 index f3b2e9186..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlck.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class TipTileBlck extends PlaceableElement { - public TipTileBlck(){ - super("Therm-PLAC-0009", - "Tip Tile Block", - "The tile corresponding to the Blocked tip of a thermometer", - "edu/rpi/legup/images/thermometer/TipBlock.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckE.java new file mode 100644 index 000000000..2e5c6ac82 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileBlckE extends PlaceableElement { + public TipTileBlckE(){ + super("Therm-PLAC-0025", + "Tip Tile Block East", + "The tile corresponding to the Blocked tip of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipBlockE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckN.java new file mode 100644 index 000000000..6d32bfdec --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileBlckN extends PlaceableElement { + public TipTileBlckN(){ + super("Therm-PLAC-0026", + "Tip Tile Block North", + "The tile corresponding to the Blocked tip of a north thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipBlockN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckS.java new file mode 100644 index 000000000..3981b257a --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileBlckS extends PlaceableElement { + public TipTileBlckS(){ + super("Therm-PLAC-0027", + "Tip Tile Block South", + "The tile corresponding to the Blocked tip of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipBlockS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckW.java new file mode 100644 index 000000000..a25b1332a --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileBlckW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileBlckW extends PlaceableElement { + public TipTileBlckW(){ + super("Therm-PLAC-0028", + "Tip Tile Block West", + "The tile corresponding to the Blocked tip of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipBlockW.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmp.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmp.java deleted file mode 100644 index 25c59e1d2..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmp.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class TipTileEmp extends PlaceableElement { - public TipTileEmp(){ - super("Therm-PLAC-0007", - "Tip Tile Empty", - "The tile corresponding to the empty tip of a thermometer", - "edu/rpi/legup/images/thermometer/TipEmp.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpE.java new file mode 100644 index 000000000..e84c8ff40 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileEmpE extends PlaceableElement { + public TipTileEmpE(){ + super("Therm-PLAC-0029", + "Tip Tile Empty East", + "The tile corresponding to the empty tip of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipEmpE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpN.java new file mode 100644 index 000000000..6745eb8d1 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileEmpN extends PlaceableElement { + public TipTileEmpN(){ + super("Therm-PLAC-0030", + "Tip Tile Empty North", + "The tile corresponding to the empty tip of a north thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipEmpN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpS.java new file mode 100644 index 000000000..9b56ae4dd --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileEmpS extends PlaceableElement { + public TipTileEmpS(){ + super("Therm-PLAC-0031", + "Tip Tile Empty South", + "The tile corresponding to the empty tip of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipEmpS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpW.java new file mode 100644 index 000000000..eb48a7274 --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileEmpW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileEmpW extends PlaceableElement { + public TipTileEmpW(){ + super("Therm-PLAC-0032", + "Tip Tile Empty West", + "The tile corresponding to the empty tip of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipEmpW.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFill.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFill.java deleted file mode 100644 index 20b9165cd..000000000 --- a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFill.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.rpi.legup.puzzle.thermometer.elements; - -import edu.rpi.legup.model.elements.PlaceableElement; - -public class TipTileFill extends PlaceableElement { - public TipTileFill(){ - super("Therm-PLAC-0008", - "Tip Tile Fill", - "The tile corresponding to the filled tip of a thermometer", - "edu/rpi/legup/images/thermometer/TipFill.png"); - } -} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillE.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillE.java new file mode 100644 index 000000000..baaefb41b --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillE.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileFillE extends PlaceableElement { + public TipTileFillE(){ + super("Therm-PLAC-0033", + "Tip Tile Fill East", + "The tile corresponding to the filled tip of an east thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipFillE.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillN.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillN.java new file mode 100644 index 000000000..31fabccdd --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillN.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileFillN extends PlaceableElement { + public TipTileFillN(){ + super("Therm-PLAC-0034", + "Tip Tile Fill North", + "The tile corresponding to the filled tip of a north thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipFillN.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillS.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillS.java new file mode 100644 index 000000000..f64bb131a --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillS.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileFillS extends PlaceableElement { + public TipTileFillS(){ + super("Therm-PLAC-0035", + "Tip Tile Fill South", + "The tile corresponding to the filled tip of a south thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipFillS.png"); + } +} diff --git a/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillW.java b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillW.java new file mode 100644 index 000000000..6fbbc839e --- /dev/null +++ b/src/main/java/edu/rpi/legup/puzzle/thermometer/elements/TipTileFillW.java @@ -0,0 +1,12 @@ +package edu.rpi.legup.puzzle.thermometer.elements; + +import edu.rpi.legup.model.elements.PlaceableElement; + +public class TipTileFillW extends PlaceableElement { + public TipTileFillW(){ + super("Therm-PLAC-0036", + "Tip Tile Fill West", + "The tile corresponding to the filled tip of a west thermometer", + "edu/rpi/legup/images/thermometer/Elements/TipFillW.png"); + } +} diff --git a/src/main/resources/edu/rpi/legup/images/thermometer/Elements/ShaftFillW.png b/src/main/resources/edu/rpi/legup/images/thermometer/Elements/ShaftFillW.png index 046b96e26..3688bbe0a 100644 Binary files a/src/main/resources/edu/rpi/legup/images/thermometer/Elements/ShaftFillW.png and b/src/main/resources/edu/rpi/legup/images/thermometer/Elements/ShaftFillW.png differ