nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'pr775' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2022-05-28 19:42:21 -04:00
parent 9e6ac144b4 67f80848bd
commit 0ce9d3a1e9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mon.c
+1 -1
View File
@@ -3811,7 +3811,7 @@ normal_shape(struct monst *mon)
if (mcham >= LOW_PM) { if (mcham >= LOW_PM) {
unsigned mcan = mon->mcan; unsigned mcan = mon->mcan;
(void) newcham(mon, &mons[mcham], NO_NC_FLAGS); (void) newcham(mon, &mons[mcham], NC_SHOW_MSG);
mon->cham = NON_PM; mon->cham = NON_PM;
/* newcham() may uncancel a polymorphing monster; override that */ /* newcham() may uncancel a polymorphing monster; override that */
if (mcan) if (mcan)
src/muse.c
+4 -3
View File
@@ -2143,7 +2143,8 @@ use_misc(struct monst* mtmp)
return 2; return 2;
case MUSE_WAN_POLYMORPH: case MUSE_WAN_POLYMORPH:
mzapwand(mtmp, otmp, TRUE); mzapwand(mtmp, otmp, TRUE);
(void) newcham(mtmp, muse_newcham_mon(mtmp), NC_VIA_WAND_OR_SPELL); (void) newcham(mtmp, muse_newcham_mon(mtmp),
NC_VIA_WAND_OR_SPELL | NC_SHOW_MSG);
if (oseen) if (oseen)
makeknown(WAN_POLYMORPH); makeknown(WAN_POLYMORPH);
return 2; return 2;
@@ -2152,7 +2153,7 @@ use_misc(struct monst* mtmp)
m_useup(mtmp, otmp); m_useup(mtmp, otmp);
if (vismon) if (vismon)
pline("%s suddenly mutates!", Monnam(mtmp)); pline("%s suddenly mutates!", Monnam(mtmp));
(void) newcham(mtmp, muse_newcham_mon(mtmp), NO_NC_FLAGS); (void) newcham(mtmp, muse_newcham_mon(mtmp), NC_SHOW_MSG);
if (oseen) if (oseen)
makeknown(POT_POLYMORPH); makeknown(POT_POLYMORPH);
return 2; return 2;
@@ -2179,7 +2180,7 @@ use_misc(struct monst* mtmp)
worm_move(mtmp); worm_move(mtmp);
newsym(g.trapx, g.trapy); newsym(g.trapx, g.trapy);
(void) newcham(mtmp, (struct permonst *) 0, NO_NC_FLAGS); (void) newcham(mtmp, (struct permonst *) 0, NC_SHOW_MSG);
return 2; return 2;
case MUSE_BAG: case MUSE_BAG:
return mloot_container(mtmp, otmp, vismon); return mloot_container(mtmp, otmp, vismon);
src/trap.c
+2 -3
View File
@@ -2166,8 +2166,7 @@ trapeffect_poly_trap(
if (resists_magm(mtmp)) { if (resists_magm(mtmp)) {
shieldeff(mtmp->mx, mtmp->my); shieldeff(mtmp->mx, mtmp->my);
} else if (!resist(mtmp, WAND_CLASS, 0, NOTELL)) { } else if (!resist(mtmp, WAND_CLASS, 0, NOTELL)) {
(void) newcham(mtmp, (struct permonst *) 0, (void) newcham(mtmp, (struct permonst *) 0, NC_SHOW_MSG);
in_sight ? NC_SHOW_MSG : NO_NC_FLAGS);
if (in_sight) if (in_sight)
seetrap(trap); seetrap(trap);
} }
@@ -2618,7 +2617,7 @@ steedintrap(struct trap* trap, struct obj* otmp)
if (!resists_magm(steed) && !resist(steed, WAND_CLASS, 0, NOTELL)) { if (!resists_magm(steed) && !resist(steed, WAND_CLASS, 0, NOTELL)) {
struct permonst *mdat = steed->data; struct permonst *mdat = steed->data;
(void) newcham(steed, (struct permonst *) 0, NO_NC_FLAGS); (void) newcham(steed, (struct permonst *) 0, NC_SHOW_MSG);
if (!can_saddle(steed) || !can_ride(steed)) { if (!can_saddle(steed) || !can_ride(steed)) {
dismount_steed(DISMOUNT_POLY); dismount_steed(DISMOUNT_POLY);
} else { } else {