diff options
| author | elliptic <hyperelliptical@gmail.com> | 2013-03-14 20:48:09 -0400 |
|---|---|---|
| committer | elliptic <hyperelliptical@gmail.com> | 2013-03-14 20:53:35 -0400 |
| commit | 472dd48ada808e2b997abec98cc008dbb5ac2534 (patch) | |
| tree | 532a9c2fe5ae07733e667151ffd29b43dacc012a /crawl-ref/source/attitude-change.cc | |
| parent | ae5911e10c2764478d59d61e742cadde8d6282e9 (diff) | |
| download | crawl-ref-472dd48ada808e2b997abec98cc008dbb5ac2534.tar.gz crawl-ref-472dd48ada808e2b997abec98cc008dbb5ac2534.zip | |
Don't warn Jiyvaites when attacking slimes that are known shapeshifters.
Since killing shifters in slime form doesn't give penance.
A couple related changes:
* Let Jiyvaites convert summoned slimes (they are still slimes, after all,
just slimes from elsewhere). This means that shapeshifters are really
the only exception (which makes sense since they are not really slimes).
* Don't let Jiyva prayer paralyse shapeshifters in slime form.
Diffstat (limited to 'crawl-ref/source/attitude-change.cc')
| -rw-r--r-- | crawl-ref/source/attitude-change.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index 17449d7ac9..8eeb92d9aa 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -116,7 +116,6 @@ void beogh_follower_convert(monster* mons, bool orc_hit) void slime_convert(monster* mons) { if (you.religion == GOD_JIYVA && mons_is_slime(mons) - && !mons->is_summoned() && !mons->is_shapeshifter() && !mons->neutral() && !mons->friendly() |