- kingShelters[Us] = make_score(shelter, 0);
- return kingShelters[Us];
+
+ if (relative_rank(Us, ksq) > RANK_4)
+ return kingSafety[Us] = SCORE_ZERO;
+
+ Value bonus = shelter_storm<Us>(pos, ksq);
+
+ // If we can castle use the bonus after the castle if is bigger
+ if (pos.can_castle(Us == WHITE ? WHITE_OO : BLACK_OO))
+ bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_G1)));
+
+ if (pos.can_castle(Us == WHITE ? WHITE_OOO : BLACK_OOO))
+ bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_C1)));
+
+ return kingSafety[Us] = make_score(bonus, 0);