summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/spells3.cc')
-rw-r--r--crawl-ref/source/spells3.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 9063d93df2..3214b7164f 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -212,8 +212,6 @@ int cast_smiting(int power, dist &beam)
mprf("You smite %s!", monster->name(DESC_NOCAP_THE).c_str());
- behaviour_event(monster, ME_WHACK, MHITYOU);
-
// Maxes out at around 40 damage at 27 Invocations, which is plenty
// in my book (the old max damage was around 70, which seems excessive)
hurt_monster(monster, 7 + (random2(power) * 33 / 191));
@@ -229,6 +227,8 @@ int cast_smiting(int power, dist &beam)
if (mons_is_holy(monster))
did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice, true, monster);
+ behaviour_event(monster, ME_ANNOY, MHITYOU);
+
if (monster->hit_points < 1)
monster_die(monster, KILL_YOU, 0);
else
@@ -276,8 +276,6 @@ int airstrike(int power, dist &beam)
hurted = 0;
else
{
- behaviour_event(monster, ME_WHACK, MHITYOU);
-
hurt_monster(monster, hurted);
if (mons_friendly(monster))
@@ -291,6 +289,8 @@ int airstrike(int power, dist &beam)
if (mons_is_holy(monster))
did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice, true, monster);
+ behaviour_event(monster, ME_ANNOY, MHITYOU);
+
if (monster->hit_points < 1)
monster_die(monster, KILL_YOU, 0);
else