From 5eee0ee90369686245490f09532d6c6e224bab7a Mon Sep 17 00:00:00 2001 From: dshaligram Date: Fri, 15 Aug 2008 17:37:01 +0000 Subject: Trunk->0.4 r6817: Fixed demonspawn getting free protection from torment/draining (jarpiain). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6818 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mon-util.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 3b07256850..737c0ea63d 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2450,7 +2450,12 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell ) // that'll mean monsters can just "know" the player is fully // life-protected if he has triple life protection. const mon_holy_type holiness = foe->holiness(); - return (holiness == MH_UNDEAD || holiness == MH_DEMONIC + return (holiness == MH_UNDEAD + // Demons, but not demonspawn - demonspawn will show + // up as demonic for purposes of things like holy + // wrath, but are still (usually) susceptible to + // torment and draining. + || (holiness == MH_DEMONIC && foe != &you) || holiness == MH_NONLIVING || holiness == MH_PLANT); } -- cgit v1.2.3-54-g00ecf