Add prayer duration fixes for gods who accept fresh corpses or butchery.

1 files changed, 15 insertions, 10 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index b03e5fd0a2..5b8ae2003b 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2504,22 +2504,27 @@ void pray()
             you.duration[DUR_PRAYER] *= 2;
     }
 
-    if (you.religion == GOD_FEAWN)
+    // Assume for now that gods who like fresh corpses and/or butchery
+    // don't use prayer for anything else.
+    if (you.religion == GOD_ZIN
+        || you.religion == GOD_BEOGH
+        || you.religion == GOD_NEMELEX_XOBEH
+        || you.religion == GOD_JIYVA
+        || god_likes_fresh_corpses(you.religion)
+        || god_likes_butchery(you.religion))
+    {
+        you.duration[DUR_PRAYER] = 1;
+    }
+    else if (you.religion == GOD_ELYVILON || you.religion == GOD_YREDELEMNUL)
+        you.duration[DUR_PRAYER] = 20;
+    else if (you.religion == GOD_FEAWN)
     {
         if (you.duration[DUR_SLOW] < you.duration[DUR_PRAYER])
             slow_player(you.duration[DUR_PRAYER]);
         mprf(MSGCH_GOD, "You feel in touch with plants.");
     }
 
-    if (you.religion == GOD_ZIN || you.religion == GOD_BEOGH
-        || you.religion == GOD_NEMELEX_XOBEH || you.religion == GOD_JIYVA)
-    {
-        you.duration[DUR_PRAYER] = 1;
-    }
-    else if (you.religion == GOD_YREDELEMNUL || you.religion == GOD_ELYVILON)
-        you.duration[DUR_PRAYER] = 20;
-
-    // Gods that like fresh corpses, Beoghites and Nemelexites offer the
+    // Gods who like fresh corpses, Beoghites and Nemelexites offer the
     // items they're standing on.
     if (altar_god == GOD_NO_GOD
         && (god_likes_fresh_corpses(you.religion)