diff options
| author | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 16:40:46 +0000 |
|---|---|---|
| committer | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 16:40:46 +0000 |
| commit | ecb59b4de1ae34862f133d4b98dd8270d2ec4cf1 (patch) | |
| tree | 3a0ce42df632708198f5ec2e9a3db878b3d6e724 /crawl-ref/source/fight.cc | |
| parent | 50286f06b77aefd2cebc397b3debaa4c09f22549 (diff) | |
| download | crawl-ref-ecb59b4de1ae34862f133d4b98dd8270d2ec4cf1.tar.gz crawl-ref-ecb59b4de1ae34862f133d4b98dd8270d2ec4cf1.zip | |
* Change elemental staff damage from 3d((1 + spell skill + Evocations)/2) to 1d(1 + spell skill + Evocations), reducing the overall damage by a third and increasing the variance.
* Apply monster AC to the special damage from staff of earth.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10369 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -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 4c53fc9b84..2089559086 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3380,8 +3380,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() @@ -3446,8 +3445,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( |