diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 21:20:59 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 21:20:59 +0000 |
| commit | 72d421a98654a1d73704397dfd9a4be3177289d0 (patch) | |
| tree | 5a0428dd04f392344d89aa99ee4247413d384de3 /crawl-ref/source/fight.cc | |
| parent | 280d409759be7af8b54366f07ccba17348ea24f9 (diff) | |
| download | crawl-ref-72d421a98654a1d73704397dfd9a4be3177289d0.tar.gz crawl-ref-72d421a98654a1d73704397dfd9a4be3177289d0.zip | |
A bug fix commit! (I didn't do one of these in a while...)
* 2856912: being turned into a pig while berserk complaining about being
"too berserk" when unequipping the weapon
* 2849963: shields working even when melded
* 2845355: melded equipment not being affected by remove curse
* 2836148: disallow toggle_with_I if you've got a spell on 'I'
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10671 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -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 a037b25dec..a4f3c9b3f6 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -197,7 +197,7 @@ int calc_heavy_armour_penalty( bool random_factor ) const bool ur_armed = (you.weapon() != NULL); int heavy_armour = 0; - // heavy armour modifiers for shield borne + // Heavy armour modifiers for shield borne. if (player_wearing_slot(EQ_SHIELD)) { switch (you.shield()->sub_type) @@ -219,7 +219,9 @@ int calc_heavy_armour_penalty( bool random_factor ) { if (you.skills[SK_SHIELDS] < maybe_random2(13, random_factor)) + { heavy_armour += maybe_random2(3, random_factor); + } } } break; |