diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index 52bbde74e..d21cc9652 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1290 $ $NHDT-Date: 1699582923 2023/11/10 02:22:03 $ +$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1294 $ $NHDT-Date: 1699813307 2023/11/12 18:21:47 $ General Fixes and Modified Features ----------------------------------- @@ -1741,6 +1741,7 @@ if recoil from throwing an item while levitating sent hero into a wall of intended destination include '-' as suggested item in "what to dip?" prompt if dipping at pool or fountain or sink with slippery hands +don't attempt a second hit for bare handed/martial arts if wearing a shield Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository diff --git a/src/uhitm.c b/src/uhitm.c index 636a87b70..5180f4084 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 uhitm.c $NHDT-Date: 1685312552 2023/05/28 22:22:32 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.409 $ */ +/* NetHack 3.7 uhitm.c $NHDT-Date: 1699813308 2023/11/12 18:21:48 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.419 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -715,8 +715,8 @@ hitum_cleave( return (target && DEADMONSTER(target)) ? FALSE : TRUE; } -/* returns True if hero is fighting without a weapon and has sufficient - skill in bare-handeded combat or martial arts to attack twice */ +/* returns True if hero is fighting without a weapon and without a shield and + has sufficient skill in bare-handed/martial arts to attack twice */ static boolean double_punch(void) { @@ -733,7 +733,7 @@ double_punch(void) * master (5) : 60% * grandmaster (6) : 80% */ - if (!uwep && skl_lvl > P_BASIC) + if (!uwep && !uarms && skl_lvl > P_BASIC) return (skl_lvl - P_BASIC) > rn2(5); return FALSE; }