summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mstuff2.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/mstuff2.cc')
-rw-r--r--crawl-ref/source/mstuff2.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index bef3fa7ddd..bd118219df 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -2210,7 +2210,9 @@ bool orange_statue_effects(monsters *mons)
bool orc_battle_cry(monsters *chief)
{
const actor *foe = chief->get_foe();
- if (foe && !silenced(chief->x, chief->y)
+ if (foe
+ && (foe != &you || !mons_friendly(chief))
+ && !silenced(chief->x, chief->y)
&& chief->can_see(foe)
&& coinflip())
{
@@ -2234,7 +2236,7 @@ bool orc_battle_cry(monsters *chief)
if (ench.ench == ENCH_NONE || ench.degree < level)
{
const int dur =
- random_range(9, 15) * speed_to_duration(mons->speed);
+ random_range(12, 20) * speed_to_duration(mons->speed);
if (ench.ench != ENCH_NONE)
{