diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-20 15:02:44 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-20 15:02:44 +0000 |
| commit | a0b75696ac03c32a83ef53f7eaf30562abcf7fd8 (patch) | |
| tree | da4ace599ab2b4b83e44b0c361a9454b3a56bad6 | |
| parent | c102112f5aaf9e8102352111f15f4d04fe185383 (diff) | |
| download | crawl-ref-a0b75696ac03c32a83ef53f7eaf30562abcf7fd8.tar.gz crawl-ref-a0b75696ac03c32a83ef53f7eaf30562abcf7fd8.zip | |
Clean up the conversion-on-sight routines a bit more, and, for
consistency, check for *living* holy beings' turning against you.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3747 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 9df1b0f555..4c87480c78 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -752,8 +752,8 @@ static void good_god_follower_attitude_change(monsters *monster) // neutral towards you if (is_good_god(you.religion) && monster->foe == MHITYOU - && !(monster->flags & MF_ATT_CHANGE_ATTEMPT) && mons_is_holy(monster) + && !(monster->flags & MF_ATT_CHANGE_ATTEMPT) && !mons_neutral(monster) && !mons_friendly(monster) && mons_player_visible(monster) && !mons_is_sleeping(monster) @@ -779,6 +779,7 @@ static void good_god_follower_attitude_change(monsters *monster) } } else if (!is_good_god(you.religion) + && monster->alive() && mons_is_holy(monster) && monster->attitude != ATT_HOSTILE && (monster->flags & MF_ATT_CHANGE_ATTEMPT) @@ -809,8 +810,8 @@ void beogh_follower_convert(monsters *monster, bool orc_hit) // for followers of Beogh, decide whether orcs will join you if (you.religion == GOD_BEOGH && monster->foe == MHITYOU - && !(monster->flags & MF_ATT_CHANGE_ATTEMPT) && mons_species(monster->type) == MONS_ORC + && !(monster->flags & MF_ATT_CHANGE_ATTEMPT) && !mons_friendly(monster) && mons_player_visible(monster) && !mons_is_sleeping(monster) && !mons_is_confused(monster) && !mons_is_paralysed(monster)) |