summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/direct.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-08 20:08:53 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-08 20:08:53 +0000
commit95d587c3feda35ad847d676165aa9e9a6c67bfb4 (patch)
treef62bf3770b9958bcd590466184a7386361a27b33 /crawl-ref/source/direct.cc
parent9da9f88dfcd5bbbc28cd41b33bdee86f05183398 (diff)
downloadcrawl-ref-95d587c3feda35ad847d676165aa9e9a6c67bfb4.tar.gz
crawl-ref-95d587c3feda35ad847d676165aa9e9a6c67bfb4.zip
Orc knights and warlords can yell battle-cries to make lesser orcs fight better.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2387 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/direct.cc')
-rw-r--r--crawl-ref/source/direct.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc
index a36b6ffe45..40f16abf09 100644
--- a/crawl-ref/source/direct.cc
+++ b/crawl-ref/source/direct.cc
@@ -1741,8 +1741,11 @@ static std::string describe_mons_enchantment(const monsters &mons,
if (paralysed && (ench.ench == ENCH_SLOW || ench.ench == ENCH_HASTE))
return "";
- if (ench.ench == ENCH_HASTE && mons.has_ench(ENCH_BERSERK))
+ if ((ench.ench == ENCH_HASTE || ench.ench == ENCH_BATTLE_FRENZY)
+ && mons.has_ench(ENCH_BERSERK))
+ {
return "";
+ }
switch (ench.ench)
{
@@ -1758,6 +1761,8 @@ static std::string describe_mons_enchantment(const monsters &mons,
return "moving slowly";
case ENCH_BERSERK:
return "berserk";
+ case ENCH_BATTLE_FRENZY:
+ return "consumed by blood-lust";
case ENCH_HASTE:
return "moving very quickly";
case ENCH_CONFUSION: