change 'm #tip' behavior
Using the 'm' prefix with #tip was putting up a menu to pick between one or more floor containers and 'choose from invent', but that interfered with choosing Tip as a context-sensitive item-action for carried container. Change 'm' to behave like it does with #eat and \#quaff and several other commands: skip possible candidates on the floor and go directly to picking something from inventory. That prevents using 'm' to force a menu of |a - <floor container> |i - pick a container being carried for any menustyle when there is one floor container. For menustyles other than traditional, I think that's inconsequential; player needs to answer 'n' for floor container and then get the choose-from-invent prompt instead of 'i' and then choose. When there are two or more containers on hero's spot, 'm' prefix isn't needed to get that menu. Unfortuately using 'm' to override menustyle:Traditional is still a thing players might want to do. Keep the prior behavior for that style when multiple containers are present (dotip() already skipped that menu despite 'm' when there was just one container). Use the new behavior (skip floor containers) when one (or none) is present. That's inconsistent but seems more useful than alternatives. It is relatively unlikely that anyone who uses traditional non-menu item selection will also use newfangled inventory item-actions so the menu isn't likely to interfere with the latter. Update the Guidebook to describe how Traditional differs just in case.
This commit is contained in:
@@ -747,11 +747,12 @@ It can also be used with the `{\tt $\backslash$}' (known, show a
|
||||
list of all discovered objects) and the `{\tt \`{}}' (knownclass,
|
||||
show a list of discovered objects in a particular class) commands to offer
|
||||
a menu of several sorting alternatives (which sets a new value for the
|
||||
{\it sortdiscoveries\/} option).
|
||||
{\it sortdiscoveries\/}
|
||||
option); also for ``{\tt \#vanquished}'' command to offer a sorting menu.
|
||||
\\
|
||||
%.lp ""
|
||||
A few other commands (eat food, offer sacrifice, apply tinning-kit,
|
||||
drink/quaff, dip) use
|
||||
drink/quaff, dip, tip container) use
|
||||
the `{\tt m}' prefix to skip checking for applicable objects on
|
||||
the floor and go straight to checking inventory,
|
||||
or (for ``{\tt \#loot}'' to remove a saddle),
|
||||
@@ -1773,8 +1774,20 @@ Debug mode only.
|
||||
%.lp
|
||||
\item[\tb{\#tip}]
|
||||
Tip over a container (bag or box) to pour out its contents.
|
||||
When there are containers on the floor, the game will prompt to pick one
|
||||
of them or ``tip something being carried''.
|
||||
\\
|
||||
%.lp ""
|
||||
If the latter is chosen, there will be another prompt for which item
|
||||
from inventory to tip.
|
||||
The `{\tt m}' prefix makes the command skip containers on the
|
||||
floor and pick one from inventory, except for the special case of
|
||||
{\it menustyle:Traditional\/}
|
||||
with two or more containers present; that situation will start with the
|
||||
floor container menu.
|
||||
\\
|
||||
%.lp ""
|
||||
Autocompletes. Default key is `{\tt M-T}'.
|
||||
The `{\tt m}' prefix makes the command use a menu.
|
||||
%.lp
|
||||
\item[\tb{\#travel}]
|
||||
Travel to a specific location on the map.
|
||||
|
||||
Reference in New Issue
Block a user