diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-19 08:54:13 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-19 12:09:55 -0400 |
| commit | 61e7c1565861f7a89ca6f0554d135d64ec55a6fe (patch) | |
| tree | 5bb02d34013d20e3e95c06b541467729eebf8557 /crawl-ref/source/mon-place.cc | |
| parent | df118164fecb6f63ba9eee7a6a750bee6b4b940f (diff) | |
| download | crawl-ref-61e7c1565861f7a89ca6f0554d135d64ec55a6fe.tar.gz crawl-ref-61e7c1565861f7a89ca6f0554d135d64ec55a6fe.zip | |
Try to reduce duplication in Recite code.
is_chaotic() and is_unclean() have been changed to return an int
roughly equal to what would have been returned before by the Zin
recite function. Some bool flags were added to the function to make
it still work right for the other uses (e.g. silver).
Prince Ribbit is no longer specially vulnerable to Recite, and insane/
sluggish uniques are unclean rather than chaotic, which seems more
consistent with the other uses of the terms.
The special case for nonliving and plant monsters to be unrecitable
is removed.
Diffstat (limited to 'crawl-ref/source/mon-place.cc')
| -rw-r--r-- | crawl-ref/source/mon-place.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc index f3c79d362e..fa54ba7827 100644 --- a/crawl-ref/source/mon-place.cc +++ b/crawl-ref/source/mon-place.cc @@ -3776,9 +3776,9 @@ conduct_type player_will_anger_monster(monster* mon) return DID_HOLY; if (you_worship(GOD_ZIN)) { - if (mon->is_unclean()) + if (mon->unclean()) return DID_UNCLEAN; - if (mon->is_chaotic()) + if (mon->chaos()) return DID_CHAOS; } if (you_worship(GOD_TROG) && mon->is_actual_spellcaster()) |