diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/food.cc | 18 | ||||
-rw-r--r-- | crawl-ref/source/mutation.cc | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index a9b8893b0a..5ec6b7bbfb 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -650,11 +650,23 @@ void chunk_nutrition_message(int nutrition) mpr("That was not very filling."); } +static int apply_herbivore_chunk_effects(int nutrition) +{ + int how_herbivorous = you.mutation[MUT_HERBIVOROUS]; + + while (how_herbivorous--) + nutrition = nutrition * 80 / 100; + + return (nutrition); +} + static int chunk_nutrition(bool likes_chunks) { int nutrition = CHUNK_BASE_NUTRITION; + if (likes_chunks || you.hunger_state < HS_SATIATED) - return (nutrition); + return (likes_chunks? nutrition + : apply_herbivore_chunk_effects(nutrition)); const int gourmand = wearing_amulet(AMU_THE_GOURMAND)? @@ -675,7 +687,7 @@ static int chunk_nutrition(bool likes_chunks) epercent); #endif - return (effective_nutrition); + return (apply_herbivore_chunk_effects(effective_nutrition)); } static void say_chunk_flavour(bool likes_chunks) @@ -1082,7 +1094,7 @@ bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg, bool reqid, bool ur_carnivorous = (you.mutation[MUT_CARNIVOROUS] == 3); - bool ur_herbivorous = (you.mutation[MUT_HERBIVOROUS] > 1); + bool ur_herbivorous = (you.mutation[MUT_HERBIVOROUS] == 3); // ur_chunkslover not defined in terms of ur_carnivorous because // a player could be one and not the other IMHO - 13mar2000 {dlb} diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index ed4c8f90b5..9ea39dc6fc 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -104,7 +104,7 @@ const char *mutation_descrip[][3] = { "Your digestive system is specialised to digest meat.", "You are carnivorous."}, - {"You digest meat inefficiently.", "You digest meat inefficiently.", + {"You digest meat inefficiently.", "You digest meat very inefficiently.", "You are primarily a herbivore."}, {"Your flesh is heat resistant.", "Your flesh is very heat resistant.", |