diff options
| author | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 20:54:02 +0000 |
|---|---|---|
| committer | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 20:54:02 +0000 |
| commit | 3ea0d9a50eeaf5092400eb84dfafb50d04ac2cf7 (patch) | |
| tree | 3eda990fa9c853233f8bc005e40638354ba9d70a | |
| parent | 27f833f02cc66e11e1faf9ae3b8711c7d5b3cab0 (diff) | |
| download | crawl-ref-3ea0d9a50eeaf5092400eb84dfafb50d04ac2cf7.tar.gz crawl-ref-3ea0d9a50eeaf5092400eb84dfafb50d04ac2cf7.zip | |
Revert the elemental staff special damage to 3d((1+skill+evo)/2) again. Fix a bug that prevented the special damage costing 2 mp per kerpoww. Staff of earth keeps taking monster AC to account.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10374 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/fight.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 2089559086..d709287da4 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3380,7 +3380,7 @@ void melee_attack::player_sustain_passive_damage() int melee_attack::player_staff_damage(int skill) { - return roll_dice(1, 1 + you.skills[skill] + you.skills[SK_EVOCATIONS]); + return roll_dice(3, (1 + you.skills[skill] + you.skills[SK_EVOCATIONS])/2); } void melee_attack::emit_nodmg_hit_message() @@ -3526,6 +3526,8 @@ void melee_attack::player_apply_staff_damage() if (special_damage > 0) { + dec_mp(staff_cost); + if (!item_type_known(*weapon)) { set_ident_flags( *weapon, ISFLAG_KNOW_TYPE ); |