diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-11 23:53:54 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-11 23:53:54 +0000 |
| commit | e2af2ff4f44c359f1522b1695379bfc437b1bd42 (patch) | |
| tree | 8de57c7095950c20869731aa9c53bbfee412081c /crawl-ref/source/ouch.cc | |
| parent | 5a90add2104dc9a44569f938b84df9f359b399aa (diff) | |
| download | crawl-ref-e2af2ff4f44c359f1522b1695379bfc437b1bd42.tar.gz crawl-ref-e2af2ff4f44c359f1522b1695379bfc437b1bd42.zip | |
Adjust cleansing flame damage. It's now consistent between the player
and monsters; it now damages non-evil and non-unholy monsters (but only
at a 50% rate); and, if you worship a good god, your followers resist
it.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4204 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 082c28923a..b4b4527525 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -241,12 +241,16 @@ int check_your_resists(int hurted, beam_type flavour) break; case BEAM_HOLY: - if (!you.is_undead && you.species != SP_DEMONSPAWN && - !is_evil_god(you.religion)) - { - canned_msg( MSG_YOU_RESIST ); + if (you.is_undead || you.species != SP_DEMONSPAWN) + hurted = (hurted * 3) / 2; + else if (is_good_god(you.religion)) hurted = 0; - } + else if (!is_evil_god(you.religion)) + hurted /= 2; + + if (hurted == 0) + canned_msg(MSG_YOU_RESIST); + break; default: |