Decontaminate all chunks.

"This chunk gives you less nutrition" is not a very interesting effects,
and most of the time the only real effect is that you have to press 'e' a
few more times. If chunks on the whole are too common (which in the
current food environment is very hard to define) monsters in general can
give fewer chunks, or chunks can be less nutritious; no reason to make
some monsters special.

A good deal of code is still around because of the other less-nutrition
case, non-ghoul saprovores eating rotten chunks.

1 files changed, 2 insertions, 5 deletions

diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index aff0748919..b0da39eb36 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -4095,11 +4095,8 @@ bool melee_attack::_player_vampire_draws_blood(const monster* mon, const int dam
         int food_value = 0;
         if (chunk_type == CE_CLEAN)
             food_value = 30 + random2avg(59, 2);
-        else if (chunk_type == CE_CONTAMINATED
-                 || chunk_is_poisonous(chunk_type))
-        {
+        else if (chunk_is_poisonous(chunk_type))
             food_value = 15 + random2avg(29, 2);
-        }
 
         // Bats get rather less nutrition out of it.
         if (you.form == TRAN_BAT)
@@ -4132,6 +4129,6 @@ bool melee_attack::_vamp_wants_blood_from_monster(const monster* mon)
     const corpse_effect_type chunk_type = mons_corpse_effect(mon->type);
 
     // Don't drink poisonous or mutagenic blood.
-    return chunk_type == CE_CLEAN || chunk_type == CE_CONTAMINATED
+    return chunk_type == CE_CLEAN
            || (chunk_is_poisonous(chunk_type) && player_res_poison());
 }