diff options
| author | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 16:59:00 +0000 |
|---|---|---|
| committer | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 16:59:00 +0000 |
| commit | 517b49cc7f25ea06a64a7f75e7f9c5d1154b54cf (patch) | |
| tree | 038125131c409d4d380dff40ea529a65fc1b4e5a /crawl-ref | |
| parent | 4d0033a9b385e5c492bb125dccb7c06f2c918fa3 (diff) | |
| download | crawl-ref-517b49cc7f25ea06a64a7f75e7f9c5d1154b54cf.tar.gz crawl-ref-517b49cc7f25ea06a64a7f75e7f9c5d1154b54cf.zip | |
Apply r10369 to 0.5: Elemental staff damage from 3d((1 + spell skill + evoc)/2) to 1d(1 + spell skill + evoc). Apply monster AC to staff of earth special damage.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10370 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/fight.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index aa320f1f0b..f5d458708c 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3420,8 +3420,7 @@ void melee_attack::player_sustain_passive_damage() int melee_attack::player_staff_damage(int skill) { - return roll_dice(3, - 1 + (you.skills[skill] + you.skills[SK_EVOCATIONS]) / 2); + return roll_dice(1, 1 + you.skills[skill] + you.skills[SK_EVOCATIONS]); } void melee_attack::emit_nodmg_hit_message() @@ -3486,8 +3485,9 @@ void melee_attack::player_apply_staff_damage() case STAFF_EARTH: special_damage = player_staff_damage(SK_EARTH_MAGIC); + special_damage = player_apply_monster_ac(special_damage); - if (special_damage) + if (special_damage > 0) { special_damage_message = make_stringf( |