diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-15 23:38:49 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-15 23:38:49 +0000 |
| commit | 2687b83ea619355a067a72c5033ee973999ac307 (patch) | |
| tree | 2f8362ef8c258d766b1638f28827ae7ce4df810e /crawl-ref/source/religion.cc | |
| parent | c804a3c5630d5c0e93a1bb34b03733e1805315fa (diff) | |
| download | crawl-ref-2687b83ea619355a067a72c5033ee973999ac307.tar.gz crawl-ref-2687b83ea619355a067a72c5033ee973999ac307.zip | |
Make the logic for servants' killing holy beings match that for your
killing holy beings.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9776 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 35539ecdd9..7a0f3d5cb2 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2747,13 +2747,15 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_ZIN: case GOD_SHINING_ONE: case GOD_ELYVILON: - if (victim->attitude != ATT_HOSTILE - || testbits(victim->flags, MF_CREATED_FRIENDLY) - || testbits(victim->flags, MF_WAS_NEUTRAL)) + if (victim->attitude == ATT_HOSTILE + && !testbits(victim->flags, MF_CREATED_FRIENDLY) + && !testbits(victim->flags, MF_WAS_NEUTRAL)) { - penance = level * 3; - piety_change = -level * 3; + break; } + + penance = level * 3; + piety_change = -level * 3; retval = true; break; @@ -2813,12 +2815,14 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_ZIN: case GOD_SHINING_ONE: case GOD_ELYVILON: - if (testbits(victim->flags, MF_CREATED_FRIENDLY) - || testbits(victim->flags, MF_WAS_NEUTRAL)) + if (!testbits(victim->flags, MF_CREATED_FRIENDLY) + && !testbits(victim->flags, MF_WAS_NEUTRAL)) { - penance = level * 3; - piety_change = -level * 3; + break; } + + penance = level * 3; + piety_change = -level * 3; retval = true; break; |