From 990084e0bd9bc3863b0a3a75307367ef6c745624 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 19 Jan 2009 07:57:15 +0000 Subject: Make draining beams properly take full negative energy resistance into account. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8583 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 2 +- crawl-ref/source/fight.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 145a7204d6..4c7fd7f5fd 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2209,7 +2209,7 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted, break; case BEAM_NEG: - if (mons_res_negative_energy(monster) > 0) + if (mons_res_negative_energy(monster) == 3) { if (doFlavouredEffects) simple_monster_message(monster, " appears unharmed."); diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 53ee28d25d..662a51f259 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2925,7 +2925,7 @@ bool melee_attack::apply_damage_brand() break; } case SPWPN_PAIN: - if (defender->res_negative_energy() > 0) + if (defender->res_negative_energy()) break; if (x_chance_in_y(attacker->skill(SK_NECROMANCY) + 1, 8)) @@ -3233,7 +3233,7 @@ void melee_attack::player_apply_staff_damage() } case STAFF_DEATH: - if (defender->res_negative_energy() > 0) + if (defender->res_negative_energy()) break; if (x_chance_in_y(you.skills[SK_NECROMANCY] + 1, 8)) -- cgit v1.2.3-54-g00ecf