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:
+3
-3
@@ -1586,7 +1586,7 @@ struct monst *mtmp;
|
||||
return FALSE;
|
||||
|
||||
if (!stuck && !immobile &&
|
||||
(mtmp->cham == CHAM_ORDINARY) && monstr[monsndx(mdat)] < 6) {
|
||||
(mtmp->cham == NON_PM) && monstr[monsndx(mdat)] < 6) {
|
||||
boolean ignore_boulders = (verysmall(mdat) ||
|
||||
throws_rocks(mdat) ||
|
||||
passes_walls(mdat));
|
||||
@@ -1657,14 +1657,14 @@ struct monst *mtmp;
|
||||
}
|
||||
nomore(MUSE_WAN_POLYMORPH);
|
||||
if(obj->otyp == WAN_POLYMORPH && obj->spe > 0
|
||||
&& (mtmp->cham == CHAM_ORDINARY)
|
||||
&& (mtmp->cham == NON_PM)
|
||||
&& monstr[monsndx(mdat)] < 6) {
|
||||
m.misc = obj;
|
||||
m.has_misc = MUSE_WAN_POLYMORPH;
|
||||
}
|
||||
nomore(MUSE_POT_POLYMORPH);
|
||||
if(obj->otyp == POT_POLYMORPH
|
||||
&& (mtmp->cham == CHAM_ORDINARY)
|
||||
&& (mtmp->cham == NON_PM)
|
||||
&& monstr[monsndx(mdat)] < 6) {
|
||||
m.misc = obj;
|
||||
m.has_misc = MUSE_POT_POLYMORPH;
|
||||
|
||||
Reference in New Issue
Block a user