From 8a76884836d971133fc65427c2ebfadec2d42d96 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Sun, 14 Jan 2007 06:09:22 +0000 Subject: [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 --- crawl-ref/source/spells2.cc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/spells2.cc') 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 @@ -1126,6 +1126,18 @@ char burn_freeze(int pow, char flavour) if (flavour != BEAM_MISSILE) hurted = mons_adjust_flavoured(monster, beam, hurted); + 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); @@ -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) -- cgit v1.2.3-54-g00ecf