nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fix for two empty-handed hits

Browse Source 
When using bare-handed combat or martial arts at better than 'basic'
skill, don't attempt a second hit if wearing a shield.
This commit is contained in:
PatR
2023-11-12 10:21:51 -08:00
parent 76d328d86a
commit fcf1a42cac
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes3-7-0.txt
+2 -1
View File
@@ -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 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 intended destination
include '-' as suggested item in "what to dip?" prompt if dipping at pool or include '-' as suggested item in "what to dip?" prompt if dipping at pool or
fountain or sink with slippery hands 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 Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository
src/uhitm.c
+4 -4
View File
@@ -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) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -715,8 +715,8 @@ hitum_cleave(
return (target && DEADMONSTER(target)) ? FALSE : TRUE; return (target && DEADMONSTER(target)) ? FALSE : TRUE;
} }
/* returns True if hero is fighting without a weapon and has sufficient /* returns True if hero is fighting without a weapon and without a shield and
skill in bare-handeded combat or martial arts to attack twice */ has sufficient skill in bare-handed/martial arts to attack twice */
static boolean static boolean
double_punch(void) double_punch(void)
{ {
@@ -733,7 +733,7 @@ double_punch(void)
* master (5) : 60% * master (5) : 60%
* grandmaster (6) : 80% * grandmaster (6) : 80%
*/ */
if (!uwep && skl_lvl > P_BASIC) if (!uwep && !uarms && skl_lvl > P_BASIC)
return (skl_lvl - P_BASIC) > rn2(5); return (skl_lvl - P_BASIC) > rn2(5);
return FALSE; return FALSE;
} }