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

track the handedness of the hero

Browse Source 
Don't make either LEFT_HANDED or RIGHT_HANDED be an advantage
or a disadvantage.

use suggested macros
This commit is contained in:
nhmall
2023-12-01 16:11:55 -05:00
parent 8ee8d89814
commit e4e8eea4e8
6 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/objnam.c
View File

@@ -1406,7 +1406,15 @@ doname_base(
tethered ? "tethered " : "", /* aklys */
/* avoid "tethered wielded in right hand" for twoweapon */
(twoweap_primary && !tethered) ? "wielded" : "weapon",
twoweap_primary ? "right " : "", hand_s);
URIGHTY ? "right " : "left ",
/*
(twoweap_primary && URIGHTY)
? "right "
: (twoweap_primary && ULEFTY)
? "left "
: "",
*/
hand_s);
if (!Blind) {
if (gw.warn_obj_cnt && obj == uwep
&& (EWarn_of_mon & W_WEP) != 0L)
@@ -1423,7 +1431,8 @@ doname_base(
}
if (obj->owornmask & W_SWAPWEP) {
if (u.twoweap)
Sprintf(eos(bp), " (wielded in left %s)", body_part(HAND));
Sprintf(eos(bp), " (wielded in %s %s)",
URIGHTY ? "left" : "right", body_part(HAND));
else
/* TODO: rephrase this when obj isn't a weapon or weptool */
Sprintf(eos(bp), " (alternate weapon%s; not wielded)",