* Fix some issues with the new food colourings, and make it respect

  Vampires' drinking habits.

* Allow other channels than MSGCH_TUTORIAL to use formatted strings
  and use it to send a coloured string through the butcher prompt,
  thus visibly setting off dangerous corpses. I'd like normal 
  corpses (no patterns in food_colouring.txt matching) not to be 
  highlighted at all, but they're currently shown in lightgrey, that
  will have to be improved.

* Fix Vampire mutation screen displaying poison resistance wrongly.

* Add a new option force_more_message whose syntax is copied from
  travel_stop_message. Any message containing a regex within this
  listing will enforce a -More- prompt. By default, it's only 
  enabled for "You start to lose your buoyoncy."

* Tweak the messages for Kenku flying to fix 1823833.

* Make Xom be amused at players teleporting in a labyrinth or when
  becoming (Near) Starving while in a labyrinth and with little food
  at their disposal.

Yes, it's one of those "Something for everyone" commits. :D


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

1 files changed, 12 insertions, 4 deletions

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 4b3ca9f252..947937e859 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -2194,8 +2194,18 @@ const std::string menu_colour_item_prefix(const item_def &item)
 
     switch (item.base_type)
     {
+    case OBJ_CORPSES:
+        // Skeletons cannot be eaten.
+        if (item.sub_type == CORPSE_SKELETON)
+        {
+            prefixes.push_back("inedible");
+            break;
+        }
+        // intentional fall-through
     case OBJ_FOOD:
-        if (!can_ingest(item.base_type, item.sub_type, true, true, false)
+        if (item.base_type != OBJ_CORPSES
+               && !can_ingest(item.base_type, item.sub_type, true, true, false)
+            || you.species == SP_VAMPIRE && !mons_has_blood(item.plus)
             || food_is_rotten(item)
                && !player_mutation_level(MUT_SAPROVOROUS))
         {
@@ -2204,9 +2214,7 @@ const std::string menu_colour_item_prefix(const item_def &item)
         else if (is_preferred_food(item))
             prefixes.push_back("preferred");
 
-        // intentional fall-through
-    case OBJ_CORPSES:
-        if (is_poisonous(item) && !player_res_poison())
+        if (is_poisonous(item))
             prefixes.push_back("poisonous");
         else if (is_mutagenic(item))
             prefixes.push_back("mutagenic");