Split the Enchantments school.

1 files changed, 17 insertions, 16 deletions

diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h
index 82eb7729b7..516d800c4f 100644
--- a/crawl-ref/source/spl-util.h
+++ b/crawl-ref/source/spl-util.h
@@ -12,22 +12,23 @@
 
 enum spschool_flag_type
 {
-  SPTYP_NONE           = 0, // "0" is reserved for no type at all {dlb}
-  SPTYP_CONJURATION    = 1, // was 11, but only for old typematch routine {dlb}
-  SPTYP_ENCHANTMENT    = 1<<1,
-  SPTYP_FIRE           = 1<<2,
-  SPTYP_ICE            = 1<<3,
-  SPTYP_TRANSMUTATION  = 1<<4,
-  SPTYP_NECROMANCY     = 1<<5,
-  SPTYP_SUMMONING      = 1<<6,
-  SPTYP_DIVINATION     = 1<<7,
-  SPTYP_TRANSLOCATION  = 1<<8,
-  SPTYP_POISON         = 1<<9,
-  SPTYP_EARTH          = 1<<10,
-  SPTYP_AIR            = 1<<11,
-  SPTYP_HOLY           = 1<<12, //jmf: moved to accommodate "random" miscast f/x
-  SPTYP_LAST_EXPONENT  = 12,    //jmf: ``NUM_SPELL_TYPES'' kinda useless
-  NUM_SPELL_TYPES      = 14,
+  SPTYP_NONE           = 0,    // "0" is reserved for no type at all {dlb}
+  SPTYP_CONJURATION    = 1<<0, // was 11, but only for old typematch routine {dlb}
+  SPTYP_HEXES          = 1<<1,
+  SPTYP_CHARMS         = 1<<2,
+  SPTYP_FIRE           = 1<<3,
+  SPTYP_ICE            = 1<<4,
+  SPTYP_TRANSMUTATION  = 1<<5,
+  SPTYP_NECROMANCY     = 1<<6,
+  SPTYP_SUMMONING      = 1<<7,
+  SPTYP_DIVINATION     = 1<<8,
+  SPTYP_TRANSLOCATION  = 1<<9,
+  SPTYP_POISON         = 1<<10,
+  SPTYP_EARTH          = 1<<11,
+  SPTYP_AIR            = 1<<12,
+  SPTYP_HOLY           = 1<<13, //jmf: moved to accommodate "random" miscast f/x
+  SPTYP_LAST_EXPONENT  = 13,    //jmf: ``NUM_SPELL_TYPES'' kinda useless
+  NUM_SPELL_TYPES      = 15,
   SPTYP_RANDOM         = 1<<14,
 };