diff options
| author | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 20:54:38 +0000 |
|---|---|---|
| committer | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 20:54:38 +0000 |
| commit | 6271619f27e575d4e6c73bb6ffc75119a80f7747 (patch) | |
| tree | ecc62ea891bcfad880288eb12c2a8c7b08a0207f /crawl-ref | |
| parent | 3e72fe4d8fe5f221fcf7146e7b06de5b65eaa825 (diff) | |
| download | crawl-ref-6271619f27e575d4e6c73bb6ffc75119a80f7747.tar.gz crawl-ref-6271619f27e575d4e6c73bb6ffc75119a80f7747.zip | |
Commit r10374 to 0.5: 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/branches/stone_soup-0.5@10375 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -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 f5d458708c..7833e06630 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3420,7 +3420,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() @@ -3566,6 +3566,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 ); |