Commit Graph
2797 Commits
Author SHA1 Message Date
nhmall c58b6119ca be consistent with the tex version 2018-05-20 15:36:51 -04:00
nhmall 9cb9164ce5 update note of appreciation in Guidebooks (dat/history to follow) 2018-05-20 15:11:49 -04:00
PatR b17c6d0b54 fix #H7155 - polearm can reveal hidden monster
The code to choose a likely target when applying a polearm was
basing its decision on visible spots which contained monsters,
so could expose the location of a hidden monster if there was
only one such spot within polearm range.  Not mentioned in the
report:  it also wouldn't pick remembered, unseen monster unless
there was a monster still at that spot.

I've changed it to choose candidate location based on the glyphs
shown rather than on the presence of monsters.
2018-05-19 15:46:09 -07:00
PatR 98099863ff fix #H7159 - orc hero can start with lembas wafers
Orc heroes get an extra food item ("to compensate for generally
inferior equipment") and it could randomly be lembas wafers (or
cram rations), and Ranger heroes always started with cram rations
even when they're orcs.  Fixing the latter was simple, but the
normal race-based substitutions weren't applied to randomly
generated items, so the fix for the former required a bit of code
reorganization in ini_inv().

Elf heroes already get lembas instead of cram; do the reverse for
dwarves (although I don't think this case can happen--no role gets
lembas wafers and only orcs and always-human tourists get random
food); give orc heroes tripe instead of either lembas or cram.
2018-05-19 11:47:15 -07:00
PatR e9f1e03271 fix some of #H7156 - perm_invent issues
> [1. perm_invent is kept in flags so persists across save/restore, but
>  perm_invent capability can change if player restores with a different
>  interface--or same one running on a different-sized display--so it
>  ought to be in iflags instead.]

Not addressed here.

> 2. perm_invent window does not get updated when charging a wand (or
> other chargeable item presumably), with a scroll of charging.

Most scrolls rely on useup() -> update_inventory(), but charging uses up
the scroll early so that it will be gone from inventory when choosing an
item to charge.  It needed an explicit update_inventory() after charging.

> 3. update_inventory(), is called from setworn(), which is called from
> dorestore(), when loading a save.  Segfaults have been observed in
> variants based on this code (though not yet in vanilla 3.6.1), so it's
> possible this may be unsafe.  The update_inventory() call in setworn()
> could be protected with "if (!restoring) ..."

