Final Images + Rule file expansion pack

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/FinishWithBlockedDirectRule.java

@@ -0,0 +1,30 @@
+package edu.rpi.legup.puzzle.thermometer.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+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.thermometer.ThermometerBoard;
+import edu.rpi.legup.puzzle.thermometer.ThermometerCell;
+import edu.rpi.legup.puzzle.thermometer.ThermometerFill;
+import edu.rpi.legup.puzzle.thermometer.ThermometerVial;
+
+import java.util.ArrayList;
+
+//TODO: Rule is unimplemented
+public class FinishWithBlockedDirectRule extends DirectRule{
+    public FinishWithBlockedDirectRule() {
+        super(
+                "THERM-BASC-0004",
+                "Finish With Blocked",
+                "Remaining tiles must be blocked once requirement is satisfied",
+                "edu/rpi/legup/images/thermometer/FinishWithBlocked.png");
+    }
+
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {return null;}
+
+    @Override
+    public Board getDefaultBoard(TreeNode node) {return null;}
+}

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/FinishWithMercuryDirectRule.java

@@ -0,0 +1,30 @@
+package edu.rpi.legup.puzzle.thermometer.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+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.thermometer.ThermometerBoard;
+import edu.rpi.legup.puzzle.thermometer.ThermometerCell;
+import edu.rpi.legup.puzzle.thermometer.ThermometerFill;
+import edu.rpi.legup.puzzle.thermometer.ThermometerVial;
+
+import java.util.ArrayList;
+
+//TODO: Rule is unimplemented
+public class FinishWithMercuryDirectRule extends DirectRule{
+    public FinishWithMercuryDirectRule() {
+        super(
+                "THERM-BASC-0003",
+                "Finish with Mercury",
+                "Remaining tiles must be filled to satisfy requirement",
+                "edu/rpi/legup/images/thermometer/FinishWithMercury.png");
+    }
+
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {return null;}
+
+    @Override
+    public Board getDefaultBoard(TreeNode node) {return null;}
+}

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/MercuryOrBlockedCaseRule.java

@@ -46,6 +46,11 @@ public String checkRuleRaw(TreeTransition transition) {
         return null;
     }
 
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+        return null;
+    }
+
     @Override
     public CaseBoard getCaseBoard(Board board) {
         ThermometerBoard thermometerBoard = (ThermometerBoard) board.copy();
@@ -76,9 +81,4 @@ public ArrayList<Board> getCases(Board board, PuzzleElement puzzleElement) {
 
         return cases;
     }
-
-    @Override
-    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
-        return null;
-    }
 }

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/MinimumFillDirectRule.java

@@ -0,0 +1,30 @@
+package edu.rpi.legup.puzzle.thermometer.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+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.thermometer.ThermometerBoard;
+import edu.rpi.legup.puzzle.thermometer.ThermometerCell;
+import edu.rpi.legup.puzzle.thermometer.ThermometerFill;
+import edu.rpi.legup.puzzle.thermometer.ThermometerVial;
+
+import java.util.ArrayList;
+
+//TODO: Rule is unimplemented
+public class MinimumFillDirectRule extends DirectRule{
+    public MinimumFillDirectRule() {
+        super(
+                "THERM-BASC-0005",
+                "Minimum Fill",
+                "Some thermometers must be filled a minimum amount to satisfy requirement",
+                "edu/rpi/legup/images/thermometer/MinimumFill.png");
+    }
+
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {return null;}
+
+    @Override
+    public Board getDefaultBoard(TreeNode node) {return null;}
+}

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/RestEmptyDirectRule.java

@@ -87,6 +87,13 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
         return super.getInvalidUseOfRuleMessage() + "Something went wrong - 3";
     }
 
+    /**
+     * 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/thermometer/rules/SatisfyMercuryCaseRule.java

@@ -0,0 +1,33 @@
+package edu.rpi.legup.puzzle.thermometer.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.CaseBoard;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+import edu.rpi.legup.model.rules.CaseRule;
+import edu.rpi.legup.model.tree.TreeTransition;
+import edu.rpi.legup.puzzle.thermometer.*;
+import java.util.ArrayList;
+//TODO:This rule is unimplemented
+public class SatisfyMercuryCaseRule extends CaseRule {
+    public SatisfyMercuryCaseRule() {
+        super("THERM-CASE-0002",
+                "Satisfy Mercury",
+                "There are multiple ways column/row requirements can be fufilled",
+                "edu/rpi/legup/images/thermometer/SatisfyMercury.png");
+    }
+
+    @Override
+    public String checkRuleRaw(TreeTransition transition) {return null;}
+
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
+        return null;
+    }
+
+    @Override
+    public ArrayList<Board> getCases(Board board, PuzzleElement puzzleElement) {return null;}
+
+    @Override
+    public CaseBoard getCaseBoard(Board board) {return null;}
+
+}

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/ThermometerTooLargeDirectRule.java

@@ -0,0 +1,30 @@
+package edu.rpi.legup.puzzle.thermometer.rules;
+
+import edu.rpi.legup.model.gameboard.Board;
+import edu.rpi.legup.model.gameboard.PuzzleElement;
+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.thermometer.ThermometerBoard;
+import edu.rpi.legup.puzzle.thermometer.ThermometerCell;
+import edu.rpi.legup.puzzle.thermometer.ThermometerFill;
+import edu.rpi.legup.puzzle.thermometer.ThermometerVial;
+
+import java.util.ArrayList;
+
+//TODO: Rule is unimplemented
+public class ThermometerTooLargeDirectRule extends DirectRule{
+    public ThermometerTooLargeDirectRule() {
+        super(
+                "THERM-BASC-0006",
+                "Thermometer Too Large",
+                "If thermometer is larger than required mercury, some of it must be blocked",
+                "edu/rpi/legup/images/thermometer/ThermometerTooLarge.png");
+    }
+
+    @Override
+    public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {return null;}
+
+    @Override
+    public Board getDefaultBoard(TreeNode node) {return null;}
+}

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/TooFewMercuryContradiction.java

@@ -14,8 +14,8 @@ public class TooFewMercuryContradiction extends ContradictionRule{
 
     public TooFewMercuryContradiction(){
         super("THERM-CONT-0002",
-                "Too Many Mercury",
-                "More mercury in column/row than target",
+                "Too Few Mercury",
+                "Not enough mercury in column/row to fufill requirement",
                 "edu/rpi/legup/images/thermometer/NotEnoughMercury.png");
     }