Merge branch 'demonspawn-enemies'

With the forest dispersal work done, and with everything working up to
the original designer's standards, this is ready for trunk.

Conflicts:
	crawl-ref/source/beam.cc
	crawl-ref/source/dat/des/branches/pan.des
	crawl-ref/source/enum.h
	crawl-ref/source/hiscores.cc
	crawl-ref/source/melee_attack.cc
	crawl-ref/source/mgen_enum.h
	crawl-ref/source/mon-cast.cc
	crawl-ref/source/mon-data.h
	crawl-ref/source/mon-ench.cc
	crawl-ref/source/mon-info.cc
	crawl-ref/source/mon-info.h
	crawl-ref/source/mon-place.cc
	crawl-ref/source/mon-spll.h
	crawl-ref/source/mon-stuff.cc
	crawl-ref/source/mon-util.cc
	crawl-ref/source/mutation.cc
	crawl-ref/source/output.cc
	crawl-ref/source/player.cc
	crawl-ref/source/spl-data.h
	crawl-ref/source/status.cc
	crawl-ref/source/wiz-you.cc

1 files changed, 66 insertions, 0 deletions

diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 0d00e728e2..7c28d216f8 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -2344,4 +2344,70 @@
        SPELL_NO_SPELL
       }
     },
+
+    {  MST_WORLDBINDER,
+      {
+       SPELL_FORCEFUL_INVITATION,
+       SPELL_FORCEFUL_INVITATION,
+       SPELL_NO_SPELL,
+       SPELL_FORCEFUL_INVITATION,
+       SPELL_FORCEFUL_INVITATION,
+       SPELL_NO_SPELL
+      }
+    },
+
+    {  MST_DEMONSPAWN_BLOOD_SAINT,
+      {
+       SPELL_LEGENDARY_DESTRUCTION,
+       SPELL_MELEE,
+       SPELL_EPHEMERAL_INFUSION,
+       SPELL_LEGENDARY_DESTRUCTION,
+       SPELL_MELEE,
+       SPELL_EPHEMERAL_INFUSION
+      }
+    },
+
+    {  MST_DEMONSPAWN_CORRUPTER,
+      {
+       SPELL_PLANEREND,
+       SPELL_CORRUPT_BODY,
+       SPELL_NO_SPELL,
+       SPELL_PLANEREND,
+       SPELL_CORRUPT_BODY,
+       SPELL_NO_SPELL
+      }
+    },
+
+    {  MST_DEMONSPAWN_CHAOS_CHAMPION,
+      {
+       SPELL_REARRANGE_PIECES,
+       SPELL_CHAOTIC_MIRROR,
+       SPELL_NO_SPELL,
+       SPELL_REARRANGE_PIECES,
+       SPELL_CHAOTIC_MIRROR,
+       SPELL_NO_SPELL
+      }
+    },
+
+    {  MST_DEMONSPAWN_BLACK_SUN,
+      {
+       SPELL_BOLT_OF_DRAINING,
+       SPELL_MALIGN_OFFERING,
+       SPELL_BLACK_MARK,
+       SPELL_BLACK_MARK,
+       SPELL_DISPEL_UNDEAD,
+       SPELL_DEATHS_DOOR
+      }
+    },
+
+    {  MST_DEMONSPAWN_WARMONGER,
+      {
+       SPELL_MELEE, // heh
+       SPELL_SAP_MAGIC,
+       SPELL_GRAND_AVATAR,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL
+      }
+    },
 #endif