summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/fight.cc5
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);
}