diff options
| -rw-r--r-- | crawl-ref/source/spells2.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 36483e010f..000d98db84 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1062,9 +1062,10 @@ void drain_life(int pow) hurted = 3 + random2(7) + random2(pow); - hurt_monster(monster, hurted); behaviour_event(monster, ME_WHACK, MHITYOU, you.x_pos, you.y_pos); + hurt_monster(monster, hurted); + hp_gain += hurted; if (monster->hit_points < 1) @@ -1209,7 +1210,7 @@ char burn_freeze(int pow, beam_type flavour) if (hurted) { - behaviour_event(monster, ME_ANNOY, MHITYOU); + behaviour_event(monster, ME_WHACK, MHITYOU); if (mons_friendly(monster)) did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster); diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index e597c7acae..9063d93df2 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -212,7 +212,7 @@ int cast_smiting(int power, dist &beam) mprf("You smite %s!", monster->name(DESC_NOCAP_THE).c_str()); - behaviour_event(monster, ME_ANNOY, MHITYOU); + 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) @@ -276,7 +276,7 @@ int airstrike(int power, dist &beam) hurted = 0; else { - behaviour_event(monster, ME_ANNOY, MHITYOU); + behaviour_event(monster, ME_WHACK, MHITYOU); hurt_monster(monster, hurted); @@ -291,8 +291,6 @@ 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, you.x_pos, you.y_pos); - if (monster->hit_points < 1) monster_die(monster, KILL_YOU, 0); else |