1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 6f47554dea..a1cd6669b7 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2427,8 +2427,12 @@ int melee_attack::player_calc_base_weapon_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;
+    if (shield && weapon->base_type == OBJ_WEAPONS
+        && weapon->sub_type == WPN_QUARTERSTAFF
+        && hands_reqd(*weapon, player_size()) == HANDS_HALF)
+    {
+        damage /= 2;
+    }
 
     return (damage);
 }