Got rid of setup_dragon(), moving it's functionality into setup_mons_cast() and

mons_spells(), and added the new spells Fire Breath, Cold Breath and Draconian
Breath to trigger that functionality.  Also added the new spell Acid Splash to
replace monstuff's _plant_spit(), and Sticky Flame Splash, which is exactly the
same as Sticky Flame except for the messages it gives and when it makes noise
(monsters now spit sticky flame instead of breathing it).  All things that were
handled as monster special abilities are still handled as such, and were just
changed to manually invoke mons_cast().

The spell messages in dat/database/monspell.txt can now take advantage of a new
substitution, "@target@", which is expanded into the spell's target.

Added the spell flags SPFLAG_INNATE, for monster spells which are innate even
when the monster is a priest or wizard, and which can be used by them when
silenced, and SPFLAG_NOISY, for spells which produce noise even when used by
monsters other than priests or wizards.

Added the monster class flags M_SPELL_NO_SILENT, for monsters which aren't
wizards or priests, yet still can't use spells if silenced (currently only used
for Geryon blowing his horn to summon beasts), and M_NOISY_SPELLS, for monsters
which can cast spells when silenced, yet whose spells make noise when not
silenced (currently only used by curse skulls and Murray).


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

1 files changed, 6 insertions, 6 deletions

diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 84b312ac98..3d9a82bc42 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -354,11 +354,11 @@
 
     {  MST_MOTTLED_DRAGON,
       {
-       SPELL_STICKY_FLAME,
-       SPELL_STICKY_FLAME,
+       SPELL_STICKY_FLAME_SPLASH,
+       SPELL_STICKY_FLAME_SPLASH,
        SPELL_NO_SPELL,
-       SPELL_STICKY_FLAME,
-       SPELL_STICKY_FLAME,
+       SPELL_STICKY_FLAME_SPLASH,
+       SPELL_STICKY_FLAME_SPLASH,
        SPELL_NO_SPELL
       }
     },
@@ -882,8 +882,8 @@
 
     {  MST_HELL_HOG,
       {
-       SPELL_STICKY_FLAME,
-       SPELL_STICKY_FLAME,
+       SPELL_STICKY_FLAME_SPLASH,
+       SPELL_STICKY_FLAME_SPLASH,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,