diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-17 20:07:05 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-17 20:07:05 +0000 |
| commit | 8b9b77f9c1c5de85523182851329eca2280bf629 (patch) | |
| tree | 97c6be30a2e844eacdbdb884b5db3dda6844d64b /crawl-ref/source/religion.cc | |
| parent | a37bd53efcc5d4991660e1563ff47b59a08d31ce (diff) | |
| download | crawl-ref-8b9b77f9c1c5de85523182851329eca2280bf629.tar.gz crawl-ref-8b9b77f9c1c5de85523182851329eca2280bf629.zip | |
Really fix handling of monsters that TSO doesn't mind your using
unchivalric attacks against. Also, indicate the victim when handling
the stabbing conduct.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5111 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index b3b106ab1c..00cd805673 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1895,10 +1895,14 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known, case DID_UNCHIVALRIC_ATTACK: case DID_POISON: - if (you.religion == GOD_SHINING_ONE - && (thing_done != DID_UNCHIVALRIC_ATTACK - || tso_unchivalric_attack_safe_monster(victim))) + if (you.religion == GOD_SHINING_ONE) { + if (thing_done == DID_UNCHIVALRIC_ATTACK + && tso_unchivalric_attack_safe_monster(victim)) + { + break; + } + ret = true; piety_change = -level; penance = level * 2; |