diff options
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index d709287da4..8f83f9570f 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(3, (1 + you.skills[skill] + you.skills[SK_EVOCATIONS])/2); + return (random2(5*(you.skills[skill] + you.skills[SK_EVOCATIONS])/4)); } void melee_attack::emit_nodmg_hit_message() @@ -3399,9 +3399,7 @@ void melee_attack::player_apply_staff_damage() if (!weapon || !item_is_staff(*weapon)) return; - const int staff_cost = 2; - if (you.magic_points < staff_cost - || random2(15) > you.skills[SK_EVOCATIONS]) + if (random2(15) > you.skills[SK_EVOCATIONS]) { return; } @@ -3526,8 +3524,6 @@ 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 ); |