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

Accessibility: more message locations pt 4

Browse Source
This commit is contained in:
Pasi Kallinen
2024-12-14 15:51:55 +02:00
parent 369f1ff959
commit 1849985214
1 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/muse.c
+55 -53
View File
@@ -107,7 +107,7 @@ precheck(struct monst *mon, struct obj *obj)
pline1(empty); pline1(empty);
} else { } else {
if (vis) if (vis)
pline("In a cloud of smoke, %s emerges!", a_monnam(mtmp)); pline_mon(mtmp, "In a cloud of smoke, %s emerges!", a_monnam(mtmp));
pline("%s speaks.", vis ? Monnam(mtmp) : Something); pline("%s speaks.", vis ? Monnam(mtmp) : Something);
/* I suspect few players will be upset that monsters */ /* I suspect few players will be upset that monsters */
/* can't wish for wands of death here.... */ /* can't wish for wands of death here.... */
@@ -133,7 +133,7 @@ precheck(struct monst *mon, struct obj *obj)
/* 3.6.1: no Deaf filter; 'if' message doesn't warrant it, 'else' /* 3.6.1: no Deaf filter; 'if' message doesn't warrant it, 'else'
message doesn't need it since You_hear() has one of its own */ message doesn't need it since You_hear() has one of its own */
if (vis) { if (vis) {
pline("%s zaps %s, which suddenly explodes!", Monnam(mon), pline_mon(mon, "%s zaps %s, which suddenly explodes!", Monnam(mon),
an(xname(obj))); an(xname(obj)));
} else { } else {
/* same near/far threshold as mzapwand() */ /* same near/far threshold as mzapwand() */
@@ -182,7 +182,7 @@ mzapwand(
monverbself(mtmp, Monnam(mtmp), "zap", (char *) 0), monverbself(mtmp, Monnam(mtmp), "zap", (char *) 0),
doname(otmp)); doname(otmp));
} else { } else {
pline("%s zaps %s!", Monnam(mtmp), an(xname(otmp))); pline_mon(mtmp, "%s zaps %s!", Monnam(mtmp), an(xname(otmp)));
stop_occupation(); stop_occupation();
} }
otmp->spe -= 1; otmp->spe -= 1;
@@ -246,7 +246,7 @@ mreadmsg(struct monst *mtmp, struct obj *otmp)
if (vismon) { if (vismon) {
/* directly see the monster reading the scroll */ /* directly see the monster reading the scroll */
pline("%s reads %s!", Monnam(mtmp), onambuf); pline_mon(mtmp, "%s reads %s!", Monnam(mtmp), onambuf);
} else { /* !Deaf, otherwise we wouldn't reach here */ } else { /* !Deaf, otherwise we wouldn't reach here */
char blindbuf[BUFSZ]; char blindbuf[BUFSZ];
boolean similar = same_race(gy.youmonst.data, mtmp->data), boolean similar = same_race(gy.youmonst.data, mtmp->data),
@@ -285,7 +285,7 @@ mquaffmsg(struct monst *mtmp, struct obj *otmp)
{ {
if (canseemon(mtmp)) { if (canseemon(mtmp)) {
otmp->dknown = 1; otmp->dknown = 1;
pline("%s drinks %s!", Monnam(mtmp), singular(otmp, doname)); pline_mon(mtmp, "%s drinks %s!", Monnam(mtmp), singular(otmp, doname));
} else if (!Deaf) { } else if (!Deaf) {
Soundeffect(se_mon_chugging_potion, 25); Soundeffect(se_mon_chugging_potion, 25);
You_hear("a chugging sound."); You_hear("a chugging sound.");
@@ -386,7 +386,7 @@ m_tele(
mon_learns_traps(mtmp, TELEP_TRAP); mon_learns_traps(mtmp, TELEP_TRAP);
} else if ((mon_has_amulet(mtmp) || On_W_tower_level(&u.uz)) && !rn2(3)) { } else if ((mon_has_amulet(mtmp) || On_W_tower_level(&u.uz)) && !rn2(3)) {
if (vismon) if (vismon)
pline("%s seems disoriented for a moment.", Monnam(mtmp)); pline_mon(mtmp, "%s seems disoriented for a moment.", Monnam(mtmp));
} else { } else {
/* teleport monster 'mtmp' */ /* teleport monster 'mtmp' */
if (how) { if (how) {
@@ -775,7 +775,7 @@ mon_escape(struct monst *mtmp, boolean vismon)
|| (mtmp->iswiz && svc.context.no_of_wizards < 2)) || (mtmp->iswiz && svc.context.no_of_wizards < 2))
return 0; return 0;
if (vismon) if (vismon)
pline("%s escapes the dungeon!", Monnam(mtmp)); pline_mon(mtmp, "%s escapes the dungeon!", Monnam(mtmp));
mongone(mtmp); mongone(mtmp);
return 2; return 2;
} }
@@ -811,7 +811,7 @@ use_defensive(struct monst *mtmp)
case MUSE_UNICORN_HORN: case MUSE_UNICORN_HORN:
if (vismon) { if (vismon) {
if (otmp) if (otmp)
pline("%s uses a unicorn horn!", Monnam(mtmp)); pline_mon(mtmp, "%s uses a unicorn horn!", Monnam(mtmp));
else else
pline_The("tip of %s's horn glows!", mon_nam(mtmp)); pline_The("tip of %s's horn glows!", mon_nam(mtmp));
} }
@@ -820,13 +820,13 @@ use_defensive(struct monst *mtmp)
} else if (mtmp->mconf || mtmp->mstun) { } else if (mtmp->mconf || mtmp->mstun) {
mtmp->mconf = mtmp->mstun = 0; mtmp->mconf = mtmp->mstun = 0;
if (vismon) if (vismon)
pline("%s seems steadier now.", Monnam(mtmp)); pline_mon(mtmp, "%s seems steadier now.", Monnam(mtmp));
} else } else
impossible("No need for unicorn horn?"); impossible("No need for unicorn horn?");
return 2; return 2;
case MUSE_BUGLE: case MUSE_BUGLE:
if (vismon) { if (vismon) {
pline("%s plays %s!", Monnam(mtmp), doname(otmp)); pline_mon(mtmp, "%s plays %s!", Monnam(mtmp), doname(otmp));
} else if (!Deaf) { } else if (!Deaf) {
Soundeffect(se_bugle_playing_reveille, 100); Soundeffect(se_bugle_playing_reveille, 100);
You_hear("a bugle playing reveille!"); You_hear("a bugle playing reveille!");
@@ -873,11 +873,11 @@ use_defensive(struct monst *mtmp)
nlev = random_teleport_level(); nlev = random_teleport_level();
if (mon_has_amulet(mtmp) || In_endgame(&u.uz)) { if (mon_has_amulet(mtmp) || In_endgame(&u.uz)) {
if (vismon) if (vismon)
pline("%s seems very disoriented for a moment.", pline_mon(mtmp, "%s seems very disoriented for a moment.",
Monnam(mtmp)); Monnam(mtmp));
} else if (nlev == depth(&u.uz)) { } else if (nlev == depth(&u.uz)) {
if (vismon) if (vismon)
pline("%s shudders for a moment.", Monnam(mtmp)); pline_mon(mtmp, "%s shudders for a moment.", Monnam(mtmp));
} else { } else {
get_level(&flev, nlev); get_level(&flev, nlev);
migrate_to_level(mtmp, ledger_no(&flev), MIGR_RANDOM, migrate_to_level(mtmp, ledger_no(&flev), MIGR_RANDOM,
@@ -920,7 +920,7 @@ use_defensive(struct monst *mtmp)
/* pit creation succeeded */ /* pit creation succeeded */
if (vis) { if (vis) {
seetrap(t); seetrap(t);
pline("%s has made a pit in the %s.", Monnam(mtmp), pline_mon(mtmp, "%s has made a pit in the %s.", Monnam(mtmp),
surface(mtmp->mx, mtmp->my)); surface(mtmp->mx, mtmp->my));
} }
fill_pit(mtmp->mx, mtmp->my); fill_pit(mtmp->mx, mtmp->my);
@@ -931,9 +931,9 @@ use_defensive(struct monst *mtmp)
return 2; return 2;
seetrap(t); seetrap(t);
if (vis) { if (vis) {
pline("%s has made a hole in the %s.", Monnam(mtmp), pline_mon(mtmp, "%s has made a hole in the %s.", Monnam(mtmp),
surface(mtmp->mx, mtmp->my)); surface(mtmp->mx, mtmp->my));
pline("%s %s through...", Monnam(mtmp), pline_mon(mtmp, "%s %s through...", Monnam(mtmp),
is_flyer(mtmp->data) ? "dives" : "falls"); is_flyer(mtmp->data) ? "dives" : "falls");
} else if (!Deaf) { } else if (!Deaf) {
Soundeffect(se_crash_through_floor, 100); Soundeffect(se_crash_through_floor, 100);
@@ -1014,7 +1014,7 @@ use_defensive(struct monst *mtmp)
m_flee(mtmp); m_flee(mtmp);
t = t_at(gt.trapx, gt.trapy); t = t_at(gt.trapx, gt.trapy);
if (vis) { if (vis) {
pline("%s %s into a %s!", Monnam(mtmp), pline_mon(mtmp, "%s %s into a %s!", Monnam(mtmp),
vtense(fakename[0], locomotion(mtmp->data, "jump")), vtense(fakename[0], locomotion(mtmp->data, "jump")),
trapname(t->ttyp, FALSE)); trapname(t->ttyp, FALSE));
} }
@@ -1054,7 +1054,7 @@ use_defensive(struct monst *mtmp)
(coord *) 0); (coord *) 0);
} else { } else {
if (vismon) if (vismon)
pline("%s escapes upstairs!", Monnam(mtmp)); pline_mon(mtmp, "%s escapes upstairs!", Monnam(mtmp));
migrate_to_level(mtmp, ledger_no(&(stway->tolev)), migrate_to_level(mtmp, ledger_no(&(stway->tolev)),
MIGR_STAIRS_DOWN, (coord *) 0); MIGR_STAIRS_DOWN, (coord *) 0);
} }
@@ -1065,7 +1065,7 @@ use_defensive(struct monst *mtmp)
if (!stway) if (!stway)
return 0; return 0;
if (vismon) if (vismon)
pline("%s escapes downstairs!", Monnam(mtmp)); pline_mon(mtmp, "%s escapes downstairs!", Monnam(mtmp));
migrate_to_level(mtmp, ledger_no(&(stway->tolev)), MIGR_STAIRS_UP, migrate_to_level(mtmp, ledger_no(&(stway->tolev)), MIGR_STAIRS_UP,
(coord *) 0); (coord *) 0);
return 2; return 2;
@@ -1075,7 +1075,7 @@ use_defensive(struct monst *mtmp)
if (!stway) if (!stway)
return 0; return 0;
if (vismon) if (vismon)
pline("%s escapes up the ladder!", Monnam(mtmp)); pline_mon(mtmp, "%s escapes up the ladder!", Monnam(mtmp));
migrate_to_level(mtmp, ledger_no(&(stway->tolev)), MIGR_LADDER_DOWN, migrate_to_level(mtmp, ledger_no(&(stway->tolev)), MIGR_LADDER_DOWN,
(coord *) 0); (coord *) 0);
return 2; return 2;
@@ -1085,7 +1085,7 @@ use_defensive(struct monst *mtmp)
if (!stway) if (!stway)
return 0; return 0;
if (vismon) if (vismon)
pline("%s escapes down the ladder!", Monnam(mtmp)); pline_mon(mtmp, "%s escapes down the ladder!", Monnam(mtmp));
migrate_to_level(mtmp, ledger_no(&(stway->tolev)), MIGR_LADDER_UP, migrate_to_level(mtmp, ledger_no(&(stway->tolev)), MIGR_LADDER_UP,
(coord *) 0); (coord *) 0);
return 2; return 2;
@@ -1098,7 +1098,7 @@ use_defensive(struct monst *mtmp)
return mon_escape(mtmp, vismon); return mon_escape(mtmp, vismon);
} }
if (vismon) if (vismon)
pline("%s escapes %sstairs!", Monnam(mtmp), pline_mon(mtmp, "%s escapes %sstairs!", Monnam(mtmp),
stway->up ? "up" : "down"); stway->up ? "up" : "down");
/* going from the Valley to Castle (Stronghold) has no sstairs /* going from the Valley to Castle (Stronghold) has no sstairs
to target, but having gs.sstairs.<sx,sy> == <0,0> will work the to target, but having gs.sstairs.<sx,sy> == <0,0> will work the
@@ -1111,7 +1111,7 @@ use_defensive(struct monst *mtmp)
m_flee(mtmp); m_flee(mtmp);
t = t_at(gt.trapx, gt.trapy); t = t_at(gt.trapx, gt.trapy);
if (vis) { if (vis) {
pline("%s %s onto a %s!", Monnam(mtmp), pline_mon(mtmp, "%s %s onto a %s!", Monnam(mtmp),
vtense(fakename[0], locomotion(mtmp->data, "jump")), vtense(fakename[0], locomotion(mtmp->data, "jump")),
trapname(t->ttyp, FALSE)); trapname(t->ttyp, FALSE));
} }
@@ -1136,7 +1136,7 @@ use_defensive(struct monst *mtmp)
if (!otmp->cursed && !mtmp->mcansee) if (!otmp->cursed && !mtmp->mcansee)
mcureblindness(mtmp, vismon); mcureblindness(mtmp, vismon);
if (vismon) if (vismon)
pline("%s looks better.", Monnam(mtmp)); pline_mon(mtmp, "%s looks better.", Monnam(mtmp));
if (oseen) if (oseen)
makeknown(POT_HEALING); makeknown(POT_HEALING);
m_useup(mtmp, otmp); m_useup(mtmp, otmp);
@@ -1150,7 +1150,7 @@ use_defensive(struct monst *mtmp)
if (!mtmp->mcansee) if (!mtmp->mcansee)
mcureblindness(mtmp, vismon); mcureblindness(mtmp, vismon);
if (vismon) if (vismon)
pline("%s looks much better.", Monnam(mtmp)); pline_mon(mtmp, "%s looks much better.", Monnam(mtmp));
if (oseen) if (oseen)
makeknown(POT_EXTRA_HEALING); makeknown(POT_EXTRA_HEALING);
m_useup(mtmp, otmp); m_useup(mtmp, otmp);
@@ -1163,7 +1163,7 @@ use_defensive(struct monst *mtmp)
if (!mtmp->mcansee && otmp->otyp != POT_SICKNESS) if (!mtmp->mcansee && otmp->otyp != POT_SICKNESS)
mcureblindness(mtmp, vismon); mcureblindness(mtmp, vismon);
if (vismon) if (vismon)
pline("%s looks completely healed.", Monnam(mtmp)); pline_mon(mtmp, "%s looks completely healed.", Monnam(mtmp));
if (oseen) if (oseen)
makeknown(otmp->otyp); makeknown(otmp->otyp);
m_useup(mtmp, otmp); m_useup(mtmp, otmp);
@@ -1596,7 +1596,7 @@ mbhitm(struct monst *mtmp, struct obj *otmp)
/* for consistency with zap.c, don't identify */ /* for consistency with zap.c, don't identify */
if (mtmp->ispriest && *in_rooms(mtmp->mx, mtmp->my, TEMPLE)) { if (mtmp->ispriest && *in_rooms(mtmp->mx, mtmp->my, TEMPLE)) {
if (cansee(mtmp->mx, mtmp->my)) if (cansee(mtmp->mx, mtmp->my))
pline("%s resists the magic!", Monnam(mtmp)); pline_mon(mtmp, "%s resists the magic!", Monnam(mtmp));
} else if (!tele_restrict(mtmp)) } else if (!tele_restrict(mtmp))
(void) rloc(mtmp, RLOC_MSG); (void) rloc(mtmp, RLOC_MSG);
} }
@@ -1889,7 +1889,7 @@ use_offensive(struct monst *mtmp)
if (vis) if (vis)
pline_The("scroll erupts in a tower of flame!"); pline_The("scroll erupts in a tower of flame!");
shieldeff(mtmp->mx, mtmp->my); shieldeff(mtmp->mx, mtmp->my);
pline("%s is uninjured.", Monnam(mtmp)); pline_mon(mtmp, "%s is uninjured.", Monnam(mtmp));
(void) destroy_mitem(mtmp, SCROLL_CLASS, AD_FIRE); (void) destroy_mitem(mtmp, SCROLL_CLASS, AD_FIRE);
(void) destroy_mitem(mtmp, SPBOOK_CLASS, AD_FIRE); (void) destroy_mitem(mtmp, SPBOOK_CLASS, AD_FIRE);
(void) destroy_mitem(mtmp, POTION_CLASS, AD_FIRE); (void) destroy_mitem(mtmp, POTION_CLASS, AD_FIRE);
@@ -2262,7 +2262,7 @@ mloot_container(
if (howfar > 2) /* not adjacent */ if (howfar > 2) /* not adjacent */
Norep("%s rummages through %s.", Monnam(mon), contnr_nam); Norep("%s rummages through %s.", Monnam(mon), contnr_nam);
else if (takeout_indx == 0) /* adjacent, first item */ else if (takeout_indx == 0) /* adjacent, first item */
pline("%s removes %s from %s.", Monnam(mon), pline_mon(mon, "%s removes %s from %s.", Monnam(mon),
doname(xobj), contnr_nam); doname(xobj), contnr_nam);
else /* adjacent, additional items */ else /* adjacent, additional items */
pline("%s removes %s.", upstart(mpronounbuf), pline("%s removes %s.", upstart(mpronounbuf),
@@ -2324,8 +2324,9 @@ use_misc(struct monst *mtmp)
if (on_level(&tolevel, &u.uz)) if (on_level(&tolevel, &u.uz))
goto skipmsg; goto skipmsg;
if (vismon) { if (vismon) {
pline("%s rises up, through the %s!", Monnam(mtmp), pline_mon(mtmp, "%s rises up, through the %s!",
ceiling(mtmp->mx, mtmp->my)); Monnam(mtmp),
ceiling(mtmp->mx, mtmp->my));
trycall(otmp); trycall(otmp);
} }
m_useup(mtmp, otmp); m_useup(mtmp, otmp);
@@ -2335,7 +2336,7 @@ use_misc(struct monst *mtmp)
} else { } else {
skipmsg: skipmsg:
if (vismon) { if (vismon) {
pline("%s looks uneasy.", Monnam(mtmp)); pline_mon(mtmp, "%s looks uneasy.", Monnam(mtmp));
trycall(otmp); trycall(otmp);
} }
m_useup(mtmp, otmp); m_useup(mtmp, otmp);
@@ -2343,7 +2344,7 @@ use_misc(struct monst *mtmp)
} }
} }
if (vismon) if (vismon)
pline("%s seems more experienced.", Monnam(mtmp)); pline_mon(mtmp, "%s seems more experienced.", Monnam(mtmp));
if (oseen) if (oseen)
makeknown(POT_GAIN_LEVEL); makeknown(POT_GAIN_LEVEL);
m_useup(mtmp, otmp); m_useup(mtmp, otmp);
@@ -2403,7 +2404,7 @@ use_misc(struct monst *mtmp)
mquaffmsg(mtmp, otmp); mquaffmsg(mtmp, otmp);
m_useup(mtmp, otmp); m_useup(mtmp, otmp);
if (vismon) if (vismon)
pline("%s suddenly mutates!", Monnam(mtmp)); pline_mon(mtmp, "%s suddenly mutates!", Monnam(mtmp));
(void) newcham(mtmp, muse_newcham_mon(mtmp), NC_SHOW_MSG); (void) newcham(mtmp, muse_newcham_mon(mtmp), NC_SHOW_MSG);
if (oseen) if (oseen)
makeknown(POT_POLYMORPH); makeknown(POT_POLYMORPH);
@@ -2414,7 +2415,7 @@ use_misc(struct monst *mtmp)
if (vis || vistrapspot) if (vis || vistrapspot)
seetrap(t); seetrap(t);
if (vismon || vistrapspot) { if (vismon || vistrapspot) {
pline("%s deliberately %s onto a %s!", Some_Monnam(mtmp), pline_mon(mtmp, "%s deliberately %s onto a %s!", Some_Monnam(mtmp),
vtense(fakename[0], locomotion(mtmp->data, "jump")), vtense(fakename[0], locomotion(mtmp->data, "jump")),
t->tseen ? trapname(t->ttyp, FALSE) : "hidden trap"); t->tseen ? trapname(t->ttyp, FALSE) : "hidden trap");
/* note: if mtmp is unseen because it is invisible, its new /* note: if mtmp is unseen because it is invisible, its new
@@ -2457,8 +2458,8 @@ use_misc(struct monst *mtmp)
hand = makeplural(hand); hand = makeplural(hand);
if (vismon) if (vismon)
pline("%s flicks a bullwhip towards your %s!", Monnam(mtmp), pline_mon(mtmp, "%s flicks a bullwhip towards your %s!",
hand); Monnam(mtmp), hand);
if (obj->otyp == HEAVY_IRON_BALL) { if (obj->otyp == HEAVY_IRON_BALL) {
pline("%s fails to wrap around %s.", The_whip, the_weapon); pline("%s fails to wrap around %s.", The_whip, the_weapon);
return 1; return 1;
@@ -2485,17 +2486,17 @@ use_misc(struct monst *mtmp)
freeinv(obj); freeinv(obj);
switch (where_to) { switch (where_to) {
case 1: /* onto floor beneath mon */ case 1: /* onto floor beneath mon */
pline("%s yanks %s from your %s!", Monnam(mtmp), the_weapon, pline_mon(mtmp, "%s yanks %s from your %s!", Monnam(mtmp),
hand); the_weapon, hand);
place_object(obj, mtmp->mx, mtmp->my); place_object(obj, mtmp->mx, mtmp->my);
break; break;
case 2: /* onto floor beneath you */ case 2: /* onto floor beneath you */
pline("%s yanks %s to the %s!", Monnam(mtmp), the_weapon, pline_mon(mtmp, "%s yanks %s to the %s!", Monnam(mtmp),
surface(u.ux, u.uy)); the_weapon, surface(u.ux, u.uy));
dropy(obj); dropy(obj);
break; break;
case 3: /* into mon's inventory */ case 3: /* into mon's inventory */
pline("%s snatches %s!", Monnam(mtmp), the_weapon); pline_mon(mtmp, "%s snatches %s!", Monnam(mtmp), the_weapon);
(void) mpickobj(mtmp, obj); (void) mpickobj(mtmp, obj);
break; break;
} }
@@ -2763,7 +2764,7 @@ mcureblindness(struct monst *mon, boolean verbos)
mon->mcansee = 1; mon->mcansee = 1;
mon->mblinded = 0; mon->mblinded = 0;
if (verbos && haseyes(mon->data)) if (verbos && haseyes(mon->data))
pline("%s can see again.", Monnam(mon)); pline_mon(mon, "%s can see again.", Monnam(mon));
} }
} }
@@ -2813,7 +2814,7 @@ mon_consume_unstone(
long save_quan = obj->quan; long save_quan = obj->quan;
obj->quan = 1L; obj->quan = 1L;
pline("%s %s %s.", Monnam(mon), pline_mon(mon, "%s %s %s.", Monnam(mon),
((obj->oclass == POTION_CLASS) ? "quaffs" ((obj->oclass == POTION_CLASS) ? "quaffs"
: (obj->otyp == TIN) ? "opens and eats the contents of" : (obj->otyp == TIN) ? "opens and eats the contents of"
: "eats"), : "eats"),
@@ -2829,9 +2830,9 @@ mon_consume_unstone(
if (acid && !tinned && !resists_acid(mon)) { if (acid && !tinned && !resists_acid(mon)) {
mon->mhp -= rnd(15); mon->mhp -= rnd(15);
if (vis) if (vis)
pline("%s has a very bad case of stomach acid.", Monnam(mon)); pline_mon(mon, "%s has a very bad case of stomach acid.", Monnam(mon));
if (DEADMONSTER(mon)) { if (DEADMONSTER(mon)) {
pline("%s dies!", Monnam(mon)); pline_mon(mon, "%s dies!", Monnam(mon));
if (by_you) if (by_you)
/* hero gets credit (experience) and blame (possible loss /* hero gets credit (experience) and blame (possible loss
of alignment and/or luck and/or telepathy depending on of alignment and/or luck and/or telepathy depending on
@@ -2847,13 +2848,13 @@ mon_consume_unstone(
pline("What a pity - %s just ruined a future piece of art!", pline("What a pity - %s just ruined a future piece of art!",
mon_nam(mon)); mon_nam(mon));
else else
pline("%s seems limber!", Monnam(mon)); pline_mon(mon, "%s seems limber!", Monnam(mon));
} }
if (lizard && (mon->mconf || mon->mstun)) { if (lizard && (mon->mconf || mon->mstun)) {
mon->mconf = 0; mon->mconf = 0;
mon->mstun = 0; mon->mstun = 0;
if (vis && !is_bat(mon->data) && mon->data != &mons[PM_STALKER]) if (vis && !is_bat(mon->data) && mon->data != &mons[PM_STALKER])
pline("%s seems steadier now.", Monnam(mon)); pline_mon(mon, "%s seems steadier now.", Monnam(mon));
} }
if (mon->mtame && !mon->isminion && nutrit > 0) { if (mon->mtame && !mon->isminion && nutrit > 0) {
struct edog *edog = EDOG(mon); struct edog *edog = EDOG(mon);
@@ -3000,7 +3001,7 @@ muse_unslime(
boolean vis = canseemon(mon), res = TRUE; boolean vis = canseemon(mon), res = TRUE;
if (vis) if (vis)
pline("%s starts turning %s.", Monnam(mon), pline_mon(mon, "%s starts turning %s.", Monnam(mon),
green_mon(mon) ? "into ooze" : hcolor(NH_GREEN)); green_mon(mon) ? "into ooze" : hcolor(NH_GREEN));
/* -4 => sliming, causes quiet loss of enhanced speed */ /* -4 => sliming, causes quiet loss of enhanced speed */
mon_adjust_speed(mon, -4, (struct obj *) 0); mon_adjust_speed(mon, -4, (struct obj *) 0);
@@ -3029,7 +3030,8 @@ muse_unslime(
} else if (otyp == STRANGE_OBJECT) { } else if (otyp == STRANGE_OBJECT) {
/* monster is using fire breath on self */ /* monster is using fire breath on self */
if (vis) if (vis)
pline("%s.", monverbself(mon, Monnam(mon), "breath", "fire on")); pline_mon(mon, "%s.",
monverbself(mon, Monnam(mon), "breath", "fire on"));
if (!rn2(3)) if (!rn2(3))
mon->mspec_used = rn1(10, 5); mon->mspec_used = rn1(10, 5);
/* -21 => monster's fire breath; 1 => # of damage dice */ /* -21 => monster's fire breath; 1 => # of damage dice */
@@ -3070,7 +3072,7 @@ muse_unslime(
if (obj->quan > 1L) if (obj->quan > 1L)
obj = splitobj(obj, 1L); obj = splitobj(obj, 1L);
if (vis && !was_lit) { if (vis && !was_lit) {
pline("%s ignites %s.", Monnam(mon), ansimpleoname(obj)); pline_mon(mon, "%s ignites %s.", Monnam(mon), ansimpleoname(obj));
saw_lit = TRUE; saw_lit = TRUE;
} }
begin_burn(obj, was_lit); begin_burn(obj, was_lit);
@@ -3105,7 +3107,7 @@ muse_unslime(
for pacifist conduct); xkilled()'s message would say for pacifist conduct); xkilled()'s message would say
"You killed/destroyed <mon>" so give our own message */ "You killed/destroyed <mon>" so give our own message */
if (vis) if (vis)
pline("%s is %s by the fire!", Monnam(mon), pline_mon(mon, "%s is %s by the fire!", Monnam(mon),
nonliving(mon->data) ? "destroyed" : "killed"); nonliving(mon->data) ? "destroyed" : "killed");
xkilled(mon, XKILL_NOMSG | XKILL_NOCONDUCT); xkilled(mon, XKILL_NOMSG | XKILL_NOCONDUCT);
} else } else
@@ -3113,12 +3115,12 @@ muse_unslime(
} else { } else {
/* non-fatal damage occurred */ /* non-fatal damage occurred */
if (vis) if (vis)
pline("%s is burned%s", Monnam(mon), exclam(dmg)); pline_mon(mon, "%s is burned%s", Monnam(mon), exclam(dmg));
} }
} }
if (vis) { if (vis) {
if (res && !DEADMONSTER(mon)) if (res && !DEADMONSTER(mon))
pline("%s slime is burned away!", s_suffix(Monnam(mon))); pline_mon(mon, "%s slime is burned away!", s_suffix(Monnam(mon)));
if (otyp != STRANGE_OBJECT) if (otyp != STRANGE_OBJECT)
makeknown(otyp); makeknown(otyp);
} }