From 7a8845f9d089d9b5b70c5842d1d77e157374ac75 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Wed, 1 Feb 2023 01:38:39 +0300 Subject: feat: exclude pawncontrolled squares from mobility --- src/board/mod.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/board/mod.rs') diff --git a/src/board/mod.rs b/src/board/mod.rs index 8d12a12..fd0ff25 100644 --- a/src/board/mod.rs +++ b/src/board/mod.rs @@ -434,9 +434,20 @@ impl Board { pub fn mobility(&self, color: Color) -> f32 { let mut mobility = 0.; let opponent_occupancy = self.color_occupancy(color.flip()); - let empty = self.empty(); let player_pieces = self.pieces_by_color(color); + let opponent_pawns = match color { + Color::Black => self.pieces[PieceType::Pawn as usize], + Color::White => self.pieces[PieceType::PawnBlack as usize], + }; + + let pawn_attacked_squares = serialize_bitboard(opponent_pawns).iter().fold(0u64, |acc, square| { + acc | self.attacks.pawn[color.flip() as usize][*square as usize] + }); + + // Exclude squares controlled by enemy pawns from mobility + let empty = self.empty() & !pawn_attacked_squares; + for (piece_type, piece) in player_pieces.iter().enumerate() { match PieceType::from(piece_type) { PieceType::Pawn => { -- cgit v1.2.3