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, 27 insertions, 0 deletions

diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 087a78474f..f31b56a552 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -827,6 +827,33 @@ int spell_type2skill(unsigned int spelltype)
     }
 }                               // end spell_type2skill()
 
+int spell_skill2type(unsigned int skill)
+{
+    switch (skill)
+    {
+    case SK_CONJURATIONS:   return (SPTYP_CONJURATION);
+    case SK_ENCHANTMENTS:   return (SPTYP_ENCHANTMENT);
+    case SK_FIRE_MAGIC:     return (SPTYP_FIRE);
+    case SK_ICE_MAGIC:      return (SPTYP_ICE);
+    case SK_TRANSMIGRATION: return (SPTYP_TRANSMIGRATION);
+    case SK_NECROMANCY:     return (SPTYP_NECROMANCY);
+    case SK_SUMMONINGS:     return (SPTYP_SUMMONING);
+    case SK_DIVINATIONS:    return (SPTYP_DIVINATION);
+    case SK_TRANSLOCATIONS: return (SPTYP_TRANSLOCATION);
+    case SK_POISON_MAGIC:   return (SPTYP_POISON);
+    case SK_EARTH_MAGIC:    return (SPTYP_EARTH);
+    case SK_AIR_MAGIC:      return (SPTYP_AIR);
+
+    default:
+    case SPTYP_HOLY:
+#ifdef DEBUG_DIAGNOSTICS
+        mprf(MSGCH_DIAGNOSTICS, "spell_skill2type: called with skill %u",
+             spelltype );
+#endif
+        return (-1);
+    }
+}                               // end spell_type2skill()
+
 /*
  **************************************************
  *                                                *