marco/mchess-server
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Fix king moves and fix formatting.

Browse Source
This commit is contained in:
Marco 2023-06-28 11:39:44 +02:00
parent 2d5eacb351
commit 63e973a3be
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chess/board.go
View File

@ -200,12 +200,11 @@ func (b *Board) handleSpecialMove(move types.Move) bool {
var was bool var was bool
var pieceAtStartSquare = b.getPieceAt(move.StartSquare) var pieceAtStartSquare = b.getPieceAt(move.StartSquare)
switch pieceAtStartSquare.(type) { switch piece := pieceAtStartSquare.(type) {
case Pawn: case Pawn:
pawn := pieceAtStartSquare.(Pawn) was = piece.HandlePossiblePromotion(b, move)
was = pawn.HandlePossiblePromotion(b, move)
if !was { if !was {
was = pawn.HandleEnPassant(b, move, b.getLastMove()) was = piece.HandleEnPassant(b, move, b.getLastMove())
} }
} }
return was return was

10
chess/free_squares.go
View File

@ -31,14 +31,15 @@ func (b *Board) GetNonBlockedDiagonals(fromSquare types.Coordinate) []types.Coor
} }
func (b *Board) GetNonBlockedKingMoves(fromSquare types.Coordinate) []types.Coordinate { func (b *Board) GetNonBlockedKingMoves(fromSquare types.Coordinate) []types.Coordinate {
return b.getNonBlockedConsecutive(fromSquare.GetAllKingMoves(), fromSquare) return b.getNonBlockedRaw(fromSquare.GetAllKingMoves(), fromSquare)
} }
func (b *Board) GetNonBlockedKnightMoves(fromSquare types.Coordinate) []types.Coordinate { func (b *Board) GetNonBlockedKnightMoves(fromSquare types.Coordinate) []types.Coordinate {
allKnightMoves := fromSquare.GetAllKnightMoves() return b.getNonBlockedRaw(fromSquare.GetAllKnightMoves(), fromSquare)
return b.getNonBlockedForKnights(allKnightMoves, fromSquare)
} }
// returns only those squares in a straight/diagonal that are not blocked
// until it hits a blocking piece (excluding same color, including diff color)
func (b *Board) getNonBlockedConsecutive( func (b *Board) getNonBlockedConsecutive(
squaresToCheck []types.Coordinate, squaresToCheck []types.Coordinate,
sourceSquare types.Coordinate, sourceSquare types.Coordinate,
@ -64,7 +65,8 @@ func (b *Board) getNonBlockedConsecutive(
return nonBlocked return nonBlocked
} }
func (b *Board) getNonBlockedForKnights( // returns any square in squaresToCheck that are not blocked
func (b *Board) getNonBlockedRaw(
squaresToCheck []types.Coordinate, squaresToCheck []types.Coordinate,
sourceSquare types.Coordinate, sourceSquare types.Coordinate,
) []types.Coordinate { ) []types.Coordinate {