summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-book.cc
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-15 22:05:51 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-16 00:37:56 +0100
commit499f07fc517ae167f5a230a398568def9622e3e3 (patch)
treeb0b0c0f94a600c2facc994fa42c22c5354b35835 /crawl-ref/source/spl-book.cc
parent381bd5c28bb04dacd4fe2f7e8c51a0bdebbdcc8a (diff)
downloadcrawl-ref-499f07fc517ae167f5a230a398568def9622e3e3.tar.gz
crawl-ref-499f07fc517ae167f5a230a398568def9622e3e3.zip
Count primary disciplines in themed randart book acquirement statistics.
Diffstat (limited to 'crawl-ref/source/spl-book.cc')
-rw-r--r--crawl-ref/source/spl-book.cc8
1 files changed, 6 insertions, 2 deletions
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);
}