From 141d24bdeb70285b3a1ef18e60fb8a6888846622 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sat, 14 Dec 2024 16:19:14 +0200 Subject: [PATCH] Accessibility: more message locations pt 5 --- src/worn.c | 60 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/src/worn.c b/src/worn.c index aae1611a4..7e545370c 100644 --- a/src/worn.c +++ b/src/worn.c @@ -475,11 +475,13 @@ mon_adjust_speed( /* mimic the player's petrification countdown; "slowing down" even if fast movement rate retained via worn speed boots */ if (flags.verbose) - pline("%s is slowing down.", Monnam(mon)); + pline_mon(mon, "%s is slowing down.", Monnam(mon)); } else if (adjust > 0 || mon->mspeed == MFAST) - pline("%s is suddenly moving %sfaster.", Monnam(mon), howmuch); + pline_mon(mon, "%s is suddenly moving %sfaster.", + Monnam(mon), howmuch); else - pline("%s seems to be moving %sslower.", Monnam(mon), howmuch); + pline_mon(mon, "%s seems to be moving %sslower.", + Monnam(mon), howmuch); /* might discover an object if we see the speed change happen */ if (obj != 0) @@ -871,7 +873,7 @@ m_dowear_type( (void) strsubst(newarm, "an ", "another "); newarm[BUFSZ - 1] = '\0'; } - pline("%s%s puts on %s.", Monnam(mon), buf, newarm); + pline_mon(mon, "%s%s puts on %s.", Monnam(mon), buf, newarm); if (autocurse) pline("%s %s %s %s for a moment.", s_suffix(Monnam(mon)), simpleonames(best), otense(best, "glow"), @@ -1117,7 +1119,8 @@ mon_break_armor(struct monst *mon, boolean polyspot) } else { Soundeffect(se_cracking_sound, 100); if (vis) - pline("%s breaks out of %s armor!", Monnam(mon), ppronoun); + pline_mon(mon, "%s breaks out of %s armor!", + Monnam(mon), ppronoun); else You_hear("a cracking sound."); } @@ -1128,13 +1131,13 @@ mon_break_armor(struct monst *mon, boolean polyspot) && (otmp->otyp != MUMMY_WRAPPING || !WrappingAllowed(mdat))) { if (otmp->oartifact) { if (vis) - pline("%s %s falls off!", s_suffix(Monnam(mon)), + pline_mon(mon, "%s %s falls off!", s_suffix(Monnam(mon)), cloak_simple_name(otmp)); m_lose_armor(mon, otmp, polyspot); } else { Soundeffect(se_ripping_sound, 100); if (vis) - pline("%s %s tears apart!", s_suffix(Monnam(mon)), + pline_mon(mon, "%s %s tears apart!", s_suffix(Monnam(mon)), cloak_simple_name(otmp)); else You_hear("a ripping sound."); @@ -1143,7 +1146,8 @@ mon_break_armor(struct monst *mon, boolean polyspot) } if ((otmp = which_armor(mon, W_ARMU)) != 0) { if (vis) - pline("%s shirt rips to shreds!", s_suffix(Monnam(mon))); + pline_mon(mon, "%s shirt rips to shreds!", + s_suffix(Monnam(mon))); else You_hear("a ripping sound."); m_useup(mon, otmp); @@ -1155,8 +1159,8 @@ mon_break_armor(struct monst *mon, boolean polyspot) if ((otmp = which_armor(mon, W_ARM)) != 0) { Soundeffect(se_thud, 50); if (vis) - pline("%s armor falls around %s!", s_suffix(Monnam(mon)), - pronoun); + pline_mon(mon, "%s armor falls around %s!", + s_suffix(Monnam(mon)), pronoun); else You_hear("a thud."); m_lose_armor(mon, otmp, polyspot); @@ -1166,21 +1170,22 @@ mon_break_armor(struct monst *mon, boolean polyspot) && (otmp->otyp != MUMMY_WRAPPING || !WrappingAllowed(mdat))) { if (vis) { if (is_whirly(mon->data)) - pline("%s %s falls, unsupported!", s_suffix(Monnam(mon)), - cloak_simple_name(otmp)); + pline_mon(mon, "%s %s falls, unsupported!", + s_suffix(Monnam(mon)), cloak_simple_name(otmp)); else - pline("%s shrinks out of %s %s!", Monnam(mon), ppronoun, - cloak_simple_name(otmp)); + pline_mon(mon, "%s shrinks out of %s %s!", + Monnam(mon), ppronoun, + cloak_simple_name(otmp)); } m_lose_armor(mon, otmp, polyspot); } if ((otmp = which_armor(mon, W_ARMU)) != 0) { if (vis) { if (passes_thru_clothes) - pline("%s seeps right through %s shirt!", Monnam(mon), - ppronoun); + pline_mon(mon, "%s seeps right through %s shirt!", + Monnam(mon), ppronoun); else - pline("%s becomes much too small for %s shirt!", + pline_mon(mon, "%s becomes much too small for %s shirt!", Monnam(mon), ppronoun); } m_lose_armor(mon, otmp, polyspot); @@ -1190,15 +1195,16 @@ mon_break_armor(struct monst *mon, boolean polyspot) /* [caller needs to handle weapon checks] */ if ((otmp = which_armor(mon, W_ARMG)) != 0) { if (vis) - pline("%s drops %s gloves%s!", Monnam(mon), ppronoun, - MON_WEP(mon) ? " and weapon" : ""); + pline_mon(mon, "%s drops %s gloves%s!", + Monnam(mon), ppronoun, + MON_WEP(mon) ? " and weapon" : ""); m_lose_armor(mon, otmp, polyspot); } if ((otmp = which_armor(mon, W_ARMS)) != 0) { Soundeffect(se_clank, 50); if (vis) - pline("%s can no longer hold %s shield!", Monnam(mon), - ppronoun); + pline_mon(mon, "%s can no longer hold %s shield!", + Monnam(mon), ppronoun); else You_hear("a clank."); m_lose_armor(mon, otmp, polyspot); @@ -1209,8 +1215,8 @@ mon_break_armor(struct monst *mon, boolean polyspot) /* flimsy test for horns matches polyself handling */ && (handless_or_tiny || !is_flimsy(otmp))) { if (vis) - pline("%s helmet falls to the %s!", s_suffix(Monnam(mon)), - surface(mon->mx, mon->my)); + pline_mon(mon, "%s helmet falls to the %s!", + s_suffix(Monnam(mon)), surface(mon->mx, mon->my)); else You_hear("a clank."); m_lose_armor(mon, otmp, polyspot); @@ -1220,9 +1226,11 @@ mon_break_armor(struct monst *mon, boolean polyspot) if ((otmp = which_armor(mon, W_ARMF)) != 0) { if (vis) { if (is_whirly(mon->data)) - pline("%s boots fall away!", s_suffix(Monnam(mon))); + pline_mon(mon, "%s boots fall away!", + s_suffix(Monnam(mon))); else - pline("%s boots %s off %s feet!", s_suffix(Monnam(mon)), + pline_mon(mon, "%s boots %s off %s feet!", + s_suffix(Monnam(mon)), verysmall(mdat) ? "slide" : "are pushed", ppronoun); } m_lose_armor(mon, otmp, polyspot); @@ -1232,7 +1240,7 @@ mon_break_armor(struct monst *mon, boolean polyspot) if ((otmp = which_armor(mon, W_SADDLE)) != 0) { m_lose_armor(mon, otmp, polyspot); if (vis) - pline("%s saddle falls off.", s_suffix(Monnam(mon))); + pline_mon(mon, "%s saddle falls off.", s_suffix(Monnam(mon))); } if (mon == u.usteed) noride = TRUE;