diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-02 17:26:51 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-02 17:26:51 +0000 |
| commit | e000d7bfd8e667dfa983ad176c83ac905cfbdca5 (patch) | |
| tree | f54834a638f3767258b6d5b84e6d13d0a109aaa7 /crawl-ref | |
| parent | 7a551ec849db7f38819269458a40ad79f3f587cc (diff) | |
| download | crawl-ref-e000d7bfd8e667dfa983ad176c83ac905cfbdca5.tar.gz crawl-ref-e000d7bfd8e667dfa983ad176c83ac905cfbdca5.zip | |
Apply trunk r7033 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7083 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 9b5cb0d13d..be13374bce 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2568,11 +2568,15 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, switch (you.religion) { case GOD_SHINING_ONE: + case GOD_OKAWARU: + case GOD_MAKHLEB: simple_god_message(" accepts your collateral kill."); ret = true; - // only holy gods care about this, so no XP level deduction - if (random2(level + 10) > 5) + if (random2(level + 10 - (is_good_god(you.religion) ? 0 : + you.experience_level/3)) > 5) + { piety_change = 1; + } break; default: break; |