summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fearmonger.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2013-07-15 19:20:57 -0600
committerSteve Melenchuk <smelenchuk@gmail.com>2013-07-15 22:41:11 -0600
commit0d004d7d187477d76832a96a5d9997508bad19ff (patch)
treeebf4b839d49ce98e9d58b2dc4af99e2edee0a86d /crawl-ref/source/fearmonger.cc
parente4b7ec4c851d5e1edb719a64312035e6b7a6afdc (diff)
downloadcrawl-ref-0d004d7d187477d76832a96a5d9997508bad19ff.tar.gz
crawl-ref-0d004d7d187477d76832a96a5d9997508bad19ff.zip
Don't equate frenzy with berserk; let non-natural monsters frenzy.
This removes the implicit haste, might, and HP boost associated with frenzy. Frenzying a natural monster also hastes and mights them; frenzying a non-natural monster will simply make them attack nearby monsters indiscriminately without any combat enhancements.
Diffstat (limited to 'crawl-ref/source/fearmonger.cc')
-rw-r--r--crawl-ref/source/fearmonger.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/fearmonger.cc b/crawl-ref/source/fearmonger.cc
index fa08a933b2..d10e9e08a5 100644
--- a/crawl-ref/source/fearmonger.cc
+++ b/crawl-ref/source/fearmonger.cc
@@ -186,6 +186,7 @@ bool player::_possible_fearmonger(const monster* mon) const
&& !mon->submerged() && !mon->confused()
&& !mon->asleep() && !mon->cannot_move()
&& !mon->wont_attack() && !mon->pacified()
- && !mon->berserk() && !mons_is_fleeing(mon)
+ && !mon->berserk_or_insane()
+ && !mons_is_fleeing(mon)
&& !is_sanctuary(pos()));
}