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/it_use2.cc | |
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/it_use2.cc')
-rw-r--r-- | crawl-ref/source/it_use2.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index ad53a89f49..542e9adbf1 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -38,7 +38,7 @@ #include "religion.h" #include "skills2.h" #include "spells2.h" -#include "spl-cast.h" +#include "spl-mis.h" #include "spl-util.h" #include "stuff.h" #include "tutorial.h" @@ -437,8 +437,8 @@ bool unwield_item(bool showMsgs) case SPWPN_STAFF_OF_WUCAD_MU: item.plus = 0; item.plus2 = 0; - miscast_effect( SPTYP_DIVINATION, 9, 90, 100, - "the Staff of Wucad Mu" ); + MiscastEffect( &you, WIELD_MISCAST, SPTYP_DIVINATION, 9, 90, + "the Staff of Wucad Mu" ); break; default: break; @@ -502,8 +502,8 @@ bool unwield_item(bool showMsgs) // if it's to be allowed as a player spell. -- bwr // int effect = 9 - random2avg( you.skills[SK_TRANSLOCATIONS] * 2, 2 ); - miscast_effect( SPTYP_TRANSLOCATION, 9, 90, 100, - "distortion unwield" ); + MiscastEffect( &you, WIELD_MISCAST, SPTYP_TRANSLOCATION, 9, 90, + "distortion unwield" ); break; // NOTE: When more are added here, *must* duplicate unwielding |