};
const Score ThreatByRook[PIECE_TYPE_NB] = {
- S(0, 0), S(0, 25), S(40, 62), S(40, 59), S( 0, 34), S(35, 48)
+ S(0, 0), S(0, 25), S(40, 62), S(40, 59), S(0, 34), S(35, 48)
};
// ThreatByKing[on one/on many] contains bonuses for king attacks on
ei.attackedBy[Us][ALL_PIECES] = b | ei.attackedBy[Us][PAWN];
// Init our king safety tables only if we are going to use them
- if (pos.non_pawn_material(Them) >= QueenValueMg)
+ if (pos.non_pawn_material(Them) >= RookValueMg + KnightValueMg)
{
ei.kingRing[Us] = b;
if (relative_rank(Us, pos.square<KING>(Us)) == RANK_1)
Score score = ei.pe->king_safety<Us>(pos, ksq);
// Main king safety evaluation
- if (ei.kingAttackersCount[Them])
+ if (ei.kingAttackersCount[Them] > (1 - pos.count<QUEEN>(Them)))
{
// Find the attacked squares which are defended only by our king...
undefended = ei.attackedBy[Them][ALL_PIECES]
+ 201 * popcount(undefended)
+ 143 * (popcount(b) + !!pos.pinned_pieces(Us))
- 848 * !pos.count<QUEEN>(Them)
- - 28 * mg_value(score) / 25 - 5;
+ - 9 * mg_value(score) / 8
+ + 40;
// Analyse the safe enemy's checks which are possible on next move
safe = ~pos.pieces(Them);
safe &= ~ei.attackedBy[Us][ALL_PIECES] | (undefended & ei.attackedBy2[Them]);
- b1 = pos.attacks_from<ROOK >(ksq);
+ b1 = pos.attacks_from< ROOK>(ksq);
b2 = pos.attacks_from<BISHOP>(ksq);
// Enemy queen safe checks
// Adjust bonus based on the king's proximity
ebonus += distance(pos.square<KING>(Them), blockSq) * 5 * rr
- - distance(pos.square<KING>(Us ), blockSq) * 2 * rr;
+ - distance(pos.square<KING>( Us), blockSq) * 2 * rr;
// If blockSq is not the queening square then consider also a second push
if (relative_rank(Us, blockSq) != RANK_8)
<< " Imbalance | " << Term(IMBALANCE)
<< " Pawns | " << Term(PAWN)
<< " Knights | " << Term(KNIGHT)
- << " Bishop | " << Term(BISHOP)
+ << " Bishops | " << Term(BISHOP)
<< " Rooks | " << Term(ROOK)
<< " Queens | " << Term(QUEEN)
<< " Mobility | " << Term(MOBILITY)