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/hiscores.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/hiscores.cc')
-rw-r--r-- | crawl-ref/source/hiscores.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 6267202d22..a4af6be2b3 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -1629,8 +1629,12 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity) needs_damage = true; break; - case KILLED_BY_XOM: // only used for old Xom kills - desc += terse? "xom" : "Killed for Xom's enjoyment"; + case KILLED_BY_XOM: + if (terse) + desc += "xom"; + else + desc += auxkilldata.empty() ? "Killed for Xom's enjoyment" + : auxkilldata; needs_damage = true; break; @@ -1699,6 +1703,14 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity) desc += terse? "bleeding" : " bled to death"; break; + case KILLED_BY_DIVINE_WRATH: + if (terse) + desc += "divine wrath"; + else + desc += auxkilldata.empty() ? "Divine wrath" : auxkilldata; + needs_damage = true; + break; + default: desc += terse? "program bug" : "Nibbled to death by software bugs"; break; |