From f0deecaa9c06ee566a2938991fb33e0f89633f37 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 27 Apr 2007 15:31:10 +0000
Subject: [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
---
 crawl-ref/source/fight.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'crawl-ref/source/fight.cc')

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);
 }
 
-- 
cgit v1.2.3-54-g00ecf