Commit Graph

12827 Commits

Author SHA1 Message Date
nhmall
e795dd107e fix Makefile.mingw32 2022-02-04 20:26:05 -05:00
PatR
e8341dc9d7 fix github issue #666 - cursed light vs worn light
Another gold dragon scales/mail issue, reported bu vultur-cadens:
reading a cursed scroll of light extinguishes carried light sources
except for wielded Sunsword and worn gold dragon scales/mail; there
was a special message for Sunsword (preventing the hero from being in
darkness) but no such message for gold dragon scales/mail.  Replace
the special message with a more generic one applicable to both cases.

Also, implement the suggestion that cursed light degrade the amount
of light being emitted (which varies by bless/curse state) for those
two cases.  Sunsword has a 75% chance to resist, gold dragon scales
25% chance.  And add the inverse:  blessed scroll of light might
increase the amount of light by improving their bless/curse state.
The resistance check applies here too and isn't inverted; Sunsword
is still fairly likely to resist.

Uncursed scroll of light, spell of light regardless of skill, zapped
or broken wand of light have so such effect.

Closes #666
2022-02-04 16:20:03 -08:00
nhmall
0fba9cf896 .gitattributes for Xcode directory 2022-02-04 19:01:11 -05:00
nhw_cron
c673750d07 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 18:57:10 -05:00
nhmall
2f83190f8a macOS.370 Lua 2022-02-04 18:55:12 -05:00
nhmall
ee1eff538c Lua link on Jammy Jellyfish 2022-02-04 18:03:08 -05:00
PatR
5b28db5f23 more obsolete files: DECUS C's preprocessor
Get rid sys/share/cpp[123].shr, the pre-ANSI C preprocessor that was
included in the source distribution for use on systems with ancient
C compilers whose preprocessor that couldn't cope with nethack's large
number of macros.
2022-02-04 14:34:46 -08:00
nhmall
6af710bc97 provide a Makefile target to clean the Lua submodule 2022-02-04 17:11:09 -05:00
nhw_cron
82b8175377 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 16:58:50 -05:00
nhw_cron
6e7e676fec This is cron-daily v1-Feb-3-2022. 005guidebook updated: doc/Guidebook.txt 2022-02-04 16:11:05 -05:00
nhmall
a25259a97a more obsolete file references 2022-02-04 15:52:42 -05:00
nhmall
a71d5e3cb3 remove some obsolete file references 2022-02-04 15:43:21 -05:00
nhw_cron
789f5174f0 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 15:38:23 -05:00
nhmall
990d672dce inadvertent space typo 2022-02-04 15:23:23 -05:00
nhkeni
1d210ed722 prevent ..files value from being pull from ..
This was creating extra nethack.ico entries in Files.
2022-02-04 15:11:04 -05:00
nhmall
6057c9813d CI update for mingw
Add GIT=1 to the make-mingw32 command
2022-02-04 15:07:32 -05:00
nhmall
b8489de8eb support use of git submodules with the Makefiles
git=1 when invoking make will use the submodule submodules/lua.

On windows, it will also use the submodule submodules/pdcurses.
2022-02-04 14:48:29 -05:00
nhmall
8499c71fcc update a couple of lagging 3.6 references 2022-02-04 12:47:05 -05:00
nhw_cron
91f7353b65 This is cron-daily v1-Feb-3-2022. 005guidebook updated: doc/Guidebook.txt 2022-02-04 12:37:06 -05:00
nhw_cron
44d0faca22 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 11:28:41 -05:00
nhmall
3db819478f update OS terminology used in some text references 2022-02-04 11:26:14 -05:00
nhmall
5d4fc4591d more .gitattributes updates 2022-02-04 11:01:20 -05:00
nhmall
ccf9bb5fe2 updated Files 2022-02-04 10:43:43 -05:00
nhw_cron
47751ed6cb This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 10:32:32 -05:00
nhmall
471df587ab take 2 on src/.gitattributes 2022-02-04 09:41:30 -05:00
nhmall
c9e9b7a02a Revert "revert today's src/.gitattributes changes"
This reverts commit 5204eef9c0.
2022-02-04 09:40:31 -05:00
nhmall
ec350281c6 Revert "This is cron-daily v1-Jan-26-2022. 000files updated: Files"
This reverts commit 6d513efc1e.
2022-02-04 09:39:23 -05:00
Pasi Kallinen
8f7f598050 Fix mention_walls distinguishing unseen walls from solid stone
Bumping into an unseen wall reported "a wall" instead of "solid stone",
even though you could not know it was a wall when looking at it.

