diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 16:03:12 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 16:03:12 +0000 |
| commit | 7737a83cf752ab895c89d0a6032881f32344dc6c (patch) | |
| tree | b434bf50429fda7314a40995dceee6a217cf3e55 /crawl-ref/source/spells3.cc | |
| parent | 70889101822801851ed68a29b4a1f48996129a15 (diff) | |
| download | crawl-ref-7737a83cf752ab895c89d0a6032881f32344dc6c.tar.gz crawl-ref-7737a83cf752ab895c89d0a6032881f32344dc6c.zip | |
Revert the previous conduct-related changes, so that attacking friendly
or neutral monsters generates the proper conduct again. The previous
consistency needs to be reimplemented.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5125 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
| -rw-r--r-- | crawl-ref/source/spells3.cc | 8 |
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 |