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

Fix ambiguous rook moves

This commit is contained in:
ekzyis 2024-09-26 06:48:07 +02:00
parent e6f9c529f8
commit bab667d0ed
3 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
chess/board.go
View File

@ -557,7 +557,8 @@ func (b *Board) moveRook(position string, queen bool, fromX int, fromY int) erro
y int y int
xPrev int xPrev int
yPrev int yPrev int
piece *Piece p *Piece
validPrev []*Square
err error err error
) )
@ -567,21 +568,20 @@ func (b *Board) moveRook(position string, queen bool, fromX int, fromY int) erro
checkRookMove := b.validateMove(Rook, fromX, fromY) checkRookMove := b.validateMove(Rook, fromX, fromY)
checkQueenMove := b.validateMove(Queen, fromX, fromY) checkQueenMove := b.validateMove(Queen, fromX, fromY)
checkMove := func(p *Piece, xPrev int, yPrev int) bool {
return (!queen && checkRookMove(p, xPrev, yPrev)) || (queen && checkQueenMove(p, xPrev, yPrev))
}
xPrev = x xPrev = x
yPrev = y yPrev = y
for xPrev >= 0 && xPrev < 8 && yPrev >= 0 && yPrev < 8 { for xPrev >= 0 && xPrev < 8 && yPrev >= 0 && yPrev < 8 {
xPrev++ xPrev++
piece = b.getPiece(xPrev, yPrev) p = b.getPiece(xPrev, yPrev)
if piece != nil { if p != nil {
if (!queen && checkRookMove(piece, xPrev, yPrev)) || (queen && checkQueenMove(piece, xPrev, yPrev)) { if checkMove(p, xPrev, yPrev) {
b.tiles[xPrev][yPrev] = nil validPrev = append(validPrev, &Square{X: xPrev, Y: yPrev})
b.tiles[x][y] = piece
return nil
} else {
// direction blocked by other piece
break
} }
break
} }
} }
@ -589,12 +589,10 @@ func (b *Board) moveRook(position string, queen bool, fromX int, fromY int) erro
yPrev = y yPrev = y
for xPrev >= 0 && xPrev < 8 && yPrev >= 0 && yPrev < 8 { for xPrev >= 0 && xPrev < 8 && yPrev >= 0 && yPrev < 8 {
yPrev-- yPrev--
piece = b.getPiece(xPrev, yPrev) p = b.getPiece(xPrev, yPrev)
if piece != nil { if p != nil {
if (!queen && checkRookMove(piece, xPrev, yPrev)) || (queen && checkQueenMove(piece, xPrev, yPrev)) { if checkMove(p, xPrev, yPrev) {
b.tiles[xPrev][yPrev] = nil validPrev = append(validPrev, &Square{X: xPrev, Y: yPrev})
b.tiles[x][y] = piece
return nil
} else { } else {
break break
} }
@ -605,12 +603,10 @@ func (b *Board) moveRook(position string, queen bool, fromX int, fromY int) erro
yPrev = y yPrev = y
for xPrev >= 0 && xPrev < 8 && yPrev >= 0 && yPrev < 8 { for xPrev >= 0 && xPrev < 8 && yPrev >= 0 && yPrev < 8 {
xPrev-- xPrev--
piece = b.getPiece(xPrev, yPrev) p = b.getPiece(xPrev, yPrev)
if piece != nil { if p != nil {
if (!queen && checkRookMove(piece, xPrev, yPrev)) || (queen && checkQueenMove(piece, xPrev, yPrev)) { if checkMove(p, xPrev, yPrev) {
b.tiles[xPrev][yPrev] = nil validPrev = append(validPrev, &Square{X: xPrev, Y: yPrev})
b.tiles[x][y] = piece
return nil
} else { } else {
break break
} }
@ -621,18 +617,29 @@ func (b *Board) moveRook(position string, queen bool, fromX int, fromY int) erro
yPrev = y yPrev = y
for xPrev >= 0 && xPrev < 8 && yPrev >= 0 && yPrev < 8 { for xPrev >= 0 && xPrev < 8 && yPrev >= 0 && yPrev < 8 {
yPrev++ yPrev++
piece = b.getPiece(xPrev, yPrev) p = b.getPiece(xPrev, yPrev)
if piece != nil { if p != nil {
if (!queen && checkRookMove(piece, xPrev, yPrev)) || (queen && checkQueenMove(piece, xPrev, yPrev)) { if checkMove(p, xPrev, yPrev) {
b.tiles[xPrev][yPrev] = nil validPrev = append(validPrev, &Square{X: xPrev, Y: yPrev})
b.tiles[x][y] = piece
return nil
} else { } else {
break break
} }
} }
} }
if len(validPrev) > 1 {
return fmt.Errorf("move ambiguous: %d rooks can move to %s", len(validPrev), position)
}
if len(validPrev) == 1 {
xPrev = validPrev[0].X
yPrev = validPrev[0].Y
p = b.getPiece(xPrev, yPrev)
b.tiles[x][y] = p
b.tiles[xPrev][yPrev] = nil
return nil
}
return fmt.Errorf("no rook found that can move to %s", position) return fmt.Errorf("no rook found that can move to %s", position)
} }

8
chess/board_test.go
View File

@ -332,6 +332,14 @@ func TestBoardMoveRookInvalid(t *testing.T) {
// path blocked by pawn at d3 // path blocked by pawn at d3
assertMoveError(t, b, "Rh3", "no rook found that can move to h3") assertMoveError(t, b, "Rh3", "no rook found that can move to h3")
// ambiguous moves
b = chess.NewBoard()
assertParse(t, b, "a4 e6 h4 e5 Ra3 e4")
assertMoveError(t, b, "Rh3", "move ambiguous: 2 rooks can move to h3")
assertParse(t, b, "Rhh3")
} }
func TestBoardMoveQueen(t *testing.T) { func TestBoardMoveQueen(t *testing.T) {

6
chess/square.go Normal file
View File

@ -0,0 +1,6 @@
package chess
type Square struct {
X int
Y int
}