Commit Graph

2319 Commits

Author SHA1 Message Date
keni
11f1983253 update .gitattributes files for substitution and copyright headers 2018-04-25 14:52:43 -04:00
nhmall
6623b5b007 Update Guidebook.txt 2018-04-23 21:38:36 -04:00
nhmall
f6496a61f1 Apr23 Guidebook date bump 2018-04-23 21:31:28 -04:00
PatR
79c49eb86d Guidebook...
Refine the recently added short description about how monsters are
displayed on the map.
2018-04-23 16:08:57 -07:00
PatR
e1dd895dc2 fix #H7079 - melting ice destroys lowered dbridge
melt_ice() attempted to handle this but checked for raised drawbridge
instead of lowered one.
2018-04-23 00:39:57 -07:00
PatR
6f16a318a3 Guidebook update: map display of mons and objs
Mostly add a paragraph clarifying the classification of WONTFIX for
a reported bug ('I' unseen monster clobbers remembered object at the
location).  It felt like it needed a parallel paragraph for monsters.
2018-04-22 20:01:14 -07:00
nhmall
21d1e68951 Guidebook.txt update 2018-04-21 17:27:36 -04:00
nhmall
e48600ec87 adjacent pit movement isn't a fall
H7074 1311

> When moving from a pit into an adjacent pit, you "fall into" the pit and take
> damage. This happens even when you are walking back and forth between two pits,
> repeatedly, where you should have no way to fall.
>
> The intent seems to be that you can move into the adjacent pit without having
> to climb out of the first one, and this works properly - the only problem is
> that the pit gets triggered when you ought to have no distance to fall.

