From 64da77e12fd42c286572c8a94f3d1274fd326364 Mon Sep 17 00:00:00 2001 From: haranp Date: Sun, 12 Oct 2008 21:30:22 +0000 Subject: 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 --- crawl-ref/source/monstuff.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/monstuff.cc') 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); -- cgit v1.2.3-54-g00ecf