diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2013-10-20 16:35:07 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2013-10-20 19:55:34 +0100 |
| commit | 61870f32c3dda2b2f95b2cc5262115dad8a92eda (patch) | |
| tree | c5b0a19f93d825e4f39f4ed4f325b057b33da965 /crawl-ref/source/attitude-change.cc | |
| parent | f298866b7268d42eb5047781f741cd8431b50312 (diff) | |
| download | crawl-ref-61870f32c3dda2b2f95b2cc5262115dad8a92eda.tar.gz crawl-ref-61870f32c3dda2b2f95b2cc5262115dad8a92eda.zip | |
Always turn slimes neutral for Jiyva worshippers when they enter LOS
Waking them up if necessary.
Diffstat (limited to 'crawl-ref/source/attitude-change.cc')
| -rw-r--r-- | crawl-ref/source/attitude-change.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index 48a83e0cbc..20f5c7d673 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -109,9 +109,7 @@ void slime_convert(monster* mons) && !mons->is_shapeshifter() && !mons->neutral() && !mons->friendly() - && !testbits(mons->flags, MF_ATT_CHANGE_ATTEMPT) - && you.visible_to(mons) && !mons->asleep() - && !mons_is_confused(mons) && !mons->paralysed()) + && !testbits(mons->flags, MF_ATT_CHANGE_ATTEMPT)) { mons->flags |= MF_ATT_CHANGE_ATTEMPT; if (!player_under_penance()) @@ -463,6 +461,8 @@ static void _jiyva_convert_slime(monster* slime) { ASSERT(mons_is_slime(slime)); + behaviour_event(slime, ME_ALERT); + if (you.can_see(slime)) { if (mons_genus(slime->type) == MONS_GIANT_EYEBALL) |