diff options
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 4223245ab6..af55054702 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1185,6 +1185,8 @@ enum enchant_type ENCH_SUBMERGED, ENCH_SHORT_LIVED, ENCH_PARALYSIS, // 20 + ENCH_SICK, + ENCH_SLEEPY, // Monster can't wake until this wears off. NUM_ENCHANTMENTS }; @@ -1807,6 +1809,7 @@ enum mons_class_flags M_NO_EXP_GAIN = (1<<31) // worth 0 xp }; +// now saved in an unsigned long. enum mon_resist_flags { MR_NO_FLAGS = 0, @@ -1822,22 +1825,23 @@ enum mon_resist_flags MR_RES_HELLFIRE = (1<< 3), MR_RES_COLD = (1<< 4), MR_RES_ASPHYX = (1<< 5), + MR_RES_ACID = (1<< 6), // vulnerabilities - MR_VUL_ELEC = (1<< 6), - MR_VUL_POISON = (1<< 7), - MR_VUL_FIRE = (1<< 8), - MR_VUL_COLD = (1<< 9), + MR_VUL_ELEC = (1<< 7), + MR_VUL_POISON = (1<< 8), + MR_VUL_FIRE = (1<< 9), + MR_VUL_COLD = (1<<10), // melee armour resists/vulnerabilities // XXX: how to do combos (bludgeon/slice, bludgeon/pierce) - MR_RES_PIERCE = (1<<10), - MR_RES_SLICE = (1<<11), - MR_RES_BLUDGEON = (1<<12), + MR_RES_PIERCE = (1<<11), + MR_RES_SLICE = (1<<12), + MR_RES_BLUDGEON = (1<<13), - MR_VUL_PIERCE = (1<<13), - MR_VUL_SLICE = (1<<14), - MR_VUL_BLUDGEON = (1<<15) + MR_VUL_PIERCE = (1<<14), + MR_VUL_SLICE = (1<<15), + MR_VUL_BLUDGEON = (1<<16) }; enum targ_mode_type |