Use the same method when looking at glyphs on the map instead of
the map location type.

Fixes #318
2022-02-04 14:02:18 +02:00
nhmall
5204eef9c0 revert today's src/.gitattributes changes
For now. They appear to have broken some automation.
2022-02-03 12:31:21 -05:00
nhmall
01e820fa37 yet even more src/.gitattributes (final?) 2022-02-03 11:26:49 -05:00
nhmall
4dbc3566cf even more src/.gitattributes 2022-02-03 11:24:07 -05:00
nhmall
4f55c938d3 more src/.gitattributes 2022-02-03 11:22:29 -05:00
nhmall
d66e375f70 update src/.gitattributes for cron-job purposes 2022-02-03 11:19:54 -05:00
nhw_cron
6d513efc1e This is cron-daily v1-Jan-26-2022. 000files updated: Files 2022-02-03 09:01:30 -05:00
PatR
fffa9d58b7 rubber hose attacks
Give similar feedback for attacking with a rubber hose as for bullwhip:
the wielder "lashes" rather than "swings".
2022-02-03 04:42:19 -08:00
PatR
8a722ea949 Qt: add tool tips to to extended command selector
For the grid of extended commands used to pick one after typing "#",
show a command's description if the mouse hovers over its button.
For once something with Qt was actually easy.
2022-02-03 04:17:30 -08:00
PatR
62f89bf0c4 Files update 2022-02-03 03:29:14 -08:00
PatR
87bcd2ee50 update .gitignore
Ignore the new timestamp files src/moc.qt5 and src/moc.qt6.  They
probably ought to be renamed Qt*.moc-t but I haven't done that.

Also put back vis_tab.* in case someone checks out 3.6 and builds
that, then checks out 3.7 without doing 'make spotless' first.
2022-02-03 00:27:43 -08:00
nhmall
bc752a8f9d remove some duplicated code in monst.c 2022-02-02 21:26:01 -05:00
nhmall
c26bae521b static keyword on prototype, but function missing it
error 28 in line 4090 of "invent.c": redeclaration of var <adjust_ok> with new storage-class
error 28 in line 4100 of "invent.c": redeclaration of var <adjust_gold_ok> with new storage-class
error 28 in line 610 of "mdlib.c": redeclaration of var <count_and_validate_winopts> with new storage-class
error 28 in line 3846 of "options.c": redeclaration of var <pfxfn_cond_> with new storage-class
error 28 in line 3886 of "options.c": redeclaration of var <pfxfn_font> with new storage-class
error 28 in line 5307 of "options.c": redeclaration of var <determine_ambiguities> with new storage-class
error 28 in line 5343 of "options.c": redeclaration of var <length_without_val> with new storage-class
error 28 in line 6853 of "options.c": redeclaration of var <illegal_menu_cmd_key> with new storage-class
error 28 in line 7708 of "options.c": redeclaration of var <count_apes> with new storage-class
error 28 in line 2686 of "pickup.c": redeclaration of var <stash_ok> with new storage-class
error 28 in line 1008 of "read.c": redeclaration of var <can_center_cloud> with new storage-class
error 28 in line 31 of "rnd.c": redeclaration of var <whichrng> with new storage-class
2022-02-02 15:33:49 -05:00
PatR
afe36abdac fixes entry for pull request #665 - mplayer chat
From entrez:  Have fake players respond to #chat via verbalize() rather
than pline() since those responses are spoken.

