chameleon behaviour

- restore intended behaviour of kill_genocided_monsters().
  It has been incorrect since  the chameleon overhaul in June 2004.
- eliminate CHAM_ORDINARY and use NON_PM instead.
This commit is contained in:
nethack.allison
2006-03-12 04:43:28 +00:00
parent e1ef0f1042
commit 0b88609133
15 changed files with 48 additions and 51 deletions
+2 -2
View File
@@ -469,14 +469,14 @@ mattacku(mtmp)
}
/* Special demon handling code */
if((mtmp->cham == CHAM_ORDINARY) && is_demon(mdat) && !range2
if((mtmp->cham == NON_PM) && is_demon(mdat) && !range2
&& mtmp->data != &mons[PM_BALROG]
&& mtmp->data != &mons[PM_SUCCUBUS]
&& mtmp->data != &mons[PM_INCUBUS])
if (!mtmp->mcan && !rn2(13)) (void)msummon(mtmp);
/* Special lycanthrope handling code */
if((mtmp->cham == CHAM_ORDINARY) && is_were(mdat) && !range2) {
if((mtmp->cham == NON_PM) && is_were(mdat) && !range2) {
if(is_human(mdat)) {
if(!rn2(5 - (night() * 2)) && !mtmp->mcan) new_were(mtmp);