Fix the remaining (known) issues with butchering all corpses in a stash:

* You should now get the "not swapping back" warning also for sac sessions 
  and chained butchery.
* Vampires choosing (a)ll from a "Bottle this corpse?" prompt will only
  attempt to bottle corpses that actually contain blood (so they no longer
  will be autobutchering bloodless corpses in the stash).

Also changed Vampire spell hunger reduction to 
  Thirsty, Very Thirsty: 50%
  Near Starving, Starving: None


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

1 files changed, 5 insertions, 3 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d7c49328c8..f96b3ec1d2 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6017,13 +6017,15 @@ void player::make_hungry(int hunger_increase, bool silent)
 }
 
 // For semi-undead species (Vampire!) reduce food cost for spells and abilities
-// to 75% (hungry), 50% (very hungry), 25% (near starving), or zero (starving).
+// to 50% (hungry, very hungry) or zero (near starving, starving).
 int calc_hunger(int food_cost)
 {
     if (you.is_undead == US_SEMI_UNDEAD && you.hunger_state < HS_SATIATED)
     {
-        food_cost *= you.hunger_state;
-        food_cost /= 4;
+        if (you.hunger_state <= HS_NEAR_STARVING)
+            return 0;
+
+        return (food_cost/2);
     }
     return (food_cost);
 }