diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-07 19:30:36 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-07 19:30:36 +0000 |
| commit | a4bc53ca7167c06fd165cbf9a09d000c9f19c2cb (patch) | |
| tree | 04921c25d05be84284fcfe5856500e9af14fb6ac /crawl-ref/source/spells2.cc | |
| parent | 423211fbca07241d7c628986d8075f4dccc5de36 (diff) | |
| download | crawl-ref-a4bc53ca7167c06fd165cbf9a09d000c9f19c2cb.tar.gz crawl-ref-a4bc53ca7167c06fd165cbf9a09d000c9f19c2cb.zip | |
Replace the conduct for killing a neutral monster with a conduct for
attacking a neutral monster.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4102 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index fa0cd9c2d8..6e621ed17e 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1166,7 +1166,7 @@ char burn_freeze(int pow, beam_type flavour) : "______", monster->name(DESC_NOCAP_THE).c_str()); - int hurted = roll_dice( 1, 3 + pow / 3 ); + int hurted = roll_dice( 1, 3 + pow / 3 ); bolt beam; @@ -1179,7 +1179,9 @@ char burn_freeze(int pow, beam_type flavour) { if (mons_friendly( monster )) did_god_conduct( DID_ATTACK_FRIEND, 5, true, monster ); - + else if (mons_neutral( monster )) + did_god_conduct( DID_ATTACK_NEUTRAL, 5, true, monster ); + if (mons_holiness( monster ) == MH_HOLY) did_god_conduct( DID_ATTACK_HOLY, monster->hit_dice ); } |