Commit Graph

11601 Commits

Author SHA1 Message Date
Dean Luick
3ffd330c31 Remove vision tables from makedefs
Update makdefs source and its man page.

Remove all mentions of the vision table files from:
o .gitattributes
o .gitignore
o Files
o Cross-compiling

Add a brief note in the fixes file.
2021-01-03 13:37:25 -06:00
PatR
62ba302851 Unix 'make clean' and 'make spotless'
Provide a reasonably straightforward way to leave lua alone when
changing git branches (which I precede with 'make spotless').
 make clean-keep-lib
and
 make spotless-keep-lib
are new alternate forms of top level 'make clean' and 'make spotless'
that won't touch lib/lua/.
2021-01-03 11:27:17 -08:00
nhmall
dd15a1c46d cron doc/Guidebook.txt update 2021-01-02 22:57:14 -05:00
nhmall
e93eeb25fd Windows SELECTSAVED follow-up
set_savefile_name() was misbehaving on Windows if the regularize argument
was false.
2021-01-02 22:28:54 -05:00
PatR
46460255ef curses: restoring via menu
Clone the tty SELECTSAVED code in curses.  If you would be getting
the "who are you?" prompt (perhaps via 'nethack -u player') and
you have at least one save file, you'll get a menu of save files
(plus entries for 'new game' and 'quit') to choose from.  Requires
'#define SELECTDSAVED' at build time (only ntconf.h does that by
default) and when present, can be disabled by setting 'selectsaved'
to False in NETHACKOPTIONS or .nethackrc.
2021-01-02 18:50:04 -08:00
PatR
c71dd6696d pickup_types documentation
Another one from several years ago.  Document 'pickup_types:.'
as a way to set pickup_types to a value that won't ever cause
anything to be picked up, in order to leave all autopickup
decisions to player's autopickup exceptions.

Actually implementing pickup_types:none would require just as
much documentation plus extra code.
2021-01-02 17:07:46 -08:00
PatR
b1d0943d6d quickmimic fixes
Reported by a beta tester four years ago:  if you telepathically
observed a pet eat a mimic corpse and temporarily change shape,
you were told that you sensed it happening but the map continued
to show its true form (because telepathy overrides mimicking).
Attempting to force the map to show the alternate shape in that
situation was hopeless, so give an alternate message instead.

While trying to fix this, I noticed my dog mimicking a throne
several times.  The list of alternate shapes for quickmimic
included SINK which happens to have the same value as S_throne.
Change that to S_sink.
2021-01-02 11:59:40 -08:00
PatR
b815c470ec remove mapglyph() remnants from win/curses/
Remove a couple of leftover references to mapglyph() from the
curses code (present inside '#if 0' blocks).  I've tried to
substitute code which should work but have no idea whether it
actually will.
2021-01-02 10:46:17 -08:00
nhw_cron
9bd992f4a5 This is cron-daily v1-Jan-20-2020. files updated: Files 2021-01-02 10:50:55 -05:00
nhmall
1f78be370d fixes37.0 update 2021-01-02 10:49:48 -05:00
nhmall
10dfceac7b another unused variable 2021-01-02 09:44:09 -05:00
nhmall
5910f86c19 unused variables 2021-01-02 09:35:56 -05:00
nhmall
1d94e65e45 finish mapglyph() removal 2021-01-02 09:22:53 -05:00
nhmall
18116d4a7b update for 2021 2021-01-01 22:07:54 -05:00
nhmall
44b4b1f3d1 Merge branch 'actual-nh-patch-1' into NetHack-3.7 2020-12-31 22:57:52 -05:00
nhmall
985cffbfed Merge branch 'patch-1' of https://github.com/actual-nh/NetHack into actual-nh-patch-1 2020-12-31 22:57:33 -05:00
nhmall
eb14a7ddf2 Check bones data directly for deja vu messages PR #374
Closes #374
Closes #322
2020-12-31 21:31:13 -05:00
nhmall
cdfbae5529 Merge branch 'entrez-fix322' into NetHack-3.7 2020-12-31 21:25:16 -05:00
nhmall
02e465e643 Merge branch 'fix322' of https://github.com/entrez/NetHack into entrez-fix322 2020-12-31 21:18:51 -05:00
actual-nh
c3e94596f8 Missing quote mark
Again, checked vs my copy.
2020-12-31 19:54:39 -05:00
actual-nh
0a5852291e Typo (Hogfather)
One typo in a quotation from Hogfather; I have checked (Corgi edition (13th printing?), 1997, page 310) and corrected it to match the original.
2020-12-31 19:51:04 -05:00
PatR
db673ab791 termcap followup
A little more testing for ANSI_DEFAULT forced on has revealed
that hilites[Black] has also been left Null, a problem that
MS-DOS hid.
2020-12-31 16:09:46 -08:00
nhmall
862c4064ab gender-specific names can be used in .lua files with the gender upheld
Revert "monster name references in .lua files"
This reverts commit 0e0aa7bdf6.
2020-12-31 18:51:00 -05:00
PatR
e7e07cb067 pull request #411 - freeing termcap hilite entries
(strings to switch color) for ANSI_DEFAULT.  Instead of lumping
more conditional code into tty_shutdown() I put the new code
into a separate routine and also pulled the existing setup code
out of tty_startup() into a separate routine too.

It will be a miracle if this doesn't break anything due to the
crazy amount of convoluted conditionals present in termcap.c.

