From 4dc29a1b7f189efd7ae5b097dd68ff4bc6ec9bc0 Mon Sep 17 00:00:00 2001
From: Chris Campbell <chriscampbell89@gmail.com>
Date: Mon, 4 Jul 2016 19:55:50 +0100
Subject: [PATCH] Don't give sickness a chance to cause stat drain

Its main purpose is preventing HP regeneration and it's a rare effect, so just
make it do that one thing.
---
 crawl-ref/source/dat/descript/status.txt |  5 ++---
 crawl-ref/source/enum.h                  |  4 ++++
 crawl-ref/source/timed_effects.cc        | 17 +++--------------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/crawl-ref/source/dat/descript/status.txt b/crawl-ref/source/dat/descript/status.txt
index f0dc2c67837..5206e4211c1 100644
--- a/crawl-ref/source/dat/descript/status.txt
+++ b/crawl-ref/source/dat/descript/status.txt
@@ -212,9 +212,8 @@ without taking damage.
 %%%%
 Sick status
 
-You have been sickened. Your health will no longer regenerate and your
-attributes may be drained temporarily. Sickness can be cured immediately by
-potions of curing.
+You have been sickened, and your health will no longer regenerate. Sickness can
+be cured immediately by potions of curing.
 %%%%
 Vertigo status
 
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index fda887f1708..252c94b2b35 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -5203,9 +5203,13 @@ enum timed_effect_type
 {
     TIMER_CORPSES,
     TIMER_HELL_EFFECTS,
+#if TAG_MAJOR_VERSION == 34
     TIMER_SICKNESS,
+#endif
     TIMER_CONTAM,
+#if TAG_MAJOR_VERSION == 34
     TIMER_DETERIORATION,
+#endif
     TIMER_GOD_EFFECTS,
 #if TAG_MAJOR_VERSION == 34
     TIMER_SCREAM,
diff --git a/crawl-ref/source/timed_effects.cc b/crawl-ref/source/timed_effects.cc
index 7d5251a7b98..536b71ebd1e 100644
--- a/crawl-ref/source/timed_effects.cc
+++ b/crawl-ref/source/timed_effects.cc
@@ -813,19 +813,6 @@ static void _handle_magic_contamination(int /*time_delta*/)
     }
 }
 
-// Adjust the player's stats if diseased.
-static void _handle_sickness(int /*time_delta*/)
-{
-    // If Cheibriados has slowed your biology, disease might
-    // not actually do anything.
-    if (you.disease && one_chance_in(30)
-        && !(have_passive(passive_t::slow_metabolism) && coinflip()))
-    {
-        mprf(MSGCH_WARN, "Your disease is taking its toll.");
-        lose_stat(STAT_RANDOM, 1);
-    }
-}
-
 // Exercise armour *xor* stealth skill: {dlb}
 static void _wait_practice(int /*time_delta*/)
 {
@@ -957,7 +944,9 @@ static struct timed_effect timed_effects[] =
 {
     { rot_floor_items,               200,   200, true  },
     { _hell_effects,                 200,   600, false },
-    { _handle_sickness,              100,   300, false },
+#if TAG_MAJOR_VERSION == 34
+    { nullptr,                         0,     0, false },
+#endif
     { _handle_magic_contamination,   200,   600, false },
 #if TAG_MAJOR_VERSION == 34
     { nullptr,                         0,     0, false },