Merge branch 'master' into unified_combat_control

Conflicts:
	crawl-ref/source/fight.cc
	crawl-ref/source/mon-stuff.cc
	crawl-ref/source/player-stats.cc

One of the more significant changes resulting from this merge is
that the new minotaur_retaliation which is supposed to have a max
occurrence of once per monster attack round simply has a chance
per monster attack (regardless of whether we're in the same
effective attack round) which increases based on effective_attack_num
which lends to the possibility of multiple retaliations.

1 files changed, 7 insertions, 7 deletions

diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc
index 36651c9421..d55f75c37a 100644
--- a/crawl-ref/source/behold.cc
+++ b/crawl-ref/source/behold.cc
@@ -271,11 +271,11 @@ bool player::possible_beholder(const monster* mon) const
          && !mon->wont_attack() && !mon->pacified()
          && ((mons_genus(mon->type) == MONS_MERMAID
               || mon->has_spell(SPELL_MESMERISE))
-         && !silenced(pos()) && !silenced(mon->pos())
-         && !mon->has_ench(ENCH_MUTE)
-         && !mon->confused()
-         && !mon->asleep() && !mon->cannot_move()
-         && !mon->berserk() && !mons_is_fleeing(mon)
-         && !is_sanctuary(you.pos())
-         || player_equip_unrand(UNRAND_DEMON_AXE)));
+             && !silenced(pos()) && !silenced(mon->pos())
+             && !mon->has_ench(ENCH_MUTE)
+             && !mon->confused()
+             && !mon->asleep() && !mon->cannot_move()
+             && !mon->berserk() && !mons_is_fleeing(mon)
+             && !is_sanctuary(you.pos())
+           || player_equip_unrand(UNRAND_DEMON_AXE)));
 }