diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:07:35 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:07:35 +0000 |
| commit | 6bf5bb925649736d9d313011523bdb429c225970 (patch) | |
| tree | c874f9c4aa50725e1d48d7dbb624370e3823e8f2 /crawl-ref/source/beam.cc | |
| parent | ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7 (diff) | |
| download | crawl-ref-6bf5bb925649736d9d313011523bdb429c225970.tar.gz crawl-ref-6bf5bb925649736d9d313011523bdb429c225970.zip | |
Apply r6700 and r6706: Cleansing Flame harming helpless monsters and
angering TSO, !blood counting towards decks of summoning.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6710 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 69614f6cc0..5c1f024c4e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2264,9 +2264,13 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted, break; case BEAM_HOLY: // flame of cleansing + // Cleansing flame doesn't hurt holy monsters or monsters your + // god wouldn't like to be hurt. if (mons_is_holy(monster) - || (is_good_god(you.religion) - && (is_follower(monster) || mons_neutral(monster)))) + || you.religion == GOD_SHINING_ONE + && is_unchivalric_attack(&you, monster, monster) + || is_good_god(you.religion) + && (is_follower(monster) || mons_neutral(monster))) { hurted = 0; } |