Added ice statues.

Monster spells now use spell_type instead of the old mon_spell_type.

Fixed buggy behaviour when banished from Labyrinth.

DGL_WHEREIS was not including current time, fixed.

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

1 files changed, 579 insertions, 571 deletions

diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 4131fb405e..48ab9448f4 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -20,7 +20,7 @@
              enchantment,
              self-enchantment,          // 50% tried after others fail
              misc(1) spell,
-             misc(2) spell,             // MS_DIG must be here to work!
+             misc(2) spell,             // SPELL_DIG must be here to work!
              emergency spell            // only when fleeing
         }
 
@@ -31,766 +31,774 @@
 
 
     {  MST_ORC_WIZARD_I,
-       MS_MMISSILE,
-       MS_SLOW,
-       MS_HASTE,
-       MS_MMISSILE,
-       MS_BLINK,
-       MS_BLINK  },
+       SPELL_MAGIC_DART,
+       SPELL_SLOW,
+       SPELL_HASTE,
+       SPELL_MAGIC_DART,
+       SPELL_BLINK,
+       SPELL_BLINK  },
 
     {  MST_ORC_WIZARD_II,
-       MS_FLAME,
-       MS_CONFUSE,
-       MS_INVIS,
-       MS_MMISSILE,
-       MS_NO_SPELL,
-       MS_CONFUSE  },
+       SPELL_THROW_FLAME,
+       SPELL_CONFUSE,
+       SPELL_INVISIBILITY,
+       SPELL_MAGIC_DART,
+       SPELL_NO_SPELL,
+       SPELL_CONFUSE  },
 
     {  MST_ORC_WIZARD_III,
-       MS_FROST,
-       MS_CANTRIP,
-       MS_HASTE,
-       MS_FLAME,
-       MS_MMISSILE,
-       MS_INVIS  },
+       SPELL_THROW_FROST,
+       SPELL_CANTRIP,
+       SPELL_HASTE,
+       SPELL_THROW_FLAME,
+       SPELL_MAGIC_DART,
+       SPELL_INVISIBILITY  },
 
     {  MST_GUARDIAN_NAGA,
-       MS_TELEPORT_OTHER,
-       MS_TELEPORT_OTHER,
-       MS_HEAL,
-       MS_VENOM_BOLT,
-       MS_SLOW,
-       MS_HEAL  },
+       SPELL_TELEPORT_OTHER,
+       SPELL_TELEPORT_OTHER,
+       SPELL_LESSER_HEALING,
+       SPELL_VENOM_BOLT,
+       SPELL_SLOW,
+       SPELL_LESSER_HEALING  },
 
     {  MST_LICH_I,
-       MS_COLD_BOLT,
-       MS_PARALYSIS,
-       MS_SUMMON_DEMON_GREATER,
-       MS_ANIMATE_DEAD,
-       MS_IRON_BOLT,
-       MS_TELEPORT  },
+       SPELL_BOLT_OF_COLD,
+       SPELL_PARALYSE,
+       SPELL_SUMMON_GREATER_DEMON,
+       SPELL_ANIMATE_DEAD,
+       SPELL_BOLT_OF_IRON,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_LICH_II,
-       MS_FIRE_BOLT,
-       MS_CONFUSE,
-       MS_HASTE,
-       MS_NEGATIVE_BOLT,
-       MS_SUMMON_DEMON_GREATER,
-       MS_BANISHMENT  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_CONFUSE,
+       SPELL_HASTE,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_SUMMON_GREATER_DEMON,
+       SPELL_BANISHMENT  },
 
     {  MST_LICH_III,
-       MS_NEGATIVE_BOLT,
-       MS_ANIMATE_DEAD,
-       MS_SUMMON_UNDEAD,
-       MS_FROST,
-       MS_CRYSTAL_SPEAR,
-       MS_SUMMON_UNDEAD  },
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_ANIMATE_DEAD,
+       SPELL_SUMMON_UNDEAD,
+       SPELL_THROW_FROST,
+       SPELL_LEHUDIBS_CRYSTAL_SPEAR,
+       SPELL_SUMMON_UNDEAD  },
 
     {  MST_LICH_IV,
-       MS_ORB_ENERGY,
-       MS_COLD_BOLT,
-       MS_INVIS,
-       MS_ANIMATE_DEAD,
-       MS_IRON_BOLT,
-       MS_INVIS  },
+       SPELL_ISKENDERUNS_MYSTIC_BLAST,
+       SPELL_BOLT_OF_COLD,
+       SPELL_INVISIBILITY,
+       SPELL_ANIMATE_DEAD,
+       SPELL_BOLT_OF_IRON,
+       SPELL_INVISIBILITY  },
 
     {  MST_BURNING_DEVIL,
-       MS_HELLFIRE_BURST,
-       MS_HELLFIRE_BURST,
-       MS_NO_SPELL,
-       MS_HELLFIRE_BURST,
-       MS_HELLFIRE_BURST,
-       MS_HELLFIRE_BURST  },
+       SPELL_HELLFIRE_BURST,
+       SPELL_HELLFIRE_BURST,
+       SPELL_NO_SPELL,
+       SPELL_HELLFIRE_BURST,
+       SPELL_HELLFIRE_BURST,
+       SPELL_HELLFIRE_BURST  },
 
     {  MST_VAMPIRE,
-       MS_VAMPIRE_SUMMON,
-       MS_CONFUSE,
-       MS_INVIS,
-       MS_NO_SPELL,
-       MS_VAMPIRE_SUMMON,
-       MS_VAMPIRE_SUMMON },
+       SPELL_VAMPIRE_SUMMON,
+       SPELL_CONFUSE,
+       SPELL_INVISIBILITY,
+       SPELL_NO_SPELL,
+       SPELL_VAMPIRE_SUMMON,
+       SPELL_VAMPIRE_SUMMON },
 
     {  MST_VAMPIRE_KNIGHT,
-       MS_VAMPIRE_SUMMON,
-       MS_PARALYSIS,
-       MS_HASTE,
-       MS_INVIS,
-       MS_VAMPIRE_SUMMON,
-       MS_HEAL  },
+       SPELL_VAMPIRE_SUMMON,
+       SPELL_PARALYSE,
+       SPELL_HASTE,
+       SPELL_INVISIBILITY,
+       SPELL_VAMPIRE_SUMMON,
+       SPELL_LESSER_HEALING  },
 
     {  MST_VAMPIRE_MAGE,
-       MS_NEGATIVE_BOLT,
-       MS_SUMMON_UNDEAD,
-       MS_INVIS,
-       MS_ANIMATE_DEAD,
-       MS_ANIMATE_DEAD,
-       MS_TELEPORT },
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_SUMMON_UNDEAD,
+       SPELL_INVISIBILITY,
+       SPELL_ANIMATE_DEAD,
+       SPELL_ANIMATE_DEAD,
+       SPELL_TELEPORT_SELF },
 
     {  MST_EFREET,
-       MS_FIRE_BOLT,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_FIREBALL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_FIREBALL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_BRAIN_WORM,
-       MS_BRAIN_FEED,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_BRAIN_FEED,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_BRAIN_FEED,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_BRAIN_FEED,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_GIANT_ORANGE_BRAIN,
-       MS_BRAIN_FEED,
-       MS_MUTATION,
-       MS_LEVEL_SUMMON,
-       MS_CONFUSE,
-       MS_BLINK,
-       MS_TELEPORT  },
+       SPELL_BRAIN_FEED,
+       SPELL_POLYMORPH_OTHER,
+       SPELL_SHADOW_CREATURES,
+       SPELL_CONFUSE,
+       SPELL_BLINK,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_RAKSHASA,
-       MS_FAKE_RAKSHASA_SUMMON,
-       MS_BLINK,
-       MS_INVIS,
-       MS_FAKE_RAKSHASA_SUMMON,
-       MS_BLINK,
-       MS_TELEPORT  },
+       SPELL_FAKE_RAKSHASA_SUMMON,
+       SPELL_BLINK,
+       SPELL_INVISIBILITY,
+       SPELL_FAKE_RAKSHASA_SUMMON,
+       SPELL_BLINK,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_GREAT_ORB_OF_EYES,
-       MS_PARALYSIS,
-       MS_DISINTEGRATE,
-       MS_NO_SPELL,
-       MS_SLOW,
-       MS_CONFUSE,
-       MS_TELEPORT_OTHER  },
+       SPELL_PARALYSE,
+       SPELL_DISINTEGRATE,
+       SPELL_NO_SPELL,
+       SPELL_SLOW,
+       SPELL_CONFUSE,
+       SPELL_TELEPORT_OTHER  },
 
     {  MST_ORC_SORCERER,
-       MS_FIRE_BOLT,
-       MS_NEGATIVE_BOLT,
-       MS_SUMMON_DEMON,
-       MS_PARALYSIS,
-       MS_ANIMATE_DEAD,
-       MS_TELEPORT  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_SUMMON_DEMON,
+       SPELL_PARALYSE,
+       SPELL_ANIMATE_DEAD,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_STEAM_DRAGON,
-       MS_STEAM_BALL,
-       MS_STEAM_BALL,
-       MS_NO_SPELL,
-       MS_STEAM_BALL,
-       MS_STEAM_BALL,
-       MS_NO_SPELL  },
+       SPELL_STEAM_BALL,
+       SPELL_STEAM_BALL,
+       SPELL_NO_SPELL,
+       SPELL_STEAM_BALL,
+       SPELL_STEAM_BALL,
+       SPELL_NO_SPELL  },
 
     {  MST_HELL_KNIGHT_I,
-       MS_NO_SPELL,
-       MS_PAIN,
-       MS_HASTE,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_HASTE  },
+       SPELL_NO_SPELL,
+       SPELL_PAIN,
+       SPELL_HASTE,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_HASTE  },
 
     {  MST_HELL_KNIGHT_II,
-       MS_NO_SPELL,
-       MS_FIRE_BOLT,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_BLINK  },
+       SPELL_NO_SPELL,
+       SPELL_BOLT_OF_FIRE,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_BLINK  },
 
     {  MST_NECROMANCER_I,
-       MS_COLD_BOLT,
-       MS_NEGATIVE_BOLT,
-       MS_NO_SPELL,
-       MS_ANIMATE_DEAD,
-       MS_ANIMATE_DEAD,
-       MS_TELEPORT  },
+       SPELL_BOLT_OF_COLD,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_NO_SPELL,
+       SPELL_ANIMATE_DEAD,
+       SPELL_ANIMATE_DEAD,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_NECROMANCER_II,
-       MS_FIRE_BOLT,
-       MS_PAIN,
-       MS_INVIS,
-       MS_ANIMATE_DEAD,
-       MS_ANIMATE_DEAD,
-       MS_BLINK  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_PAIN,
+       SPELL_INVISIBILITY,
+       SPELL_ANIMATE_DEAD,
+       SPELL_ANIMATE_DEAD,
+       SPELL_BLINK  },
 
     {  MST_WIZARD_I,
-       MS_MMISSILE,
-       MS_PARALYSIS,
-       MS_HASTE,
-       MS_LIGHTNING_BOLT,
-       MS_CONFUSE,
-       MS_TELEPORT  },
+       SPELL_MAGIC_DART,
+       SPELL_PARALYSE,
+       SPELL_HASTE,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_CONFUSE,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_WIZARD_II,
-       MS_VENOM_BOLT,
-       MS_ORB_ENERGY,
-       MS_INVIS,
-       MS_CONFUSE,
-       MS_SLOW,
-       MS_TELEPORT  },
+       SPELL_VENOM_BOLT,
+       SPELL_ISKENDERUNS_MYSTIC_BLAST,
+       SPELL_INVISIBILITY,
+       SPELL_CONFUSE,
+       SPELL_SLOW,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_WIZARD_III,
-       MS_PARALYSIS,
-       MS_CRYSTAL_SPEAR,
-       MS_BLINK,
-       MS_FIRE_BOLT,
-       MS_COLD_BOLT,
-       MS_HEAL  },
+       SPELL_PARALYSE,
+       SPELL_LEHUDIBS_CRYSTAL_SPEAR,
+       SPELL_BLINK,
+       SPELL_BOLT_OF_FIRE,
+       SPELL_BOLT_OF_COLD,
+       SPELL_LESSER_HEALING  },
 
     {  MST_WIZARD_IV,
-       MS_STONE_ARROW,
-       MS_STING,
-       MS_BLINK,
-       MS_LIGHTNING_BOLT,
-       MS_BANISHMENT,
-       MS_HEAL  },
+       SPELL_STONE_ARROW,
+       SPELL_STING,
+       SPELL_BLINK,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_BANISHMENT,
+       SPELL_LESSER_HEALING  },
 
     {  MST_WIZARD_V,
-       MS_PARALYSIS,
-       MS_FLAME,
-       MS_INVIS,
-       MS_TELEPORT_OTHER,
-       MS_FIREBALL,
-       MS_TELEPORT_OTHER  },
+       SPELL_PARALYSE,
+       SPELL_THROW_FLAME,
+       SPELL_INVISIBILITY,
+       SPELL_TELEPORT_OTHER,
+       SPELL_FIREBALL,
+       SPELL_TELEPORT_OTHER  },
 
     {  MST_ORC_PRIEST,
-       MS_PAIN,
-       MS_NO_SPELL,
-       MS_CANTRIP,
-       MS_SMITE,
-       MS_NO_SPELL,
-       MS_HEAL  },
+       SPELL_PAIN,
+       SPELL_NO_SPELL,
+       SPELL_CANTRIP,
+       SPELL_SMITING,
+       SPELL_NO_SPELL,
+       SPELL_LESSER_HEALING  },
 
     {  MST_ORC_HIGH_PRIEST,
-       MS_PAIN,
-       MS_SUMMON_DEMON,
-       MS_SUMMON_DEMON,
-       MS_SMITE,
-       MS_ANIMATE_DEAD,
-       MS_HEAL  },
+       SPELL_PAIN,
+       SPELL_SUMMON_DEMON,
+       SPELL_SUMMON_DEMON,
+       SPELL_SMITING,
+       SPELL_ANIMATE_DEAD,
+       SPELL_LESSER_HEALING  },
 
     {  MST_MOTTLED_DRAGON,
-       MS_STICKY_FLAME,
-       MS_STICKY_FLAME,
-       MS_NO_SPELL,
-       MS_STICKY_FLAME,
-       MS_STICKY_FLAME,
-       MS_NO_SPELL  },
+       SPELL_STICKY_FLAME,
+       SPELL_STICKY_FLAME,
+       SPELL_NO_SPELL,
+       SPELL_STICKY_FLAME,
+       SPELL_STICKY_FLAME,
+       SPELL_NO_SPELL  },
 
     {  MST_ICE_FIEND,
-       MS_COLD_BOLT,
-       MS_COLD_BOLT,
-       MS_NO_SPELL,
-       MS_TORMENT,
-       MS_NO_SPELL,
-       MS_SUMMON_DEMON  },
+       SPELL_BOLT_OF_COLD,
+       SPELL_BOLT_OF_COLD,
+       SPELL_NO_SPELL,
+       SPELL_SYMBOL_OF_TORMENT,
+       SPELL_NO_SPELL,
+       SPELL_SUMMON_DEMON  },
 
     {  MST_SHADOW_FIEND,
-       MS_COLD_BOLT,
-       MS_NEGATIVE_BOLT,
-       MS_NO_SPELL,
-       MS_TORMENT,
-       MS_NO_SPELL,
-       MS_SUMMON_DEMON  },
+       SPELL_BOLT_OF_COLD,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_NO_SPELL,
+       SPELL_SYMBOL_OF_TORMENT,
+       SPELL_NO_SPELL,
+       SPELL_SUMMON_DEMON  },
 
     {  MST_TORMENTOR,
-       MS_PAIN,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_PAIN,
-       MS_NO_SPELL,
-       MS_TORMENT  },
+       SPELL_PAIN,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_PAIN,
+       SPELL_NO_SPELL,
+       SPELL_SYMBOL_OF_TORMENT  },
 
     {  MST_STORM_DRAGON,
-       MS_LIGHTNING_BOLT,
-       MS_LIGHTNING_BOLT,
-       MS_NO_SPELL,
-       MS_LIGHTNING_BOLT,
-       MS_LIGHTNING_BOLT,
-       MS_NO_SPELL  },
+       SPELL_LIGHTNING_BOLT,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_NO_SPELL,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_NO_SPELL  },
 
     {  MST_WHITE_IMP,
-       MS_FROST,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_THROW_FROST,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_YNOXINUL,
-       MS_NO_SPELL,
-       MS_IRON_BOLT,
-       MS_SUMMON_UFETUBUS,
-       MS_NO_SPELL,
-       MS_SUMMON_UFETUBUS,
-       MS_NO_SPELL  },
+       SPELL_NO_SPELL,
+       SPELL_BOLT_OF_IRON,
+       SPELL_SUMMON_UFETUBUS,
+       SPELL_NO_SPELL,
+       SPELL_SUMMON_UFETUBUS,
+       SPELL_NO_SPELL  },
 
     {  MST_NEQOXEC,
-       MS_MUTATION,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_BRAIN_FEED,
-       MS_SUMMON_DEMON_LESSER,
-       MS_NO_SPELL  },
+       SPELL_POLYMORPH_OTHER,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_BRAIN_FEED,
+       SPELL_CALL_IMP,
+       SPELL_NO_SPELL  },
 
     {  MST_HELLWING,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_TELEPORT_OTHER,
-       MS_ANIMATE_DEAD,
-       MS_TELEPORT  },
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_TELEPORT_OTHER,
+       SPELL_ANIMATE_DEAD,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_SMOKE_DEMON,
-       MS_STICKY_FLAME,
-       MS_STEAM_BALL,
-       MS_NO_SPELL,
-       MS_SMITE,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_STICKY_FLAME,
+       SPELL_STEAM_BALL,
+       SPELL_NO_SPELL,
+       SPELL_SMITING,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_CACODEMON,
-       MS_SUMMON_DEMON_LESSER,
-       MS_SUMMON_DEMON_LESSER,
-       MS_SUMMON_DEMON_LESSER,
-       MS_MUTATION,
-       MS_DIG,
-       MS_SUMMON_DEMON  },
+       SPELL_CALL_IMP,
+       SPELL_CALL_IMP,
+       SPELL_CALL_IMP,
+       SPELL_POLYMORPH_OTHER,
+       SPELL_DIG,
+       SPELL_SUMMON_DEMON  },
 
     {  MST_GREEN_DEATH,
-       MS_POISON_ARROW,
-       MS_POISON_BLAST,
-       MS_NO_SPELL,
-       MS_VENOM_BOLT,
-       MS_SUMMON_DEMON_LESSER,
-       MS_BLINK  },
+       SPELL_POISON_ARROW,
+       SPELL_POISONOUS_CLOUD,
+       SPELL_NO_SPELL,
+       SPELL_VENOM_BOLT,
+       SPELL_CALL_IMP,
+       SPELL_BLINK  },
 
     {  MST_BALRUG,
-       MS_FIRE_BOLT,
-       MS_FIREBALL,
-       MS_NO_SPELL,
-       MS_STICKY_FLAME,
-       MS_SMITE,
-       MS_TELEPORT  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_FIREBALL,
+       SPELL_NO_SPELL,
+       SPELL_STICKY_FLAME,
+       SPELL_SMITING,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_BLUE_DEATH,
-       MS_LIGHTNING_BOLT,
-       MS_COLD_BOLT,
-       MS_NO_SPELL,
-       MS_SUMMON_DEMON_LESSER,
-       MS_LEVEL_SUMMON,
-       MS_TELEPORT_OTHER  },
+       SPELL_LIGHTNING_BOLT,
+       SPELL_BOLT_OF_COLD,
+       SPELL_NO_SPELL,
+       SPELL_CALL_IMP,
+       SPELL_SHADOW_CREATURES,
+       SPELL_TELEPORT_OTHER  },
 
     {  MST_GERYON,
-       MS_SUMMON_BEAST,
-       MS_SUMMON_BEAST,
-       MS_NO_SPELL,
-       MS_SUMMON_BEAST,
-       MS_NO_SPELL,
-       MS_SUMMON_BEAST  },
+       SPELL_SUMMON_BEAST,
+       SPELL_SUMMON_BEAST,
+       SPELL_NO_SPELL,
+       SPELL_SUMMON_BEAST,
+       SPELL_NO_SPELL,
+       SPELL_SUMMON_BEAST  },
 
     {  MST_DISPATER,
-       MS_SUMMON_DEMON_GREATER,
-       MS_IRON_BOLT,
-       MS_SUMMON_DEMON,
-       MS_LIGHTNING_BOLT,
-       MS_HELLFIRE,
-       MS_SUMMON_DEMON_GREATER  },
+       SPELL_SUMMON_GREATER_DEMON,
+       SPELL_BOLT_OF_IRON,
+       SPELL_SUMMON_DEMON,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_HELLFIRE,
+       SPELL_SUMMON_GREATER_DEMON  },
 
     {  MST_ASMODEUS,
-       MS_FIRE_BOLT,
-       MS_HELLFIRE,
-       MS_SUMMON_DEMON,
-       MS_SUMMON_DEMON_GREATER,
-       MS_NEGATIVE_BOLT,
-       MS_TELEPORT  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_HELLFIRE,
+       SPELL_SUMMON_DEMON,
+       SPELL_SUMMON_GREATER_DEMON,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_ERESHKIGAL,
-       MS_NEGATIVE_BOLT,
-       MS_COLD_BOLT,
-       MS_SUMMON_DEMON,
-       MS_PAIN,
-       MS_PARALYSIS,
-       MS_HEAL  },
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_BOLT_OF_COLD,
+       SPELL_SUMMON_DEMON,
+       SPELL_PAIN,
+       SPELL_PARALYSE,
+       SPELL_LESSER_HEALING  },
 
     {  MST_ANTAEUS,
-       MS_COLD_BOLT,
-       MS_LIGHTNING_BOLT,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_BOLT_OF_COLD,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_MNOLEG,
-       MS_SUMMON_DEMON,
-       MS_SMITE,
-       MS_INVIS,
-       MS_MUTATION,
-       MS_LEVEL_SUMMON,
-       MS_TELEPORT  },
+       SPELL_SUMMON_DEMON,
+       SPELL_SMITING,
+       SPELL_INVISIBILITY,
+       SPELL_POLYMORPH_OTHER,
+       SPELL_SHADOW_CREATURES,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_LOM_LOBON,
-       MS_LIGHTNING_BOLT,
-       MS_COLD_BOLT,
-       MS_HEAL,
-       MS_SUMMON_DEMON,
-       MS_TELEPORT,
-       MS_TELEPORT  },
+       SPELL_LIGHTNING_BOLT,
+       SPELL_BOLT_OF_COLD,
+       SPELL_LESSER_HEALING,
+       SPELL_SUMMON_DEMON,
+       SPELL_TELEPORT_SELF,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_CEREBOV,
-       MS_FIRE_BOLT,
-       MS_IRON_BOLT,
-       MS_NO_SPELL,
-       MS_FIREBALL,
-       MS_SUMMON_DEMON_LESSER,
-       MS_NO_SPELL  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_BOLT_OF_IRON,
+       SPELL_NO_SPELL,
+       SPELL_FIREBALL,
+       SPELL_CALL_IMP,
+       SPELL_NO_SPELL  },
 
     {  MST_GLOORX_VLOQ,
-       MS_POISON_ARROW,
-       MS_SLOW,
-       MS_SUMMON_DEMON,
-       MS_NEGATIVE_BOLT,
-       MS_SUMMON_DEMON,
-       MS_NO_SPELL  },
+       SPELL_POISON_ARROW,
+       SPELL_SLOW,
+       SPELL_SUMMON_DEMON,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_SUMMON_DEMON,
+       SPELL_NO_SPELL  },
 
     {  MST_TITAN,
-       MS_LIGHTNING_BOLT,
-       MS_NO_SPELL,
-       MS_HEAL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_HEAL  },
+       SPELL_LIGHTNING_BOLT,
+       SPELL_NO_SPELL,
+       SPELL_LESSER_HEALING,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_LESSER_HEALING  },
 
     {  MST_GOLDEN_DRAGON,
-       MS_FIRE_BOLT,
-       MS_COLD_BOLT,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_POISON_BLAST,
-       MS_NO_SPELL  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_BOLT_OF_COLD,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_POISONOUS_CLOUD,
+       SPELL_NO_SPELL  },
 
     {  MST_DEEP_ELF_SUMMONER,
-       MS_BLINK,
-       MS_SUMMON_DEMON_LESSER,
-       MS_SUMMON_UFETUBUS,
-       MS_VAMPIRE_SUMMON,
-       MS_SUMMON_DEMON,
-       MS_TELEPORT  },
+       SPELL_BLINK,
+       SPELL_CALL_IMP,
+       SPELL_SUMMON_UFETUBUS,
+       SPELL_VAMPIRE_SUMMON,
+       SPELL_SUMMON_DEMON,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_DEEP_ELF_CONJURER_I,
-       MS_FIRE_BOLT,
-       MS_COLD_BOLT,
-       MS_CANTRIP,
-       MS_LIGHTNING_BOLT,
-       MS_STICKY_FLAME,
-       MS_TELEPORT  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_BOLT_OF_COLD,
+       SPELL_CANTRIP,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_STICKY_FLAME,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_DEEP_ELF_CONJURER_II,
-       MS_STICKY_FLAME,
-       MS_ORB_ENERGY,
-       MS_INVIS,
-       MS_STONE_ARROW,
-       MS_NEGATIVE_BOLT,
-       MS_TELEPORT  },
+       SPELL_STICKY_FLAME,
+       SPELL_ISKENDERUNS_MYSTIC_BLAST,
+       SPELL_INVISIBILITY,
+       SPELL_STONE_ARROW,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_DEEP_ELF_PRIEST,
-       MS_PAIN,
-       MS_CANTRIP,
-       MS_HEAL,
-       MS_SMITE,
-       MS_ANIMATE_DEAD,
-       MS_HEAL  },
+       SPELL_PAIN,
+       SPELL_CANTRIP,
+       SPELL_LESSER_HEALING,
+       SPELL_SMITING,
+       SPELL_ANIMATE_DEAD,
+       SPELL_LESSER_HEALING  },
 
     {  MST_DEEP_ELF_HIGH_PRIEST,
-       MS_SUMMON_DEMON,
-       MS_HELLFIRE_BURST,
-       MS_HEAL,
-       MS_SMITE,
-       MS_ANIMATE_DEAD,
-       MS_HEAL  },
+       SPELL_SUMMON_DEMON,
+       SPELL_HELLFIRE_BURST,
+       SPELL_LESSER_HEALING,
+       SPELL_SMITING,
+       SPELL_ANIMATE_DEAD,
+       SPELL_LESSER_HEALING  },
 
     {  MST_DEEP_ELF_DEMONOLOGIST,
-       MS_SUMMON_DEMON,
-       MS_BANISHMENT,
-       MS_SUMMON_DEMON,
-       MS_SUMMON_DEMON_GREATER,
-       MS_SUMMON_DEMON_LESSER,
-       MS_TELEPORT  },
+       SPELL_SUMMON_DEMON,
+       SPELL_BANISHMENT,
+       SPELL_SUMMON_DEMON,
+       SPELL_SUMMON_GREATER_DEMON,
+       SPELL_CALL_IMP,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_DEEP_ELF_ANNIHILATOR,
-       MS_LIGHTNING_BOLT,
-       MS_CRYSTAL_SPEAR,
-       MS_BLINK,
-       MS_IRON_BOLT,
-       MS_POISON_ARROW,
-       MS_TELEPORT  },
+       SPELL_LIGHTNING_BOLT,
+       SPELL_LEHUDIBS_CRYSTAL_SPEAR,
+       SPELL_BLINK,
+       SPELL_BOLT_OF_IRON,
+       SPELL_POISON_ARROW,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_DEEP_ELF_SORCERER,
-       MS_NEGATIVE_BOLT,
-       MS_BANISHMENT,
-       MS_HASTE,
-       MS_SUMMON_DEMON,
-       MS_HELLFIRE,
-       MS_TELEPORT  },
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_BANISHMENT,
+       SPELL_HASTE,
+       SPELL_SUMMON_DEMON,
+       SPELL_HELLFIRE,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_DEEP_ELF_DEATH_MAGE,
-       MS_NEGATIVE_BOLT,
-       MS_NEGATIVE_BOLT,
-       MS_HEAL,
-       MS_ANIMATE_DEAD,
-       MS_ANIMATE_DEAD,
-       MS_TELEPORT  },
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_LESSER_HEALING,
+       SPELL_ANIMATE_DEAD,
+       SPELL_ANIMATE_DEAD,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_KOBOLD_DEMONOLOGIST,
-       MS_SUMMON_DEMON_LESSER,
-       MS_SUMMON_DEMON,
-       MS_CANTRIP,
-       MS_SUMMON_DEMON_LESSER,
-       MS_SUMMON_DEMON,
-       MS_CANTRIP  },           // this should be cute -- bwr
+       SPELL_CALL_IMP,
+       SPELL_SUMMON_DEMON,
+       SPELL_CANTRIP,
+       SPELL_CALL_IMP,
+       SPELL_SUMMON_DEMON,
+       SPELL_CANTRIP  },           // this should be cute -- bwr
 
     {  MST_NAGA,
-       MS_POISON_SPLASH,
-       MS_POISON_SPLASH,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_POISON_SPLASH,
+       SPELL_POISON_SPLASH,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_NAGA_MAGE,
-       MS_VENOM_BOLT,
-       MS_ORB_ENERGY,
-       MS_HASTE,
-       MS_POISON_ARROW,
-       MS_TELEPORT_OTHER,
-       MS_TELEPORT  },
+       SPELL_VENOM_BOLT,
+       SPELL_ISKENDERUNS_MYSTIC_BLAST,
+       SPELL_HASTE,
+       SPELL_POISON_ARROW,
+       SPELL_TELEPORT_OTHER,
+       SPELL_TELEPORT_SELF  },
 
     {  MST_CURSE_SKULL,
-       MS_SUMMON_UNDEAD,
-       MS_SUMMON_UNDEAD,
-       MS_NO_SPELL,
-       MS_TORMENT,
-       MS_SUMMON_UNDEAD,
-       MS_NO_SPELL  },
+       SPELL_SUMMON_UNDEAD,
+       SPELL_SUMMON_UNDEAD,
+       SPELL_NO_SPELL,
+       SPELL_SYMBOL_OF_TORMENT,
+       SPELL_SUMMON_UNDEAD,
+       SPELL_NO_SPELL  },
 
     {  MST_SHINING_EYE,
-       MS_MUTATION,
-       MS_MUTATION,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_POLYMORPH_OTHER,
+       SPELL_POLYMORPH_OTHER,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_FROST_GIANT,
-       MS_COLD_BOLT,
-       MS_COLD_BOLT,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_BOLT_OF_COLD,
+       SPELL_BOLT_OF_COLD,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_ANGEL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_HEAL,
-       MS_NO_SPELL,
-       MS_HEAL,
-       MS_HEAL  },
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_LESSER_HEALING,
+       SPELL_NO_SPELL,
+       SPELL_LESSER_HEALING,
+       SPELL_LESSER_HEALING  },
 
     {  MST_DAEVA,
-       MS_SMITE,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_SMITE,
-       MS_SMITE,
-       MS_NO_SPELL  },
+       SPELL_SMITING,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_SMITING,
+       SPELL_SMITING,
+       SPELL_NO_SPELL  },
 
     {  MST_SHADOW_DRAGON,
-       MS_NEGATIVE_BOLT,
-       MS_NEGATIVE_BOLT,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NEGATIVE_BOLT,
-       MS_NO_SPELL  },
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_NO_SPELL  },
 
     {  MST_SPHINX,
-       MS_CONFUSE,
-       MS_PARALYSIS,
-       MS_HEAL,
-       MS_SMITE,
-       MS_SLOW,
-       MS_HEAL  },
+       SPELL_CONFUSE,
+       SPELL_PARALYSE,
+       SPELL_LESSER_HEALING,
+       SPELL_SMITING,
+       SPELL_SLOW,
+       SPELL_LESSER_HEALING  },
 
     {  MST_MUMMY,
-       MS_SUMMON_DEMON,
-       MS_SMITE,
-       MS_NO_SPELL,
-       MS_TORMENT,
-       MS_SUMMON_UNDEAD,
-       MS_SUMMON_UNDEAD },
+       SPELL_SUMMON_DEMON,
+       SPELL_SMITING,
+       SPELL_NO_SPELL,
+       SPELL_SYMBOL_OF_TORMENT,
+       SPELL_SUMMON_UNDEAD,
+       SPELL_SUMMON_UNDEAD },
 
     {  MST_ELECTRIC_GOLEM,
-       MS_LIGHTNING_BOLT,
-       MS_LIGHTNING_BOLT,
-       MS_BLINK,
-       MS_LIGHTNING_BOLT,
-       MS_LIGHTNING_BOLT,
-       MS_BLINK  },
+       SPELL_LIGHTNING_BOLT,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_BLINK,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_LIGHTNING_BOLT,
+       SPELL_BLINK  },
 
     {  MST_ORB_OF_FIRE,
-       MS_FIRE_BOLT,
-       MS_FIRE_BOLT,
-       MS_NO_SPELL,
-       MS_MUTATION,
-       MS_FIREBALL,
-       MS_FIREBALL  },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_BOLT_OF_FIRE,
+       SPELL_NO_SPELL,
+       SPELL_POLYMORPH_OTHER,
+       SPELL_FIREBALL,
+       SPELL_FIREBALL  },
 
     {  MST_SHADOW_IMP,
-       MS_PAIN,
-       MS_NO_SPELL,
-       MS_ANIMATE_DEAD,
-       MS_ANIMATE_DEAD,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_PAIN,
+       SPELL_NO_SPELL,
+       SPELL_ANIMATE_DEAD,
+       SPELL_ANIMATE_DEAD,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_GHOST,    // actual spells taken from struct (see mon-util.cc),
-       MS_NO_SPELL,          // this line: splist[x] = ghost.values[x + 14] -- dlb
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_NO_SPELL,          // this line: splist[x] = ghost.values[x + 14] -- dlb
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_HELL_HOG,
-       MS_STICKY_FLAME,
-       MS_STICKY_FLAME,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_STICKY_FLAME,
+       SPELL_STICKY_FLAME,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_SWAMP_DRAGON,
-       MS_POISON_BLAST,
-       MS_POISON_BLAST,
-       MS_NO_SPELL,
-       MS_POISON_BLAST,
-       MS_POISON_BLAST,
-       MS_NO_SPELL  },
+       SPELL_POISONOUS_CLOUD,
+       SPELL_POISONOUS_CLOUD,
+       SPELL_NO_SPELL,
+       SPELL_POISONOUS_CLOUD,
+       SPELL_POISONOUS_CLOUD,
+       SPELL_NO_SPELL  },
 
     {  MST_SWAMP_DRAKE,
-       MS_MARSH_GAS,
-       MS_MARSH_GAS,
-       MS_NO_SPELL,
-       MS_MARSH_GAS,
-       MS_MARSH_GAS,
-       MS_NO_SPELL  },
+       SPELL_MEPHITIC_CLOUD,
+       SPELL_MEPHITIC_CLOUD,
+       SPELL_NO_SPELL,
+       SPELL_MEPHITIC_CLOUD,
+       SPELL_MEPHITIC_CLOUD,
+       SPELL_NO_SPELL  },
 
     {  MST_SERPENT_OF_HELL,
-       MS_HELLFIRE,
-       MS_HELLFIRE,
-       MS_NO_SPELL,
-       MS_HELLFIRE,
-       MS_HELLFIRE,
-       MS_NO_SPELL  },
+       SPELL_HELLFIRE,
+       SPELL_HELLFIRE,
+       SPELL_NO_SPELL,
+       SPELL_HELLFIRE,
+       SPELL_HELLFIRE,
+       SPELL_NO_SPELL  },
 
     {  MST_BOGGART,
-       MS_CONFUSE,
-       MS_SLOW,
-       MS_INVIS,
-       MS_BLINK,
-       MS_LEVEL_SUMMON,
-       MS_LEVEL_SUMMON  },
+       SPELL_CONFUSE,
+       SPELL_SLOW,
+       SPELL_INVISIBILITY,
+       SPELL_BLINK,
+       SPELL_SHADOW_CREATURES,
+       SPELL_SHADOW_CREATURES  },
 
     {  MST_EYE_OF_DEVASTATION,
-       MS_ENERGY_BOLT,
-       MS_ENERGY_BOLT,
-       MS_NO_SPELL,
-       MS_ENERGY_BOLT,
-       MS_ENERGY_BOLT,
-       MS_NO_SPELL  },
+       SPELL_ENERGY_BOLT,
+       SPELL_ENERGY_BOLT,
+       SPELL_NO_SPELL,
+       SPELL_ENERGY_BOLT,
+       SPELL_ENERGY_BOLT,
+       SPELL_NO_SPELL  },
 
     {  MST_QUICKSILVER_DRAGON,
-       MS_QUICKSILVER_BOLT,
-       MS_QUICKSILVER_BOLT,
-       MS_NO_SPELL,
-       MS_QUICKSILVER_BOLT,
-       MS_QUICKSILVER_BOLT,
-       MS_NO_SPELL  },
+       SPELL_QUICKSILVER_BOLT,
+       SPELL_QUICKSILVER_BOLT,
+       SPELL_NO_SPELL,
+       SPELL_QUICKSILVER_BOLT,
+       SPELL_QUICKSILVER_BOLT,
+       SPELL_NO_SPELL  },
 
     {  MST_IRON_DRAGON,
-       MS_METAL_SPLINTERS,
-       MS_METAL_SPLINTERS,
-       MS_NO_SPELL,
-       MS_METAL_SPLINTERS,
-       MS_METAL_SPLINTERS,
-       MS_NO_SPELL  },
+       SPELL_METAL_SPLINTERS,
+       SPELL_METAL_SPLINTERS,
+       SPELL_NO_SPELL,
+       SPELL_METAL_SPLINTERS,
+       SPELL_METAL_SPLINTERS,
+       SPELL_NO_SPELL  },
 
     {  MST_SKELETAL_WARRIOR,
-       MS_ANIMATE_DEAD,
-       MS_NO_SPELL,
-       MS_ANIMATE_DEAD,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_NO_SPELL  },
+       SPELL_ANIMATE_DEAD,
+       SPELL_NO_SPELL,
+       SPELL_ANIMATE_DEAD,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL  },
 
     {  MST_MYSTIC,
-       MS_BRAIN_FEED,
-       MS_SMITE,
-       MS_INVIS,
-       MS_CONFUSE,
-       MS_PARALYSIS,
-       MS_HEAL  },
+       SPELL_BRAIN_FEED,
+       SPELL_SMITING,
+       SPELL_INVISIBILITY,
+       SPELL_CONFUSE,
+       SPELL_PARALYSE,
+       SPELL_LESSER_HEALING  },
 
     {  MST_DEATH_DRAKE,
-       MS_MIASMA,
-       MS_MIASMA,
-       MS_NO_SPELL,
-       MS_MIASMA,
-       MS_MIASMA,
-       MS_NO_SPELL  },
+       SPELL_MIASMA,
+       SPELL_MIASMA,
+       SPELL_NO_SPELL,
+       SPELL_MIASMA,
+       SPELL_MIASMA,
+       SPELL_NO_SPELL  },
 
     {  MST_DRAC_SCORCHER,
-       MS_FIRE_BOLT,
-       MS_STICKY_FLAME,
-       MS_NO_SPELL,
-       MS_FIREBALL,
-       MS_HELLFIRE,
-       MS_HELLFIRE_BURST },
+       SPELL_BOLT_OF_FIRE,
+       SPELL_STICKY_FLAME,
+       SPELL_NO_SPELL,
+       SPELL_FIREBALL,
+       SPELL_HELLFIRE,
+       SPELL_HELLFIRE_BURST },
 
     {  MST_DRAC_CALLER,
-       MS_NO_SPELL,
-       MS_SUMMON_DRAKES,
-       MS_SUMMON_DRAKES,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_SUMMON_DRAKES },
+       SPELL_NO_SPELL,
+       SPELL_SUMMON_DRAKES,
+       SPELL_SUMMON_DRAKES,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_SUMMON_DRAKES },
 
     {  MST_DRAC_SHIFTER,
-       MS_BANISHMENT,
-       MS_BLINK_OTHER,
-       MS_BLINK,
-       MS_NO_SPELL,
-       MS_BLINK_OTHER,
-       MS_CONTROLLED_BLINK },
+       SPELL_BANISHMENT,
+       SPELL_BLINK_OTHER,
+       SPELL_BLINK,
+       SPELL_NO_SPELL,
+       SPELL_BLINK_OTHER,
+       SPELL_CONTROLLED_BLINK },
 
     // Curse toe menu should be kept full, because otherwise the toe spends
     // too much time crawling around.
     {  MST_CURSE_TOE,
-       MS_SUMMON_UNDEAD,
-       MS_SUMMON_MUSHROOMS, // fungal theme
-       MS_SUMMON_MUSHROOMS,
-       MS_TORMENT,
-       MS_SUMMON_UNDEAD,
-       MS_TORMENT  },
+       SPELL_SUMMON_UNDEAD,
+       SPELL_SUMMON_MUSHROOMS, // fungal theme
+       SPELL_SUMMON_MUSHROOMS,
+       SPELL_SYMBOL_OF_TORMENT,
+       SPELL_SUMMON_UNDEAD,
+       SPELL_SYMBOL_OF_TORMENT  },
 
     // Crusader theme.
     {  MST_RUPERT,
-       MS_PARALYSIS,
-       MS_CONFUSE,
-       MS_BERSERK_RAGE,
-       MS_NO_SPELL,
-       MS_NO_SPELL,
-       MS_BERSERK_RAGE },
+       SPELL_PARALYSE,
+       SPELL_CONFUSE,
+       SPELL_BERSERKER_RAGE,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_BERSERKER_RAGE },
+
+    {  MST_ICE_STATUE,
+       SPELL_BOLT_OF_COLD,
+       SPELL_ICE_BOLT,
+       SPELL_NO_SPELL,
+       SPELL_FREEZING_CLOUD,
+       SPELL_SUMMON_ICE_BEAST,
+       SPELL_SUMMON_ICE_BEAST },
 
 #endif