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

Death misquotes

Browse Source
This commit is contained in:
PatR
2016-01-17 15:05:34 -08:00
parent d06450817b
commit 8cd65daf39
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sounds.c
+11 -10
View File
@@ -911,30 +911,30 @@ register struct monst *mtmp;
case MS_RIDER: { case MS_RIDER: {
const char *tribtitle; const char *tribtitle;
struct obj *book = 0; struct obj *book = 0;
boolean ms_Death = (ptr == &mons[PM_DEATH]);
/* 3.6.0 tribute */ /* 3.6 tribute */
if (ptr == &mons[PM_DEATH] && !context.tribute.Deathnotice if (ms_Death && !context.tribute.Deathnotice
&& (book = u_have_novel()) != 0) { && (book = u_have_novel()) != 0) {
if ((tribtitle = noveltitle(&book->novelidx)) != 0) { if ((tribtitle = noveltitle(&book->novelidx)) != 0) {
Sprintf(verbuf, "Ah, so you have a copy of /%s/.", tribtitle); Sprintf(verbuf, "Ah, so you have a copy of /%s/.", tribtitle);
/* no Death featured in these two, so exclude them */ /* no Death featured in these two, so exclude them */
if (!strcmpi(tribtitle, "Snuff") if (strcmpi(tribtitle, "Snuff")
|| !strcmpi(tribtitle, "The Wee Free Men")) && strcmpi(tribtitle, "The Wee Free Men"))
Strcat(verbuf, " I may have been misquoted there."); Strcat(verbuf, " I may have been misquoted there.");
verbl_msg = verbuf; verbl_msg = verbuf;
} }
context.tribute.Deathnotice = 1; context.tribute.Deathnotice = 1;
} else if (ptr == &mons[PM_DEATH] && rn2(3) } else if (ms_Death && rn2(3) && Death_quote(verbuf, sizeof verbuf)) {
&& Death_quote(verbuf, BUFSZ)) { verbl_msg = verbuf;
verbl_msg = verbuf;
/* end of tribute addition */ /* end of tribute addition */
} else if (ptr == &mons[PM_DEATH] && !rn2(10)) {
} else if (ms_Death && !rn2(10)) {
pline_msg = "is busy reading a copy of Sandman #8."; pline_msg = "is busy reading a copy of Sandman #8.";
} else } else
verbl_msg = "Who do you think you are, War?"; verbl_msg = "Who do you think you are, War?";
break; break;
} /* MS_RIDER */ } /* case MS_RIDER */
} /* switch */ } /* switch */
if (pline_msg) { if (pline_msg) {
@@ -942,6 +942,7 @@ register struct monst *mtmp;
} else if (mtmp->mcan && verbl_msg_mcan) { } else if (mtmp->mcan && verbl_msg_mcan) {
verbalize1(verbl_msg_mcan); verbalize1(verbl_msg_mcan);
} else if (verbl_msg) { } else if (verbl_msg) {
/* more 3.6 tribute */
if (ptr == &mons[PM_DEATH]) { if (ptr == &mons[PM_DEATH]) {
/* Death talks in CAPITAL LETTERS /* Death talks in CAPITAL LETTERS
and without quotation marks */ and without quotation marks */