diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 16:34:23 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 16:34:23 +0000 |
| commit | 07458d34157d0b88c1ff7aac4f668dc73c952cc3 (patch) | |
| tree | c29f15640ef044820b8d49540fbd17202ce6e80c /crawl-ref/source/spells2.cc | |
| parent | 6fb3fad32735b161cd4a37dde5b66ddcabe1a294 (diff) | |
| download | crawl-ref-07458d34157d0b88c1ff7aac4f668dc73c952cc3.tar.gz crawl-ref-07458d34157d0b88c1ff7aac4f668dc73c952cc3.zip | |
Add more minor cosmetic fixes, and make sure Burn/Freeze always annoys
the monster, for consistency with beams.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5127 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index ca94362bf3..126da2ee42 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1208,21 +1208,18 @@ char burn_freeze(int pow, beam_type flavour) if (flavour != BEAM_MISSILE) hurted = mons_adjust_flavoured(monster, beam, hurted); - if (hurted) - { - behaviour_event(monster, ME_ANNOY, MHITYOU); + behaviour_event(monster, ME_ANNOY, MHITYOU); - if (mons_friendly(monster)) - did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster); - else if (mons_neutral(monster)) - did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster); + if (mons_friendly(monster)) + did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster); + else if (mons_neutral(monster)) + did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster); - if (is_unchivalric_attack(&you, monster, monster)) - did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster); + if (is_unchivalric_attack(&you, monster, monster)) + did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster); - if (mons_is_holy(monster)) - did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice); - } + if (mons_is_holy(monster)) + did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice); if (hurted) { |