From 499f07fc517ae167f5a230a398568def9622e3e3 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Tue, 15 Dec 2009 22:05:51 +0100 Subject: Count primary disciplines in themed randart book acquirement statistics. --- crawl-ref/source/spl-book.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/spl-book.cc') diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index c69bdce331..f5f89f44b6 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -2467,6 +2467,9 @@ static bool _get_weighted_discs(bool completely_random, god_type god, for (int i = 0; i < SPTYP_LAST_EXPONENT; i++) { int disc = 1 << i; + if (disc & SPTYP_DIVINATION) + continue; + if (god_dislikes_spell_discipline(disc, god)) continue; @@ -3052,8 +3055,9 @@ bool make_book_theme_randart(item_def &book, int disc1, int disc2, set_artefact_name(book, name); - book.plus = disc1; - book.plus2 = disc2; + // Save primary/secondary disciplines back into the book. + book.plus = max1; + book.plus2 = max2; return (true); } -- cgit v1.2.3-54-g00ecf