summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index e455918b62..308de48246 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -757,8 +757,10 @@ bool melee_attack::player_apply_aux_unarmed()
if (aux_damage < 1)
aux_damage = 0;
else
- hurt_monster(def, damage_done);
+ hurt_monster(def, aux_damage);
+ damage_done = aux_damage;
+
if (damage_done > 0)
{
player_exercise_combat_skills();
@@ -804,12 +806,10 @@ std::string melee_attack::debug_damage_number()
std::string melee_attack::special_attack_punctuation()
{
- if (special_damage < 3)
+ if (special_damage < 6)
return ".";
- else if (special_damage < 7)
- return "!";
else
- return "!!";
+ return "!";
}
std::string melee_attack::attack_strength_punctuation()