* Fix Sif Muna occasionally gifting manuals.

* Change innate gourmand eating behaviour to MUT_GOURMAND (innate only).
* Only bother prompting to eat chunks if the player has the gourmand mutation 
  or the carnivorous mutation at level 3, or is wearing an amulet of the
  gourmand or an unidentified amulet.
* Remove gourmand behaviour from Ogres, i.e. only Trolls get the
  mutation.


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

1 files changed, 12 insertions, 0 deletions

diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 40208fcae2..b392fce971 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1508,6 +1508,18 @@ int prompt_eat_chunks()
     if (player_mutation_level(MUT_HERBIVOROUS) == 3)
         return (0);
 
+    // If we *know* player doesn't have the gourmand effect, don't prompt.
+    if (!player_mutation_level(MUT_GOURMAND)
+        && player_mutation_level(MUT_CARNIVOROUS) < 3)
+    {
+        if (!player_wearing_slot(EQ_AMULET))
+            return (0);
+
+        const item_def& amu(you.inv[you.equip[EQ_AMULET]]);
+        if (item_type_known(amu) && amu.sub_type != AMU_THE_GOURMAND)
+            return (0);
+    }
+
     bool found_valid = false;
     std::vector<item_def *> chunks;