Backport trunk r9951 to 0.5.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9952 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 2 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index c47b0de6d2..1014f0b102 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1086,14 +1086,18 @@ int player_regen()
             rr += 10;
     }
 
-    // Slow heal mutation.  Applied last.
-    // Each level reduces your natural healing by one third.
+    // Slow heal mutation.  Each level reduces your natural healing by
+    // one third.
     if (player_mutation_level(MUT_SLOW_HEALING) > 0)
     {
         rr *= 3 - player_mutation_level(MUT_SLOW_HEALING);
         rr /= 3;
     }
 
+    // Trog's Hand.  This overrides all healing reduction above.
+    if (you.attribute[ATTR_DIVINE_REGENERATION])
+        rr = std::max(100, rr);
+
     return (rr);
 }