Adjust the neutrality check again: it now requires a piety greater than

160.  Also, fix it so that it actually works properly, as 160 isn't a 
piety breakpoint (oops).


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

1 files changed, 13 insertions, 4 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index b5ecc698d8..2006c22d04 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1811,10 +1811,19 @@ void gain_piety(int pgn)
         you.redraw_armour_class = true;
     }    
 
-    if ( you.piety > 160 && old_piety <= 160 &&
-         (you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU)
-          && you.num_gifts[you.religion] == 0 )
-        simple_god_message( " will now bless your weapon at an altar...once.");
+    if (you.piety > 160 && old_piety <= 160)
+    {
+        // When you gain piety of more than 160, you get another chance
+        // to make hostile holy beings neutral.
+        if (is_good_god(you.religion))
+            holy_beings_reconvert();
+
+        if ((you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU)
+            && you.num_gifts[you.religion] == 0)
+        {
+            simple_god_message( " will now bless your weapon at an altar...once.");
+        }
+    }
 
     do_god_gift(false);
 }