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, 1 insertions, 0 deletions

diff --git a/crawl-ref/source/attack.h b/crawl-ref/source/attack.h
index f12dbe8b1c..d29800e4e4 100644
--- a/crawl-ref/source/attack.h
+++ b/crawl-ref/source/attack.h
@@ -126,6 +126,7 @@ protected:
     std::string debug_damage_number();
     std::string special_attack_punctuation();
     std::string attack_strength_punctuation();
+    std::string get_exclams(int dmg);
     std::string evasion_margin_adverb();
 
     std::string atk_name(description_level_type desc);