diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-02-24 14:09:06 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-02-24 14:09:06 +0000 |
| commit | c5f83d2896c317b5dc34e010f4e3fcea3dd195b5 (patch) | |
| tree | 38d19ee0c953efe00e797ff88d1363cddae1450c /crawl-ref/source/fight.cc | |
| parent | 8674d7ae28e958983128c045fb8504b037785da7 (diff) | |
| download | crawl-ref-c5f83d2896c317b5dc34e010f4e3fcea3dd195b5.tar.gz crawl-ref-c5f83d2896c317b5dc34e010f4e3fcea3dd195b5.zip | |
We're not quite ready for engulfing monsters yet, changed AT_ENGULF to AT_HIT.
Corrected command-line summary of the -macro option.
Player aux unarmed was reusing the primary attack damage, fixed.
Ghosts and pandemonium demons were getting 4 attacks where they should get only 1, fixed.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@960 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 10 |
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() |