// not attacked more times than defended.
if ( !(stoppers ^ lever ^ leverPush)
&& !(ourPawns & forward_file_bb(Us, s))
- && popcount(supported) >= popcount(lever)
+ && popcount(supported) >= popcount(lever) - 1
&& popcount(phalanx) >= popcount(leverPush))
e->passedPawns[Us] |= s;
template<Color Us>
Value Entry::shelter_storm(const Position& pos, Square ksq) {
- constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
+ constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
+ constexpr Direction Down = (Us == WHITE ? SOUTH : NORTH);
enum { BlockedByKing, Unopposed, BlockedByPawn, Unblocked };
- File center = std::max(FILE_B, std::min(FILE_G, file_of(ksq)));
- Bitboard b = pos.pieces(PAWN)
- & (forward_ranks_bb(Us, ksq) | rank_bb(ksq))
- & (adjacent_files_bb(center) | file_bb(center));
+ Bitboard b = pos.pieces(PAWN) & (forward_ranks_bb(Us, ksq) | rank_bb(ksq));
Bitboard ourPawns = b & pos.pieces(Us);
Bitboard theirPawns = b & pos.pieces(Them);
Value safety = MaxSafetyBonus;
+ File center = std::max(FILE_B, std::min(FILE_G, file_of(ksq)));
for (File f = File(center - 1); f <= File(center + 1); ++f)
{
b = ourPawns & file_bb(f);
int d = std::min(f, ~f);
safety -= ShelterWeakness[f == file_of(ksq)][d][rkUs]
+ StormDanger
- [f == file_of(ksq) && rkThem == relative_rank(Us, ksq) + 1 ? BlockedByKing :
- rkUs == RANK_1 ? Unopposed :
- rkThem == rkUs + 1 ? BlockedByPawn : Unblocked]
+ [(shift<Down>(b) & ksq) ? BlockedByKing :
+ rkUs == RANK_1 ? Unopposed :
+ rkThem == (rkUs + 1) ? BlockedByPawn : Unblocked]
[d][rkThem];
}