Be a bit more forgiving of zapping unidentified wands that your god

dislikes the effects of (e.g. for good gods, unidentified wands of 
draining), and properly handle inadvertent unchivalric attacks.


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

1 files changed, 9 insertions, 4 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 0c8d8c94fc..eeee25e9a4 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1897,12 +1897,17 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
     case DID_POISON:
         if (you.religion == GOD_SHINING_ONE)
         {
-            if (thing_done == DID_UNCHIVALRIC_ATTACK
-                && tso_unchivalric_attack_safe_monster(victim))
+            if (thing_done == DID_UNCHIVALRIC_ATTACK)
             {
-                break;
-            }
+                if (tso_unchivalric_attack_safe_monster(victim))
+                    break;
 
+                if (!known)
+                {
+                    simple_god_message(" did not appreciate that!");
+                    break;
+                }
+            }
             ret = true;
             piety_change = -level;
             penance = level * 2;