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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-01-22 06:12:18 -05:00
parent 00f2feb83d cd43f4b462
commit cd3f66dcfc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/uhitm.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 uhitm.c $NHDT-Date: 1547846557 2019/01/18 21:22:37 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.200 $ */ /* NetHack 3.6 uhitm.c $NHDT-Date: 1548125661 2019/01/22 02:54:21 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.202 $ */
/* 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. */
@@ -1241,7 +1241,9 @@ int dieroll;
else if (!flags.verbose) else if (!flags.verbose)
You("hit it."); You("hit it.");
else else
You("%s %s%s", Role_if(PM_BARBARIAN) ? "smite" : "hit", You("%s %s%s",
(obj && (is_shield(obj) || obj->otyp == HEAVY_IRON_BALL))
? "bash" : Role_if(PM_BARBARIAN) ? "smite" : "hit",
mon_nam(mon), canseemon(mon) ? exclam(tmp) : "."); mon_nam(mon), canseemon(mon) ? exclam(tmp) : ".");
} }
@@ -2311,7 +2313,8 @@ register struct monst *mon;
originalweapon = (altwep && uswapwep) ? &uswapwep : &uwep; originalweapon = (altwep && uswapwep) ? &uswapwep : &uwep;
if (uswapwep /* set up 'altwep' flag for next iteration */ if (uswapwep /* set up 'altwep' flag for next iteration */
/* only consider seconary when wielding one-handed primary */ /* only consider seconary when wielding one-handed primary */
&& uwep && !bimanual(uwep) && uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep))
&& !bimanual(uwep)
/* only switch if not wearing shield and not at artifact; /* only switch if not wearing shield and not at artifact;
shield limitation is iffy since still get extra swings shield limitation is iffy since still get extra swings
if polyform has them, but it matches twoweap behavior; if polyform has them, but it matches twoweap behavior;