Clean up monster potion handling, fix bug where !oHW healing

also applied !oH healing, make monsters drink !oH when helpful,
disallow potions for some monsters (currently only liches
and mummies, more can be added.)
Fixes 2035734, 2048006.


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

1 files changed, 40 insertions, 0 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index fdb8e576a5..e09bb22bae 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1325,6 +1325,14 @@ enum item_status_flag_type  // per item flags: ie. ident status, cursed status
     ISFLAG_DROPPED_BY_ALLY   = 0x80000000   // Item was dropped by an ally
 };
 
+enum item_type_id_state_type
+{
+    ID_UNKNOWN_TYPE = 0,
+    ID_MON_TRIED_TYPE,
+    ID_TRIED_TYPE,
+    ID_KNOWN_TYPE
+};
+
 enum job_type
 {
     JOB_FIGHTER,                       //    0
@@ -2249,6 +2257,38 @@ enum player_size_type
     PSIZE_PROFILE       // profile only (for stealth checks)
 };
 
+enum potion_type
+{
+    POT_HEALING,                       //    0
+    POT_HEAL_WOUNDS,
+    POT_SPEED,
+    POT_MIGHT,
+    POT_GAIN_STRENGTH,
+    POT_GAIN_DEXTERITY,                //    5
+    POT_GAIN_INTELLIGENCE,
+    POT_LEVITATION,
+    POT_POISON,
+    POT_SLOWING,
+    POT_PARALYSIS,                     //   10
+    POT_CONFUSION,
+    POT_INVISIBILITY,
+    POT_PORRIDGE,
+    POT_DEGENERATION,
+    POT_DECAY,                         //   15
+    POT_WATER,
+    POT_EXPERIENCE,
+    POT_MAGIC,
+    POT_RESTORE_ABILITIES,
+    POT_STRONG_POISON,                 //   20
+    POT_BERSERK_RAGE,
+    POT_CURE_MUTATION,
+    POT_MUTATION,
+    POT_RESISTANCE,
+    POT_BLOOD,                         //   25
+    POT_BLOOD_COAGULATED,
+    NUM_POTIONS                        //   27
+};
+
 enum pronoun_type
 {
     PRONOUN_CAP,                        // 0