chessai

commit 906f4c5401515d68be0bb302f093a871eb1e27f9
parent f3a671b397e838b86f91b6c655b60e02d9cebb03
Author: Jul <jul@9o.is>
Date:   Sat,  1 Dec 2012 15:23:30 -0500

Changed invalid to valid in rules.

Diffstat:
M
src/chess/ChessBoard.java
 | 
2
+-
M
src/chess/ChessRules.java
 | 
26
+++++++++++++++-----------

2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/chess/ChessBoard.java b/src/chess/ChessBoard.java
@@ -71,7 +71,7 @@ public class ChessBoard {
 
   //CHECK
   public void move(ChessCoordinate coor, ChessCoordinate coor1) {
-      if(!rules.invalidMove(board, coor, coor1)) {
+      if(rules.validMove(board, coor, coor1)) {
           rules.applyCaptureRule();
           board.move(coor, coor1);
           moves++;
diff --git a/src/chess/ChessRules.java b/src/chess/ChessRules.java
@@ -24,7 +24,7 @@ public class ChessRules {
     }
 
     // must be called after testing invalid is false
-    // eg. if(!invalidMove(...)) applyCaptureRule();
+    // eg. if(validMove(...)) applyCaptureRule();
     // CHECK
     public void applyCaptureRule() {
         final ChessPiece srcPiece = ChessPiece.find(state.get(src));
@@ -34,13 +34,17 @@ public class ChessRules {
         if(srcPiece.getColor() != destPiece.getColor() &&
                 srcPiece != ChessPiece.NA &&
                 destPiece != ChessPiece.NA) {
-                System.out.println(capturePrefix +
+
+            // CAPTURE!
+            // TODO handle player points here
+
+            System.out.println(capturePrefix +
                         srcPiece + src + destPiece + dest);
         }
     }
 
     // CHECK
-    public boolean invalidMove(
+    public boolean validMove(
             ChessState state,
             ChessCoordinate src,
             ChessCoordinate dest) {
@@ -48,34 +52,34 @@ public class ChessRules {
         this.src = src;
         this.dest = dest;
 
-        return empty() || selfOccupied();
+        return srcHasPiece() && uninhabitedSpace();
     }
 
     /*
      * Checks if source coordinate has a chess piece.
      */
-    private boolean empty() {
+    private boolean srcHasPiece() {
         final ChessPiece srcPiece = ChessPiece.find(state.get(src));
         if(srcPiece == ChessPiece.NA) {
             System.err.println(failurePrefix+"Empty test");
-            return true;
-        } else
             return false;
+        } else
+            return true;
     }
 
     /*
      * Checks if player moved a chess piece onto one of his own pieces.
      */
-    private boolean selfOccupied() {
+    private boolean uninhabitedSpace() {
         final ChessPiece srcPiece = ChessPiece.find(state.get(src));
         final ChessPiece destPiece = ChessPiece.find(state.get(dest));
 
         // are the source and destination pieces same color?
         if(srcPiece.getColor() == destPiece.getColor()) {
-            System.err.println(failurePrefix+"Self Occupied");
-            return true;
-        } else
+            System.err.println(failurePrefix+"Uninhabited Space");
             return false;
+        } else
+            return true;
     }
 
     //private boolean