Closes #665
2022-02-02 11:58:12 -08:00
Michael Meyer
79b3a624e4 Use verbalize for player monster speech
Attempting to chat with a player monster would inspire a witty retort,
but it was presented without quotation marks and so differed from other
types of monster speech.
2022-02-02 11:55:38 -08:00
nhmall
8ce4874152 remove unintentional repeat code in outdated file 2022-02-02 10:25:40 -05:00
PatR
9aea7b587c fix #K3455 - rocks vs xorns
Implement the suggestion that falling rock traps and rolling boulder
traps be harmless to xorns.  I've extended that to all missiles made
of stone (rocks, gems, boulders, a handful of other things that will
only matter if poly'd hero throws in '<' direction or is hit by stuff
scattered by an explosion).

I excluded ghosts because they would become even harder to kill and
the missile handling would need extra checks to test for blessed objs.
2022-02-02 05:26:03 -08:00
nhw_cron
2b70492474 This is cron-daily v1-Jan-26-2022. 000files updated: Files 2022-02-01 17:30:48 -05:00
nhmall
ba6688b40e follow-up to tilemap.c change 2022-02-01 17:18:44 -05:00
nhmall
3a4302773d two minor core changes for hypothetical Amiga cross port
The tilemap change provides three variables that used to be
uppercase compile macros in the past, and Amiga (and other ports?) used
them.

The other change just uncomments the header file include.
2022-02-01 17:11:35 -05:00
nhmall
83dcb5772b Merge branch 'amiga' into NetHack-3.7 2022-02-01 17:01:40 -05:00
PatR
bc6ca2b821 Qt 5 vs 6 'moc'
This is an attempt to address the issue of switching from Qt 5 to
Qt 6 or vice versa on Unix without running 'make spotless'.  Various
*.h files (but not all of them) in win/Qt/ are run through a program
called 'moc' to create new files *.moc that are included by *.cpp.
The problem is that the constructed files use the same names for Qt
5 or 6 but their contents apparently aren't compatible.  This adds
rules (specific to GNU make) that use a pair of timestamp files to
track which version of moc made src/*.moc and to destroy them when
switching Qt versions in order to force their re-creation.

As it stands, a hints file which includes hints/include/compiler.370
is now required in order to build the Qt interface with the Unix
Makefiles.  There's no change for platforms that don't use those and
I've no idea whether something comparable could be done for macOS
Xcode IDE.

The first time make is run with WANT_WIN_QT=1 after this is in place,
all the .moc files will be rebuilt and the subset of .cpp files which
include them will be recompiled.  After that, the .moc files will be
rebuilt as needed--and only as needed--just like any other constructed
files.
2022-02-01 13:50:12 -08:00
nhmall
bb01c6378a last known Amiga cross-compile -> outdated
Place the last known Amiga cross-compile effort into the outdated folder
tree.

This shell script was meant to be run from the top of the NetHack tree:
    outdated/sys/unix/cross-amiga.sh
It attempts two things:
1. obtain the source-code for the Amiga cross compiler and build it
   from scratch. Warning: it pulls a number of the required packages
   from the internet and installs them. (Linux was tested, but the macOS
   usage never was).
2. move the outdated hints file and hints include files for Amiga
   into the live tree for someone attempting to resurrect an Amiga port.
   It doesn't tinker with any of the files needed for the NetHack-3.7
   work-in-progess for other platforms.

Once the shell script completes those things, the cross-compile build
steps would be:
  i) cd sys/unix ; sh setup.sh hints/cross-amiga ; cd ../..
 ii) make CROSS_TO_AMIGA=1 all
iii) make CROSS_TO_AMIGA=1 package
2022-02-01 16:43:39 -05:00