djib/Sushi
1
0
Fork 0
Code Issues 2 Pull Requests Releases 1 Activity

Version 0.1.99

Browse Source 
==============
Everything seems to work fine for a two player game.
This commit is contained in:
Jean-Baptiste Hétier
2006-01-13 16:48:21 +00:00
parent c62bdacb9f
commit 651ed576bd
6 changed files with 242 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/suicideChess/Board.java
View File

@ -175,6 +175,24 @@ public class Board {
return new Piece(Piece.NONE);
}
/**
* This function returns a boolean telling if a {@link Piece} is on a {@link Square}.
* @param square The Square
* @param piece A Piece constant
* @return boolean
* @see Piece
* @see Square
*/
public boolean isEmpty(Square square, Piece piece) {
long mask = mapSquaresToBits[squareToBitBoardSquare(square)];
if ((bitBoards[piece.getPieceNumber()] & mask) == 0) {
return true;
} else {
return false;
}
}
/**
* This function converts a {@link Square} to a number representing a bitboard square
* @param square The Square to be converted
@ -234,51 +252,51 @@ public class Board {
if (displayPiece(Piece.BLACK_PAWN,mask)) {
displayedSomething=true;
display+=Character.toUpperCase(Piece.PAWN_CHAR)+" | ";
display+="'"+Character.toUpperCase(Piece.PAWN_CHAR)+"'|";
}
if (displayPiece(Piece.BLACK_QUEEN,mask)) {
displayedSomething=true;
display+=Character.toUpperCase(Piece.QUEEN_CHAR)+" | ";
display+="'"+Character.toUpperCase(Piece.QUEEN_CHAR)+"'|";
}
if (displayPiece(Piece.BLACK_KING,mask)) {
displayedSomething=true;
display+=Character.toUpperCase(Piece.KING_CHAR)+" | ";
display+="'"+Character.toUpperCase(Piece.KING_CHAR)+"'|";
}
if (displayPiece(Piece.BLACK_KNIGHT,mask)) {
displayedSomething=true;
display+=Character.toUpperCase(Piece.KNIGHT_CHAR)+" | ";
display+="'"+Character.toUpperCase(Piece.KNIGHT_CHAR)+"'|";
}
if (displayPiece(Piece.BLACK_ROOK,mask)) {
displayedSomething=true;
display+=Character.toUpperCase(Piece.ROOK_CHAR)+" | ";
display+="'"+Character.toUpperCase(Piece.ROOK_CHAR)+"'|";
}
if (displayPiece(Piece.BLACK_BISHOP,mask)) {
displayedSomething=true;
display+=Character.toUpperCase(Piece.BISHOP_CHAR)+" | ";
display+="'"+Character.toUpperCase(Piece.BISHOP_CHAR)+"'|";
}
if (displayPiece(Piece.WHITE_PAWN,mask)) {
displayedSomething=true;
display+=Piece.PAWN_CHAR+" | ";
display+=" "+Piece.PAWN_CHAR+" |";
}
if (displayPiece(Piece.WHITE_QUEEN,mask)) {
displayedSomething=true;
display+=Piece.QUEEN_CHAR+" | ";
display+=" "+Piece.QUEEN_CHAR+" |";
}
if (displayPiece(Piece.WHITE_KING,mask)) {
displayedSomething=true;
display+=Piece.KING_CHAR+" | ";
display+=" "+Piece.KING_CHAR+" |";
}
if (displayPiece(Piece.WHITE_KNIGHT,mask)) {
displayedSomething=true;
display+=Piece.KNIGHT_CHAR+" | ";
display+=" "+Piece.KNIGHT_CHAR+" |";
}
if (displayPiece(Piece.WHITE_ROOK,mask)) {
displayedSomething=true;
display+=Piece.ROOK_CHAR+" | ";
display+=" "+Piece.ROOK_CHAR+" |";
}
if (displayPiece(Piece.WHITE_BISHOP,mask)) {
displayedSomething=true;
display+=Piece.BISHOP_CHAR+" | ";
display+=" "+Piece.BISHOP_CHAR+" |";
}
if (!displayedSomething)
display+=" |";
@ -287,6 +305,7 @@ public class Board {
}
System.out.println(" +---+---+---+---+---+---+---+---+");
System.out.println(" a b c d e f g h");
System.out.println();
}
@ -331,16 +350,7 @@ public class Board {
bitBoards[piece.getColor()] ^= mapSquaresToBits[squareToBitBoardSquare(square)];;
}
//checks if a square is empty for a certain piece
private boolean isEmpty(Square square, Piece piece) {
long mask = mapSquaresToBits[squareToBitBoardSquare(square)];
if ((bitBoards[piece.getPieceNumber()] & mask) == 0) {
return true;
} else {
return false;
}
}
//used by function display()
private boolean displayPiece(int whatToDisplay, long mask) {
if ((bitBoards[whatToDisplay] & mask)==0) {
return false;

25
src/suicideChess/Move.java
View File

@ -33,7 +33,7 @@ public class Move {
private Square enPassantSquare;
public class NotAValidMoveException extends Exception {
/**
/*
* Generated by Eclipse
*/
private static final long serialVersionUID = 2194133427162274651L;
@ -305,19 +305,30 @@ public class Move {
return fromSquare.toString()+toSquare+promotionPiece;
}
/**
* Tests the equality of two moves by just looking at the fromSquare and the toSquare
* @param that A move to test
* @return boolean
*/
public boolean isSimpleEqual(Move that) {
return ((this.fromSquare.isEqual(that.fromSquare))&&(this.toSquare.isEqual(that.toSquare)));
}
/**
* Displays a move in great details.
*/
public void display() {
System.out.println(" ");
System.out.println("==== Move ====");
System.out.println("Move: "+getMovingPiece().getPieceNumber());
System.out.println("===== Move =====");
System.out.println("Move: "+getMovingPiece().toString());
System.out.println("From square: "+fromSquare());
System.out.println("To square: "+toSquare());
System.out.println((isPromotionMove() ? "Promotion: "+getPromotionPiece().getPieceNumber() : "No Promotion"));
System.out.println((isCaptureMove() ? "Capture: "+getCapturedPiece().getPieceNumber() : "No Capture"));
System.out.println((enablesEnPassant() ? "En-Passant: "+getEnPassantSquare().getFile()+getEnPassantSquare().getRank() : "No en-passant"));
System.out.println("==============");
System.out.println((isPromotionMove() ? "Promotion: "+getPromotionPiece().toString() : "No Promotion"));
System.out.println((isCaptureMove() ? "Capture: "+getCapturedPiece().toString() : "No Capture"));
System.out.println((enablesEnPassant() ? "Set en-pass.: "+getEnPassantSquare().getFile()+getEnPassantSquare().getRank() : "No en-pass. set"));
System.out.println("================");
System.out.println(" ");
}

