Savefile compatibility breakage from keeping track of which spells have been

seen.

Implemented fixed-level randart spell books, which is all randart spellbooks as
of now.  All my attempts at sorting the spell list so that spells with the same
schools group together have utterly failed.

Got rid of the hackish "non-monster origin is stored in item.orig_monnum as
(-origin - 2)" logic, replaced with the slightly less hackish "-origin".  Added
the two enumerations IT_SRC_START and IT_SRC_SHOP to do it.  Also,
origin_is_god_gift() and origin_is_acquirement() can retrieve the god/source of
the item so that you don't have to do the negation and typecasting yourself.

Added some new spell flags:

* SPFLAG_BATTLE for non-conjuration spells which are still combat/battle
  related (branding spells and single school attack spells like "Pain"),

* SPFLAG_CARD for spells which are card-type effects which don't show up in
  ordinary spellbooks (Tomb of Doroklohe and (I assume) Disintigrate)

* SPFLAG_TESTING for spells which are only used for testing (Debugging Ray)

* SPFLAG_DEVEL for spells that are still under development (Crush,
  Disrupt, and Detect Magic).


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

1 files changed, 7 insertions, 4 deletions

diff --git a/crawl-ref/source/spl-book.h b/crawl-ref/source/spl-book.h
index d156f7e977..f61432d83d 100644
--- a/crawl-ref/source/spl-book.h
+++ b/crawl-ref/source/spl-book.h
@@ -13,9 +13,6 @@
 #include "externs.h"
 #include "FixVec.h"
 
-#define SPELLBOOK_SIZE 8
-#define SPELL_LIST_KEY "spell_list"
-
 class formatted_string;
 
 enum read_book_action_type
@@ -35,8 +32,9 @@ int book_rarity(unsigned char which_book);
 bool is_valid_spell_in_book( const item_def &book, int spell );
 bool is_valid_spell_in_book( int splbook, int spell );
 
-
+void mark_had_book(const item_def &book);
 void mark_had_book(int booktype);
+
 // updated 24may2000 {dlb}
 /* ***********************************************************************
  * called from: it_use3 - item_use - spl-book
@@ -67,4 +65,9 @@ int spellbook_contents( item_def &book, read_book_action_type action,
 int count_staff_spells(const item_def &item, bool need_id);
 int rod_shield_leakage();
 
+bool make_book_level_randart(item_def &book, int level = -1,
+                             int num_spells = -1);
+bool make_book_theme_randart(item_def &book,
+                             int school_one = 0, int school_two = 0,
+                             int num_spells = -1, int max_levels = -1);
 #endif