This is really just stumbling over uncleared clutter, not a pit fall.
There was already a way to clear the clutter between adjacent pits.
2018-04-21 00:47:59 -04:00
nhmall
58eb1430b1 Guidebook.tex bit
also date bump
2018-04-20 19:00:35 -04:00
PatR
01abfa8c3d yet another Guidebook update
A couple of \e to \\ changes, a whole bunch of ^ to \(ha changes
(similar character but bigger so easier to see), ~ to \(ti (ditto),
and - to \- (first is a hyphen, second is a minus sign which is
bigger; see the difference for "- and | The walls of a room...").

As well as horizontal walls, open doors, top and bottom of swallow
and explode octagons, I changed command line switches -s, -X, and -D
to use minus sign.  I was unsure whether the umpteen M-C should be
changed too.  Since it was less work to leave them as-is, that's
what I did.  I also left ^C with smaller circumflex punctation
instead of changing to bigger circumflex character for same reason.

The [much smaller] Guidebook.tex changes need testing.

Not fixed:
I think the sentence "you can type 'nethack -s all' on most versions"
is very misleading.  Using 'versions' to refer to the various ports
rather than different releases is iffy, but my complaint is that
"typing something" sounds like an action you would perform while in
the game.  Access to a command line and figuring out how to invoke
nethack from there is probably not something where "most versions"
applies any more.  But I don't know how to rephrase that succinctly.
If I did, I would have just changed it....
2018-04-20 00:20:31 -07:00
nhmall
5895c18ab5 sync TeX Guidebook content bit with nroff Guidebook content 2018-04-19 22:27:26 -04:00
nhmall
9539dc40ce more Guidebook
Remove 3.6.0-specific preface.
Bump the date.
2018-04-19 22:10:46 -04:00
keni
98186fca84 Escaping escape characters that escaped previous updates. 2018-04-19 19:37:44 -04:00
Pasi Kallinen
d26fa16e5c Reorder #droptype menu and add some separators 2018-04-19 09:10:06 +03:00
nhmall
3b86b29ce8 extraneous braces 2018-04-16 20:44:45 -04:00
nhmall
b5a623a6d7 fix Guidebook.tex creation
The Guidebook.tex band in it breaks the creation of Guidebook.tex.

    ! Not a letter.
    l.2701 \hyphenation{.
                     nethackrc}
    ?

For these simple one-time situations, just use \mbox{} to prevent
them from hyphenation instead.
2018-04-16 20:35:53 -04:00
nhmall
123dddebb6 Guidebook date bump 2018-04-16 19:55:04 -04:00
PatR
24c62868c4 more Guidebook.mn tweaks
The sample map was being rendered in a proportional-width font for
Guidebook.mn -> Guidebook.ps -> Guidebook.pdf so looked awful.  It
is quite hard to believe that no one ever noticed this.  I wasn't
sure how to force tty font, but it is straightforward to pick
constant-width variant of Roman which seems to be 'roff's universal
font.

Prevent ".nethackrc" from being hyphenated and split across lines.
Ditto for other file names in the same section even though they
hadn't been positioned in spots where they got split.  I put same
thing into Guidebook.tex but I don't know whether their embedded
dots will become a problem there.

Loads of unmatched double quotes were confusing Emacs' nroff-mode
(which unlike tex-mode for Guidebook.tex, wasn't being activated
by default for Guidebook.mn).  Supply missing closing quote for a
bunch of things, convert literal '"' to '\(dq' for ones that aren't
intended to have matching close quote.  And change a bunch of
instances of "text" to ``text'' for rendering as quoted strings.
(There are a lot of single-quoted characters 'c' which should
probably be `c' instead, but I haven't touched those.)

There were several '\e' to render the 'escape' character, but that
is something which can be changed at will.  Use '\\' to explicitly
show backslash instead.  Change several ' - ' and '--' to '\(em'
for M-sized dash.  Right now they all have <space>\(em<space> but
the spaces probably shouldn't be there.

Change instances of 'number_pad' to '.op number_pad' to have it
rendered as an option name.

Remove the obsolete sentence which said that "Elbereth" might be
conditionally excluded.  (This change also made in Guidebook.tex.)

Split some wide lines (wide in the source, not after rendering),
although this wasn't done exhaustively.  For the re-split lines,
put each sentence on its own line as suggested by 'roff' man page.
2018-04-16 16:29:01 -07:00
PatR
0942c1c3c8 more 'roff Guidebook tweaks
Fix the alignment of three short tables which use 'key dash meaning'
so that the dashes line up using Keni's .PS/.PL/.PE macros.  (There
might be others that need this.)

Center the "- - - -" separator which precedes the list of dungeoneers
at the end.  (Thinking about it now, possibly it should be forced to
have zero paragraph indentation prior to centering rather than tacking
on some trailing spaces to shift the non-blank part to the left.  The
title for the table of display symbols might be in the same boat here.
But I'm roff'd out for the time being.)

Try to explain object filtering for commands that can take multiple
object classes combined with multiple BUCX states (and/or 'unpaid').
At the moment it is attached to the 'D' command where it is most
likely to be used, but probably ought to have its own subsection in
the Objects chapter so that it doesn't bog down the command list.

The filtering paragraph ought to be duplicated in Guidebook.tex, but
there's enough quoting going on that I didn't trust myself to attempt
an untested change.
2018-04-16 01:24:23 -07:00
PatR
be8313cc5f doc/Guidebook.mn: UNIX trademark, other tweaks
Instead of modifying tmac.n's '.ux' macro, replace usage of it with
clone '.UX' (inline in Guidebook.mn in order to avoid modifying tmac.n
according to the author's wishes).  '.ux' was used in several places
and neglected in a few others.  Now all "UNIX" references use '.UX'
(unless I missed some...).  Only the first generates a trademark
footnote.  Also only the first adds the (r) superscript for registered
trademark; it would be better if that macro always showed (r) while
continued to show the footnote only once.

I made the mistake of making a bunch of small revisions all at once
and am not going to try to separate them out for separate commit.
I'm not sure they all got reviewed closely; I didn't spot any glaring
errors while scrolling through the formatted file.

The table of display symbols wasn't quoting the backslash used for
thrones so that symbol showed erroneously as blank.  hbeam, vbeam,
lslant, and rslant (used for zap animations) were mislabeled as
"wall".  (drawing.c used to have the same bug but it got fixed about
two years ago.  Guidebook.tex still needs to have this fixed.)

In the section 'using a configuration file', the file name ".nethackrc"
ended up as a hyphenated split across two lines.  That needs to be
fixed; the presence of a dash makes the spelling of the name become
ambiguous.

Several small tables that use <something><space+dash+space><something>
don't line up their dashes correctly.

I replaced most blank lines and also lines which begin with whitespace.
One notable exception is the sample map excerpt.  It seems to format
as intended so I didn't try to tinker with it.
2018-04-15 18:33:41 -07:00
PatR
2b818949b0 Revert "doc/tmac.n: UNIX trademark"
This reverts commit 206f9e43e9.

tmac.n contains a comment asking that modified versions not be
distributed.  So back out the change which updated '.ux' with
the current trademark owner for "UNIX" so that we can continue
distributing with Guidebook.mn.  We'll handle the out of date
trademark issue in another fashion.
2018-04-15 16:41:42 -07:00
keni
662380bf8c fix makedefs.6 formatting errors 2018-04-15 16:12:19 -04:00
PatR
206f9e43e9 doc/tmac.n: UNIX trademark
The 'roff Guidebook's first reference to UNIX includes a footnote with
the trademark notice.  Several subsequent ones do not.  I think that's
ok; I think the '.ux' macro even keeps track and only issues it once.
But the extra ones aren't currently using '.ux' and probably should in
order to get the '(tm)' character.  I'll leave that for someone else....

The history section mentions quite a few trademarked names.  I hope
that the blanket "brand and product names are trademarks or registered
trademarks of their respective holders" is sufficient for them.
2018-04-14 19:21:04 -07:00
nhmall
68b1d0c7ba doc update 2018-04-14 19:01:15 -04:00
nhmall
a972554d7e more Guidebook symbols 2018-04-14 18:46:14 -04:00
nhmall
97a2995c28 spotted a typo in Guidebook.tex 2018-04-14 17:53:37 -04:00
nhmall
7945d517f4 more Guidebook 2018-04-14 17:34:05 -04:00
nhmall
fbb7aaaa63 bump the Guidebook date 2018-04-14 17:30:45 -04:00
nhmall
8acfd6dbef Three apparently didn't require it
Even though they appeared in a document as being "special"
food, fountain, and lava symbol didn't require the quote sequence
2018-04-14 17:08:51 -04:00
nhmall
1c180fd09c TeX characters with special meaning 2018-04-14 17:06:16 -04:00
nhmall
b8ea930e46 fix a heading and table column misalignment in doc/Guidebook.tex 2018-04-14 16:57:48 -04:00
PatR
5086c89658 doc formatting
Remove trailing spaces from doc/fixes36.1 (only a couple),
doc/Guidebook.mn (several), and doc/Guidebook.tex (many).  I re-split
some lines made wider by embedded formatting directives, but tried to
avoid getting carried away with that.

I think I added one missing period to Guidebook.mn and one missing
comma to Guidebook.tex.  Aside from that, they should format the same
as they did before this patch.
2018-04-14 13:13:42 -07:00
PatR
77da2fdc65 tty EDIT_GETLIN fix for wrapped prompt
When a getlin() response is being typed, it wraps to second line if
the cursor tries to go past COLNO-1, but if a previous response is
treated as part of the prompt, using pline() to write prompt+space+text
wraps at a whole word boundary.  tty's getlin() assumes that the screen
position can be derived from that prompt+space+text_so_far but that
doesn't match if wrapping at a word boundary leaves blank space at end
of the top line.

When a prompt is accompanied by default answer, output the answer
separately instead of pretending it is part of the prompt.  Line-wrap
should occur at same point as when it was originally typed and avoid
the confusion about how far to back up when deleting characters.

This hasn't been exhaustively tested but it seems to work correctly
for ordinary input, input erased one character at a time, and input
killed all at once.  One thing which definitely hasn't been tested is
having the prompt itself be so long that it needs to wrap.
2018-04-13 04:32:05 -07:00
PatR
44eed82d41 'm ^V' (aka 'm C-v')
Allow the 'm' prefix for wizard mode level teleport command.  Using
it skips the initial prompt for level destination and goes directly
to the menu of special level locations that you get when answering
'?' to that prompt.
2018-04-09 13:48:43 -07:00
PatR
8710c2c29a minor fix for #annotate
Some github feedback pointed out that getting annotation input from
the player behaved differently from similar input for naming of
monsters and objects.  The complaint stated that hitting <return>
without supplying any input removed the old annotation, where other
naming would leave the old name intact.  3.6.0 did misbehave that
way; current code does too if EDIT_GETLIN is disabled but behaves
as desired when it's enabled.  (There's nothing that I can spot in
donamelevel() to explain why.  I'm confused.  Is tty_getlin()
returning the default answer instead of empty if that default text
is deleted at the prompt and no new text entered prior to <return>?)

Make donamelevel() work like mon/obj naming.  Empty input leaves
existing annotation, if any, intact.
2018-04-08 17:04:24 -07:00
PatR
38df5360e0 fix #H7039 - autodescribe of hallucinated statue
Having the autodescribe feature enabled and moving the cursor onto
a statue yields "statue of a <mon>" under normal circumtances, but
when done while hallucinating the feedback was just blank (because
the lookat() code couldn't find any monster at statue's location).
Now it will be "<random mon>" (not "statue of a <random mon>")
instead, same as when moving cursor over glyphs of actual monsters.
2018-04-07 16:08:10 -07:00
nhmall
c24d13f391 another guidebook typo 2018-04-07 08:38:17 -04:00
Pasi Kallinen
056a544f5a Missing word 2018-04-06 17:58:11 +03:00
Pasi Kallinen
b87dfdbecd Guidebook: Just list the extended command
... the same way the extra key binds are listed just above.
2018-04-06 08:50:35 +03:00
Pasi Kallinen
095a00e0fc Guidebook: Move ladders into stairs section 2018-04-06 08:46:08 +03:00
Pasi Kallinen
57cadfd387 Capitalize NetHack correctly 2018-04-06 08:00:50 +03:00
nhmall
b0817ee88a gb typo fix 2018-04-05 20:49:12 -04:00
nhmall
4357f644b0 gb sync 2018-04-05 18:51:50 -04:00
nhmall
c9acbf8d14 more Guidebook updates 2018-04-05 17:59:52 -04:00
nhmall
b7d07e0d91 guidebook updates today's date and dungeoneers columns 2018-04-05 07:50:49 -04:00
PatR
e1552679e2 DUMPLOG map fix
I once changed dump_map() to suppress blank lines as it processed the
known portion of current dungeon level so that no blank lines would
be shown above the mapped area and at most one would be shown below.
Any blank lines within were put back.  But the count of the current
block of suppressed lines wasn't being zeroed when an internal gap
did get put back, so after that every line got spurious blank lines
inserted in front of it.  I'm surprised that no one seems to have
discovered this problem.

This fix also changes the dumped map to suppress trailing spaces.  In
the process, I noticed that the original DUMPLOG code was clobbering
column COLNO-1 if that was ever part of known map.  buf[x - 2] = '\0'
overwrote the final map character in buf[] with the terminator.
2018-04-04 18:27:13 -07:00
Pasi Kallinen
4318aa8c04 Guidebook fix, 4 column dungeoneers 2018-04-03 20:41:53 +03:00
PatR
6faff71a17 fix another 'wonky secret door'
The cavemen quest description includes an 'S' in the lower right
corner of the MAP...ENDMAP section of the locate level.  It produced
a secret door as intended but did not have horizontal vs vertical set
because the latter was only being done for DOOR directives.  Instead
of adding an explicit directive, make the loading code set horizontal
vs vertical for all doors.

This fixes the orientation of that secret door in the Cav locate
level, but I noticed that it showed up an a visible horizontal wall
when the spots on either side were still blank.  It's behaving as
if the door is on a lit spot and the adjacent walls are unlit (this
misbehavior was already present before the current change; it was
just shown incorrectly as a visible vertical wall before).
2018-04-02 13:35:41 -07:00
PatR
f8e64b296c steed sanity check
Wizard mode sanity checking gave spurious "mon not on map" warnings
for steed when hero is mounted.  Steed is in the fmon list but not
expected to be present on the map.
2018-03-31 16:55:29 -07:00
PatR
c058826995 fix #H7015 - explosion chain reaction bug
The fix to prevent "crushed by a gas spore's explosion" set killer.name
to an empty string after a gas spore explosion finished, but that made
nested explosions end up with empty killer.name after the innermost
call completed.  explode() shouldn't have been hanging on to a pointer
to a global value that is subject to change while it executes.  Making
a local copy of the current value at the time explode() is called will
solve that (I hope...).

Simply reverting the reset of killer.name wouldn't have been correct.
The innermost explosion would still be clobbering killer.name for any
outer MON_EXPLODE explosions in progress.  When the only exploding
monster is gas spore, that wouldn't be noticeable.  But having other
types of exploding monsters and a chain reaction which affected more
than one type would have exposed that bug.  I think this fixes both
aspects of this problem but don't have a second type of exploding
monster to verify the second part.
2018-03-30 17:05:23 -07:00