Fix [2594209]: Make sure Elyvilonites can only pacify monsters using

Elyvilon's healing invocations.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9064 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 4 deletions

diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index c807b6445c..b9f2928f53 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -755,16 +755,20 @@ static int _healing_spell(int healed, bool divine_ability,
         else
             print_wounds(monster);
 
-        if (you.religion == GOD_ELYVILON && !_mons_hostile(monster))
+        if (divine_ability
+            && you.religion == GOD_ELYVILON
+            && !_mons_hostile(monster))
         {
-            simple_god_message(" appreciates the healing "
-                               "of a fellow creature.");
+            simple_god_message(" appreciates your healing of a fellow "
+                               "creature.");
             if (one_chance_in(8))
                 gain_piety(1);
         }
     }
 
-    if (you.religion == GOD_ELYVILON && _mons_hostile(monster))
+    if (divine_ability
+        && you.religion == GOD_ELYVILON
+        && _mons_hostile(monster))
     {
         did_something = true;
         simple_god_message(" supports your offer of peace.");