From dfe6cae403c98140e69f6edd5f1c72df875b04be Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 14 Feb 2009 17:14:25 +0000 Subject: For now, revert r9064, so that Elyvilonites can use wands of healing again, and refix [2594209], to not allow such wands to pacify un-pacifiable monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9067 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spells1.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/spells1.cc') diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index b9f2928f53..179f4b4224 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -755,9 +755,7 @@ static int _healing_spell(int healed, bool divine_ability, else print_wounds(monster); - if (divine_ability - && you.religion == GOD_ELYVILON - && !_mons_hostile(monster)) + if (you.religion == GOD_ELYVILON && !_mons_hostile(monster)) { simple_god_message(" appreciates your healing of a fellow " "creature."); @@ -766,8 +764,8 @@ static int _healing_spell(int healed, bool divine_ability, } } - if (divine_ability - && you.religion == GOD_ELYVILON + if (you.religion == GOD_ELYVILON + && _can_pacify_monster(monster, healed) && _mons_hostile(monster)) { did_something = true; -- cgit v1.2.3-54-g00ecf