diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-04 11:05:20 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-07 08:49:08 +0200 |
| commit | 55957d0f93dfcd45cba025520c239aa4af70a6c5 (patch) | |
| tree | d2891582af2fc7a82e9f3cc45a42ca3c5eea0fd4 /crawl-ref/source/enum.h | |
| parent | dcbbee03550116ef26720ccabf543efb15b965a6 (diff) | |
| download | crawl-ref-55957d0f93dfcd45cba025520c239aa4af70a6c5.tar.gz crawl-ref-55957d0f93dfcd45cba025520c239aa4af70a6c5.zip | |
Merge monster berserk and might; improve ordering of timeout messages.
ENCH_BERSERK now implies ENCH_MIGHT as with ENCH_HASTE, and ENCH_MIGHT
is responsible for increased damage.
ENCH_HASTE gets a timeout message (monster is no longer moving quickly).
This unsubmerged a lurking bug where sub-enchantments could time out
before or after the master enchantment depending on the ordering
of ench_type. ench_type is reordered to have the master enchantments
come first and appropriate comments are added
Breaks save compatibility.
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 0b93720711..439b1373df 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1256,34 +1256,37 @@ enum duration_type // This list must match the enchant_names array in mon-util.cc or Crawl // will CRASH, we kid you not. +// Enchantments that imply other enchantments should come first +// to avoid timeout message confusion. Currently: +// berserk -> haste, might; fatigue -> slow enum enchant_type { ENCH_NONE = 0, // 0 - ENCH_SLOW, + ENCH_BERSERK, ENCH_HASTE, ENCH_MIGHT, + ENCH_FATIGUE, // Post-berserk fatigue. + ENCH_SLOW, // 5 ENCH_FEAR, - ENCH_CONFUSION, // 5 + ENCH_CONFUSION, ENCH_INVIS, ENCH_POISON, - ENCH_BERSERK, - ENCH_ROT, - ENCH_SUMMON, // 10 + ENCH_ROT, // 10 + ENCH_SUMMON, ENCH_ABJ, ENCH_BACKLIGHT, ENCH_CHARM, - ENCH_STICKY_FLAME, - ENCH_GLOWING_SHAPESHIFTER, // 15 + ENCH_STICKY_FLAME, // 15 + ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER, ENCH_TP, ENCH_SLEEP_WARY, - ENCH_SUBMERGED, - ENCH_SHORT_LIVED, // 20 + ENCH_SUBMERGED, // 20 + ENCH_SHORT_LIVED, ENCH_PARALYSIS, ENCH_SICK, - ENCH_SLEEPY, // Monster can't wake until this wears off. - ENCH_FATIGUE, // Post-berserk fatigue. - ENCH_HELD, // 25 -- Caught in a net. + ENCH_SLEEPY, // Monster can't wake until this wears off. + ENCH_HELD, // 25 -- Caught in a net. ENCH_BATTLE_FRENZY, // Monster is in a battle frenzy ENCH_NEUTRAL, ENCH_PETRIFYING, |