This ended up being more elaborate than I anticipated. 'Q' will now accept the wielded weapon as a choice of item to quiver. If that item is a stack of more than one, it will offer to split N-1 into the quiver and leave 1 wielded. If the offer is declined, or if there is already just 1, it will require confirmation to move the item from the weapon slot to the quiver slot. The alternate weapon is handled similarly, with different phrasing when in twoweapon combat mode. Just to be crystal clear: a single object cannot be in more than one weapon, alt-weapon, or quiver slot at the same time. 'Q's old behavior of rejecting the wielded weapon was to avoid accidentally becoming empty-handed, not anything to do with multiple worn/wield slots. 'Q' will also accept a count when picking an inventory item, then put 'count'-many into the quiver, leaving N-count in original stack. Except when the chosen item is already in the quiver; it that case, it undoes the stack split and leaves things as they were. (That restriction may not have been necessary but I'm not planning to revisit it....)
99 KiB
99 KiB