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

inventory item-action: add '-' for uswapwep

Browse Source 
There's no 'w-' or 'Q-' for alternate weapon, but context-sensitive
inventory is starting from the object rather than the command so can
finesse that.  'A' does allow alternate weapon to be directly unset
(aka reset to bare/gloved hands) but is not friendly to being passed
queued input.

This adds an extra internal command which only handles unset uswapwep,
even though that is something which is awfully specialized to get it's
own command.  Users don't see this command so that shouldn't matter.
This commit is contained in:
PatR
2022-04-23 11:58:52 -07:00
parent dce05d487a
commit c2ac36f0c9
4 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/invent.c
View File

@@ -2656,7 +2656,7 @@ itemactions(struct obj *otmp)
/* -: unwield; picking current weapon offers an opportunity for 'w-'
to wield bare/gloved hands; likewise for 'Q-' with quivered item(s) */
if (otmp == uwep || otmp == uquiver) {
if (otmp == uwep || otmp == uswapwep || otmp == uquiver) {
const char *verb = (otmp == uquiver) ? "Quiver" : "Wield",
*action = (otmp == uquiver) ? "un-ready" : "un-wield",
*which = is_plural(otmp) ? "these" : "this",
@@ -2665,8 +2665,6 @@ itemactions(struct obj *otmp)
/*
* TODO: if uwep is ammo, tell player that to shoot instead of toss,
* the corresponding launcher must be wielded;
* TODO too: if otmp is uswapwep, remove it from that slot (possibly
* stopping dual-wielding in the process).
*/
Sprintf(buf, "%s '%c' to %s %s %s",
verb, HANDS_SYM, action, which,
@@ -2942,8 +2940,9 @@ itemactions(struct obj *otmp)
break;
case IA_UNWIELD:
cmdq_add_ec((otmp == uwep) ? dowield
: (otmp == uquiver) ? dowieldquiver
: donull); /* can't happen */
: (otmp == uswapwep) ? remarm_swapwep
: (otmp == uquiver) ? dowieldquiver
: donull); /* can't happen */
cmdq_add_key('-');
break;
case IA_APPLY_OBJ: