From: nethack.rankin <nethack.rankin>
Date: Fri, 31 Jan 2003 06:41:56 +0000 (+0000)
Subject: fix U242 - bug with monks
X-Git-Tag: MOVE2GIT~2214
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02d784f039cfd38087543fe8c8251f5f099b0098;p=nethack

fix U242 - bug with monks

     Monks get a big penalty to hit when wearing a suit; otherwise they
get a bonus when not wielding a weapon.  But as reported, that lets them
have their martial arts bonus even while wearing a shield which does seem
rather unexpected.  This change makes them only get their to-hit bonus
while shieldless as well as weaponless.  Impact on play balance is likely
to be quite small; late game characters hardly ever miss due to high luck
bonus and very early game ones won't have found a shield yet.

     Shouldn't the "your armor is cumbersome" message be ``if (verbose)''?
---

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 79edb4e0c..9cce23ed1 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -368,6 +368,7 @@ include rocks as likely candidates for quivering if alternate weapon is a sling
 Asmodeus fails an is_armed() check, so code in m_initweap() to give him wands 
 	of fire and cold never got called; move the code to m_initinv()
 #rub would wield the target tool even when already being worn as eyewear
+monks lose their to-hit bonus for bare-handed attacking if wearing a shield
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/uhitm.c b/src/uhitm.c
index 97d142943..3824654f4 100644
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -268,8 +268,9 @@ register struct monst *mtmp;
 	    if (uarm) {
 		Your("armor is rather cumbersome...");
 		tmp -= urole.spelarmr;
-	    } else if (!uwep)
+	    } else if (!uwep && !uarms) {
 		tmp += (u.ulevel / 3) + 2;
+	    }
 	}
 
 /*	with a lot of luggage, your agility diminishes */