* Fix wizmode targetting commands not flushing messages correctly.

* Fix Sif Muna's randart book gifts never containing the Vehumet/Kiku
  special spells, as was originally intended. (Books found elsewhere
  will never contain the spells.)
* In the highly unlikely case the player already has seen all spells 
  don't crash when attempting to gift a book. Instead, simply make the
  acquirement fail, but be quiet about "the demon of the infinite void"
  if it was instigated by Sif Muna.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9368 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 19 insertions, 13 deletions

diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 599f956785..b74bdc5d11 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1341,9 +1341,6 @@ static int _book_weight(int book)
 {
     ASSERT(book >= 0 && book <= MAX_NORMAL_BOOK);
 
-    if (book_rarity(book) == 100)
-        return 0;
-
     int total_weight = 0;
     for (int i = 0; i < SPELLBOOK_SIZE; i++)
     {
@@ -1361,7 +1358,7 @@ static int _book_weight(int book)
     return (total_weight);
 }
 
-static void _do_book_acquirement(item_def &book, int agent)
+static bool _do_book_acquirement(item_def &book, int agent)
 {
     // items() shouldn't make book a randart for acquirement items.
     ASSERT(!is_random_artefact(book));
@@ -1469,15 +1466,19 @@ static void _do_book_acquirement(item_def &book, int agent)
     }
     case BOOK_RANDART_THEME:
         book.sub_type = BOOK_RANDART_THEME;
-        make_book_theme_randart(book, 0, 0, 5 + coinflip(), 20, SPELL_NO_SPELL,
-                                owner);
+        if (!make_book_theme_randart(book, 0, 0, 5 + coinflip(), 20,
+                                     SPELL_NO_SPELL, owner))
+        {
+            return (false);
+        }
         break;
 
     case BOOK_RANDART_LEVEL:
     {
         book.sub_type  = BOOK_RANDART_LEVEL;
         int max_spells = 5 + level/3;
-        make_book_level_randart(book, level, max_spells, owner);
+        if (!make_book_level_randart(book, level, max_spells, owner))
+            return (false);
         break;
     }
 
@@ -1485,7 +1486,7 @@ static void _do_book_acquirement(item_def &book, int agent)
     {
         // The Tome of Destruction is rare enough we won't change this.
         if (book.sub_type == BOOK_DESTRUCTION)
-            return;
+            return (true);
 
         int weights[NUM_SKILLS];
         int total_weights = 0;
@@ -1513,10 +1514,7 @@ static void _do_book_acquirement(item_def &book, int agent)
 
         // Are we too skilled to get any manuals?
         if (total_weights == 0)
-        {
-            _do_book_acquirement(book, agent);
-            return;
-        }
+            return _do_book_acquirement(book, agent);
 
         book.sub_type = BOOK_MANUAL;
         book.plus     = choose_random_weighted(weights, weights + NUM_SKILLS);
@@ -1525,6 +1523,7 @@ static void _do_book_acquirement(item_def &book, int agent)
         break;
     }
     }
+    return (true);
 }
 
 bool acquirement(object_class_type class_wanted, int agent,
@@ -1711,7 +1710,14 @@ bool acquirement(object_class_type class_wanted, int agent,
 
         if (thing.base_type == OBJ_BOOKS)
         {
-            _do_book_acquirement(thing, agent);
+            if (!_do_book_acquirement(thing, agent))
+            {
+                if (!quiet)
+                    mpr("The demon of the infinite void smiles upon you.");
+                *item_index = NON_ITEM;
+                destroy_item(thing, true);
+                return (false);
+            }
             mark_had_book(thing);
         }
         else if (thing.base_type == OBJ_JEWELLERY)