Some more typesafety in monster spellbooks.

Removed unused ghost spellbook.


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

1 files changed, 287 insertions, 112 deletions

diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 48ab9448f4..7a49b88d9c 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -8,14 +8,10 @@
 
 /* *********************************************************************
 
-    this will do as long as ( 0 >= (template/sec numbers) <= 255 )
-
-    !!!NOTE!!! for simplicity, these templates assume that most monsters
-    capable of casting more powerful summonings can also cast Abjuration.
 
     Template Format:
 
-        {  WHICH TEMPLATE,
+        {  
              bolt spell,
              enchantment,
              self-enchantment,          // 50% tried after others fail
@@ -24,781 +20,960 @@
              emergency spell            // only when fleeing
         }
 
-    see: mon-util::mons_spell_list() and
-         monstuff::handle_spell() for usage details.
-
 ********************************************************************* */
 
 
     {  MST_ORC_WIZARD_I,
+      {
        SPELL_MAGIC_DART,
        SPELL_SLOW,
        SPELL_HASTE,
        SPELL_MAGIC_DART,
        SPELL_BLINK,
-       SPELL_BLINK  },
-
+       SPELL_BLINK
+      }
+    },
     {  MST_ORC_WIZARD_II,
+      {
        SPELL_THROW_FLAME,
        SPELL_CONFUSE,
        SPELL_INVISIBILITY,
        SPELL_MAGIC_DART,
        SPELL_NO_SPELL,
-       SPELL_CONFUSE  },
+       SPELL_CONFUSE  }
+    },
 
     {  MST_ORC_WIZARD_III,
+      {
        SPELL_THROW_FROST,
        SPELL_CANTRIP,
        SPELL_HASTE,
        SPELL_THROW_FLAME,
        SPELL_MAGIC_DART,
-       SPELL_INVISIBILITY  },
+       SPELL_INVISIBILITY  }
+    },
 
     {  MST_GUARDIAN_NAGA,
+      {
        SPELL_TELEPORT_OTHER,
        SPELL_TELEPORT_OTHER,
        SPELL_LESSER_HEALING,
        SPELL_VENOM_BOLT,
        SPELL_SLOW,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_LICH_I,
+      {
        SPELL_BOLT_OF_COLD,
        SPELL_PARALYSE,
        SPELL_SUMMON_GREATER_DEMON,
        SPELL_ANIMATE_DEAD,
        SPELL_BOLT_OF_IRON,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_LICH_II,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_CONFUSE,
        SPELL_HASTE,
        SPELL_BOLT_OF_DRAINING,
        SPELL_SUMMON_GREATER_DEMON,
-       SPELL_BANISHMENT  },
+       SPELL_BANISHMENT  }
+    },
 
     {  MST_LICH_III,
+      {
        SPELL_BOLT_OF_DRAINING,
        SPELL_ANIMATE_DEAD,
        SPELL_SUMMON_UNDEAD,
        SPELL_THROW_FROST,
        SPELL_LEHUDIBS_CRYSTAL_SPEAR,
-       SPELL_SUMMON_UNDEAD  },
+       SPELL_SUMMON_UNDEAD  }
+    },
 
     {  MST_LICH_IV,
+      {
        SPELL_ISKENDERUNS_MYSTIC_BLAST,
        SPELL_BOLT_OF_COLD,
        SPELL_INVISIBILITY,
        SPELL_ANIMATE_DEAD,
        SPELL_BOLT_OF_IRON,
-       SPELL_INVISIBILITY  },
+       SPELL_INVISIBILITY  }
+    },
 
     {  MST_BURNING_DEVIL,
+      {
        SPELL_HELLFIRE_BURST,
        SPELL_HELLFIRE_BURST,
        SPELL_NO_SPELL,
        SPELL_HELLFIRE_BURST,
        SPELL_HELLFIRE_BURST,
-       SPELL_HELLFIRE_BURST  },
+       SPELL_HELLFIRE_BURST  }
+    },
 
     {  MST_VAMPIRE,
+      {
        SPELL_VAMPIRE_SUMMON,
        SPELL_CONFUSE,
        SPELL_INVISIBILITY,
        SPELL_NO_SPELL,
        SPELL_VAMPIRE_SUMMON,
-       SPELL_VAMPIRE_SUMMON },
+       SPELL_VAMPIRE_SUMMON }
+    },
 
     {  MST_VAMPIRE_KNIGHT,
+      {
        SPELL_VAMPIRE_SUMMON,
        SPELL_PARALYSE,
        SPELL_HASTE,
        SPELL_INVISIBILITY,
        SPELL_VAMPIRE_SUMMON,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_VAMPIRE_MAGE,
+      {
        SPELL_BOLT_OF_DRAINING,
        SPELL_SUMMON_UNDEAD,
        SPELL_INVISIBILITY,
        SPELL_ANIMATE_DEAD,
        SPELL_ANIMATE_DEAD,
-       SPELL_TELEPORT_SELF },
+       SPELL_TELEPORT_SELF }
+    },
 
     {  MST_EFREET,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_FIREBALL,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_BRAIN_WORM,
+      {
        SPELL_BRAIN_FEED,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_BRAIN_FEED,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_GIANT_ORANGE_BRAIN,
+      {
        SPELL_BRAIN_FEED,
        SPELL_POLYMORPH_OTHER,
        SPELL_SHADOW_CREATURES,
        SPELL_CONFUSE,
        SPELL_BLINK,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_RAKSHASA,
+      {
        SPELL_FAKE_RAKSHASA_SUMMON,
        SPELL_BLINK,
        SPELL_INVISIBILITY,
        SPELL_FAKE_RAKSHASA_SUMMON,
        SPELL_BLINK,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_GREAT_ORB_OF_EYES,
+      {
        SPELL_PARALYSE,
        SPELL_DISINTEGRATE,
        SPELL_NO_SPELL,
        SPELL_SLOW,
        SPELL_CONFUSE,
-       SPELL_TELEPORT_OTHER  },
+       SPELL_TELEPORT_OTHER  }
+    },
 
     {  MST_ORC_SORCERER,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_BOLT_OF_DRAINING,
        SPELL_SUMMON_DEMON,
        SPELL_PARALYSE,
        SPELL_ANIMATE_DEAD,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_STEAM_DRAGON,
+      {
        SPELL_STEAM_BALL,
        SPELL_STEAM_BALL,
        SPELL_NO_SPELL,
        SPELL_STEAM_BALL,
        SPELL_STEAM_BALL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_HELL_KNIGHT_I,
+      {
        SPELL_NO_SPELL,
        SPELL_PAIN,
        SPELL_HASTE,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_HASTE  },
+       SPELL_HASTE  }
+    },
 
     {  MST_HELL_KNIGHT_II,
+      {
        SPELL_NO_SPELL,
        SPELL_BOLT_OF_FIRE,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_BLINK  },
+       SPELL_BLINK  }
+    },
 
     {  MST_NECROMANCER_I,
+      {
        SPELL_BOLT_OF_COLD,
        SPELL_BOLT_OF_DRAINING,
        SPELL_NO_SPELL,
        SPELL_ANIMATE_DEAD,
        SPELL_ANIMATE_DEAD,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_NECROMANCER_II,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_PAIN,
        SPELL_INVISIBILITY,
        SPELL_ANIMATE_DEAD,
        SPELL_ANIMATE_DEAD,
-       SPELL_BLINK  },
+       SPELL_BLINK  }
+    },
 
     {  MST_WIZARD_I,
+      {
        SPELL_MAGIC_DART,
        SPELL_PARALYSE,
        SPELL_HASTE,
        SPELL_LIGHTNING_BOLT,
        SPELL_CONFUSE,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_WIZARD_II,
+      {
        SPELL_VENOM_BOLT,
        SPELL_ISKENDERUNS_MYSTIC_BLAST,
        SPELL_INVISIBILITY,
        SPELL_CONFUSE,
        SPELL_SLOW,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_WIZARD_III,
+      {
        SPELL_PARALYSE,
        SPELL_LEHUDIBS_CRYSTAL_SPEAR,
        SPELL_BLINK,
        SPELL_BOLT_OF_FIRE,
        SPELL_BOLT_OF_COLD,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_WIZARD_IV,
+      {
        SPELL_STONE_ARROW,
        SPELL_STING,
        SPELL_BLINK,
        SPELL_LIGHTNING_BOLT,
        SPELL_BANISHMENT,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_WIZARD_V,
+      {
        SPELL_PARALYSE,
        SPELL_THROW_FLAME,
        SPELL_INVISIBILITY,
        SPELL_TELEPORT_OTHER,
        SPELL_FIREBALL,
-       SPELL_TELEPORT_OTHER  },
+       SPELL_TELEPORT_OTHER  }
+    },
 
     {  MST_ORC_PRIEST,
+      {
        SPELL_PAIN,
        SPELL_NO_SPELL,
        SPELL_CANTRIP,
        SPELL_SMITING,
        SPELL_NO_SPELL,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_ORC_HIGH_PRIEST,
+      {
        SPELL_PAIN,
        SPELL_SUMMON_DEMON,
        SPELL_SUMMON_DEMON,
        SPELL_SMITING,
        SPELL_ANIMATE_DEAD,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_MOTTLED_DRAGON,
+      {
        SPELL_STICKY_FLAME,
        SPELL_STICKY_FLAME,
        SPELL_NO_SPELL,
        SPELL_STICKY_FLAME,
        SPELL_STICKY_FLAME,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_ICE_FIEND,
+      {
        SPELL_BOLT_OF_COLD,
        SPELL_BOLT_OF_COLD,
        SPELL_NO_SPELL,
        SPELL_SYMBOL_OF_TORMENT,
        SPELL_NO_SPELL,
-       SPELL_SUMMON_DEMON  },
+       SPELL_SUMMON_DEMON  }
+    },
 
     {  MST_SHADOW_FIEND,
+      {
        SPELL_BOLT_OF_COLD,
        SPELL_BOLT_OF_DRAINING,
        SPELL_NO_SPELL,
        SPELL_SYMBOL_OF_TORMENT,
        SPELL_NO_SPELL,
-       SPELL_SUMMON_DEMON  },
+       SPELL_SUMMON_DEMON  }
+    },
 
     {  MST_TORMENTOR,
+      {
        SPELL_PAIN,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_PAIN,
        SPELL_NO_SPELL,
-       SPELL_SYMBOL_OF_TORMENT  },
+       SPELL_SYMBOL_OF_TORMENT  }
+    },
 
     {  MST_STORM_DRAGON,
+      {
        SPELL_LIGHTNING_BOLT,
        SPELL_LIGHTNING_BOLT,
        SPELL_NO_SPELL,
        SPELL_LIGHTNING_BOLT,
        SPELL_LIGHTNING_BOLT,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_WHITE_IMP,
+      {
        SPELL_THROW_FROST,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_YNOXINUL,
+      {
        SPELL_NO_SPELL,
        SPELL_BOLT_OF_IRON,
        SPELL_SUMMON_UFETUBUS,
        SPELL_NO_SPELL,
        SPELL_SUMMON_UFETUBUS,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_NEQOXEC,
+      {
        SPELL_POLYMORPH_OTHER,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_BRAIN_FEED,
        SPELL_CALL_IMP,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_HELLWING,
+      {
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_TELEPORT_OTHER,
        SPELL_ANIMATE_DEAD,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_SMOKE_DEMON,
+      {
        SPELL_STICKY_FLAME,
        SPELL_STEAM_BALL,
        SPELL_NO_SPELL,
        SPELL_SMITING,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_CACODEMON,
+      {
        SPELL_CALL_IMP,
        SPELL_CALL_IMP,
        SPELL_CALL_IMP,
        SPELL_POLYMORPH_OTHER,
        SPELL_DIG,
-       SPELL_SUMMON_DEMON  },
+       SPELL_SUMMON_DEMON  }
+    },
 
     {  MST_GREEN_DEATH,
+      {
        SPELL_POISON_ARROW,
        SPELL_POISONOUS_CLOUD,
        SPELL_NO_SPELL,
        SPELL_VENOM_BOLT,
        SPELL_CALL_IMP,
-       SPELL_BLINK  },
+       SPELL_BLINK  }
+    },
 
     {  MST_BALRUG,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_FIREBALL,
        SPELL_NO_SPELL,
        SPELL_STICKY_FLAME,
        SPELL_SMITING,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_BLUE_DEATH,
+      {
        SPELL_LIGHTNING_BOLT,
        SPELL_BOLT_OF_COLD,
        SPELL_NO_SPELL,
        SPELL_CALL_IMP,
        SPELL_SHADOW_CREATURES,
-       SPELL_TELEPORT_OTHER  },
+       SPELL_TELEPORT_OTHER  }
+    },
 
     {  MST_GERYON,
+      {
        SPELL_SUMMON_BEAST,
        SPELL_SUMMON_BEAST,
        SPELL_NO_SPELL,
        SPELL_SUMMON_BEAST,
        SPELL_NO_SPELL,
-       SPELL_SUMMON_BEAST  },
+       SPELL_SUMMON_BEAST  }
+    },
 
     {  MST_DISPATER,
+      {
        SPELL_SUMMON_GREATER_DEMON,
        SPELL_BOLT_OF_IRON,
        SPELL_SUMMON_DEMON,
        SPELL_LIGHTNING_BOLT,
        SPELL_HELLFIRE,
-       SPELL_SUMMON_GREATER_DEMON  },
+       SPELL_SUMMON_GREATER_DEMON  }
+    },
 
     {  MST_ASMODEUS,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_HELLFIRE,
        SPELL_SUMMON_DEMON,
        SPELL_SUMMON_GREATER_DEMON,
        SPELL_BOLT_OF_DRAINING,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_ERESHKIGAL,
+      {
        SPELL_BOLT_OF_DRAINING,
        SPELL_BOLT_OF_COLD,
        SPELL_SUMMON_DEMON,
        SPELL_PAIN,
        SPELL_PARALYSE,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_ANTAEUS,
+      {
        SPELL_BOLT_OF_COLD,
        SPELL_LIGHTNING_BOLT,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_MNOLEG,
+      {
        SPELL_SUMMON_DEMON,
        SPELL_SMITING,
        SPELL_INVISIBILITY,
        SPELL_POLYMORPH_OTHER,
        SPELL_SHADOW_CREATURES,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_LOM_LOBON,
+      {
        SPELL_LIGHTNING_BOLT,
        SPELL_BOLT_OF_COLD,
        SPELL_LESSER_HEALING,
        SPELL_SUMMON_DEMON,
        SPELL_TELEPORT_SELF,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_CEREBOV,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_BOLT_OF_IRON,
        SPELL_NO_SPELL,
        SPELL_FIREBALL,
        SPELL_CALL_IMP,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_GLOORX_VLOQ,
+      {
        SPELL_POISON_ARROW,
        SPELL_SLOW,
        SPELL_SUMMON_DEMON,
        SPELL_BOLT_OF_DRAINING,
        SPELL_SUMMON_DEMON,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_TITAN,
+      {
        SPELL_LIGHTNING_BOLT,
        SPELL_NO_SPELL,
        SPELL_LESSER_HEALING,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_GOLDEN_DRAGON,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_BOLT_OF_COLD,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_POISONOUS_CLOUD,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_DEEP_ELF_SUMMONER,
+      {
        SPELL_BLINK,
        SPELL_CALL_IMP,
        SPELL_SUMMON_UFETUBUS,
        SPELL_VAMPIRE_SUMMON,
        SPELL_SUMMON_DEMON,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_DEEP_ELF_CONJURER_I,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_BOLT_OF_COLD,
        SPELL_CANTRIP,
        SPELL_LIGHTNING_BOLT,
        SPELL_STICKY_FLAME,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_DEEP_ELF_CONJURER_II,
+      {
        SPELL_STICKY_FLAME,
        SPELL_ISKENDERUNS_MYSTIC_BLAST,
        SPELL_INVISIBILITY,
        SPELL_STONE_ARROW,
        SPELL_BOLT_OF_DRAINING,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_DEEP_ELF_PRIEST,
+      {
        SPELL_PAIN,
        SPELL_CANTRIP,
        SPELL_LESSER_HEALING,
        SPELL_SMITING,
        SPELL_ANIMATE_DEAD,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_DEEP_ELF_HIGH_PRIEST,
+      {
        SPELL_SUMMON_DEMON,
        SPELL_HELLFIRE_BURST,
        SPELL_LESSER_HEALING,
        SPELL_SMITING,
        SPELL_ANIMATE_DEAD,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_DEEP_ELF_DEMONOLOGIST,
+      {
        SPELL_SUMMON_DEMON,
        SPELL_BANISHMENT,
        SPELL_SUMMON_DEMON,
        SPELL_SUMMON_GREATER_DEMON,
        SPELL_CALL_IMP,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_DEEP_ELF_ANNIHILATOR,
+      {
        SPELL_LIGHTNING_BOLT,
        SPELL_LEHUDIBS_CRYSTAL_SPEAR,
        SPELL_BLINK,
        SPELL_BOLT_OF_IRON,
        SPELL_POISON_ARROW,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_DEEP_ELF_SORCERER,
+      {
        SPELL_BOLT_OF_DRAINING,
        SPELL_BANISHMENT,
        SPELL_HASTE,
        SPELL_SUMMON_DEMON,
        SPELL_HELLFIRE,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_DEEP_ELF_DEATH_MAGE,
+      {
        SPELL_BOLT_OF_DRAINING,
        SPELL_BOLT_OF_DRAINING,
        SPELL_LESSER_HEALING,
        SPELL_ANIMATE_DEAD,
        SPELL_ANIMATE_DEAD,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_KOBOLD_DEMONOLOGIST,
+      {
        SPELL_CALL_IMP,
        SPELL_SUMMON_DEMON,
        SPELL_CANTRIP,
        SPELL_CALL_IMP,
        SPELL_SUMMON_DEMON,
-       SPELL_CANTRIP  },           // this should be cute -- bwr
+       SPELL_CANTRIP  },           // this should be cute -- bw
+         },
 
     {  MST_NAGA,
+      {
        SPELL_POISON_SPLASH,
        SPELL_POISON_SPLASH,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_NAGA_MAGE,
+      {
        SPELL_VENOM_BOLT,
        SPELL_ISKENDERUNS_MYSTIC_BLAST,
        SPELL_HASTE,
        SPELL_POISON_ARROW,
        SPELL_TELEPORT_OTHER,
-       SPELL_TELEPORT_SELF  },
+       SPELL_TELEPORT_SELF  }
+    },
 
     {  MST_CURSE_SKULL,
+      {
        SPELL_SUMMON_UNDEAD,
        SPELL_SUMMON_UNDEAD,
        SPELL_NO_SPELL,
        SPELL_SYMBOL_OF_TORMENT,
        SPELL_SUMMON_UNDEAD,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_SHINING_EYE,
+      {
        SPELL_POLYMORPH_OTHER,
        SPELL_POLYMORPH_OTHER,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_FROST_GIANT,
+      {
        SPELL_BOLT_OF_COLD,
        SPELL_BOLT_OF_COLD,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_ANGEL,
+      {
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_LESSER_HEALING,
        SPELL_NO_SPELL,
        SPELL_LESSER_HEALING,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_DAEVA,
+      {
        SPELL_SMITING,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_SMITING,
        SPELL_SMITING,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_SHADOW_DRAGON,
+      {
        SPELL_BOLT_OF_DRAINING,
        SPELL_BOLT_OF_DRAINING,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_BOLT_OF_DRAINING,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_SPHINX,
+      {
        SPELL_CONFUSE,
        SPELL_PARALYSE,
        SPELL_LESSER_HEALING,
        SPELL_SMITING,
        SPELL_SLOW,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_MUMMY,
+      {
        SPELL_SUMMON_DEMON,
        SPELL_SMITING,
        SPELL_NO_SPELL,
        SPELL_SYMBOL_OF_TORMENT,
        SPELL_SUMMON_UNDEAD,
-       SPELL_SUMMON_UNDEAD },
+       SPELL_SUMMON_UNDEAD }
+    },
 
     {  MST_ELECTRIC_GOLEM,
+      {
        SPELL_LIGHTNING_BOLT,
        SPELL_LIGHTNING_BOLT,
        SPELL_BLINK,
        SPELL_LIGHTNING_BOLT,
        SPELL_LIGHTNING_BOLT,
-       SPELL_BLINK  },
+       SPELL_BLINK  }
+    },
 
     {  MST_ORB_OF_FIRE,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_BOLT_OF_FIRE,
        SPELL_NO_SPELL,
        SPELL_POLYMORPH_OTHER,
        SPELL_FIREBALL,
-       SPELL_FIREBALL  },
+       SPELL_FIREBALL  }
+    },
 
     {  MST_SHADOW_IMP,
+      {
        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),
-       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  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_HELL_HOG,
+      {
        SPELL_STICKY_FLAME,
        SPELL_STICKY_FLAME,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_SWAMP_DRAGON,
+      {
        SPELL_POISONOUS_CLOUD,
        SPELL_POISONOUS_CLOUD,
        SPELL_NO_SPELL,
        SPELL_POISONOUS_CLOUD,
        SPELL_POISONOUS_CLOUD,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_SWAMP_DRAKE,
+      {
        SPELL_MEPHITIC_CLOUD,
        SPELL_MEPHITIC_CLOUD,
        SPELL_NO_SPELL,
        SPELL_MEPHITIC_CLOUD,
        SPELL_MEPHITIC_CLOUD,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_SERPENT_OF_HELL,
+      {
        SPELL_HELLFIRE,
        SPELL_HELLFIRE,
        SPELL_NO_SPELL,
        SPELL_HELLFIRE,
        SPELL_HELLFIRE,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_BOGGART,
+      {
        SPELL_CONFUSE,
        SPELL_SLOW,
        SPELL_INVISIBILITY,
        SPELL_BLINK,
        SPELL_SHADOW_CREATURES,
-       SPELL_SHADOW_CREATURES  },
+       SPELL_SHADOW_CREATURES  }
+    },
 
     {  MST_EYE_OF_DEVASTATION,
+      {
        SPELL_ENERGY_BOLT,
        SPELL_ENERGY_BOLT,
        SPELL_NO_SPELL,
        SPELL_ENERGY_BOLT,
        SPELL_ENERGY_BOLT,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_QUICKSILVER_DRAGON,
+      {
        SPELL_QUICKSILVER_BOLT,
        SPELL_QUICKSILVER_BOLT,
        SPELL_NO_SPELL,
        SPELL_QUICKSILVER_BOLT,
        SPELL_QUICKSILVER_BOLT,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_IRON_DRAGON,
+      {
        SPELL_METAL_SPLINTERS,
        SPELL_METAL_SPLINTERS,
        SPELL_NO_SPELL,
        SPELL_METAL_SPLINTERS,
        SPELL_METAL_SPLINTERS,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_SKELETAL_WARRIOR,
+      {
        SPELL_ANIMATE_DEAD,
        SPELL_NO_SPELL,
        SPELL_ANIMATE_DEAD,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_MYSTIC,
+      {
        SPELL_BRAIN_FEED,
        SPELL_SMITING,
        SPELL_INVISIBILITY,
        SPELL_CONFUSE,
        SPELL_PARALYSE,
-       SPELL_LESSER_HEALING  },
+       SPELL_LESSER_HEALING  }
+    },
 
     {  MST_DEATH_DRAKE,
+      {
        SPELL_MIASMA,
        SPELL_MIASMA,
        SPELL_NO_SPELL,
        SPELL_MIASMA,
        SPELL_MIASMA,
-       SPELL_NO_SPELL  },
+       SPELL_NO_SPELL  }
+    },
 
     {  MST_DRAC_SCORCHER,
+      {
        SPELL_BOLT_OF_FIRE,
        SPELL_STICKY_FLAME,
        SPELL_NO_SPELL,
        SPELL_FIREBALL,
        SPELL_HELLFIRE,
-       SPELL_HELLFIRE_BURST },
+       SPELL_HELLFIRE_BURST }
+    },
 
     {  MST_DRAC_CALLER,
+      {
        SPELL_NO_SPELL,
        SPELL_SUMMON_DRAKES,
        SPELL_SUMMON_DRAKES,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_SUMMON_DRAKES },
+       SPELL_SUMMON_DRAKES }
+    },
 
     {  MST_DRAC_SHIFTER,
+      {
        SPELL_BANISHMENT,
        SPELL_BLINK_OTHER,
        SPELL_BLINK,
        SPELL_NO_SPELL,
        SPELL_BLINK_OTHER,
-       SPELL_CONTROLLED_BLINK },
+       SPELL_CONTROLLED_BLINK }
+    },
 
     // Curse toe menu should be kept full, because otherwise the toe spends
     // too much time crawling around.
     {  MST_CURSE_TOE,
+      {
        SPELL_SUMMON_UNDEAD,
        SPELL_SUMMON_MUSHROOMS, // fungal theme
        SPELL_SUMMON_MUSHROOMS,
        SPELL_SYMBOL_OF_TORMENT,
        SPELL_SUMMON_UNDEAD,
-       SPELL_SYMBOL_OF_TORMENT  },
+       SPELL_SYMBOL_OF_TORMENT  }
+    },
 
     // Crusader theme.
     {  MST_RUPERT,
+      {
        SPELL_PARALYSE,
        SPELL_CONFUSE,
        SPELL_BERSERKER_RAGE,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_BERSERKER_RAGE },
+       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 },
+       SPELL_SUMMON_ICE_BEAST }
+    }
 
 #endif