22
src/suicideChess/Piece.java
View File

@ -138,4 +138,26 @@ public class Piece {
public int getPieceType() {
return ((pieceNumber/2)-1);
}
/**
* Displays the agebraic name of the piece
* @return String
*/
public String toString() {
switch (pieceNumber/2-1) {
case BISHOP:
return Character.toString(BISHOP_CHAR);
case QUEEN:
return Character.toString(QUEEN_CHAR);
case KING:
return Character.toString(KING_CHAR);
case ROOK:
return Character.toString(ROOK_CHAR);
case PAWN:
return Character.toString(PAWN_CHAR);
case KNIGHT:
return Character.toString(KNIGHT_CHAR);
}
return "**Error**";
}
}

135
src/suicideChess/Rules.java
View File

@ -13,22 +13,58 @@ import suicideChess.Square.NotAValidSquare;
public class Rules {
private ArrayList<Move> legalMoves;
private ArrayList<Move> legalMovesNonCapture;
private ArrayList<Move> legalMovesCapture;
public class UnexpectedError extends Exception {
/*
* Generated by Eclipse
*/
private static final long serialVersionUID = 7448113740797323379L;
UnexpectedError(String s) { super(s); };
}
public Rules () {
legalMoves = new ArrayList<Move>();
legalMovesNonCapture = new ArrayList<Move>();
legalMovesCapture = new ArrayList<Move>();
}
/**
* Computes the possible moves according to the current status of the {@link Board} and the
* color of the current player.
* @param board The current board position.
* @param color The color of the current player.
* @throws NotAValidSquare If the program throws this exception then there is a bug.
* @throws UnexpectedError This should never happen.
* @see Square
* @see Board
*/
public void legalMovesForPlayer(Board board, int color) throws NotAValidSquare, UnexpectedError {
// Find it! There is only one king, so look for it and stop
Square square;
for(int squareNb = 0; squareNb < Board.NB_OF_SQUARES; squareNb++) {
square = new Square(squareNb);
if (board.isEmpty(square, new Piece(color))) {
continue;
}
legalMovesFromSquare(square,board);
}
}
/**
* Computes the possible moves from a given {@link Square}
* according to the current status of the {@link Board}
* @param square The square from which the move must start
* @param board The current board position.
* @throws NotAValidSquare If the program throws this exception then there is a bug.
* @throws UnexpectedError This should never happen.
* @see Square
* @see Board
*/
public ArrayList<Move> legalMovesFromSquare(Square fromSquare, Board board) throws NotAValidSquare {
public void legalMovesFromSquare(Square fromSquare, Board board) throws NotAValidSquare, UnexpectedError {
Move validMove;
Square toSquare;
@ -71,6 +107,7 @@ public class Rules {
}
} else {
captureLeft = false;
captureEnPassantLeft=false;
}
if(fromSquare.getFileNb()<Board.NB_OF_FILES) {
toCaptureRightSquare = new Square(fromSquare.getFileNb()+1, fromSquare.getRank()+1);
@ -82,6 +119,7 @@ public class Rules {
}
} else {
captureRight = false;
captureEnPassantRight=false;
}
break;
case Piece.BLACK:
@ -102,6 +140,7 @@ public class Rules {
}
} else {
captureLeft = false;
captureEnPassantLeft=false;
}
if(fromSquare.getFileNb()<Board.NB_OF_FILES) {
toCaptureRightSquare = new Square(fromSquare.getFileNb()+1, fromSquare.getRank()-1);
@ -113,10 +152,11 @@ public class Rules {
}
} else {
captureRight = false;
captureEnPassantRight=false;
}
break;
default: //this should never happen
return legalMoves;
default:
throw new UnexpectedError("ERROR 01.");
}
if (board.getPiece(toSquare).getPieceNumber()!=Piece.NONE) {
normalMove= false; //cannot move forward if there is a piece
@ -138,82 +178,82 @@ public class Rules {
if (normalMove) {
//to Queen
validMove = new Move(fromSquare, toSquare, movingPiece, new Piece(Piece.NONE), new Piece(Piece.QUEEN_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesNonCapture.add(validMove);
//to King
validMove = new Move(fromSquare, toSquare, movingPiece, new Piece(Piece.NONE), new Piece(Piece.KING_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
//to Knight
validMove = new Move(fromSquare, toSquare, movingPiece, new Piece(Piece.NONE), new Piece(Piece.KNIGHT_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesNonCapture.add(validMove);
//to Bishop
validMove = new Move(fromSquare, toSquare, movingPiece, new Piece(Piece.NONE), new Piece(Piece.BISHOP_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesNonCapture.add(validMove);
//to Knight
validMove = new Move(fromSquare, toSquare, movingPiece, new Piece(Piece.NONE), new Piece(Piece.KNIGHT_CHAR, movingPiece.getColor()));
legalMovesNonCapture.add(validMove);
//to Rook
validMove = new Move(fromSquare, toSquare, movingPiece, new Piece(Piece.NONE), new Piece(Piece.ROOK_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesNonCapture.add(validMove);
}
if (captureLeft) {
//to Queen
validMove = new Move(fromSquare, toCaptureLeftSquare, movingPiece, board.getPiece(toCaptureLeftSquare), new Piece(Piece.QUEEN_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
//to King
validMove = new Move(fromSquare, toCaptureLeftSquare, movingPiece, board.getPiece(toCaptureLeftSquare), new Piece(Piece.KING_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
//to Knight
validMove = new Move(fromSquare, toCaptureLeftSquare, movingPiece, board.getPiece(toCaptureLeftSquare), new Piece(Piece.KNIGHT_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
//to Bishop
validMove = new Move(fromSquare, toCaptureLeftSquare, movingPiece, board.getPiece(toCaptureLeftSquare), new Piece(Piece.BISHOP_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
//to Knight
validMove = new Move(fromSquare, toCaptureLeftSquare, movingPiece, board.getPiece(toCaptureLeftSquare), new Piece(Piece.KNIGHT_CHAR, movingPiece.getColor()));
legalMovesCapture.add(validMove);
//to Rook
validMove = new Move(fromSquare, toCaptureLeftSquare, movingPiece, board.getPiece(toCaptureLeftSquare), new Piece(Piece.ROOK_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
}
if (captureRight) {
//to Queen
validMove = new Move(fromSquare, toCaptureRightSquare, movingPiece, board.getPiece(toCaptureRightSquare), new Piece(Piece.QUEEN_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
//to King
validMove = new Move(fromSquare, toCaptureRightSquare, movingPiece, board.getPiece(toCaptureRightSquare), new Piece(Piece.KING_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
//to Knight
validMove = new Move(fromSquare, toCaptureRightSquare, movingPiece, board.getPiece(toCaptureRightSquare), new Piece(Piece.KNIGHT_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
//to Bishop
validMove = new Move(fromSquare, toCaptureRightSquare, movingPiece, board.getPiece(toCaptureRightSquare), new Piece(Piece.BISHOP_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
//to Rook
validMove = new Move(fromSquare, toCaptureRightSquare, movingPiece, board.getPiece(toCaptureRightSquare), new Piece(Piece.ROOK_CHAR, movingPiece.getColor()));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
}
} else {
if (normalMove) {
validMove = new Move(fromSquare, toSquare, movingPiece, new Piece(Piece.NONE), new Piece(Piece.NONE));
legalMoves.add(validMove);
legalMovesNonCapture.add(validMove);
}
if (bigJump) {
//create an 'en-passant' status
validMove = new Move(fromSquare, toBigJumpSquare, toSquare, movingPiece, false);
legalMoves.add(validMove);
legalMovesNonCapture.add(validMove);
}
if (captureEnPassantLeft) {
//create an 'en-passant' move
validMove = new Move(fromSquare, toCaptureLeftSquare, captureEnPassantLeftSquare, movingPiece, true);
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
}
if (captureEnPassantRight) {
//create an 'en-passant' move
validMove = new Move(fromSquare, toCaptureRightSquare, captureEnPassantRightSquare, movingPiece, true);
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
}
if (captureLeft) {
validMove = new Move(fromSquare, toCaptureLeftSquare, movingPiece, board.getPiece(toCaptureLeftSquare), new Piece(Piece.NONE));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
}
if (captureRight) {
validMove = new Move(fromSquare, toCaptureRightSquare, movingPiece, board.getPiece(toCaptureRightSquare), new Piece(Piece.NONE));
legalMoves.add(validMove);
legalMovesCapture.add(validMove);
}
}
@ -239,16 +279,45 @@ public class Rules {
validMove = new Move(fromSquare, toSquare, movingPiece, board.getPiece(toSquare), new Piece(Piece.NONE));
//add move to list of legal moves
legalMoves.add(validMove);
if (validMove.isCaptureMove()) {
legalMovesCapture.add(validMove);
break; //don't go further in the ray
} else {
legalMovesNonCapture.add(validMove);
}
}//end for moveNumber
}//end for ray
} //end case
return legalMoves;
}
/**
* This function return the current status of the ArrayList<Move> of all legal {@link Moves}
* without a capture.
* You need to call legalMovesFromSquare before calling this function.
* @return ArrayList<Move>
*/
public ArrayList<Move> getLegalMovesNonCapture() {
return legalMovesNonCapture;
}
/**
* This function return the current status of the ArrayList<Move> of all legal {@link Moves}
* with a capture.
* You need to call legalMovesFromSquare before calling this function.
* @return ArrayList<Move>
*/
public ArrayList<Move> getLegalMovesCapture() {
return legalMovesCapture;
}
/*===================*
* PRECOMPUTED MOVES *
*===================*/
private static int[][][][] movesAllowed;
static {

2
src/suicideChess/Square.java
View File

@ -14,7 +14,7 @@ public class Square {
private int rank;
public class NotAValidSquare extends Exception {
/**
/*
* Generated by Eclipse
*/
private static final long serialVersionUID = 7586171991212094565L;

56
src/suicideChess/SuicideChess.java
View File

@ -46,13 +46,14 @@ public class SuicideChess {
Board bitboard = new Board();
bitboard.display();
/*int playerColor = Piece.WHITE;
System.out.println("White: ");*/
int playerColor = Piece.WHITE;
System.out.println("White: ");
while (true) {
try {
String whatMove= moveInput.readLine();
boolean playedALegalMove = false;
if (whatMove.startsWith("quit")) {
System.out.println("Goodbye!");
@ -61,10 +62,21 @@ public class SuicideChess {
if (whatMove.startsWith("hint")) {
Rules rules = new Rules();
ArrayList<Move> allLegalMoves =
rules.legalMovesFromSquare(new Square(whatMove.substring(5,7)),bitboard);
rules.legalMovesForPlayer(bitboard,playerColor);
ArrayList<Move> allLegalMoves = rules.getLegalMovesCapture();
if (allLegalMoves.size()==0) {
allLegalMoves = rules.getLegalMovesNonCapture();
}
for(int i = 0; i<allLegalMoves.size(); i++) {
allLegalMoves.get(i).display();
if(allLegalMoves.get(i).isPromotionMove()) {
System.out.println(allLegalMoves.get(i).fromSquare().toString() +
allLegalMoves.get(i).toSquare().toString() +
allLegalMoves.get(i).getPromotionPiece().toString());
} else {
System.out.println(allLegalMoves.get(i).fromSquare().toString() +
allLegalMoves.get(i).toSquare().toString());
}
}
continue;
}
@ -79,32 +91,50 @@ public class SuicideChess {
Move theMove = new Move(whatMove, bitboard);
Rules rules = new Rules();
ArrayList<Move> allLegalMoves =
rules.legalMovesFromSquare(new Square(whatMove.substring(0,2)),bitboard);
boolean needToCapture = false;
int foundMoveIndex = -1;
if(theMove.getMovingPiece().getColor() == playerColor) {
rules.legalMovesForPlayer(bitboard,playerColor);
ArrayList<Move> allLegalMoves = rules.getLegalMovesCapture();
if (allLegalMoves.size()==0) {
allLegalMoves = rules.getLegalMovesNonCapture();
} else {
needToCapture = true;
}
for (int moveIndex = 0; moveIndex < allLegalMoves.size(); moveIndex++) {
if (allLegalMoves.get(moveIndex).toSquare().isEqual(theMove.toSquare())) {
if (allLegalMoves.get(moveIndex).isSimpleEqual(theMove)) {
if(theMove.isPromotionMove()&&
theMove.getPromotionPiece().getPieceNumber()!=allLegalMoves.get(moveIndex).getPromotionPiece().getPieceNumber()) {
continue;
}
foundMoveIndex=moveIndex;
break;
}
}
if (foundMoveIndex == -1) {
System.out.println("This move is not valid. Please type 'hint "+whatMove.substring(0,2)
+"' to see available moves.");
if (needToCapture) {
System.out.println("Capturing is mandatory.");
}
System.out.println("This move is not valid. Please type 'hint' to see list of legal moves.");
} else {
allLegalMoves.get(foundMoveIndex).display();
bitboard.doMove(allLegalMoves.get(foundMoveIndex));
bitboard.display();
playedALegalMove=true;
}
} else {
System.out.println("Please play a piece of the right color.");
}
/*if (playerColor == Piece.WHITE) {
if (playedALegalMove) {
if (playerColor == Piece.WHITE) {
playerColor = Piece.BLACK;
System.out.println("Black: ");
} else {
playerColor = Piece.WHITE;
System.out.println("White: ");
}*/
}
}
} catch (NotAValidMoveException err) {
System.out.println(err);