diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-01-14 06:09:22 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-01-14 06:09:22 +0000 |
| commit | 8a76884836d971133fc65427c2ebfadec2d42d96 (patch) | |
| tree | d70a99c023cd47373ca17404687444de8779dd26 /crawl-ref/source/spells2.cc | |
| parent | 0f27d16c2da428a8651ce96f154d15f716f81014 (diff) | |
| download | crawl-ref-8a76884836d971133fc65427c2ebfadec2d42d96.tar.gz crawl-ref-8a76884836d971133fc65427c2ebfadec2d42d96.zip | |
[1634209] Freeze will wake and annoy its target.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@847 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index fa0348d4ec..00addb438f 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1128,6 +1128,18 @@ char burn_freeze(int pow, char flavour) if (hurted) { + if (mons_friendly( monster )) + did_god_conduct( DID_ATTACK_FRIEND, 5 ); + + if (mons_holiness( monster ) == MH_HOLY) + did_god_conduct( DID_ATTACK_HOLY, monster->hit_dice ); + } + + if (!mons_friendly(monster) || hurted) + behaviour_event( monster, ME_ANNOY, MHITYOU ); + + if (hurted) + { hurt_monster(monster, hurted); if (monster->hit_points < 1) @@ -1138,8 +1150,11 @@ char burn_freeze(int pow, char flavour) if (flavour == BEAM_COLD) { - if (mons_class_flag( monster->type, M_COLD_BLOOD ) && coinflip()) + if (mons_class_flag( monster->type, M_COLD_BLOOD ) + && coinflip()) + { mons_add_ench(monster, ENCH_SLOW); + } const int cold_res = mons_res_cold( monster ); if (cold_res <= 0) |