On the other hand, I found and fixed a bug while trying to test.
The ANSI_DEFAULT hilites for Gray and No_Color were null instead
of an empty string.  MS-DOS stdio apparently fixes that up, but
on OSX (after #undef UNIX and TERMLIB and TERMINFO and #define
ANSI_DEFAULT in termcap.c) I started seeing instances of "(null)"
on the map (OSX stdio does a different fix up for Null pointers)
as soon as I enabled 'color'.  It was an attempt to set No_Color.

Closes #411
2020-12-31 14:49:21 -08:00
PatR
4c8a8bcfee fix github issue #431 - failed displacing
Being able to swap places with peaceful monsters instead of just
with pets made it possible to cause them to flee. Shopkeepers
wouldn't abandon the shop door but temple priests would attack
if hero tried to chat while they were fleeing.
2020-12-31 11:23:29 -08:00
Michael Meyer
6ae7818346 Refactor bones search loop
Using a for loop instead of an if and a do/while makes the code much
more clear and concise, so that it's easier to understand what the
function does at a glance.  The actual approach to iterating through the
current level's bones files and searching for a match is more or less
unchanged.
2020-12-30 22:42:48 -05:00
PatR
565cdf3cba tribute typo: Lords and Ladies #5
Add a missing opening quote mark near the end of passage 5 of
Lords and Ladies.
2020-12-30 17:55:30 -08:00
nhmall
0e0aa7bdf6 monster name references in .lua files
Closes #434
2020-12-30 19:18:25 -05:00
nhmall
1cf9d0323a pmnames follow-up
replace references to "aligned priest" in several lua files with "aligned cleric"

also accept "aligned priest" during ^G parsing
2020-12-30 18:57:24 -05:00
Michael Meyer
47884d63ac Merge branch 'NetHack-3.7' into fix322 2020-12-30 14:05:16 -05:00
nhmall
d38a5fedd0 another vision table bit for gcc Makefile for Windows 2020-12-30 12:31:01 -05:00
nhmall
a7c804a965 Xcode updates for vision table removal part 3 2020-12-30 12:17:39 -05:00
PatR
99cc236d4a vis_tab removal for VMS
Get rid of vis_tab.{c,h}, also the commented out remnants of
{dgn_comp,lev_comp}.*, and put back sfstruct.* that erroneously
got removed along with some other stuff way back when.

Untested, and the lua stuff needs to be modularized.
2020-12-30 08:58:15 -08:00
nhmall
a7b662e3db remove some obsolete references from the outdated tree
untested, of course
2020-12-30 10:45:27 -05:00
nhmall
b8cb4ec81d Xcode updates for vision table removal part 2 2020-12-30 10:01:08 -05:00
nhmall
4d31563ca1 Xcode updates for vision table removal 2020-12-30 09:56:32 -05:00
PatR
ef4efdb125 ^G prompting revisited
CP_TRYLIM-1 was the right value when the prompt augmentation
was at the top of the loop before the first prompt, but should
been changed to CP_TRYLIM when that got moved to the bottom of
the loop.

First prompt:
|Create what kind of monster?
Second and subsequent prompts if first attempt is unsuccessful:
|Create what kind of monster? [type name or symbol]

Prior to this fix, the shorter prompt was being used on the
first and second tries and not switching to the longer one until
the third.
2020-12-30 02:24:59 -08:00
nhmall
5f486677d0 Merge branch 'win-novisiontables' into NetHack-3.7 2020-12-29 22:12:59 -05:00
Dean Luick
a4e7646f4c Remove src and unix VISION_TABLES
Remove all references to the unused vision tables in the main source
and unix build.  Leave makedefs able to generate the vision tables.
makdefs will be cleaned up in a different commit, once all ports
are clear of dependencies.
2020-12-29 20:38:37 -06:00
PatR
b735122c2c ^G prompting
Make the initial prompt for ^G be less verbose.  Only expand to
the verbose form if a second or further try is needed.

Also, remove an orphan comment about is_male() and is_female().
2020-12-29 15:44:06 -08:00
nhmall
a1678d62f3 fixes entry for PR #433
Closes #433
2020-12-29 18:02:01 -05:00
nhmall
00c9277cfe usage of whichpm in new gender code required a null ptr guard 2020-12-29 17:49:30 -05:00
PatR
9c6a65f49b fix github issue #432 - bad sanity check
The block of sanity check code that is causing impossible warnings
about the Wizard mimicking a monster was initially only used for
furniture and objects specifically because of the Wizard.  When it
got extended to check for mimicking monsters, an exception for the
Wizard was needed but not added.

Fixes #432
2020-12-29 14:34:37 -08:00
nhmall
1c2c5dae1b remove vision tables from Windows and msdos builds 2020-12-28 22:07:00 -05:00
nhmall
f30bb8aaa4 another monster gender name handling tweak
ensure that monster female name variation ends up as a female during ^G

arbitrate when there is a conflict between gender term (male or female) and
a gender-tied monster name (cavewoman) during ^G; gender term wins
2020-12-28 14:02:22 -05:00
PatR
524f9dd82b Qt map's "ttychar"
Change the glyphttychar[ROWNO][COLNO] array from uchar to
unsighed short.  DrawWalls() has handling for values in over 2000.

This also reformats pretty much all of the NetHackQtMapViewport
portion of qt_map.cpp.
2020-12-28 10:01:43 -08:00
nhmall
c31047984b typo in tilemap.c update 2020-12-28 09:19:07 -05:00
nhmall
30fe65b5e0 fix tilemap.c compile when STATUES_LOOK_LIKE_MONSTERS wasn't defined 2020-12-28 09:14:39 -05:00
nhmall
1d063218d3 another wishing gender processing tweak 2020-12-27 22:38:41 -05:00
nhmall
242a59ac19 have a ^G-created monster's gender done in makemon instead of after 2020-12-27 21:44:51 -05:00