ekzyis
/
chessbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement queen moves

This commit is contained in:
ekzyis 2024-09-18 07:00:09 +02:00
parent 2c6a7133e3
commit 044e7a959e
2 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
chess/board.go
View File

@ -139,9 +139,9 @@ func (b *Board) Move(position string) error {
} else if len(position) == 3 {
switch strings.ToLower(position[0:1]) {
case "r":
err = b.moveRook(position[1:3])
err = b.moveRook(position[1:3], false)
case "b":
err = b.moveBishop(position[1:3])
err = b.moveBishop(position[1:3], false)
case "n":
err = b.moveKnight(position[1:3])
case "q":
@ -216,7 +216,7 @@ func (b *Board) movePawn(position string) error {
return fmt.Errorf("no pawn found that can move to %s", position)
}
func (b *Board) moveRook(position string) error {
func (b *Board) moveRook(position string, queen bool) error {
var (
x int
y int
@ -236,7 +236,7 @@ func (b *Board) moveRook(position string) error {
xPrev++
piece = b.getPiece(xPrev, yPrev)
if piece != nil {
if piece.Name == Rook && piece.Color == b.turn {
if ((!queen && piece.Name == Rook) || (queen && piece.Name == Queen)) && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece
return nil
@ -253,7 +253,7 @@ func (b *Board) moveRook(position string) error {
yPrev--
piece = b.getPiece(xPrev, yPrev)
if piece != nil {
if piece.Name == Rook && piece.Color == b.turn {
if ((!queen && piece.Name == Rook) || (queen && piece.Name == Queen)) && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece
return nil
@ -269,7 +269,7 @@ func (b *Board) moveRook(position string) error {
xPrev--
piece = b.getPiece(xPrev, yPrev)
if piece != nil {
if piece.Name == Rook && piece.Color == b.turn {
if ((!queen && piece.Name == Rook) || (queen && piece.Name == Queen)) && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece
return nil
@ -285,7 +285,7 @@ func (b *Board) moveRook(position string) error {
yPrev++
piece = b.getPiece(xPrev, yPrev)
if piece != nil {
if piece.Name == Rook && piece.Color == b.turn {
if ((!queen && piece.Name == Rook) || (queen && piece.Name == Queen)) && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece
return nil
@ -298,7 +298,7 @@ func (b *Board) moveRook(position string) error {
return fmt.Errorf("no rook found that can move to %s", position)
}
func (b *Board) moveBishop(position string) error {
func (b *Board) moveBishop(position string, queen bool) error {
var (
x int
y int
@ -319,7 +319,7 @@ func (b *Board) moveBishop(position string) error {
yPrev--
piece = b.getPiece(xPrev, yPrev)
if piece != nil {
if piece.Name == Bishop && piece.Color == b.turn {
if ((!queen && piece.Name == Bishop) || (queen && piece.Name == Queen)) && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece
return nil
@ -337,7 +337,7 @@ func (b *Board) moveBishop(position string) error {
yPrev++
piece = b.getPiece(xPrev, yPrev)
if piece != nil {
if piece.Name == Bishop && piece.Color == b.turn {
if ((!queen && piece.Name == Bishop) || (queen && piece.Name == Queen)) && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece
return nil
@ -354,7 +354,7 @@ func (b *Board) moveBishop(position string) error {
yPrev++
piece = b.getPiece(xPrev, yPrev)
if piece != nil {
if piece.Name == Bishop && piece.Color == b.turn {
if ((!queen && piece.Name == Bishop) || (queen && piece.Name == Queen)) && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece
return nil
@ -371,7 +371,7 @@ func (b *Board) moveBishop(position string) error {
yPrev--
piece = b.getPiece(xPrev, yPrev)
if piece != nil {
if piece.Name == Bishop && piece.Color == b.turn {
if ((!queen && piece.Name == Bishop) || (queen && piece.Name == Queen)) && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece
return nil
@ -474,7 +474,19 @@ func (b *Board) moveKnight(position string) error {
}
func (b *Board) moveQueen(position string) error {
return nil
var (
err error
)
if err = b.moveBishop(position, true); err == nil {
return nil
}
if err = b.moveRook(position, true); err == nil {
return nil
}
return fmt.Errorf("no queen found that can move to %s", position)
}
func (b *Board) moveKing(position string) error {

21
chess/board_test.go
View File

@ -151,6 +151,27 @@ func TestBoardMoveRook(t *testing.T) {
assertNoPiece(t, b, "a8")
}
func TestBoardMoveQueen(t *testing.T) {
b := chess.NewBoard()
b.Move("Qd3")
assertMoveError(t, b, "Qd3", "no queen found that can move to d3")
b.Move("d4")
b.Move("d5")
b.Move("Qd3")
assertPiece(t, b, "d3", chess.Queen, chess.Light)
assertNoPiece(t, b, "d1")
b.Move("Qd6")
assertPiece(t, b, "d6", chess.Queen, chess.Dark)
assertNoPiece(t, b, "d8")
}
func assertPiece(t *testing.T, b *chess.Board, position string, name chess.PieceName, color chess.Color) {
p := b.At(position)