[1619461] AotG now needs ~800 turns to charge fully, and the

contaminated->clean effect is proportional to charge.

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

4 files changed, 9 insertions, 7 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 6695a63e00..b2f7bad7bb 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1428,7 +1428,7 @@ static void decrement_durations()
 {
     if (wearing_amulet(AMU_THE_GOURMAND))
     {
-        if (you.duration[DUR_GOURMAND] < GOURMAND_MAX && coinflip())
+        if (you.duration[DUR_GOURMAND] < GOURMAND_MAX && one_chance_in(4))
             you.duration[DUR_GOURMAND]++;
     }
     else
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h
index 6c61ec3ee8..f143a0ec51 100644
--- a/crawl-ref/source/defines.h
+++ b/crawl-ref/source/defines.h
@@ -149,7 +149,7 @@
 
 // Should never exceed 255 - durations are saved as single bytes.
 #define GOURMAND_MAX                    200
-#define GOURMAND_NUTRITION_BASE         20
+#define GOURMAND_NUTRITION_BASE         10
 
 #define CHUNK_BASE_NUTRITION            1000
 
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 0975b9efbc..1514d69379 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2701,7 +2701,7 @@ static std::string describe_jewellery( const item_def &item, bool verbose)
 
         case AMU_THE_GOURMAND:
             description +=
-                "This amulet immediately fully protects its wearer from "
+                "This amulet protects its wearer from "
                 "sickness from eating fresh raw meat and allows them to "
                 "digest it when not hungry, but its effects on the wearer's "
                 "digestion are cumulative over time, and are initially "
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index f124cf3ae4..5d141024b6 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1270,10 +1270,12 @@ static int determine_chunk_effect(int which_chunk_type, bool rotten_chunk)
         }
     }
 
-    // the amulet of the gourmad will permit consumption of rotting meat as
-    // though it were "clean" meat - ghouls can expect the reverse, as they
-    // prize rotten meat ... yum! {dlb}:
-    if (wearing_amulet(AMU_THE_GOURMAND))
+    // the amulet of the gourmad will permit consumption of
+    // contaminated meat as though it were "clean" meat - ghouls get
+    // rotting meat effect from clean chunks, since they love rotting
+    // meat.
+    if (wearing_amulet(AMU_THE_GOURMAND)
+        && random2(GOURMAND_MAX) < you.duration[DUR_GOURMAND])
     {
         if (you.species == SP_GHOUL)
         {