summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/fight.cc4
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 );