summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/effects.cc2
-rw-r--r--crawl-ref/source/makeitem.cc2
-rw-r--r--crawl-ref/source/spl-book.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 840139a34b..0680d93bfb 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1466,7 +1466,7 @@ static void _do_book_acquirement(item_def &book, int agent)
switch(choice)
{
case 0:
- make_book_theme_randart(book, 0, 0, 7, 25);
+ make_book_theme_randart(book, 0, 0, 7, 22);
break;
case 1:
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 98475447a5..cd028c986d 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2472,7 +2472,7 @@ static void _generate_book_item(item_def& item, int allow_uniques,
}
if (item.sub_type == BOOK_RANDART_THEME)
- make_book_theme_randart(item, 0, 0, 7, 25);
+ make_book_theme_randart(item, 0, 0, 7, 22);
else if (item.sub_type == BOOK_RANDART_LEVEL)
{
int max_level = std::min( 9, std::max(1, item_level / 3) );
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 6cdb8e8dc7..dfd3db7e3b 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -2321,7 +2321,7 @@ bool make_book_theme_randart(item_def &book, int disc1, int disc2,
// If there are several "secondary" disciplines with the same count
// ignore all of them. Same, if the secondary discipline appears only once.
- if (num2 > 1 && num1 > num2 || count[max2] < 2)
+ if (num2 > 1 && count[max1] > count[max2] || count[max2] < 2)
max2 = max1;
// Remove spells that don't fit either discipline.