diff --git a/src/files.c b/src/files.c index 9c24cf2a6..9bc152726 100644 --- a/src/files.c +++ b/src/files.c @@ -3336,13 +3336,14 @@ int tribpassage; int scope = 0, section = 0, passage = 0, book = 0; int linect = 0, passagecnt = 0, targetpassage = 0, textcnt = 0; char *sectionnm = "", *booknm = ""; + const char *badtranslation = "an incomprehensible foreign translation"; boolean matchedsection = FALSE, matchedtitle = FALSE; winid tribwin = WIN_ERR; /* check for mandatories */ if (!tribsection || !tribtitle) { - pline("It's an incomprehensible foreign translation of \"%s\"!", - tribtitle); + pline("It's %s of \"%s\"!", + badtranslation, tribtitle); return; } @@ -3452,7 +3453,12 @@ cleanup: display_nhwindow(tribwin, FALSE); destroy_nhwindow(tribwin); tribwin = WIN_ERR; + u.uconduct.literate++; + } else { + pline("It seems to be %s of \"%s\"!", + badtranslation, tribtitle); } + return; } /* ---------- END TRIBUTE ----------- */ diff --git a/src/read.c b/src/read.c index 9be9f9390..38f122af1 100644 --- a/src/read.c +++ b/src/read.c @@ -152,9 +152,11 @@ doread() #endif /* Actions required to win the game aren't counted towards conduct */ + /* Novel conduct is handled in read_tribute so exclude it too*/ if (scroll->otyp != SPE_BOOK_OF_THE_DEAD && scroll->otyp != SPE_BLANK_PAPER && - scroll->otyp != SCR_BLANK_PAPER) + scroll->otyp != SCR_BLANK_PAPER && + scroll->otyp != SPE_NOVEL) u.uconduct.literate++; if(scroll->oclass == SPBOOK_CLASS) {