diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-27 15:31:10 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-27 15:31:10 +0000 |
| commit | f0deecaa9c06ee566a2938991fb33e0f89633f37 (patch) | |
| tree | 6a7ef82d3edc6121114d983241b4f72b662516a7 /crawl-ref/source/fight.cc | |
| parent | 3681a15ca61168627c8aa2efa5334b3749aacafd (diff) | |
| download | crawl-ref-f0deecaa9c06ee566a2938991fb33e0f89633f37.tar.gz crawl-ref-f0deecaa9c06ee566a2938991fb33e0f89633f37.zip | |
[1707320] The game was not reducing damage for quarterstaff + shield, fixed.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1382 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 406078c3b0..6f47554dea 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2425,6 +2425,11 @@ int melee_attack::player_calc_base_weapon_damage() damage = property( *weapon, PWPN_DAMAGE ); } + // Quarterstaves can be wielded with a worn shield, but are much + // less effective. + if (shield && hands_reqd(*weapon, player_size()) == HANDS_TWO) + damage /= 3; + return (damage); } |