diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-18 00:52:30 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-18 00:52:30 +0000 |
| commit | d9a793b72258ceb8f5465161acf8ba743ca26d89 (patch) | |
| tree | a701f49d650bae28e019e511e0ba385a7c27606d /crawl-ref/source/ouch.cc | |
| parent | 6817824379462ee5a1aab8267eb437d2b543504e (diff) | |
| download | crawl-ref-d9a793b72258ceb8f5465161acf8ba743ca26d89.tar.gz crawl-ref-d9a793b72258ceb8f5465161acf8ba743ca26d89.zip | |
Move cleansing flame (BEAM_HOLY) resistance to the actor interface.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8523 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index d746ef8bf9..53c0021c81 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -218,12 +218,13 @@ int check_your_resists(int hurted, beam_type flavour) break; case BEAM_HOLY: - if (is_good_god(you.religion)) + // Cleansing flame. + if (you.res_cleansing_flame() > 0) hurted = 0; - else if (player_is_unholy()) - hurted = (hurted * 3) / 2; - else if (!is_evil_god(you.religion)) + else if (you.res_cleansing_flame() == 0) hurted /= 2; + else if (you.res_cleansing_flame() < -1) + hurted = (hurted * 3) / 2; if (hurted == 0) canned_msg(MSG_YOU_RESIST); |