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, 3 insertions, 2 deletions

diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index f2480f9445..e77664d47c 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -857,7 +857,7 @@ void tutorial_healing_reminder()
             learned_something_new(TUT_NEED_POISON_HEALING);
     }
     else if (Options.tut_seen_invisible > 0
-             && you.num_turns < Options.tut_seen_invisible + 20)
+             && you.num_turns - Options.tut_seen_invisible <= 20)
     {
         // If we recently encountered an invisible monster, we need a
         // special message.
@@ -2434,7 +2434,8 @@ void tutorial_describe_item(const item_def &item)
                         "<w>d</w>rop menu. On a related note, offering several "
                         "corpses on a floor square is facilitated by using the "
                         "<w>c</w>hop prompt where <w>c</w> is a valid synonym "
-                        "for <w>y</w>es.";
+                        "for <w>y</w>es, or directly chopping <w>a</w>ll "
+                        "corpses.";
             }
 #endif
             Options.tutorial_events[TUT_SEEN_CARRION] = 0;