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

refine context-sensitive inventory action 'w'

Browse Source 
|w - wield this item in your hands
is "suboptimal" when poly'd into some form which lacks hands.  Don't
offer 'w' as a choice if in a form what can't wield anything, and
substitute "claws" for "hands" when in forms that warrant it.

Include iron ball as a type of item leading to 'w - wield as weapon'
instead of falling through to 'w - wield in hands'.
This commit is contained in:
PatR
2024-05-21 14:27:49 -07:00
parent a1692a8061
commit f634bb863f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/invent.c
+9 -5
View File
@@ -3380,10 +3380,10 @@ itemactions(struct obj *otmp)
/* w: wield, hold in hands, works on everything but with different /* w: wield, hold in hands, works on everything but with different
advice text; not mentioned for things that are already wielded */ advice text; not mentioned for things that are already wielded */
if (otmp == uwep) { if (otmp == uwep || cantwield(gy.youmonst.data)) {
; ; /* either already wielded or can't wield anything; skip 'w' */
} else if (otmp->oclass == WEAPON_CLASS || is_weptool(otmp) } else if (otmp->oclass == WEAPON_CLASS || is_weptool(otmp)
|| is_wet_towel(otmp)) { || is_wet_towel(otmp) || otmp->otyp == HEAVY_IRON_BALL) {
Sprintf(buf, "Wield this %s as your weapon", Sprintf(buf, "Wield this %s as your weapon",
(otmp->quan > 1L) ? "stack" : "item"); (otmp->quan > 1L) ? "stack" : "item");
ia_addmenu(win, IA_WIELD_OBJ, 'w', buf); ia_addmenu(win, IA_WIELD_OBJ, 'w', buf);
@@ -3394,8 +3394,12 @@ itemactions(struct obj *otmp)
/* originally this was using "hold this item in your hands" but /* originally this was using "hold this item in your hands" but
there's no concept of "holding an item", plus it unwields there's no concept of "holding an item", plus it unwields
whatever item you already have wielded so use "wield this item" */ whatever item you already have wielded so use "wield this item" */
Sprintf(buf, "Wield this %s in your hands", Sprintf(buf, "Wield this %s in your %s",
(otmp->quan > 1L) ? "stack" : "item"); (otmp->quan > 1L) ? "stack" : "item",
/* only two-handed weapons and unicorn horns care about
pluralizing "hand" and they won't reach here, but plural
sounds better when poly'd into something with "claw" */
makeplural(body_part(HAND)));
ia_addmenu(win, IA_WIELD_OBJ, 'w', buf); ia_addmenu(win, IA_WIELD_OBJ, 'w', buf);
} }