Simplify healing rate calculation for vampires, and make vampires'

hunger level affect their stat recovery rate similarly to how it affects 
their healing rate.


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

1 files changed, 9 insertions, 26 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 43c22b9096..0b5d0fa414 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1066,35 +1066,18 @@ int player_regen()
     // The better-fed you are, the faster you heal.
     if (you.species == SP_VAMPIRE)
     {
-        switch (you.hunger_state)
-        {
-        case HS_STARVING:
-            // No regeneration for starving vampires!
+        if (you.hunger_state == HS_STARVING)
+            // No regeneration for starving vampires.
             rr = 0;
-            break;
-
-        case HS_NEAR_STARVING:
-        case HS_VERY_HUNGRY:
-        case HS_HUNGRY:
-            // Halved if hungry.
+        else if (you.hunger_state == HS_ENGORGED)
+            // More bonus regeneration for engorged vampires.
+            rr += 20;
+        else if (you.hunger_state <= HS_HUNGRY)
+            // Halved regeneration for hungry vampires.
             rr /= 2;
-            break;
-
-        case HS_SATIATED:
-            // No effect at standard hunger.
-            break;
-
-        case HS_FULL:
-        case HS_VERY_FULL:
-            // Bonus for being full.
+        else if (you.hunger_state >= HS_FULL)
+            // Bonus regeneration for full vampires.
             rr += 10;
-            break;
-
-        case HS_ENGORGED:
-            // Bigger bonus for being engorged.
-            rr += 20;
-            break;
-        }
     }
 
     // Slow heal mutation.  Applied last.