Merge remote-tracking branch 'origin/NetHack-3.6.0'

This commit is contained in:
keni
2016-07-04 20:17:43 -04:00
25 changed files with 358 additions and 134 deletions

View File

@@ -570,9 +570,23 @@ Figure 2
Go in that direction until you hit a wall or run into something.
.lp m[yuhjklbn]
Prefix: move without picking up objects or fighting (even if you remember
a monster there)
a monster there).
.lp ""
A few non-movement commands use the `m' prefix to request operating
via menu (to temporarily override the
.op menustyle:Traditional
option).
Primarily useful for `,' (pickup) when there is only one class of
objects present (where there won't be any ``what kinds of objects?'' prompt,
so no opportunity to answer `m' at that prompt).
.lp ""
A few other commands (eat food, offer sacrifice, apply tinning-kit) use
the `m' prefix to skip checking for applicable objects on the floor
and go straight to checking inventory,
or (for ``#loot'' to remove a saddle),
skip containers and go straight to adjacent monsters.
.lp F[yuhjklbn]
Prefix: fight a monster (even if you only guess one is there)
Prefix: fight a monster (even if you only guess one is there).
.lp M[yuhjklbn]
Prefix: move far, no pickup.
.lp "g[yuhjklbn]
@@ -640,6 +654,11 @@ D%u - drop only unpaid food.
Kick something (usually a door).
.lp e
Eat food.
.lp ""
Normally checks for edible item(s) on the floor, then if none are found
or none are chosen, checks for edible item(s) in inventory.
Precede `e' with the `m' prefix to bypass attempting to eat
anything off the floor.
.\" Make sure Elbereth is not hyphenated below, the exact spelling matters
.hw Elbereth
.lp E
@@ -928,6 +947,8 @@ Kick something.
.lp #loot
Loot a box or bag on the floor beneath you, or the saddle
from a steed standing next to you.
Precede with the `m' prefix to skip containers at your location
and go directly to removing a saddle.
.lp #monster
Use a monster's special ability (when polymorphed into monster form).
.lp #name
@@ -1286,13 +1307,21 @@ have the right equipment and skill. Convincing a wild beast to let
you saddle it up is difficult to say the least. Many a dungeoneer
has had to resort to magic and wizardry in order to forge the alliance.
Once you do have the beast under your control however, you can
easily climb in and out of the saddle with the `#ride' command. Lead
easily climb in and out of the saddle with the ``#ride'' command. Lead
the beast around the dungeon when riding, in the same manner as
you would move yourself. It is the beast that you will see displayed
on the map.
.pg
Riding skill is managed by the `#enhance' command. See the section
Riding skill is managed by the ``#enhance'' command. See the section
on Weapon proficiency for more information about that.
.pg
Use the `a' (apply) command and pick a saddle in your inventory to
attempt to put that saddle on an adjacent creature. If successful,
it will be transferred to that creature's inventory.
.pg
Use the ``#loot'' command while adjacent to a saddled creature to
try to remove the saddle from that creature. If successful, it will
be transferred to your inventory.
.hn 2
Bones levels
.pg

View File

@@ -690,10 +690,24 @@ Go in that direction until you hit a wall or run into something.
%.lp
\item[\tb{m[yuhjklbn]}]
Prefix: move without picking up objects or fighting (even if you remember
a monster there)
a monster there).\\
%.lp ""
A few non-movement commands use the `{\tt m}' prefix to request operating
via menu (to temporarily override the
{\it menustyle:Traditional\/}
option).
Primarily useful for `{\tt ,}' (pickup) when there is only one class of
objects present (where there won't be any ``what kinds of objects?'' prompt,
so no opportunity to answer `{\tt m}' at that prompt).\\
%.lp ""
A few other commands (eat food, offer sacrifice, apply tinning-kit) 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),
skip containers and go straight to adjacent monsters.
%.lp
\item[\tb{F[yuhjklbn]}]
Prefix: fight a monster (even if you only guess one is there)
Prefix: fight a monster (even if you only guess one is there).
%.lp
\item[\tb{M[yuhjklbn]}]
Prefix: Move far, no pickup.
@@ -775,7 +789,12 @@ the bless\-ed/\-un\-curs\-ed/\-curs\-ed groups may be typed.\\
Kick something (usually a door).
%.lp
\item[\tb{e}]
Eat food.
Eat food.\\
%.lp ""
Normally checks for edible item(s) on the floor, then if none are found
or none are chosen, checks for edible item(s) in inventory.
Precede `{\tt e}' with the `{\tt m}' prefix to bypass attempting to eat
anything off the floor.
%.lp
% Make sure Elbereth is not hyphenated below, the exact spelling matters.
% (Only specified here to parallel Guidebook.mn; use of \tt font implicity
@@ -1119,6 +1138,8 @@ Kick something.
\item[\tb{\#loot}]
Loot a box or bag on the floor beneath you, or the saddle
from a steed standing next to you.
Precede with the `{\tt m}' prefix to skip containers at your location
and go directly to removing a saddle.
%.lp
\item[\tb{\#monster}]
Use a monster's special ability (when polymorphed into monster form).
@@ -1574,15 +1595,25 @@ have the right equipment and skill. Convincing a wild beast to let
you saddle it up is difficult to say the least. Many a dungeoneer
has had to resort to magic and wizardry in order to forge the alliance.
Once you do have the beast under your control however, you can
easily climb in and out of the saddle with the `{\tt \#ride}' command. Lead
easily climb in and out of the saddle with the ``{\tt \#ride}'' command. Lead
the beast around the dungeon when riding, in the same manner as
you would move yourself. It is the beast that you will see displayed
on the map.
%.pg
Riding skill is managed by the `{\tt \#enhance}' command. See the section
Riding skill is managed by the ``{\tt \#enhance}'' command. See the section
on Weapon proficiency for more information about that.
%.pg
Use the `{\tt a}' (apply) command and pick a saddle in your inventory to
attempt to put that saddle on an adjacent creature. If successful,
it will be transferred to that creature's inventory.
%.pg
Use the ``{\tt \#loot}'' command while adjacent to a saddled creature to
try to remove the saddle from that creature. If successful, it will
be transferred to your inventory.
%.hn 2
\subsection*{Bones levels}

View File

@@ -302,6 +302,16 @@ conduct: wishing for an artifact and not getting it because it already exists
avoid ring of poison resistance as starting equipment for orcish wizard
gelatinous cube shouldn't be able to eat a scroll of scare monster
make fireballs or cones of cold cast a skilled or higher not go through walls
prevent flying monsters from hovering over unreachable underwater objects
lembas wafer gives increased nutrition to elves, reduced nutrition to orcs;
cram ration gives increase nutrition to dwarves
when #tip's terse object drop format got interrupted by a regular message,
it continued using "obj2, obj3, ..." for subsequent objects, where
the sentence grammar no longer made sense (the interrupting message
still follows the comma of a partial sentence--attempting to fix that
seems hopeless; leaving it is better than always using verbose format)
for #tip inside shop, credit was incorrectly given for spilled gold if that
gold's stale location coordinates didn't happen to be inside the shop
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
@@ -322,6 +332,7 @@ when picking a destination for #jump, '$' to show valid dest. is more accurate
Platform- and/or Interface-Specific Fixes
-----------------------------------------
tiles: wrinkled spellbook had a spurious brown pixel on far right edge of tile
tty: M-N gave "Unknown command 'M-" with "'." finishing the sentence on the
line below it, leaving bogus '.' displayed on the top row of the map
tty: specifying all four of role, race, gender, and alignment still prompted
@@ -337,6 +348,8 @@ tty: if color is disabled and use_inverse is enabled, display lava in inverse
tty: if "--More--" was written to leftmost column (beginning of second line)
while hero was swallowed, cursor would end up in wrong place (at end
of status line instead back on map) after message line was cleared
tty: long message lines which wrap when shown on the top line might be
re-displayed incorrectly by ^P for msg_window={full,combo,reverse}
unix/X11: in top level Makefile, some commented out definitions of VARDATND
misspelled pilemark.xbm (as pilemark.xpm)
unix: options file with CR+LF line ends and an invalid option line resulted in
@@ -365,6 +378,7 @@ X11: support pre-selected entries in menu windows
X11: make the extended command menu be easier to use and look a little nicer
X11: make the getline text entry widget display a bigger text entry area
X11: color didn't work when the map was displayed as text rather than tiles
X11: use grayscale monster tiles for statues
General New Features