diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 16:38:03 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 16:38:03 +0000 |
| commit | b30c6bb162a1d85a8895250182eb6c175d2e75af (patch) | |
| tree | d3e80f6c1728df569827b51adc63c9890de32034 /crawl-ref/source/spells2.cc | |
| parent | 07458d34157d0b88c1ff7aac4f668dc73c952cc3 (diff) | |
| download | crawl-ref-b30c6bb162a1d85a8895250182eb6c175d2e75af.tar.gz crawl-ref-b30c6bb162a1d85a8895250182eb6c175d2e75af.zip | |
Annoy a monster at the right time when casting Burn/Freeze on it.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5128 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 126da2ee42..3cd7fadc26 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1208,8 +1208,6 @@ char burn_freeze(int pow, beam_type flavour) if (flavour != BEAM_MISSILE) hurted = mons_adjust_flavoured(monster, beam, hurted); - behaviour_event(monster, ME_ANNOY, MHITYOU); - if (mons_friendly(monster)) did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster); else if (mons_neutral(monster)) @@ -1221,6 +1219,8 @@ char burn_freeze(int pow, beam_type flavour) if (mons_is_holy(monster)) did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice); + behaviour_event(monster, ME_ANNOY, MHITYOU); + if (hurted) { hurt_monster(monster, hurted); |