diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-17 17:26:46 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-17 17:26:46 +0000 |
| commit | 4cb403f3211066a2c2e131e824ed50f9a83d9c4a (patch) | |
| tree | 11fed7ea793ea5ffc06d74f085da37fc8c3eba6f /crawl-ref/source/fight.cc | |
| parent | 7e4d7e95e692aa3fa32430cd9ddaece5ad96e2fa (diff) | |
| download | crawl-ref-4cb403f3211066a2c2e131e824ed50f9a83d9c4a.tar.gz crawl-ref-4cb403f3211066a2c2e131e824ed50f9a83d9c4a.zip | |
* Tweak FAQ as suggested in FR 2472030.
* Fix 2515108: stash tracker not being initialized at game start.
* Fix 2514024: melded armour hindering melee.
* Fix 2512301: =regeneration described as useless for Mummies.
* Fix weapon swap prompt when untransforming with monsters in view.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8503 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 5fd1dd6311..fbeb88e680 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -219,7 +219,7 @@ int calc_heavy_armour_penalty( bool random_factor ) } // Heavy armour modifiers for PARM_EVASION. - if (you.equip[EQ_BODY_ARMOUR] != -1) + if (player_wearing_slot(EQ_BODY_ARMOUR)) { const int ev_pen = property( you.inv[you.equip[EQ_BODY_ARMOUR]], PARM_EVASION ); @@ -233,15 +233,15 @@ int calc_heavy_armour_penalty( bool random_factor ) // ??? what is the reasoning behind this ??? {dlb} // My guess is that its supposed to encourage monk-style play -- bwr - if (!ur_armed) + if (!ur_armed && heavy_armour) { if (random_factor) { heavy_armour *= (coinflip() ? 3 : 2); } - // (2+3)/2 else { + // avg. value: (2+3)/2 heavy_armour *= 5; heavy_armour /= 2; } |