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

cancelled nurse #chat

Browse Source 
On May 17, 2005, <email deleted> wrote:
> Cancelled nurses shouldn't say "Relax, this won't
> hurt a bit."
This commit is contained in:
nethack.allison
2006-03-14 23:53:22 +00:00
parent 8d96ddd767
commit b56187f1b9
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.4
+1
View File
@@ -200,6 +200,7 @@ use "your kraken" instead of "a kraken" when searching reveals a tame
hidden monster hidden monster
Magicbane should not produce "<something> are confused" message Magicbane should not produce "<something> are confused" message
handle antholes more sensibly when ants aren't available handle antholes more sensibly when ants aren't available
cancelled nurses shouldn't say "Relax, this won't hurt a bit"
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/sounds.c
+4 -1
View File
@@ -420,7 +420,8 @@ domonnoise(mtmp)
register struct monst *mtmp; register struct monst *mtmp;
{ {
register const char *pline_msg = 0, /* Monnam(mtmp) will be prepended */ register const char *pline_msg = 0, /* Monnam(mtmp) will be prepended */
*verbl_msg = 0; /* verbalize() */ *verbl_msg = 0, /* verbalize() */
*verbl_msg_mcan = 0; /* verbalize() if cancelled */
struct permonst *ptr = mtmp->data; struct permonst *ptr = mtmp->data;
char verbuf[BUFSZ]; char verbuf[BUFSZ];
@@ -765,6 +766,7 @@ register struct monst *mtmp;
pline_msg = "seems to mutter a cantrip."; pline_msg = "seems to mutter a cantrip.";
break; break;
case MS_NURSE: case MS_NURSE:
verbl_msg_mcan = "I hate this job!";
if (uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep))) if (uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep)))
verbl_msg = "Put that weapon away before you hurt someone!"; verbl_msg = "Put that weapon away before you hurt someone!";
else if (uarmc || uarm || uarmh || uarms || uarmg || uarmf) else if (uarmc || uarm || uarmh || uarms || uarmg || uarmf)
@@ -810,6 +812,7 @@ register struct monst *mtmp;
} }
if (pline_msg) pline("%s %s", Monnam(mtmp), pline_msg); if (pline_msg) pline("%s %s", Monnam(mtmp), pline_msg);
else if (mtmp->mcan && verbl_msg_mcan) verbalize(verbl_msg_mcan);
else if (verbl_msg) verbalize(verbl_msg); else if (verbl_msg) verbalize(verbl_msg);
return(1); return(1);
} }