diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-29 22:59:35 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-29 22:59:35 +0000 |
commit | 63036c9e5ed0103475fea0c6710317f15e8cdb24 (patch) | |
tree | c6e731b631741fc069a6baeb80bf15c58458e9e0 /crawl-ref/source/spl-util.h | |
parent | e744cede0540585248737db8e27a8320e5476955 (diff) | |
download | crawl-ref-63036c9e5ed0103475fea0c6710317f15e8cdb24.tar.gz crawl-ref-63036c9e5ed0103475fea0c6710317f15e8cdb24.zip |
Implemented monster spell miscasts. Spell miscasting is now handled
by the MiscastEffect class, which has helper methods to make most of
the non-helper code agnostic with respect to whether the miscaster is
the player or a monster. Mummy death curses now affect monsters, and
Zot traps now directly affect friendly and good-neutral monsters.
In wizard mode you can force the player or a monster to miscast by
targeting it and pressing 'M'.
Todo/issues/notes:
* Clouds now have a killer_type in addition to a kill_category.
* There aren't any divination monster miscast effects yet.
* Many of the harmless message-only miscast effects are missing
monster messages.
* If a monster actually miscasts a spell (not getting a mummy
death curse or setting off a Zot trap) and this kills both the
monster and the player then the wrong monster will be listed in
hiscore entry. Since monsters can't do true spell miscasts yet, this
can wait.
* There was old, non-functioning code making Zot traps heal, haste or
turn invisible hostile monsters that triggered it. I fixed it and
then commented it out.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6723 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-util.h')
-rw-r--r-- | crawl-ref/source/spl-util.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h index 315e84c697..3734b8d2d4 100644 --- a/crawl-ref/source/spl-util.h +++ b/crawl-ref/source/spl-util.h @@ -66,6 +66,8 @@ void init_spell_descs(void); void init_spell_name_cache(); spell_type spell_by_name(std::string name, bool partial_match = false); +spschool_flag_type school_by_name(std::string name); + int get_spell_slot_by_letter( char letter ); spell_type get_spell_by_letter( char letter ); @@ -95,6 +97,7 @@ int count_bits( unsigned int bits ); const char *spell_title(spell_type which_spell); const char* spelltype_short_name( int which_spelltype ); +const char* spelltype_long_name( int which_spelltype ); typedef int cell_func(coord_def where, int pow, int aux); int apply_area_visible(cell_func cf, int power, @@ -120,9 +123,10 @@ bool spell_direction( dist &spelld, bolt &pbolt, bool cancel_at_self = false ); void apply_area_cloud(int (*func) (int, int, int, int, cloud_type, - kill_category), + kill_category, killer_type), int x, int y, int pow, int number, cloud_type ctype, - kill_category kc, int spread_rate = -1); + kill_category kc, killer_type killer, + int spread_rate = -1); const char *spelltype_name(unsigned int which_spelltype); |