tty doesn't support perm_invent, so this might be a win32 issue.
I've made the suggested change, but a better fix would be to turn off
perm_invent as soon as options processing (new game) or options restore
(old game unless/until #1 gets changed) has finished setting things up,
then turn it back on at the end of moveloop()'s prolog when play is
about to start.

 = =

Most of the read.c change is reordering prototypes to match the order
of the corresponding functions.  I did this when adding a new static
routine, then ended up discarding that routine.
2018-05-19 04:19:18 -07:00
PatR bed79b8391 more hilite_status threshold number parsing
In addition to leading '-' for negative values, accept explicit '+'
for positive values as a no-op.
2018-05-18 22:56:21 -07:00
PatR 546321d055 Unix Makefile changes 2018-05-18 22:04:21 -04:00
nhmall 76de68fb4f Merge branch 'NetHack-3.6.0' 2018-05-17 19:43:29 -04:00
PatR 4b98266e25 fix #H7160 - hilite thresholds reject negatives
There was a prior report about this but I can't find it; maybe it
didn't go through the web contact form.  Anyway, status_hilite
threshold numeric values wouldn't accept a minus sign before the
digits, preventing negative AC values from being tracked.
2018-05-17 15:48:09 -07:00
nhmall 2758cd998a Guidebook.txt update 2018-05-17 03:42:38 +00:00
nhmall 1e60a16565 sync date between two Guidebook files (.mn, .tex) 2018-05-16 23:26:07 -04:00
nhmall 2b66b5ecd1 bump version ID values 2018-05-16 23:06:44 -04:00
nhmall a6e52210fa Merge branch 'NetHack-3.6.0' 2018-05-15 19:43:24 -04:00
nhmall 8dc2c59796 fixes36.2 catch-up for previous commit 2018-05-15 19:41:12 -04:00
nhmall 88f5dcbfb4 fix spaces in hilite_status option text field not working H7107 (GitHub #88)
Fixes #88

H7107: FWD: spaces in hilite_status option text field not working
2018-05-15 19:35:36 -04:00
nhmall e3b0badbdf Merge branch 'NetHack-3.6.0' 2018-05-15 06:42:13 -04:00
nhmall 504f0a4510 integrate aklys feature introduced in 3.6.1 into 3.6.x display 2018-05-15 06:41:06 -04:00
nhmall 5d410a3457 remove entry from fixes37.0 cherry picked into minor dev branch
this display-support for a 3.6.1 feature was originally committed
to master but it might as well accompany the 3.6 line changes
that are already there.
2018-05-15 06:32:54 -04:00
nhmall e058df508e Merge branch 'NetHack-3.6.0' 2018-05-15 01:21:54 -04:00
nhmall aaddab5450 catch up on fixes36.2 updates 2018-05-15 01:10:32 -04:00
nhmall 2e8b69d5ff some tty per field rendering and optimization 2018-05-14 21:13:37 -04:00
nhmall 3fe8325f14 integrate aklys feature introduced in 3.6.1 into display 2018-04-29 10:40:11 -04:00
nhmall 740a51f3d8 Merge branch 'NetHack-3.6.0' 2018-04-28 17:25:03 -04:00
nhmall 4e5c41401f last line of config file wasn't heeded if newline was missing 2018-04-28 17:22:21 -04:00
nhmall cf73c4bf26 windows build fix
preprocess bigroom.des
	$(U)makedefs --input bigroom.des --output - --grep | $(U)levcomp

insert a missing tile (placeholder only - it needs future fixing!)
2018-04-28 16:04:45 -04:00
nhmall c8afcdb795 correct an overwrite 2018-04-28 12:22:44 -04:00
nhmall f4e70044be prepare repository for new major version 2018-04-28 12:17:48 -04:00
nhmall 52dd755d27 Merge branch 'NetHack-3.6.0' 2018-04-28 12:12:32 -04:00
nhmall 331abfe530 Specify both width and height when creating font for width testing
From Bart...

When we are creating the console font for testing character widths,
we were not specifying width. Because of this, the created font's
average width might be larger then what we expect and we might
falsely detect that the font was inappropriate for playing Nethack.
Fix provides the width that we are expecting when creating the font.
2018-04-28 12:11:19 -04:00
nhmall d8443dff37 Merge branch 'NetHack-3.6.0' 2018-04-27 06:37:54 -04:00
PatR 78fe5fbb05 display glitch: warning vs remembered,unseen
Noticed while testing the fix for the recently reported clairvoyance
bug.  I saw a '1' move onto an 'I', then when it moved again the 'I'
reappeared.  The remembered unseen monster couldn't be there anymore
if the warned-of monster was able to walk through that spot, so
remove any 'I' when showing a warning (digit) to stop remembering an
unseen monster at the warning spot.

Nobody has ever reported this so fixing it isn't urgent, but fixing
it is trivial so I'm doing it in now (without the clairvoyance fix).
2018-04-26 15:07:00 -07:00
nhmall dcb9657b03 new Guidebook.txt 2018-04-25 19:56:39 -04:00
nhmall 0e2555881a Merge branch 'NetHack-3.6.0' 2018-04-25 18:15:49 -04:00
nhmall 9914250632 Guidebook.tex bit spotted in test pdf generation 2018-04-25 17:36:29 -04:00
nhmall 5101b9efb8 Update some dates and comment out BETA 2018-04-25 17:11:28 -04:00
nhmall 671c40c557 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2018-04-25 16:58:59 -04:00
nhmall fd482d11f0 fixes36.1 multi-line entries require leading tab after first line 2018-04-25 16:55:42 -04:00
keni 0f58af6f37 add missing copyright info 2018-04-25 16:54:50 -04:00
keni 11f1983253 update .gitattributes files for substitution and copyright headers 2018-04-25 14:52:43 -04:00
nhmall df7d10bec8 Merge branch 'NetHack-3.6.0' 2018-04-23 21:41:06 -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 17518b8fc3 Merge branch 'NetHack-3.6.0' 2018-04-19 22:31:35 -04:00