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

tethered aklys description

Browse Source 
Recent object formatting changes for wielded weapon put some pline
arguments in the wrong order.
 a - aklys (weapontethered  in hand)
or worse, when dual-wielding
 a - aklys (wieldedtethered  in right hand)
Change back to
 a - aklys (tethered weapon in hand)
or
 a - aklys (tethered weapon in right hand)

I considered (tethered weapon wielded in right hand) for the two-
weapon case, but I think that's too verbose.
This commit is contained in:
PatR
2020-01-07 04:40:20 -08:00
parent 2d0e7e0578
commit a49dcd1e12
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.55 $ $NHDT-Date: 1578394755 2020/01/07 10:59:15 $
$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.56 $ $NHDT-Date: 1578400811 2020/01/07 12:40:11 $
General Fixes and Modified Features
-----------------------------------
@@ -53,6 +53,7 @@ autounlock with artifact unlocking tool didn't do touch check on that tool
autounlock picked Rogue's artifact key over lock-pick or credit card (or
ordinary key depending upon invent order) even for non-rogues who
would be blasted when touching it
wielded aklys had its "(tethered weapon...)" description scrambled
Platform- and/or Interface-Specific Fixes

11
src/objnam.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 objnam.c $NHDT-Date: 1578394756 2020/01/07 10:59:16 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.281 $ */
/* NetHack 3.7 objnam.c $NHDT-Date: 1578400811 2020/01/07 12:40:11 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.282 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1174,7 +1174,9 @@ unsigned doname_flags;
}
if ((obj->owornmask & W_WEP) && !g.mrg_to_wielded) {
boolean twoweap_primary = (obj == uwep && u.twoweap);
boolean twoweap_primary = (obj == uwep && u.twoweap),
tethered = (obj->otyp == AKLYS);
/* use alternate phrasing for non-weapons and for wielded ammo
(arrows, bolts), or missiles (darts, shuriken, boomerangs)
@@ -1195,8 +1197,9 @@ unsigned doname_flags;
/* note: Sting's glow message, if added, will insert text
in front of "(weapon in hand)"'s closing paren */
Sprintf(eos(bp), " (%s%s in %s%s)",
twoweap_primary ? "wielded" : "weapon",
(obj->otyp == AKLYS) ? "tethered " : "",
tethered ? "tethered " : "", /* aklys */
/* avoid "tethered wielded in right hand" for twoweapon */
(twoweap_primary && !tethered) ? "wielded" : "weapon",
twoweap_primary ? "right " : "", hand_s);
if (g.warn_obj_cnt && obj == uwep