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/fight.cc | |
| 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/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 5b6a56b6b2..6a579ff73f 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4187,8 +4187,7 @@ int melee_attack::mons_calc_damage(const mon_attack_def &attk) damage += 1 + random2(attk.damage); // Berserk/mighted/frenzied monsters get bonus damage. - if (attacker_as_monster()->has_ench(ENCH_BERSERK) - || attacker_as_monster()->has_ench(ENCH_MIGHT)) + if (attacker_as_monster()->has_ench(ENCH_MIGHT)) damage = damage * 3 / 2; else if (attacker_as_monster()->has_ench(ENCH_BATTLE_FRENZY)) { |