diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-29 06:09:25 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-29 06:09:25 +0000 |
| commit | 4e484905bc378b2a6a86a17b874a740118d62539 (patch) | |
| tree | 6f69965159fcfa3c6579198ca5e217dd9d16c753 /crawl-ref/source/fight.cc | |
| parent | de335f00ea4b4ccf145dbac9a78d1bb81acb36b3 (diff) | |
| download | crawl-ref-4e484905bc378b2a6a86a17b874a740118d62539.tar.gz crawl-ref-4e484905bc378b2a6a86a17b874a740118d62539.zip | |
Add minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5324 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 7228295e86..952ba93e29 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1961,7 +1961,7 @@ void melee_attack::drain_player() void melee_attack::drain_monster() { - if (defender->res_negative_energy() > 0 || one_chance_in(3)) + if (defender->res_negative_energy() || one_chance_in(3)) return; if (defender_visible) @@ -2226,7 +2226,7 @@ bool melee_attack::apply_damage_brand() } if (defender->holiness() != MH_NATURAL || !weapon - || defender->res_negative_energy() > 0 + || defender->res_negative_energy() || damage_done < 1 || attacker->stat_hp() == attacker->stat_maxhp() || one_chance_in(5)) { @@ -2275,7 +2275,7 @@ bool melee_attack::apply_damage_brand() break; } case SPWPN_PAIN: - if (defender->res_negative_energy() <= 0 + if (defender->res_negative_energy() && random2(8) <= attacker->skill(SK_NECROMANCY)) { if (defender_visible) @@ -2554,7 +2554,7 @@ void melee_attack::player_apply_staff_damage() } case STAFF_DEATH: - if (mons_res_negative_energy(def) > 0) + if (mons_res_negative_energy(def)) break; if (random2(8) <= you.skills[SK_NECROMANCY]) |