diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-18 22:04:29 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-18 22:04:29 +0000 |
| commit | 9848185528abe4c0afe9a92f4ea99f61e0e276b8 (patch) | |
| tree | 3f3600eb9a644572e7caa3407c3510ed1c81a5fc /crawl-ref/source/fight.cc | |
| parent | 10065258766b5242641e19172f0a0c72863dcad6 (diff) | |
| download | crawl-ref-9848185528abe4c0afe9a92f4ea99f61e0e276b8.tar.gz crawl-ref-9848185528abe4c0afe9a92f4ea99f61e0e276b8.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8558 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 1452c27c11..5df150ac6b 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2050,11 +2050,12 @@ int melee_attack::fire_res_apply_cerebov_downgrade(int res) void melee_attack::drain_defender() { - const int rn = defender->res_negative_energy(); - if (defender->atype() == ACT_MONSTER || one_chance_in(3)) return; + special_damage = 1 + random2(damage_done) + / (2 + defender->res_negative_energy()); + if (defender->drain_exp(attacker)) { if (defender->atype() == ACT_PLAYER) @@ -2062,8 +2063,6 @@ void melee_attack::drain_defender() attacker->god_conduct(DID_NECROMANCY, 2); } - - special_damage = 1 + random2(damage_done) / (2 + rn); } bool melee_attack::distortion_affects_defender() |