Merge pull request #147 from Bram-Hub/nurikabe-rule_name_changes

Nurikabe rule name changes
Bram-Hub · Jun 16, 2022 · e60e195 · e60e195
2 parents 9e0300c + 0ddb91a
commit e60e195
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.../nurikabe/rules/UnreachableBasicRule.java → ...ikabe/rules/CannotReachCellBasicRule.java b/.../nurikabe/rules/UnreachableBasicRule.java → ...ikabe/rules/CannotReachCellBasicRule.java
@@ -10,10 +10,10 @@
 import edu.rpi.legup.puzzle.nurikabe.NurikabeCell;
 import edu.rpi.legup.puzzle.nurikabe.NurikabeType;
 
-public class UnreachableBasicRule extends BasicRule {
-    public UnreachableBasicRule() {
+public class CannotReachCellBasicRule extends BasicRule {
+    public CannotReachCellBasicRule() {
         super("NURI-BASC-0008",
-                "Unreachable white region",
+                "Can't Reach Cell",
                 "A cell must be black if it cannot be reached by any white region",
                 "edu/rpi/legup/images/nurikabe/rules/Unreachable.png");
     }
@@ -29,7 +29,7 @@ public UnreachableBasicRule() {
      */
     @Override
     protected String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElement) {
-        ContradictionRule contraRule = new CantReachWhiteContradictionRule();
+        ContradictionRule contraRule = new UnreachableWhiteCellContradictionRule();
 
         NurikabeBoard destBoardState = (NurikabeBoard) transition.getBoard();
         NurikabeCell cell = (NurikabeCell) destBoardState.getPuzzleElement(puzzleElement);

diff --git a/...ules/CantReachWhiteContradictionRule.java → ...nreachableWhiteCellContradictionRule.java b/...ules/CantReachWhiteContradictionRule.java → ...nreachableWhiteCellContradictionRule.java
@@ -11,14 +11,14 @@
 import java.util.ArrayList;
 import java.util.Set;
 
-public class CantReachWhiteContradictionRule extends ContradictionRule {
+public class UnreachableWhiteCellContradictionRule extends ContradictionRule {
 
     private final String NO_CONTRADICTION_MESSAGE = "Cell at this index can be reached";
     private final String INVALID_USE_MESSAGE = "Does not contain a contradiction at this index";
 
-    public CantReachWhiteContradictionRule() {
+    public UnreachableWhiteCellContradictionRule() {
         super("NURI-CONT-0002",
-                "Unreachables are Black",
+                "Unreachable White Cell",
                 "A white cell must be able to reach a white region",
                 "edu/rpi/legup/images/nurikabe/contradictions/CantReach.png");
     }

diff --git a/src/main/java/edu/rpi/legup/puzzle/nurikabe/rules/nurikabe_reference_sheet.txt b/src/main/java/edu/rpi/legup/puzzle/nurikabe/rules/nurikabe_reference_sheet.txt
@@ -5,11 +5,11 @@ NURI-BASC-0004 : FillinBlackBasicRule
 NURI-BASC-0005 : FillinWhiteBasicRule
 NURI-BASC-0006 : PreventBlackSquareBasicRule
 NURI-BASC-0007 : SurroundRegionBasicRule
-NURI-BASC-0008 : UnreachableBasicRule
+NURI-BASC-0008 : CannotReachCellBasicRule
 NURI-BASC-0009 : WhiteBottleNeckBasicRule
 
 NURI-CONT-0001 : BlackSquareContradictionRule
-NURI-CONT-0002 : CantReachWhiteContradictionRule
+NURI-CONT-0002 : UnreachableWhiteCellContradictionRule
 NURI-CONT-0003 : IsolateBlackContradictionRule
 NURI-CONT-0004 : MultipleNumbersContradictionRule
 NURI-CONT-0005 : NoNumberContradictionRule