const Score Tempo = make_score(24, 11);
// Rooks and queens on the 7th rank
- const Score RookOn7thBonus = make_score(3, 20);
- const Score QueenOn7thBonus = make_score(1, 8);
+ const Score RookOn7thBonus = make_score(11, 20);
+ const Score QueenOn7thBonus = make_score( 3, 8);
// Rooks and queens attacking pawns on the same rank
- const Score RookOnPawnBonus = make_score(3, 48);
- const Score QueenOnPawnBonus = make_score(1, 40);
+ const Score RookOnPawnBonus = make_score(10, 28);
+ const Score QueenOnPawnBonus = make_score( 4, 20);
// Rooks on open files (modified by Joona Kiiski)
const Score RookOpenFileBonus = make_score(43, 21);
// right to castle.
const Value TrappedRookPenalty = Value(180);
+ // Penalty for bishop with pawns on the same coloured squares
+ const Score BishopPawnsPenalty = make_score(8, 12);
+
// Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by
// a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only
// happen in Chess960 games.
// Penalty for bishop with same coloured pawns
if (Piece == BISHOP)
- score -= make_score(8, 12) * ei.pi->same_colored_pawn_count(s, Us);
+ score -= BishopPawnsPenalty * ei.pi->pawns_on_same_color_squares(Us, s);
// Bishop and knight outposts squares
if ( (Piece == BISHOP || Piece == KNIGHT)