summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-07 19:43:47 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-07 19:43:47 +0000
commitd53b2d5bb77a4cf9a7ba054556a20022dd46c110 (patch)
tree93b011d174244ae7922f4a4dbaefe1d931e0495c /crawl-ref/source/spells3.cc
parenta4bc53ca7167c06fd165cbf9a09d000c9f19c2cb (diff)
downloadcrawl-ref-d53b2d5bb77a4cf9a7ba054556a20022dd46c110.tar.gz
crawl-ref-d53b2d5bb77a4cf9a7ba054556a20022dd46c110.zip
Make sure casting Smite or Airstrike on holy beings will trigger the
"attack holy" conduct. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4104 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
-rw-r--r--crawl-ref/source/spells3.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 074a064c70..6ceb3fb857 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -219,6 +219,9 @@ int cast_smiting(int power, dist &beam)
else if (mons_neutral(monster))
did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
+ 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)
@@ -275,6 +278,9 @@ int airstrike(int power, dist &beam)
else if (mons_neutral(monster))
did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
+ 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)