Add miscellaneous minor fixes.

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

1 files changed, 6 insertions, 1 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index d476560ba6..b95bee3a36 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2508,10 +2508,13 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case GOD_YREDELEMNUL:
         case GOD_MAKHLEB:
         case GOD_LUGONU:
+            if (god_hates_attacking_friend(you.religion, victim))
+                break;
+
             simple_god_message(
                 make_stringf(" accepts your %skill.",
                              thing_done == DID_KILL_HOLY ? "" : "collateral ")
-                            .c_str());
+                             .c_str());
 
             ret = true;
             if (random2(level + 18) > 2)
@@ -2584,7 +2587,9 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
             ret = true;
             if (random2(level + 10 - (is_good_god(you.religion) ? 0 :
                                       you.experience_level/3)) > 5)
+            {
                 piety_change = 1;
+            }
             break;
         default:
             break;