diff options
author | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-23 20:27:29 +0000 |
---|---|---|
committer | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-23 20:27:29 +0000 |
commit | 82427799c197fbfc8e78e64fabcddb25fc004e78 (patch) | |
tree | 01e7f81d78513330f2f943dd509c154f432587e8 /crawl-ref | |
parent | 1a8d4c881449acb7024d558d731d297318162f47 (diff) | |
download | crawl-ref-82427799c197fbfc8e78e64fabcddb25fc004e78.tar.gz crawl-ref-82427799c197fbfc8e78e64fabcddb25fc004e78.zip |
Apply r10387 to 0.5: No MP cost for elemental staff special damage. Make the damage roll 1d(1.25*(skill+skill)), which is a sixth less than it used to be and has higher variance.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10389 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-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 7833e06630..7a6fa64142 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(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() @@ -3439,9 +3439,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; } @@ -3566,8 +3564,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 ); |