diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-12 21:30:22 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-12 21:30:22 +0000 |
| commit | 64da77e12fd42c286572c8a94f3d1274fd326364 (patch) | |
| tree | 6b9f1345eb0c63a1aaf95c947fed895b59d59c3d /crawl-ref/source/monstuff.cc | |
| parent | b573bc763f072029021a6a6e67f859df0f856469 (diff) | |
| download | crawl-ref-64da77e12fd42c286572c8a94f3d1274fd326364.tar.gz crawl-ref-64da77e12fd42c286572c8a94f3d1274fd326364.zip | |
Dancing weapons (from Tukima's Dance) shouldn't trigger penance
when defeated. (This can be argued either way, but it does seem
more logical to me this way.) [2145742]
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7228 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 1f0c4d66d7..6868e2c1d1 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1090,7 +1090,10 @@ void monster_die(monsters *monster, killer_type killer, } // No piety loss if god gifts killed by other monsters. - if (mons_friendly(monster) && !mons_is_god_gift(monster)) + // Also, dancing weapons aren't really friendlies. + if (mons_friendly(monster) + && !mons_is_god_gift(monster) + && monster->type != MONS_DANCING_WEAPON) { did_god_conduct(DID_FRIEND_DIED, 1 + (monster->hit_dice / 2), true, monster); |