Use macros for monster appearances

This commit is contained in:
Pasi Kallinen
2015-10-18 13:55:11 +03:00
parent 822b372644
commit 95983f6ae6
11 changed files with 20 additions and 39 deletions

View File

@@ -845,10 +845,8 @@ not_special:
if (!mtmp->mcansee
|| (should_see && Invis && !perceives(ptr) && rn2(11))
|| (youmonst.m_ap_type == M_AP_OBJECT
&& youmonst.mappearance == STRANGE_OBJECT) || u.uundetected
|| (youmonst.m_ap_type == M_AP_OBJECT
&& youmonst.mappearance == GOLD_PIECE && !likes_gold(ptr))
|| is_obj_mappear(&youmonst,STRANGE_OBJECT) || u.uundetected
|| (is_obj_mappear(&youmonst,GOLD_PIECE) && !likes_gold(ptr))
|| (mtmp->mpeaceful && !mtmp->isshk) || /* allow shks to follow */
((monsndx(ptr) == PM_STALKER || ptr->mlet == S_BAT
|| ptr->mlet == S_LIGHT) && !rn2(3)))